[josm] 01/11: Imported Upstream version 0.0.svn7906+dfsg1

Bas Couwenberg sebastic at xs4all.nl
Mon Dec 29 23:09:06 UTC 2014


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

sebastic-guest pushed a commit to branch master
in repository josm.

commit 4adb53ec0103702ce2dbfb2e7d7ae86847c9620e
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Mon Dec 29 22:01:55 2014 +0100

    Imported Upstream version 0.0.svn7906+dfsg1
---
 .classpath                                         |    4 +-
 CONTRIBUTION                                       |    4 +-
 README                                             |   34 +-
 REVISION                                           |    8 +-
 build.xml                                          |   16 +-
 data/defaultpresets.xml                            |  102 +-
 data/validator/combinations.mapcss                 |   22 +-
 data/validator/deprecated.mapcss                   |   19 +-
 data/validator/geometry.mapcss                     |   49 +
 data/validator/highway.mapcss                      |   29 +-
 data/validator/multiple.mapcss                     |   35 +-
 data/validator/numeric.mapcss                      |   15 +-
 i18n/launchpad.pl                                  |    6 +-
 i18n/po/af.po                                      |  188 +-
 i18n/po/am.po                                      |  188 +-
 i18n/po/ar.po                                      |  190 +-
 i18n/po/ast.po                                     | 2894 +++++++++--------
 i18n/po/az.po                                      |  188 +-
 i18n/po/be.po                                      |  188 +-
 i18n/po/bg.po                                      |  192 +-
 i18n/po/bn.po                                      |  188 +-
 i18n/po/br.po                                      |  188 +-
 i18n/po/bs.po                                      |  188 +-
 i18n/po/ca.po                                      |  233 +-
 i18n/po/ca at valencia.po                             |  206 +-
 i18n/po/cs.po                                      |  229 +-
 i18n/po/cy.po                                      |  188 +-
 i18n/po/da.po                                      | 1723 +++++-----
 i18n/po/de.po                                      |  242 +-
 i18n/po/de_DE.po                                   |  188 +-
 i18n/po/el.po                                      |  196 +-
 i18n/po/en_AU.po                                   |  196 +-
 i18n/po/en_CA.po                                   |  188 +-
 i18n/po/en_GB.po                                   |  210 +-
 i18n/po/eo.po                                      |  190 +-
 i18n/po/es.po                                      |  269 +-
 i18n/po/et.po                                      |  190 +-
 i18n/po/eu.po                                      |  194 +-
 i18n/po/fa.po                                      |  188 +-
 i18n/po/fi.po                                      |  204 +-
 i18n/po/fil.po                                     |  188 +-
 i18n/po/fr.po                                      |  224 +-
 i18n/po/gl.po                                      |  198 +-
 i18n/po/he.po                                      |  190 +-
 i18n/po/hi.po                                      |  188 +-
 i18n/po/hr.po                                      |  188 +-
 i18n/po/ht.po                                      |  188 +-
 i18n/po/hu.po                                      |  208 +-
 i18n/po/hy.po                                      |  188 +-
 i18n/po/ia.po                                      |  188 +-
 i18n/po/id.po                                      |  206 +-
 i18n/po/is.po                                      |  190 +-
 i18n/po/it.po                                      |  211 +-
 i18n/po/ja.po                                      |  212 +-
 i18n/po/ka.po                                      |  188 +-
 i18n/po/km.po                                      | 3354 ++++++++++++--------
 i18n/po/ko.po                                      |  188 +-
 i18n/po/ky.po                                      |  188 +-
 i18n/po/lo.po                                      |  188 +-
 i18n/po/lt.po                                      |  196 +-
 i18n/po/lv.po                                      |  188 +-
 i18n/po/mk.po                                      |  188 +-
 i18n/po/ms.po                                      |  188 +-
 i18n/po/nb.po                                      |  192 +-
 i18n/po/nds.po                                     |  188 +-
 i18n/po/nl.po                                      |  210 +-
 i18n/po/nn.po                                      |  188 +-
 i18n/po/oc.po                                      |  188 +-
 i18n/po/pa.po                                      |  188 +-
 i18n/po/pl.po                                      |  362 ++-
 i18n/po/pt.po                                      |  206 +-
 i18n/po/pt_BR.po                                   |  235 +-
 i18n/po/rm.po                                      |  188 +-
 i18n/po/ro.po                                      |  188 +-
 i18n/po/ru.po                                      |  248 +-
 i18n/po/sk.po                                      |  394 ++-
 i18n/po/sl.po                                      |  188 +-
 i18n/po/sq.po                                      |  188 +-
 i18n/po/sr.po                                      |  188 +-
 i18n/po/sv.po                                      |  248 +-
 i18n/po/ta.po                                      |  190 +-
 i18n/po/te.po                                      |  188 +-
 i18n/po/th.po                                      |  188 +-
 i18n/po/tr.po                                      |  190 +-
 i18n/po/ug.po                                      |  188 +-
 i18n/po/uk.po                                      | 1938 +++++------
 i18n/po/ur.po                                      |  188 +-
 i18n/po/vi.po                                      |  188 +-
 i18n/po/zh_CN.po                                   |  235 +-
 i18n/po/zh_TW.po                                   |  230 +-
 images/presets/cattle_grid.png                     |  Bin 459 -> 0 bytes
 images/presets/motorway_exit.png                   |  Bin 856 -> 0 bytes
 images/presets/stile.png                           |  Bin 291 -> 0 bytes
 images/presets/traffic-light.png                   |  Bin 322 -> 0 bytes
 linux/latest/usr/share/man/man1/josm-latest.1      |   19 +-
 linux/tested/usr/share/man/man1/josm.1             |   19 +-
 src/org/openstreetmap/josm/Main.java               |   97 +-
 .../josm/actions/AlignInLineAction.java            |  148 +-
 .../josm/actions/AutoScaleAction.java              |    4 +-
 .../josm/actions/DistributeAction.java             |    2 +-
 .../josm/actions/ImageryAdjustAction.java          |   50 +-
 src/org/openstreetmap/josm/actions/InfoAction.java |   10 +-
 .../openstreetmap/josm/actions/InfoWebAction.java  |    7 +
 .../josm/actions/JoinNodeWayAction.java            |   22 +-
 src/org/openstreetmap/josm/actions/JosmAction.java |    1 -
 .../openstreetmap/josm/actions/JumpToAction.java   |    2 +
 .../josm/actions/LassoModeAction.java              |    7 +
 .../josm/actions/MapRectifierWMSmenuAction.java    |   22 +-
 .../josm/actions/MergeLayerAction.java             |    2 +-
 .../josm/actions/MergeNodesAction.java             |   15 +-
 .../josm/actions/MergeSelectionAction.java         |   33 +-
 .../openstreetmap/josm/actions/MirrorAction.java   |    3 +-
 src/org/openstreetmap/josm/actions/MoveAction.java |   14 +-
 .../openstreetmap/josm/actions/MoveNodeAction.java |    3 +
 .../openstreetmap/josm/actions/OpenFileAction.java |   12 +-
 .../josm/actions/OpenLocationAction.java           |   12 +-
 .../josm/actions/OrthogonalizeAction.java          |   12 +-
 .../josm/actions/SelectByInternalPointAction.java  |   12 +-
 .../actions/downloadtasks/DownloadOsmTask.java     |   22 +-
 .../josm/actions/mapmode/AddNoteAction.java        |    9 +-
 .../josm/actions/upload/FixDataHook.java           |    4 +-
 .../josm/corrector/ReverseWayNoTagCorrector.java   |   20 +-
 src/org/openstreetmap/josm/data/AutosaveTask.java  |   10 +-
 .../josm/data/CustomConfigurator.java              |   28 +-
 src/org/openstreetmap/josm/data/Preferences.java   |  181 +-
 .../openstreetmap/josm/data/ProjectionBounds.java  |    3 +
 src/org/openstreetmap/josm/data/ViewportData.java  |   36 +-
 .../josm/data/osm/AbstractPrimitive.java           |    6 +-
 src/org/openstreetmap/josm/data/osm/DataSet.java   |   14 +
 .../josm/data/osm/DatasetConsistencyTest.java      |    2 +-
 src/org/openstreetmap/josm/data/osm/Node.java      |    9 +-
 src/org/openstreetmap/josm/data/osm/NoteData.java  |   76 +
 .../josm/data/osm/OsmPrimitiveType.java            |   11 +-
 src/org/openstreetmap/josm/data/osm/OsmUtils.java  |    3 +-
 src/org/openstreetmap/josm/data/osm/Relation.java  |    2 +-
 .../josm/data/osm/RelationMember.java              |    7 +-
 src/org/openstreetmap/josm/data/osm/Way.java       |    4 +-
 .../josm/data/osm/visitor/BoundingXYVisitor.java   |    5 +-
 .../data/osm/visitor/paint/StyledMapRenderer.java  |    7 +-
 .../josm/data/validation/OsmValidator.java         |   10 +-
 .../josm/data/validation/TestError.java            |    2 +-
 .../data/validation/routines/DomainValidator.java  |  565 +++-
 .../data/validation/routines/EmailValidator.java   |    5 +-
 .../validation/routines/InetAddressValidator.java  |    1 +
 .../data/validation/routines/RegexValidator.java   |    1 +
 .../data/validation/routines/UrlValidator.java     |    8 +-
 .../josm/data/validation/tests/Highways.java       |    8 +-
 .../josm/data/validation/tests/InternetTags.java   |  111 +-
 .../josm/data/validation/tests/Lanes.java          |   10 +-
 .../data/validation/tests/MapCSSTagChecker.java    |   97 +-
 .../data/validation/tests/RelationChecker.java     |  259 +-
 .../data/validation/tests/SimilarNamedWays.java    |  162 +-
 src/org/openstreetmap/josm/gui/ExtendedDialog.java |    2 +-
 .../openstreetmap/josm/gui/MainApplication.java    |   30 +-
 src/org/openstreetmap/josm/gui/MapFrame.java       |    6 +-
 src/org/openstreetmap/josm/gui/MapStatus.java      |    6 +-
 src/org/openstreetmap/josm/gui/MapView.java        |   61 +-
 .../josm/gui/NavigatableComponent.java             |   74 +-
 src/org/openstreetmap/josm/gui/NoteSortDialog.java |   88 +
 .../josm/gui/conflict/pair/ListMergeModel.java     |    2 +-
 .../tags/MultiValueResolutionDecision.java         |    6 +-
 .../josm/gui/dialogs/ChangesetDialog.java          |    2 +-
 .../josm/gui/dialogs/DialogsPanel.java             |    6 +-
 .../josm/gui/dialogs/InspectPrimitiveDialog.java   |    6 +-
 .../josm/gui/dialogs/MapPaintDialog.java           |    5 +-
 .../dialogs/{NoteDialog.java => NotesDialog.java}  |   65 +-
 .../josm/gui/dialogs/OsmIdSelectionDialog.java     |   45 +-
 .../josm/gui/dialogs/SelectionListDialog.java      |   50 +-
 .../changeset/query/ChangesetQueryDialog.java      |    2 +-
 .../gui/dialogs/properties/PropertiesDialog.java   |    3 +
 .../josm/gui/dialogs/properties/TagEditHelper.java |    1 +
 .../dialogs/relation/GenericRelationEditor.java    |   25 +-
 .../josm/gui/download/DownloadDialog.java          |    4 +-
 src/org/openstreetmap/josm/gui/help/HelpUtil.java  |    8 +-
 .../josm/gui/history/TagInfoViewer.java            |    2 +
 .../josm/gui/history/TagTableColumnModel.java      |   11 +-
 .../io/DownloadPrimitivesWithReferrersTask.java    |    2 +-
 .../josm/gui/io/UploadStrategySelectionPanel.java  |    2 -
 .../openstreetmap/josm/gui/layer/NoteLayer.java    |   33 +-
 src/org/openstreetmap/josm/gui/layer/TMSLayer.java |   68 +-
 .../gui/layer/geoimage/CorrelateGpxWithImages.java |    2 +-
 .../josm/gui/layer/geoimage/GeoImageLayer.java     |   13 +
 .../josm/gui/layer/geoimage/ImageViewerDialog.java |   25 +-
 .../josm/gui/layer/geoimage/ThumbsLoader.java      |   11 +-
 .../openstreetmap/josm/gui/mappaint/Cascade.java   |    2 +-
 .../josm/gui/mappaint/MapPaintStyles.java          |   11 +
 .../josm/gui/mappaint/NodeElemStyle.java           |    4 +-
 src/org/openstreetmap/josm/gui/mappaint/Range.java |   14 +-
 .../josm/gui/mappaint/StyleCache.java              |    4 +-
 .../josm/gui/mappaint/mapcss/Instruction.java      |    3 +-
 .../josm/gui/mappaint/mapcss/MapCSSRule.java       |   10 +
 .../josm/gui/mappaint/mapcss/Selector.java         |    9 +-
 .../josm/gui/mappaint/xml/XmlCondition.java        |    5 +-
 .../preferences/advanced/AdvancedPreference.java   |    2 +-
 .../gui/preferences/imagery/ImageryPreference.java |   45 +-
 .../projection/AbstractProjectionChoice.java       |    2 +-
 .../projection/CodeProjectionChoice.java           |    2 +-
 .../projection/CustomProjectionChoice.java         |    2 +-
 .../projection/ListProjectionChoice.java           |    2 +-
 .../projection/UTMProjectionChoice.java            |    2 +-
 .../josm/gui/preferences/shortcut/PrefJPanel.java  |    2 +-
 .../josm/gui/tagging/TagEditorModel.java           |    6 +-
 .../josm/gui/tagging/TaggingPresetItems.java       |    6 +-
 .../josm/gui/tagging/TaggingPresetReader.java      |   38 +-
 .../gui/tagging/ac/AutoCompletingComboBox.java     |    7 +-
 .../josm/gui/tagging/ac/AutoCompletionList.java    |   13 +-
 .../gui/tagging/ac/AutoCompletionListItem.java     |    7 +-
 src/org/openstreetmap/josm/gui/util/GuiHelper.java |   45 +
 .../josm/gui/widgets/EditableList.java             |   20 +-
 .../josm/gui/widgets/JosmComboBox.java             |   22 +-
 .../josm/gui/widgets/JosmEditorPane.java           |    7 +-
 .../josm/gui/widgets/MultiSplitLayout.java         |   13 +-
 src/org/openstreetmap/josm/io/CachedFile.java      |   18 +-
 src/org/openstreetmap/josm/io/Compression.java     |    6 +-
 src/org/openstreetmap/josm/io/GpxExporter.java     |    6 +-
 src/org/openstreetmap/josm/io/GpxReader.java       |    3 -
 src/org/openstreetmap/josm/io/NoteImporter.java    |   31 +-
 .../josm/io/OsmChangesetContentParser.java         |    8 +-
 src/org/openstreetmap/josm/io/OsmImporter.java     |   17 +-
 src/org/openstreetmap/josm/io/OsmReader.java       |   15 +-
 .../josm/io/remotecontrol/DNSName.java             |    2 +
 .../josm/io/remotecontrol/RemoteControl.java       |   20 +-
 .../io/remotecontrol/RemoteControlHttpServer.java  |   11 +-
 .../io/remotecontrol/RemoteControlHttpsServer.java |   14 +-
 .../io/remotecontrol/handler/ImageryHandler.java   |   35 +-
 .../remotecontrol/handler/LoadAndZoomHandler.java  |    2 +-
 src/org/openstreetmap/josm/tools/Diff.java         |    1 -
 src/org/openstreetmap/josm/tools/ExifReader.java   |    2 +-
 src/org/openstreetmap/josm/tools/Geometry.java     |   32 +-
 src/org/openstreetmap/josm/tools/I18n.java         |  131 +-
 .../openstreetmap/josm/tools/ImageProvider.java    |   43 +-
 .../openstreetmap/josm/tools/ImageResource.java    |    4 +-
 src/org/openstreetmap/josm/tools/PlatformHook.java |   21 +
 .../openstreetmap/josm/tools/PlatformHookOsx.java  |   71 +-
 .../josm/tools/PlatformHookUnixoid.java            |   16 +
 .../josm/tools/PlatformHookWindows.java            |   15 +
 .../openstreetmap/josm/tools/TextTagParser.java    |    2 +-
 src/org/openstreetmap/josm/tools/Utils.java        |  128 +-
 .../openstreetmap/josm/tools/XmlObjectParser.java  |   14 +
 styles/standard/elemstyles.mapcss                  |  137 +-
 .../josm/actions/AlignInLineActionTest.java        |  191 ++
 .../data/validation/tests/InternetTagsTest.java    |   79 +
 .../validation/tests/RelationCheckerTest.groovy    |   15 +-
 .../validation/tests/SimilarNamedWaysTest.groovy   |  107 +
 .../org/openstreetmap/josm/tools/GeometryTest.java |   52 +
 .../josm/tools/TextTagParserTest.java              |    4 +-
 windows/README.txt                                 |   66 +
 windows/josm-nsis-brand.bmp                        |  Bin 0 -> 154542 bytes
 windows/josm-setup-unix.sh                         |  151 +
 windows/josm.nsi                                   |  471 +++
 windows/langmacros.nsh                             |   84 +
 windows/launch4j.xml                               |   35 +
 windows/locale/english.nsh                         |   51 +
 windows/locale/french.nsh                          |   51 +
 windows/locale/german.nsh                          |   51 +
 windows/logo.ico                                   |  Bin 0 -> 370070 bytes
 .../plugins/stdutils/Contrib/StdUtils/ComUtils.h   |   96 +
 .../stdutils/Contrib/StdUtils/DetectOsVersion.cpp  |  294 ++
 .../stdutils/Contrib/StdUtils/DetectOsVersion.h    |   26 +
 .../stdutils/Contrib/StdUtils/InvokeShellVerb.cpp  |  258 ++
 .../stdutils/Contrib/StdUtils/InvokeShellVerb.h    |   26 +
 .../stdutils/Contrib/StdUtils/ParameterParser.cpp  |  152 +
 .../stdutils/Contrib/StdUtils/ParameterParser.h    |   23 +
 .../plugins/stdutils/Contrib/StdUtils/RandUtils.h  |  101 +
 .../stdutils/Contrib/StdUtils/ShellExecAsUser.cpp  |  189 ++
 .../stdutils/Contrib/StdUtils/ShellExecAsUser.h    |   26 +
 .../plugins/stdutils/Contrib/StdUtils/StdUtils.aps |  Bin 0 -> 18740 bytes
 .../plugins/stdutils/Contrib/StdUtils/StdUtils.cpp |  921 ++++++
 .../plugins/stdutils/Contrib/StdUtils/StdUtils.h   |   43 +
 .../plugins/stdutils/Contrib/StdUtils/StdUtils.rc  |  Bin 0 -> 4986 bytes
 .../plugins/stdutils/Contrib/StdUtils/StdUtils.sln |   22 +
 .../stdutils/Contrib/StdUtils/StdUtils.vcxproj     |  205 ++
 .../Contrib/StdUtils/StdUtils.vcxproj.filters      |   63 +
 .../Contrib/StdUtils/StdUtils.vcxproj.user         |    7 +
 .../stdutils/Contrib/StdUtils/UnicodeSupport.cpp   |   96 +
 .../stdutils/Contrib/StdUtils/UnicodeSupport.h     |   47 +
 .../Contrib/StdUtils/include/ansi/nsis/api.h       |   83 +
 .../Contrib/StdUtils/include/ansi/nsis/pluginapi.h |   77 +
 .../Contrib/StdUtils/include/common/msvc_utils.h   |   55 +
 .../Contrib/StdUtils/include/unicode/nsis/api.h    |   83 +
 .../StdUtils/include/unicode/nsis/nsis_tchar.h     |  214 ++
 .../StdUtils/include/unicode/nsis/pluginapi.h      |  101 +
 .../stdutils/Contrib/StdUtils/lib/msvcrt_vc6.lib   |  Bin 0 -> 235942 bytes
 .../Contrib/StdUtils/lib/nsis_pluginapi_ansi.lib   |  Bin 0 -> 4668 bytes
 .../StdUtils/lib/nsis_pluginapi_unicode.lib        |  Bin 0 -> 6902 bytes
 .../plugins/stdutils/Contrib/StdUtils/resource.h   |   26 +
 .../stdutils/Contrib/StdUtils/utils/Date.exe       |  Bin 0 -> 39424 bytes
 .../stdutils/Contrib/StdUtils/utils/Zip.exe        |  Bin 0 -> 68096 bytes
 .../plugins/stdutils/Docs/StdUtils/StdUtils.html   |  752 +++++
 .../plugins/stdutils/Examples/StdUtils/!_Make.bat  |   29 +
 .../stdutils/Examples/StdUtils/GetParameters.nsi   |   38 +
 .../stdutils/Examples/StdUtils/InvokeShellVerb.nsi |   53 +
 .../stdutils/Examples/StdUtils/ShellExecAsUser.nsi |   29 +
 .../stdutils/Examples/StdUtils/ShellExecWait.nsi   |   44 +
 .../stdutils/Examples/StdUtils/StdUtilsTest.nsi    |  399 +++
 windows/plugins/stdutils/Include/StdUtils.nsh      |  301 ++
 windows/plugins/stdutils/LGPL.txt                  |  502 +++
 windows/plugins/stdutils/LGPL_EXCEPTION.txt        |    4 +
 .../stdutils/Plugins/Release_ANSI/StdUtils.dll     |  Bin 0 -> 22016 bytes
 .../stdutils/Plugins/Release_Unicode/StdUtils.dll  |  Bin 0 -> 23040 bytes
 windows/plugins/stdutils/ReadMe.txt                |   30 +
 windows/plugins/stdutils/make_pack.bat             |   54 +
 windows/plugins/stdutils/make_pack.lst             |   13 +
 303 files changed, 27796 insertions(+), 8208 deletions(-)

diff --git a/.classpath b/.classpath
index 9fb16b4..bbf3acb 100644
--- a/.classpath
+++ b/.classpath
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="src"/>
+	<classpathentry excluding="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/" kind="src" path="src"/>
 	<classpathentry kind="src" path="test/unit"/>
 	<classpathentry kind="src" path="test/functional"/>
 	<classpathentry kind="src" path="test/performance"/>
-	<classpathentry excluding="build/|data_nodist/|dist/|linux/|macosx/|nb/|src/|test/|test/build/|test/functional/|test/performance/|test/unit/|tools/|utils/" kind="src" path=""/>
+	<classpathentry excluding="build/|data_nodist/|dist/|linux/|macosx/|nb/|src/|test/|test/build/|test/functional/|test/performance/|test/unit/|tools/|utils/|windows/" kind="src" path=""/>
 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
 	<classpathentry kind="lib" path="test/lib/fest/fest-assert-1.0.jar"/>
 	<classpathentry kind="lib" path="test/lib/fest/fest-reflect-1.1.jar"/>
diff --git a/CONTRIBUTION b/CONTRIBUTION
index 209243a..8dbae3e 100644
--- a/CONTRIBUTION
+++ b/CONTRIBUTION
@@ -27,6 +27,8 @@ Many minor contributions and patches by others; see SVN history
 at http://josm.openstreetmap.de/svn/ for details. Use
 "josm-dev AT openstreetmap.org" to contact still active authors.
 
+The logo has been designed by Ilya Palikov.
+
 Copyright rests with the contributors.
 
 -------------------------------- EXTERNAL CODE --------------------------------
@@ -35,7 +37,7 @@ The jpeg metadata extraction code is from Drew Noakes
 (http://code.google.com/p/metadata-extractor/) and licensed
 with Apache license version 2.0.
 
-The Bzip2 code is from Keiron Liddle (Apache project) and licensed
+The Bzip2 code is from Apache Commons Compress and licensed
 with Apache license version 2.0.
 
 The signpost code (http://code.google.com/p/oauth-signpost/)
diff --git a/README b/README
index a214ab4..6a04b73 100644
--- a/README
+++ b/README
@@ -58,14 +58,17 @@ This is an overview of the files and directories in the JOSM code repository:
 - build.xml                 ant build file (standard way to create a JOSM binary)
 - CONTRIBUTION              list of major code contributors
 - data/                     data files that will be included in the JOSM jar file
-    - *.gsb                 NTv2 grid files for projection support
+    - fonts/                font files used for map rendering
+    - projection/           projection files
+      - *.gsb               NTv2 grid files for projection support
+      - epsg                list of projection definitions
     - *.lang                translation data
     - *.xsd                 xml schema files for validation of configuration files
-    - epsg                  list of projection definitions
     - help-browser.css      CSS file for the help sites (HTML content is downloaded from the website
                             on demand, but displayed inside the programm in a Java web browser component.)
-    - ignoretags.cfg, tagchecker.cfg
-                            data files used by the JOSM validator feature
+    - validator/            data files used by the JOSM validator feature
+      - *.cfg               files designed for the old tagchecker, still used
+      - *.mapcss            default validation rules for the new mapcss-based tagchecker
 - data_nodist/              data files that are useful for development, but not distributed
     - exif-direction-example.jpg
                             sample image, that contains direction information in the EXIF header
@@ -87,14 +90,18 @@ This is an overview of the files and directories in the JOSM code repository:
     - styles/standard       images for the main map style (external repository)
 - images_nodist/            images, which are not for distribution, but may be useful later (e.g. high
                             resolution and vector versions)
-- josm.jnlp                 Java Web Start launcher file (used on the website)
-- lib/                      libraries (directory is empty at the moment)
+- josm.jnlp                 Java Web Start launcher file (used on the website for the tested version)
+- josm-latest.jnlp          Java Web Start launcher file (used on the website for the latest version)
 - LICENSE                   the JOSM license terms
-- macosx/                   files needed to create the MacOS package
+- linux/                    files useful for Linux distributions, including Appdata files, .desktop
+                            files, Debian/Ubuntu scripts, man pages, icons, etc.
+- macosx/                   files needed to create the MacOS X package
 - netbeans/                 preconfigured Netbeans project
 - optimize-images           short script to decrease size of PNG images
 - patches/                  patches for external libraries used in JOSM (see below)
 - README                    this file
+- resources/                resource files that will be included in the JOSM jar file
+- scripts/                  various scripts used by JOSM developers
 - src/                      the source code of the program
 - start.html                HTML page to run the applet version of JOSM
 - styles/                   map styles included in JOSM
@@ -107,15 +114,18 @@ 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.8.jar
+    - animal-sniffer-ant-tasks-1.11.jar
                             TODO: what is this?
     - appbundler-1.0ea.jar  used to build Mac OS X package for Oracle Java 7
     - findbugs/             libs and config files for findbugs (automatically detects common bugs and potential
                             problems in source code); can be launched as an ant target in build.xml
+    - groovy-all-2.3.9.jar  used for some unit tests and various scripts
     - jacocoant.jar         used to include coverage data into JUnit test reports 
     - javacc.jar            used in the build process to generate some .java files from a javacc source file
                             (src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSParser.jj)
     - proguard.jar          optimize final binary jar - see build.xml (not used in production so far)
+    - xmltask.jar           used to edit XML files from Ant for the OSX package
+- windows/                  files needed to create the Windows installer
 
 The 'patches' directory
 -----------------------
@@ -132,17 +142,17 @@ Of course, it is also possible to apply the patch files manually one by one.
 
 Third party libraries
 ---------------------
-There are a couple of third party libraries which are directly included in the source code tree, in particular:
+There are some third party libraries which are directly included in the source code tree, in particular:
 
 * jmapviewer: Java component to browse a TMS map
     src/org/openstreetmap/gui (svn external)
     -> http://svn.openstreetmap.org/applications/viewer/jmapviewer/
-* Apache Ant's bzip2: Support for bzip2 compression when opening files
-    src/org/apache/tools/bzip2 (svn external)
-    -> http://svn.apache.org/repos/asf/ant/core/trunk/src/main/org/apache/tools/bzip2
 * Apache commons codec: Better Base64 support
     src/org/apache/commons/codec (svn external)
     -> http://svn.apache.org/repos/asf/commons/proper/codec/trunk/src/main/java/org/apache/commons/codec
+* Apache commons compress: Support for bzip2 compression when opening files
+    src/org/apache/commons/compress/compressors (svn external)
+    -> http://svn.apache.org/repos/asf/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/compressors
 * Apache commons validator: Improved validator routines
     src/org/openstreetmap/josm/data/validation/routines
     -> http://commons.apache.org/proper/commons-validator
diff --git a/REVISION b/REVISION
index fc69434..f2ad7dd 100644
--- a/REVISION
+++ b/REVISION
@@ -2,7 +2,7 @@
 <info>
 <entry
    path="trunk"
-   revision="7778"
+   revision="7906"
    kind="dir">
 <url>http://josm.openstreetmap.de/svn/trunk</url>
 <repository>
@@ -10,9 +10,9 @@
 <uuid>0c6e7542-c601-0410-84e7-c038aed88b3b</uuid>
 </repository>
 <commit
-   revision="7778">
-<author>bastiK</author>
-<date>2014-12-10T00:39:46.964719Z</date>
+   revision="7906">
+<author>Don-vip</author>
+<date>2014-12-28T23:13:58.752464Z</date>
 </commit>
 </entry>
 </info>
diff --git a/build.xml b/build.xml
index aafecea..e611844 100644
--- a/build.xml
+++ b/build.xml
@@ -177,6 +177,13 @@ Build-Date: ${build.tstamp}
             <param name="bundle.jar" value="dist/josm-custom.jar"/>
         </antcall>
     </target>
+    <!-- Windows target -->
+    <target name="distwin" depends="dist">
+        <exec dir="windows" executable="./josm-setup-unix.sh">
+            <arg value="${version.entry.commit.revision}"/>
+            <arg value="../dist/josm-custom.jar"/>
+        </exec>
+    </target>
     <target name="javacc" depends="init" unless="javacc.notRequired">
         <mkdir dir="${mapcss.dir}/parsergen"/>
         <exec append="false" executable="java" failifexecutionfails="true">
@@ -208,13 +215,14 @@ Build-Date: ${build.tstamp}
     </target>
     <target name="compile" depends="init,javacc,jaxb">
         <!-- COTS -->
-        <javac srcdir="${src.dir}" includes="com/**,oauth/**,org/apache/commons/codec/**,org/glassfish/**" nowarn="on"
+        <javac srcdir="${src.dir}" includes="com/**,oauth/**,org/apache/commons/**,org/glassfish/**" nowarn="on"
+            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/**"
             destdir="build" target="1.7" source="1.7" debug="on" includeantruntime="false" createMissingPackageInfoClass="false" encoding="iso-8859-1">
             <!-- get rid of "internal proprietary API" warning -->
             <compilerarg value="-XDignore.symbol.file"/>
         </javac>
         <!-- JMapViewer/JOSM -->
-        <javac srcdir="${src.dir}" excludes="com/**,oauth/**,org/apache/commons/codec/**,org/glassfish/**,org/openstreetmap/gui/jmapviewer/Demo.java" 
+        <javac srcdir="${src.dir}" excludes="com/**,oauth/**,org/apache/commons/**,org/glassfish/**,org/openstreetmap/gui/jmapviewer/Demo.java" 
             destdir="build" target="1.7" source="1.7" debug="on" includeantruntime="false" createMissingPackageInfoClass="false" encoding="UTF-8">
             <compilerarg value="-Xlint:cast"/>
             <compilerarg value="-Xlint:deprecation"/>
@@ -270,7 +278,7 @@ Build-Date: ${build.tstamp}
             <include name="**/*.jar"/>
         </fileset>
         <pathelement path="dist/josm-custom.jar"/>
-        <pathelement path="tools/groovy-all-2.3.7.jar"/>
+        <pathelement path="tools/groovy-all-2.3.9.jar"/>
     </path>
     <macrodef name="init-test-preferences">
         <attribute name="testfamily"/>
@@ -317,7 +325,7 @@ Build-Date: ${build.tstamp}
         </sequential>
     </macrodef>
     <target name="test-compile" depends="test-init,dist">
-        <taskdef name="groovyc" classname="org.codehaus.groovy.ant.Groovyc" classpath="tools/groovy-all-2.3.7.jar"/>
+        <taskdef name="groovyc" classname="org.codehaus.groovy.ant.Groovyc" classpath="tools/groovy-all-2.3.9.jar"/>
         <call-groovyc testfamily="unit">
             <cp-elements>
                 <path refid="test.classpath"/>
diff --git a/data/defaultpresets.xml b/data/defaultpresets.xml
index 27bc283..38f42a8 100644
--- a/data/defaultpresets.xml
+++ b/data/defaultpresets.xml
@@ -169,7 +169,7 @@
     </chunk>
     <chunk id="payment_base">
         <check key="payment:coins" text="Coins" />
-        <check key="payment:notes" text="Notes" />
+        <check key="payment:notes" text="Notes" text_context="payment" />
         <check key="payment:electronic_purses" text="Electronic purses and Charge cards" />
         <check key="payment:debit_cards" text="Debit cards" />
         <check key="payment:credit_cards" text="Credit cards" />
@@ -704,7 +704,7 @@
                 <text key="name" text="Name" />
                 <reference ref="highway_base" />
                 <reference ref="highway_yesno_incline_oneway_lit_width_sidewalk" />
-                <combo key="junction" text="Junction" values="roundabout,jughandle,yes" />
+                <combo key="junction" text="Junction" values="roundabout,jughandle" />
             </optional>
         </item> <!-- Construction -->
         <separator/>
@@ -988,7 +988,7 @@
         </item> <!-- Steps -->
     </group> <!-- Ways -->
     <group name="Waypoints" icon="presets/waypoints.png">
-        <item name="Motorway Junction" icon="presets/motorway_exit.png" type="node" preset_name_label="true">
+        <item name="Motorway Junction" icon="styles/standard/vehicle/motorway_junction.svg" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway_junction"
                   es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:highway=motorway_junction"
@@ -1034,7 +1034,7 @@
             </optional>
         </item> <!-- Rest Area -->
         <separator/>
-        <item name="Traffic Signal" icon="presets/traffic-light.png" type="node" preset_name_label="true">
+        <item name="Traffic Signal" icon="styles/standard/vehicle/traffic_signals.svg" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=traffic_signals"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=traffic_signals"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=traffic_signals"
@@ -1052,7 +1052,10 @@
                 <check key="bicycle" text="Cross by bicycle" />
                 <check key="horse" text="Cross on horseback" />
             </optional>
-        </item> <!-- Traffic Signal -->
+            <optional text="Optional values for specific countries">
+                <text key="name" text="Name" />
+            </optional>
+            </item> <!-- Traffic Signal -->
         <item name="Stop" icon="presets/Stop.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stop"
                   es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:highway=stop"
@@ -1083,7 +1086,7 @@
             <space />
             <combo key="direction" text="Direction" values="clockwise" />
         </item> <!-- Mini-Roundabout -->
-        <item name="Pedestrian Crossing" icon="styles/standard/vehicle/zebra_crossing.png" type="node" preset_name_label="true">
+        <item name="Pedestrian Crossing" icon="styles/standard/vehicle/crossing.svg" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Key:crossing"
                   fi.href="http://wiki.openstreetmap.org/wiki/Fi:Key:crossing"
@@ -1160,6 +1163,17 @@
                 <text key="maxspeed" text="Max. speed (km/h)" />
             </optional>
         </item> <!-- Speed Camera -->
+        <item name="Traffic Mirror" icon="styles/standard/vehicle/traffic_mirror.svg" type="node" preset_name_label="true">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=traffic_mirror"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=traffic_mirror" />
+            <key key="highway" value="traffic_mirror" />
+        </item> <!-- Traffic Mirror -->
+        <item name="Named Junction" name_context="junction=yes" type="node,closedway" preset_name_label="true">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:junction=yes" />
+            <key key="junction" value="yes" />
+            <label text="Used in some countries for a named road junction who’s name serves for local orientation." />
+            <text key="name" text="Name" />
+        </item> <!-- Named Junction -->
         <separator/>
         <item name="Elevator" icon="styles/standard/service/elevator.png" type="node,way,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=elevator"
@@ -1231,7 +1245,7 @@
             <reference ref="barrier_4" />
             <reference ref="optional_maxwidth" />
         </item> <!-- Cycle Barrier -->
-        <item name="Cattle Grid" icon="presets/cattle_grid.png" type="node" preset_name_label="true">
+        <item name="Cattle Grid" icon="styles/standard/vehicle/cattle_grid.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=cattle_grid"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:barrier=cattle_grid"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:barrier=cattle_grid" />
@@ -1312,7 +1326,7 @@
                 <text key="height" text="Height (meters)" length="7" />
             </optional>
         </item> <!-- Fence -->
-        <item name="Guard Rail" type="way" preset_name_label="true">
+        <item name="Guard Rail" type="way,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=guard_rail"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:barrier=guard_rail" />
             <key key="barrier" value="guard_rail" />
@@ -1350,7 +1364,7 @@
             <key key="barrier" value="retaining_wall" />
             <reference ref="optional_height" />
         </item> <!-- Retaining Wall -->
-        <item name="Ditch" name_context="Barrier" type="way" preset_name_label="true">
+        <item name="Ditch" name_context="Barrier" type="way,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=ditch"
                   it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:barrier=ditch"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:barrier=ditch"
@@ -1378,7 +1392,7 @@
             <reference ref="barrier_5" />
             <reference ref="optional_maxwidth" />
         </item> <!-- Entrance (Barrier Opening) -->
-        <item name="Gate" icon="presets/gate.png" type="node" preset_name_label="true">
+        <item name="Gate" icon="styles/standard/vehicle/gate.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:barrier=gate"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:barrier=gate"
@@ -1450,14 +1464,14 @@
             <reference ref="barrier_2" />
             <reference ref="optional_maxwidth" />
         </item> <!-- Kissing Gate -->
-        <item name="Chain" icon="styles/standard/vehicle/chain.svg" type="node,way" preset_name_label="true">
+        <item name="Chain" icon="styles/standard/vehicle/chain.svg" type="node,way,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=chain"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:barrier=chain" />
             <key key="barrier" value="chain" />
             <reference ref="barrier_5" />
             <reference ref="optional_maxwidth" />
         </item> <!-- Chain -->
-        <item name="Stile" icon="presets/stile.png" type="node" preset_name_label="true">
+        <item name="Stile" icon="styles/standard/vehicle/stile.svg" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=stile" />
             <space />
             <key key="barrier" value="stile" />
@@ -1778,7 +1792,8 @@
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:natural=water"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:natural=water"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:natural=water"
-                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:natural=water" />
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:natural=water"
+                  uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:natural=water" />
             <label text="A body of standing water, such as a lake or pond." />
             <space />
             <key key="natural" value="water" />
@@ -2579,7 +2594,7 @@
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:shop=bicycle" />
             <space />
             <key key="shop" value="bicycle" />
-            <text key="name" text="Name" />
+            <reference ref="name_oh" />
             <check key="service:bicycle:retail" text="Bicycles are sold" />
             <check key="service:bicycle:second_hand" text="Second-hand bicycles are sold" />
             <check key="service:bicycle:repair" text="Bicycles are repaired" />
@@ -2899,6 +2914,7 @@
     <group name="Airport" icon="presets/plane.png">
         <item name="Airport Ground" icon="presets/plane.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:aeroway=aerodrome"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:aeroway=aerodrome"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:aeroway=aerodrome"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:aeroway=aerodrome" />
@@ -2914,6 +2930,7 @@
         <separator/>
         <item name="Runway" icon="presets/runway.png" type="way,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=runway"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:aeroway=runway"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:aeroway=runway"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:aeroway=runway"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:aeroway=runway"
@@ -2925,6 +2942,7 @@
         </item> <!-- Runway -->
         <item name="Taxiway" icon="presets/taxiway.png" type="way,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=taxiway"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:aeroway=taxiway"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:aeroway=taxiway"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:aeroway=taxiway"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:aeroway=taxiway" />
@@ -2947,6 +2965,7 @@
         </item> <!-- Helipad -->
         <item name="Apron" icon="presets/apron.png" type="closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=apron"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:aeroway=apron"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:aeroway=apron"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:aeroway=apron"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:aeroway=apron" />
@@ -2954,6 +2973,7 @@
         </item> <!-- Apron -->
         <item name="Hangar" icon="presets/hangar.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=hangar"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:aeroway=hangar"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:aeroway=hangar"
                   pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:aeroway=hangar" />
             <key key="building" value="hangar" />
@@ -2973,6 +2993,7 @@
         <separator/>
         <item name="Terminal" icon="styles/standard/transport/airport/terminal.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=terminal"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:aeroway=terminal"
                   es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:aeroway=terminal"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:aeroway=terminal"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:aeroway=terminal"
@@ -2985,6 +3006,7 @@
         </item> <!-- Terminal -->
         <item name="Gate" name_context="airport" icon="presets/aeroway_gate.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=gate"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:aeroway=gate"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:aeroway=gate"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:aeroway=gate" />
             <space />
@@ -3310,6 +3332,7 @@
         <separator/>
         <item name="Information Office" icon="presets/informationoffice.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Key:information"
+                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Key:information"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Key:information"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:information"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Key:information"
@@ -3422,6 +3445,7 @@
         </item> <!-- Audio Guide -->
         <item name="Other Information Point" icon="presets/information.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=information"
+                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:tourism=information"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:tourism=information"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:tourism=information"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:tourism=information"
@@ -3572,6 +3596,12 @@
             <text key="name" text="Name" />
             <check key="fireplace" text="Fireplace" />
         </item> <!-- Picnic Site -->
+        <item name="Picnic Table" icon="presets/picnic.png" type="node" preset_name_label="true">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=picnic_table" />
+            <space />
+            <key key="leisure" value="picnic_table" />
+            <check key="covered" text="Covered" />
+        </item> <!-- Picnic Table -->
         <item name="Public Grill" icon="presets/bbq.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bbq"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bbq"
@@ -3668,6 +3698,7 @@
         </item> <!-- Arts Centre -->
         <item name="Artwork" icon="presets/arts_centre.png" type="node,way,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork"
+                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:tourism=artwork"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:tourism=artwork"
                   es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:tourism=artwork"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:tourism=artwork"
@@ -4431,6 +4462,24 @@
             <combo key="fire_hydrant:pressure" text="Pressure (in bar)" values="5,6,8,suction" />
             <text key="fire_hydrant:count" text="Count" />
         </item> <!-- Fire Hydrant -->
+        <separator/>
+        <item name="Advertising Column" icon="styles/standard/leisure/advertising_column.svg" type="node" preset_name_label="true">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:advertising=column"
+                  pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:advertising=column" />
+            <space />
+            <key key="advertising" value="column" />
+            <optional>
+                <check key="lit" text="Lit" />
+            </optional>
+        </item> <!-- Advertising Column -->
+        <item name="Billboard" icon="styles/standard/leisure/billboard.svg" type="node" preset_name_label="true">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:advertising=billboard" />
+            <space />
+            <key key="advertising" value="billboard" />
+            <optional>
+                <check key="lit" text="Lit" />
+            </optional>
+        </item> <!-- Billboard -->   
     </group> <!-- Facilities -->
   </group>  <!-- Facilities -->
   <group name="Sports" icon="styles/standard/sport/soccer.png">
@@ -4526,7 +4575,8 @@
             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" />
         </item> <!-- Nine-pin Bowling -->
         <item name="Ten-pin Bowling" icon="styles/standard/sport/10pin.png" type="node,closedway" preset_name_label="true">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=10pin" />
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=10pin"
+                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:sport=10pin" />
             <space />
             <key key="sport" value="10pin" />
             <text key="name" text="Name" />
@@ -4889,7 +4939,8 @@
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=raceway"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=raceway"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:highway=raceway"
-                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:highway=raceway" />
+                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:highway=raceway"
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:highway=raceway" />
             <space />
             <key key="highway" value="raceway" />
             <text key="name" text="Name" />
@@ -4938,6 +4989,7 @@
             <link href="http://wiki.openstreetmap.org/wiki/Key:entrance"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Key:entrance"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:entrance"
+                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Key:entrance"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Key:entrance"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Key:entrance"
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Key:entrance" />
@@ -5082,6 +5134,7 @@
         <item name="Water Tower" icon="presets/water_tower.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=water_tower"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=water_tower"
+                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:man_made=water_tower"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:man_made=water_tower"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:man_made=water_tower" />
             <space />
@@ -6750,6 +6803,7 @@
     <group name="Places" icon="presets/places.png">
         <item name="Continent" icon="presets/places.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:place=continent"
+                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:place=continent"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:place=continent" />
             <space />
             <key key="place" value="continent" />
@@ -6757,6 +6811,7 @@
         </item> <!-- Places -->
         <item name="Country" icon="presets/places.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:place=country"
+                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:place=country"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:place=country" />
             <space />
             <key key="place" value="country" />
@@ -6764,6 +6819,7 @@
         </item> <!-- Country -->
         <item name="State" icon="presets/places.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:place=state"
+                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:place=state"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:place=state" />
             <space />
             <key key="place" value="state" />
@@ -6891,6 +6947,7 @@
             <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:place=locality"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:place=locality"
+                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:place=locality"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:place=locality"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:place=locality"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:place=locality" />
@@ -7060,7 +7117,8 @@
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:landuse=forest"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:landuse=forest"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:landuse=forest"
-                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:landuse=forest" />
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:landuse=forest"
+                  uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:landuse=forest" />
             <space />
             <key key="landuse" value="forest" />
             <text key="name" text="Name" />
@@ -7568,7 +7626,6 @@
             <space />
             <text key="addr:housenumber" text="House number" match="key" auto_increment="-2,-1,+1,+2" />
             <optional>
-                <text key="addr:housename" text="House name" match="key" alternative_autocomplete_keys="name" />
                 <text key="addr:street" text="Street name" use_last_as_default="force" match="key" alternative_autocomplete_keys="name" />
                 <text key="addr:place" text="Place name" use_last_as_default="force" match="key" alternative_autocomplete_keys="name" />
                 <text key="addr:city" text="City name" use_last_as_default="force" match="key" />
@@ -7576,6 +7633,7 @@
                 <combo key="addr:country" text="Country code" values_from="java.util.Locale#getISOCountries" use_last_as_default="force" match="key" />
             </optional>
             <optional text="Optional values for specific countries">
+                <text key="addr:housename" text="House name" match="key" alternative_autocomplete_keys="name" />
                 <text key="addr:hamlet" text="Hamlet" match="key" />
                 <text key="addr:suburb" text="Suburb" use_last_as_default="force" match="key" />
                 <text key="addr:subdistrict" text="Subdistrict" use_last_as_default="force" match="key" />
@@ -7657,8 +7715,8 @@
                 <text key="name" text="Name" />
             </optional>
             <roles>
-                <role key="outer" text="outer segment" requisite="required" type="way" />
-                <role key="inner" text="inner segment" requisite="optional" type="way" />
+                <role key="outer" text="outer segment" requisite="required" type="way,closedway" />
+                <role key="inner" text="inner segment" requisite="optional" type="way,closedway" />
             </roles>
         </item> <!-- Multipolygon -->
         <item name="Boundary" icon="presets/boundaries.png" type="relation" preset_name_label="true">
@@ -7678,8 +7736,8 @@
                 <combo key="admin_level" text="Administrative level" values="1,2,3,4,5,6,7,8,9,10" />
             </optional>
             <roles>
-                <role key="outer" text="outer segment" requisite="required" type="way" />
-                <role key="inner" text="inner segment" requisite="optional" type="way" />
+                <role key="outer" text="outer segment" requisite="required" type="way,closedway" />
+                <role key="inner" text="inner segment" requisite="optional" type="way,closedway" />
                 <role key="subarea" text="Sub area" requisite="optional" type="relation" />
                 <role key="admin_centre" text="Administration centre" requisite="optional" type="node" count="1" />
                 <role key="label" text="Label point" requisite="optional" type="node" count="1" />
diff --git a/data/validator/combinations.mapcss b/data/validator/combinations.mapcss
index 7024184..14ff4b3 100644
--- a/data/validator/combinations.mapcss
+++ b/data/validator/combinations.mapcss
@@ -3,7 +3,7 @@
  */
 
 /* {0.key} without {1.key} (warning level) */
-way[junction                   ][!highway],
+way[junction                   ][!highway][junction!=yes],
 *[lanes                        ][!highway],
 *[lcn                          ][!highway],
 *[living_street                ][!highway],
@@ -133,6 +133,12 @@ way[junction                   ][!highway],
   throwWarning: tr("{0} without {1}, {2} or {3}", "{0.key}", "{1.key}", "{2.key}", "{3.tag}");
 }
 
+/* {0.key} together with {1.key}, see #10837 */
+*[noname?][name],
+*[highway]["addr:street"] {
+  throwWarning: tr("{0} together with {1}", "{0.key}", "{1.key}");
+}
+
 /* {0} on suspicious object */
 *[tunnel  ][!highway][!railway][!waterway][public_transport != platform][man_made != pipeline],
 *[bridge  ][!highway][!railway][!waterway][!piste:type][public_transport != platform][man_made !~ /^(bridge|pipeline)$/][building != bridge],
@@ -164,7 +170,7 @@ way[highway][natural],
   fixRemove: "natural";
 }
 
-/* see ticket #9593 */
+/* see #9593 */
 *[sport][tourism != hotel][highway != raceway][leisure !~ /^(sports_centre|stadium|track|pitch|golf_course|water_park|swimming_pool|recreation_ground)$/][natural !~ /^(beach|bare_rock)$/][amenity !~ /^(pub|restaurant|swimming_pool)$/][landuse !~ /^(recreation_ground|piste|farm|farmland)$/] {
     throwWarning: tr("sport without physical feature");
     assertMatch: "node sport=tennis";
@@ -186,3 +192,15 @@ way[highway] > node[ford?] { set ford_on_highway; }
 node[ford?]!.ford_on_waterway, node[ford?]!.ford_on_highway {
     throwWarning: tr("{0} should be on the node where {1} and {2} intersect", "ford", "highway", "waterway");
 }
+
+/* any other *_name tag (except old_name, loc_name and uic_name) but not a name , see #10837 */
+*[/_name$/][!name][!old_name][!loc_name][!uic_name] {
+  throwWarning: tr("alternative name without {0}", "{1.key}");
+}
+
+/* see #10837 */
+way[destination][!oneway?] {
+  throwWarning: tr("incomplete usage of {0} on a way without {1}", "{0.key}", "{1.key}");
+  suggestAlternative: "destination:forward";
+  suggestAlternative: "destination:backward";
+}
\ No newline at end of file
diff --git a/data/validator/deprecated.mapcss b/data/validator/deprecated.mapcss
index fb67b73..21a604f 100644
--- a/data/validator/deprecated.mapcss
+++ b/data/validator/deprecated.mapcss
@@ -329,16 +329,22 @@
   fixAdd: "park_ride=yes";
 }
 
-/* see #10661 */
-*[barrier=yes] {
+/* see #10661, #10837 */
+*[barrier=yes],
+*[amenity=yes],
+*[place=yes] {
   throwWarning: tr("{0}={1} is unspecific. Please replace ''{1}'' by a specific value.", "{0.key}", "{0.value}");
 }
 
-/* see #10693 - http://wiki.openstreetmap.org/wiki/Proposed_features/drop_recommendation_for_place_name */
+/* see #10693 - http://wiki.openstreetmap.org/wiki/Proposed_features/drop_recommendation_for_place_name , #10837 */
 *[place_name][!name] {
   throwWarning: tr("{0} should be replaced with {1}", "{0.key}", "{1.key}");
   fixChangeKey: "place_name => name";
 }
+*[place][place_name = *name] {
+  throwWarning: tr("{0} = {1}; remove {0}", "{1.key}", "{1.value}");
+  fixRemove: "{1.key}";
+}
 
 way[sidewalk=yes] {
   throwWarning: tr("{0}={1} is unspecific. Please replace ''{1}'' by ''left'', ''right'' or ''both''.", "{0.key}", "{0.value}");
@@ -353,4 +359,11 @@ way[sidewalk=yes] {
   throwWarning: tr("{0} is deprecated", "{0.tag}");
   fixRemove: "waterway";
   fixAdd: "mooring=yes";
+}
+
+/* see #10837 */
+*[building][levels] {
+  throwWarning: tr("{0} is deprecated", "{1.key}");
+  suggestAlternative: "building:levels";
+  fixChangeKey: "levels => building:levels";
 }
\ No newline at end of file
diff --git a/data/validator/geometry.mapcss b/data/validator/geometry.mapcss
index 280ae39..d6be64f 100644
--- a/data/validator/geometry.mapcss
+++ b/data/validator/geometry.mapcss
@@ -2,6 +2,7 @@
 node[oneway],
 node[bridge?],
 node[sidewalk],
+node[footway],
 node[waterway=river],
 node[waterway=riverbank],
 node[waterway=canal],
@@ -105,4 +106,52 @@ node[tag("shop") = parent_tag("shop")] ∈ *[shop] {
 }
 node[tag("power") = parent_tag("power")] ∈ *[power] {
   throwWarning: tr("{0} inside {1}", concat("power=", tag("power")), concat("power=", tag("power")));
+}
+
+/* isolated nodes which should be part of a way, see #10825 */
+node:unconnected[entrance],
+node:unconnected[traffic_calming],
+node:unconnected[highway=passing_place],
+node:unconnected[highway=mini_roundabout],
+node:unconnected[highway=motorway_junction],
+node:unconnected[highway=turning_loop],
+node:unconnected[highway=turning_circle],
+node:unconnected[highway=stop],
+node:unconnected[highway=give_way],
+node:unconnected[highway=traffic_signals],
+node:unconnected[highway=crossing],
+node:unconnected[crossing],
+node:unconnected[railway=crossing],
+node:unconnected[railway=level_crossing],
+node:unconnected[railway=buffer_stop],
+node:unconnected[public_transport=stop_position],
+node:unconnected[noexit],
+node:unconnected[waterway=dam],
+node:unconnected[waterway=weir],
+node:unconnected[waterway=waterfall],
+node:unconnected[amenity=ferry_terminal],
+node:unconnected[mountain_pass=yes],
+node:unconnected[barrier=gate],
+node:unconnected[barrier=lift_gate],
+node:unconnected[barrier=swing_gate],
+node:unconnected[barrier=toll_booth],
+node:unconnected[barrier=turnstile],
+node:unconnected[barrier=full-height_turnstile],
+node:unconnected[barrier=motorcycle_barrier],
+node:unconnected[barrier=rope],
+node:unconnected[barrier=sally_port],
+node:unconnected[barrier=spikes],
+node:unconnected[barrier=stile],
+node:unconnected[barrier=sump_buster],
+node:unconnected[barrier=kerb],
+node:unconnected[barrier=border_control],
+node:unconnected[barrier=bump_gate],
+node:unconnected[barrier=bus_trap],
+node:unconnected[barrier=cattle_grid],
+node:unconnected[barrier=chain],
+node:unconnected[barrier=cycle_barrier],
+node:unconnected[barrier=hampshire_gate],
+node:unconnected[barrier=height_restrictor],
+node:unconnected[barrier=debris] {
+  throwWarning: tr("{0} must be connected to a way", "{1.tag}");
 }
\ No newline at end of file
diff --git a/data/validator/highway.mapcss b/data/validator/highway.mapcss
index 528fca2..9b4a715 100644
--- a/data/validator/highway.mapcss
+++ b/data/validator/highway.mapcss
@@ -63,16 +63,12 @@ way[highway=road] {
 
 way[highway=footway][maxspeed],
 way[highway=steps][maxspeed],
-way[highway=cycleway][bicycle?!],
-way[highway=footway][foot?!],
+way[highway=cycleway][bicycle=no],
+way[highway=footway][foot=no],
 way[highway=cycleway][cycleway=lane] {
   throwWarning: tr("{0} used with {1}", "{0.value}", "{1.tag}");
-  assertMatch: "way highway=cycleway bicycle=false";
-  assertMatch: "way highway=cycleway bicycle=0";
   assertNoMatch: "way highway=cycleway bicycle=yes";
   assertNoMatch: "way highway=cycleway";
-  assertMatch: "way highway=footway foot=false";
-  assertMatch: "way highway=footway foot=0";
   assertNoMatch: "way highway=footway foot=yes";
   assertNoMatch: "way highway=footway";
   assertMatch: "way highway=cycleway cycleway=lane";
@@ -89,3 +85,24 @@ way[highway=cycleway][cycleway=lane] {
   assertMatch: "way name=Foobar-Strassenweg";
   assertNoMatch: "way name=Foobarstraße";
 }
+
+/* footway, see #10851 */
+way[footway=left],
+way[footway=right],
+way[footway=both],
+way[footway=no] {
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
+  suggestAlternative: "sidewalk";
+  fixChangeKey: "footway => sidewalk";
+  set footway_to_sidewalk;
+}
+way[footway=none] {
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
+  suggestAlternative: "sidewalk=no";
+  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");
+}
\ No newline at end of file
diff --git a/data/validator/multiple.mapcss b/data/validator/multiple.mapcss
index b49d5b6..fac1c93 100644
--- a/data/validator/multiple.mapcss
+++ b/data/validator/multiple.mapcss
@@ -1,4 +1,4 @@
-/* see #9757 - Better handling of semicolon in values
+/* see #9757, #10869 - Better handling of semicolon in values
 */
 *["addr:street" =~ /.+;(.+)?/],
 *[highway =~ /.+;(.+)?/],
@@ -9,3 +9,36 @@
 *[water =~ /.+;(.+)?/] {
     throwWarning: tr("{0} with multiple values", "{0.key}");
 }
+
+*[source              =~ /^(;.*|.*;;.*|.*;)$/],
+*["source:addr"       =~ /^(;.*|.*;;.*|.*;)$/],
+*["source:maxspeed"   =~ /^(;.*|.*;;.*|.*;)$/],
+*["source:name"       =~ /^(;.*|.*;;.*|.*;)$/],
+*["source:position"   =~ /^(;.*|.*;;.*|.*;)$/],
+*["source:postcode"   =~ /^(;.*|.*;;.*|.*;)$/],
+*[ref                 =~ /^(;.*|.*;;.*|.*;)$/],
+*[int_ref             =~ /^(;.*|.*;;.*|.*;)$/],
+*[old_ref             =~ /^(;.*|.*;;.*|.*;)$/],
+*[source_ref          =~ /^(;.*|.*;;.*|.*;)$/],
+*[route_ref           =~ /^(;.*|.*;;.*|.*;)$/],
+*[attribution         =~ /^(;.*|.*;;.*|.*;)$/],
+*[name                =~ /^(;.*|.*;;.*|.*;)$/],
+*[alt_name            =~ /^(;.*|.*;;.*|.*;)$/],
+*[note                =~ /^(;.*|.*;;.*|.*;)$/],
+*[fixme               =~ /^(;.*|.*;;.*|.*;)$/],
+*["addr:housenumber"  =~ /^(;.*|.*;;.*|.*;)$/],
+*[destination         =~ /^(;.*|.*;;.*|.*;)$/],
+*[exit_to             =~ /^(;.*|.*;;.*|.*;)$/],
+*[surface             =~ /^(;.*|.*;;.*|.*;)$/],
+*["building:use"      =~ /^(;.*|.*;;.*|.*;)$/],
+*[traffic_sign        =~ /^(;.*|.*;;.*|.*;)$/],
+*[voltage             =~ /^(;.*|.*;;.*|.*;)$/],
+*[cuisine             =~ /^(;.*|.*;;.*|.*;)$/] {
+	throwWarning: tr("empty value in semicolon-separated ''{0}''", "{0.key}");
+	assertMatch: "node ref=;A1";
+	assertMatch: "node ref=A1;";
+	assertMatch: "node ref=;";
+	assertMatch: "node ref=A1;;A2";
+	assertNoMatch: "node ref=A1";
+	assertNoMatch: "node ref=A1;A2";
+}
diff --git a/data/validator/numeric.mapcss b/data/validator/numeric.mapcss
index b2a2ee3..ae5d18b 100644
--- a/data/validator/numeric.mapcss
+++ b/data/validator/numeric.mapcss
@@ -138,4 +138,17 @@ way[incline][incline !~ /^(up|down|-?([0-9]+?(\.[1-9]%)?|100)[%°]?)$/] {
 /* see ticket #9631 */
 *[population][population !~ /^[0-9]+$/ ] {
   throwWarning: tr("{0} must be a numeric value", "{0.key}");
-}
\ No newline at end of file
+}
+
+/* lanes* must be an integer positive number only, see #10837 */
+way[highway][lanes][lanes !~ /^[1-9]([0-9]*)$/],
+way[highway]["lanes:backward"]["lanes:backward" !~ /^[1-9]([0-9]*)$/],
+way[highway]["lanes:forward"]["lanes:forward" !~ /^[1-9]([0-9]*)$/] {
+  throwError: tr("{0} must be a positive integer number", "{1.key}");
+  assertMatch: "way highway=residential lanes=-1";
+  assertMatch: "way highway=residential lanes=5.5";
+  assertMatch: "way highway=residential lanes=1;2";
+  assertMatch: "way highway=residential lanes:forward=-1";
+  assertMatch: "way highway=residential lanes:backward=-1";
+  assertNoMatch: "way highway=residential lanes=1";
+}
diff --git a/i18n/launchpad.pl b/i18n/launchpad.pl
index a978d2b..924df6e 100755
--- a/i18n/launchpad.pl
+++ b/i18n/launchpad.pl
@@ -15,13 +15,13 @@ $pwd = '';
 
 # list of supported languages
 my %lang = map {$_ => 1} (
-"bg", "ca", "cs", "da", "de", "el", "en_AU", "en_GB",
+"ast", "bg", "ca", "cs", "da", "de", "el", "en_AU", "en_GB",
 "es", "et", "fi", "fr", "gl", "hu", "id",
-"it", "ja", "nl", "pl", "pt", "pt_BR", "ru", "sk",
+"it", "ja", "km", "nl", "pl", "pt", "pt_BR", "ru", "sk",
 "sv", "uk", "zh_CN", "zh_TW"
 );
 
-my $revision = '$Revision: 30399 $';
+my $revision = '$Revision: 30879 $';
 $revision =~ s/^.*?(\d+).*$/$1/;
 my $agent = "JOSM_Launchpad/1.$revision";
 
diff --git a/i18n/po/af.po b/i18n/po/af.po
index 4efbc30..bf54bb5 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: 2014-12-10 03:42+0100\n"
+"POT-Creation-Date: 2014-12-29 01:14+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: 2014-12-10 04:31+0000\n"
-"X-Generator: Launchpad (build 17283)\n"
+"X-Launchpad-Export-Date: 2014-12-29 04:31+0000\n"
+"X-Generator: Launchpad (build 17286)\n"
 "Language: af\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -3724,6 +3724,9 @@ msgstr ""
 msgid "Checks for errors in internet-related tags."
 msgstr ""
 
+msgid " URL cannot be converted to ASCII: {0}"
+msgstr ""
+
 msgid "''{0}'': {1}"
 msgstr ""
 
@@ -3930,19 +3933,20 @@ msgstr ""
 msgid "Relation is empty"
 msgstr ""
 
-msgid "<empty>"
+msgid "Role member does not match expression {0} in template {1}"
 msgstr ""
 
-msgid "Role {0} unknown"
+msgid ""
+"Role member type {0} does not match accepted list of {1} in template {2}"
 msgstr ""
 
-msgid "Empty role found"
+msgid "<empty>"
 msgstr ""
 
-msgid "Member for role ''{0}'' does not match ''{1}''"
+msgid "Role {0} unknown in templates {1}"
 msgstr ""
 
-msgid "Member for role {0} of wrong type"
+msgid "Empty role type found when expecting one of {0}"
 msgstr ""
 
 msgid "Role {0} missing"
@@ -4478,10 +4482,35 @@ msgstr ""
 msgid "options provided as Java system properties"
 msgstr ""
 
-msgid "/PATH/TO/JOSM/FOLDER/         "
+msgid "/PATH/TO/JOSM/PREF    "
+msgstr ""
+
+msgid "Set the preferences directory"
+msgstr ""
+
+msgid "/PATH/TO/JOSM/USERDATA"
+msgstr ""
+
+msgid "Set the user data directory"
+msgstr ""
+
+msgid "/PATH/TO/JOSM/CACHE   "
+msgstr ""
+
+msgid "Set the cache directory"
 msgstr ""
 
-msgid "Change the folder for all user settings"
+msgid "/PATH/TO/JOSM/HOMEDIR "
+msgstr ""
+
+msgid ""
+"Relocate all 3 directories to homedir. Cache directory will be in "
+"homedir/cache"
+msgstr ""
+
+msgid ""
+"-Djosm.home has lower precedence, i.e. the specific setting overrides the "
+"general one"
 msgstr ""
 
 msgid ""
@@ -4736,6 +4765,21 @@ msgstr ""
 msgid "Layer ''{0}'' must be in list of layers"
 msgstr ""
 
+msgid "Default (open, closed, new)"
+msgstr ""
+
+msgid "Username"
+msgstr ""
+
+msgid "Created date"
+msgstr ""
+
+msgid "Last change date"
+msgstr ""
+
+msgid "Select note sorting method"
+msgstr ""
+
 msgid "Click to cancel the current operation"
 msgstr ""
 
@@ -6076,6 +6120,12 @@ msgstr ""
 msgid "Reopen note with message:"
 msgstr ""
 
+msgid "Sort notes"
+msgstr ""
+
+msgid "Sort"
+msgstr ""
+
 msgid "Object type:"
 msgstr ""
 
@@ -7058,9 +7108,6 @@ msgstr ""
 msgid "Sort the relation members"
 msgstr ""
 
-msgid "Sort"
-msgstr ""
-
 msgid "Relation Editor: Sort"
 msgstr ""
 
@@ -7842,9 +7889,6 @@ msgstr ""
 msgid "Enter credentials for HTTP proxy"
 msgstr ""
 
-msgid "Username"
-msgstr ""
-
 msgid "Password"
 msgstr ""
 
@@ -8524,6 +8568,9 @@ msgstr ""
 msgid "Save Layer"
 msgstr ""
 
+msgid "Note"
+msgstr ""
+
 msgid "Notes layer"
 msgstr ""
 
@@ -8970,6 +9017,9 @@ msgstr ""
 msgid "Delete File from disk"
 msgstr ""
 
+msgid "Copy image path"
+msgstr ""
+
 msgid "Next"
 msgstr ""
 
@@ -12350,6 +12400,9 @@ msgstr ""
 msgid "Illegal long value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
+msgid "{0} bytes have been read"
+msgstr ""
+
 msgid "Prepare OSM data..."
 msgstr ""
 
@@ -12530,7 +12583,7 @@ msgstr ""
 msgid "Cannot start remotecontrol server on port {0}: {1}"
 msgstr ""
 
-msgid "RemoteControl::Accepting connections on port {0}"
+msgid "RemoteControl::Accepting connections on {0}:{1}"
 msgstr ""
 
 msgid "RemoteControl::Server stopped."
@@ -12542,7 +12595,7 @@ msgstr ""
 msgid "Unable to initialize Remote Control HTTPS Server"
 msgstr ""
 
-msgid "RemoteControl::Accepting secure connections on port {0}"
+msgid "RemoteControl::Accepting secure connections on {0}:{1}"
 msgstr ""
 
 msgid "RemoteControl::Server (https) stopped."
@@ -13502,9 +13555,6 @@ msgid ""
 "contain any JOSM object or suitable text. </p></html>"
 msgstr ""
 
-msgid "Invalid bz2 file."
-msgstr ""
-
 msgid "ms"
 msgstr ""
 
@@ -14740,6 +14790,10 @@ msgstr ""
 msgid "Coins"
 msgstr ""
 
+msgctxt "payment"
+msgid "Notes"
+msgstr ""
+
 msgid "Electronic purses and Charge cards"
 msgstr ""
 
@@ -15562,6 +15616,9 @@ msgstr ""
 msgid "Cross on horseback"
 msgstr ""
 
+msgid "Optional values for specific countries"
+msgstr ""
+
 msgid "Stop"
 msgstr ""
 
@@ -15619,6 +15676,18 @@ msgstr ""
 msgid "Speed Camera"
 msgstr ""
 
+msgid "Traffic Mirror"
+msgstr ""
+
+msgctxt "junction=yes"
+msgid "Named Junction"
+msgstr ""
+
+msgid ""
+"Used in some countries for a named road junction who’s name serves for local "
+"orientation."
+msgstr ""
+
 msgid "Elevator"
 msgstr ""
 
@@ -17063,6 +17132,9 @@ msgstr ""
 msgid "Fireplace"
 msgstr ""
 
+msgid "Picnic Table"
+msgstr ""
+
 msgid "Public Grill"
 msgstr ""
 
@@ -17668,6 +17740,12 @@ msgstr ""
 msgid "Count"
 msgstr ""
 
+msgid "Advertising Column"
+msgstr ""
+
+msgid "Billboard"
+msgstr ""
+
 msgid "Sports"
 msgstr ""
 
@@ -19538,9 +19616,6 @@ msgstr ""
 msgid "vouchers"
 msgstr ""
 
-msgid "Note"
-msgstr ""
-
 msgid "Geography"
 msgstr ""
 
@@ -19924,9 +19999,6 @@ msgstr ""
 msgid "House number"
 msgstr ""
 
-msgid "House name"
-msgstr ""
-
 msgid "Street name"
 msgstr ""
 
@@ -19939,7 +20011,7 @@ msgstr ""
 msgid "Country code"
 msgstr ""
 
-msgid "Optional values for specific countries"
+msgid "House name"
 msgstr ""
 
 msgid "Subdistrict"
@@ -20611,6 +20683,13 @@ msgstr ""
 msgid "VoGIS: DOM (Surface model)"
 msgstr ""
 
+msgid ""
+"AGIV(laanderen) aerial imagery (covers Brussels region as well) (2013)"
+msgstr ""
+
+msgid "Geoservices Wallonie aerial imagery (2009)"
+msgstr ""
+
 msgid "IBGE Mapa de Setores Urbanos"
 msgstr ""
 
@@ -20745,6 +20824,9 @@ msgstr ""
 msgid "Hamburg (40 cm)"
 msgstr ""
 
+msgid "Hamburg (20 cm)"
+msgstr ""
+
 msgid "Hamburg (DK5)"
 msgstr ""
 
@@ -20990,6 +21072,9 @@ msgstr ""
 msgid "Kanton Aargau 25cm (AGIS 2011)"
 msgstr ""
 
+msgid "Kanton Aargau 25cm (AGIS 2014)"
+msgstr ""
+
 msgid "Stadt Uster Orthophoto 2008 10cm"
 msgstr ""
 
@@ -21347,6 +21432,9 @@ msgstr ""
 msgid "{0} without {1}, {2} or {3}"
 msgstr ""
 
+msgid "{0} together with {1}"
+msgstr ""
+
 msgid "{0} on suspicious object"
 msgstr ""
 
@@ -21365,6 +21453,12 @@ 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 "{0}={1} is deprecated"
 msgstr ""
 
@@ -21401,6 +21495,9 @@ msgstr ""
 msgid "{0} should be replaced with {1}"
 msgstr ""
 
+msgid "{0} = {1}; remove {0}"
+msgstr ""
+
 msgid ""
 "{0}={1} is unspecific. Please replace ''{1}'' by ''left'', ''right'' or "
 "''both''."
@@ -21439,6 +21536,9 @@ msgstr ""
 msgid "Overlapping Identical Landuses"
 msgstr ""
 
+msgid "{0} must be connected to a way"
+msgstr ""
+
 msgid "abbreviated street name"
 msgstr ""
 
@@ -21460,9 +21560,17 @@ msgstr ""
 msgid "street name contains ss"
 msgstr ""
 
+msgid ""
+"Value of ''{0}'' should either be ''{1}'' or ''{2}''. For sidewalks use "
+"''{3}'' instead."
+msgstr ""
+
 msgid "{0} with multiple values"
 msgstr ""
 
+msgid "empty value in semicolon-separated ''{0}''"
+msgstr ""
+
 msgid "numerical key"
 msgstr ""
 
@@ -21497,6 +21605,9 @@ msgstr ""
 msgid "{0} must be a numeric value"
 msgstr ""
 
+msgid "{0} must be a positive integer number"
+msgstr ""
+
 msgid "relation without type"
 msgstr ""
 
@@ -22691,6 +22802,12 @@ msgstr ""
 msgid "merge nodes"
 msgstr ""
 
+msgid "How often thinning operation should be applied (Default {0})."
+msgstr ""
+
+msgid "Thinning Iterations"
+msgstr ""
+
 msgid "Street Name:"
 msgstr ""
 
@@ -25708,7 +25825,9 @@ msgstr ""
 msgid "Move and position photos"
 msgstr ""
 
-msgid "Click+drag photo or shift+click to position photo."
+msgid ""
+"Click+drag photo, shift+click to position photo, control+click to set "
+"direction."
 msgstr ""
 
 msgid "Please load some photos."
@@ -26369,6 +26488,9 @@ msgstr ""
 msgid "Reconstruct polygons from relation {0}"
 msgstr ""
 
+msgid "Reconstruct route"
+msgstr ""
+
 msgid "Open relation wiki page"
 msgstr ""
 
@@ -26408,6 +26530,12 @@ msgstr ""
 msgid "Way without ''inner'' or ''outer'' role found"
 msgstr ""
 
+msgid "Node without ''stop'' or ''platform'' role found"
+msgstr ""
+
+msgid "Way platform without ''platform'' role found"
+msgstr ""
+
 msgid "Revert changeset fully"
 msgstr ""
 
@@ -26898,7 +27026,7 @@ msgstr ""
 msgid "create an associatedStreet relation"
 msgstr ""
 
-msgid "delete outline way"
+msgid "keep outline way"
 msgstr ""
 
 msgid "Street name: "
diff --git a/i18n/po/am.po b/i18n/po/am.po
index 6f66608..d13d86d 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: 2014-12-10 03:42+0100\n"
+"POT-Creation-Date: 2014-12-29 01:14+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: 2014-12-10 04:32+0000\n"
-"X-Generator: Launchpad (build 17283)\n"
+"X-Launchpad-Export-Date: 2014-12-29 04:33+0000\n"
+"X-Generator: Launchpad (build 17286)\n"
 "Language: am\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -3724,6 +3724,9 @@ msgstr ""
 msgid "Checks for errors in internet-related tags."
 msgstr ""
 
+msgid " URL cannot be converted to ASCII: {0}"
+msgstr ""
+
 msgid "''{0}'': {1}"
 msgstr ""
 
@@ -3930,19 +3933,20 @@ msgstr ""
 msgid "Relation is empty"
 msgstr ""
 
-msgid "<empty>"
+msgid "Role member does not match expression {0} in template {1}"
 msgstr ""
 
-msgid "Role {0} unknown"
+msgid ""
+"Role member type {0} does not match accepted list of {1} in template {2}"
 msgstr ""
 
-msgid "Empty role found"
+msgid "<empty>"
 msgstr ""
 
-msgid "Member for role ''{0}'' does not match ''{1}''"
+msgid "Role {0} unknown in templates {1}"
 msgstr ""
 
-msgid "Member for role {0} of wrong type"
+msgid "Empty role type found when expecting one of {0}"
 msgstr ""
 
 msgid "Role {0} missing"
@@ -4478,10 +4482,35 @@ msgstr ""
 msgid "options provided as Java system properties"
 msgstr ""
 
-msgid "/PATH/TO/JOSM/FOLDER/         "
+msgid "/PATH/TO/JOSM/PREF    "
+msgstr ""
+
+msgid "Set the preferences directory"
+msgstr ""
+
+msgid "/PATH/TO/JOSM/USERDATA"
+msgstr ""
+
+msgid "Set the user data directory"
+msgstr ""
+
+msgid "/PATH/TO/JOSM/CACHE   "
+msgstr ""
+
+msgid "Set the cache directory"
 msgstr ""
 
-msgid "Change the folder for all user settings"
+msgid "/PATH/TO/JOSM/HOMEDIR "
+msgstr ""
+
+msgid ""
+"Relocate all 3 directories to homedir. Cache directory will be in "
+"homedir/cache"
+msgstr ""
+
+msgid ""
+"-Djosm.home has lower precedence, i.e. the specific setting overrides the "
+"general one"
 msgstr ""
 
 msgid ""
@@ -4736,6 +4765,21 @@ msgstr ""
 msgid "Layer ''{0}'' must be in list of layers"
 msgstr ""
 
+msgid "Default (open, closed, new)"
+msgstr ""
+
+msgid "Username"
+msgstr ""
+
+msgid "Created date"
+msgstr ""
+
+msgid "Last change date"
+msgstr ""
+
+msgid "Select note sorting method"
+msgstr ""
+
 msgid "Click to cancel the current operation"
 msgstr ""
 
@@ -6076,6 +6120,12 @@ msgstr ""
 msgid "Reopen note with message:"
 msgstr ""
 
+msgid "Sort notes"
+msgstr ""
+
+msgid "Sort"
+msgstr ""
+
 msgid "Object type:"
 msgstr ""
 
@@ -7058,9 +7108,6 @@ msgstr ""
 msgid "Sort the relation members"
 msgstr ""
 
-msgid "Sort"
-msgstr ""
-
 msgid "Relation Editor: Sort"
 msgstr ""
 
@@ -7842,9 +7889,6 @@ msgstr ""
 msgid "Enter credentials for HTTP proxy"
 msgstr ""
 
-msgid "Username"
-msgstr ""
-
 msgid "Password"
 msgstr ""
 
@@ -8524,6 +8568,9 @@ msgstr ""
 msgid "Save Layer"
 msgstr ""
 
+msgid "Note"
+msgstr ""
+
 msgid "Notes layer"
 msgstr ""
 
@@ -8970,6 +9017,9 @@ msgstr ""
 msgid "Delete File from disk"
 msgstr ""
 
+msgid "Copy image path"
+msgstr ""
+
 msgid "Next"
 msgstr ""
 
@@ -12350,6 +12400,9 @@ msgstr ""
 msgid "Illegal long value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
+msgid "{0} bytes have been read"
+msgstr ""
+
 msgid "Prepare OSM data..."
 msgstr ""
 
@@ -12530,7 +12583,7 @@ msgstr ""
 msgid "Cannot start remotecontrol server on port {0}: {1}"
 msgstr ""
 
-msgid "RemoteControl::Accepting connections on port {0}"
+msgid "RemoteControl::Accepting connections on {0}:{1}"
 msgstr ""
 
 msgid "RemoteControl::Server stopped."
@@ -12542,7 +12595,7 @@ msgstr ""
 msgid "Unable to initialize Remote Control HTTPS Server"
 msgstr ""
 
-msgid "RemoteControl::Accepting secure connections on port {0}"
+msgid "RemoteControl::Accepting secure connections on {0}:{1}"
 msgstr ""
 
 msgid "RemoteControl::Server (https) stopped."
@@ -13502,9 +13555,6 @@ msgid ""
 "contain any JOSM object or suitable text. </p></html>"
 msgstr ""
 
-msgid "Invalid bz2 file."
-msgstr ""
-
 msgid "ms"
 msgstr ""
 
@@ -14740,6 +14790,10 @@ msgstr ""
 msgid "Coins"
 msgstr ""
 
+msgctxt "payment"
+msgid "Notes"
+msgstr ""
+
 msgid "Electronic purses and Charge cards"
 msgstr ""
 
@@ -15562,6 +15616,9 @@ msgstr ""
 msgid "Cross on horseback"
 msgstr ""
 
+msgid "Optional values for specific countries"
+msgstr ""
+
 msgid "Stop"
 msgstr ""
 
@@ -15619,6 +15676,18 @@ msgstr ""
 msgid "Speed Camera"
 msgstr ""
 
+msgid "Traffic Mirror"
+msgstr ""
+
+msgctxt "junction=yes"
+msgid "Named Junction"
+msgstr ""
+
+msgid ""
+"Used in some countries for a named road junction who’s name serves for local "
+"orientation."
+msgstr ""
+
 msgid "Elevator"
 msgstr ""
 
@@ -17063,6 +17132,9 @@ msgstr ""
 msgid "Fireplace"
 msgstr ""
 
+msgid "Picnic Table"
+msgstr ""
+
 msgid "Public Grill"
 msgstr ""
 
@@ -17668,6 +17740,12 @@ msgstr ""
 msgid "Count"
 msgstr ""
 
+msgid "Advertising Column"
+msgstr ""
+
+msgid "Billboard"
+msgstr ""
+
 msgid "Sports"
 msgstr ""
 
@@ -19538,9 +19616,6 @@ msgstr ""
 msgid "vouchers"
 msgstr ""
 
-msgid "Note"
-msgstr ""
-
 msgid "Geography"
 msgstr ""
 
@@ -19924,9 +19999,6 @@ msgstr ""
 msgid "House number"
 msgstr ""
 
-msgid "House name"
-msgstr ""
-
 msgid "Street name"
 msgstr ""
 
@@ -19939,7 +20011,7 @@ msgstr ""
 msgid "Country code"
 msgstr ""
 
-msgid "Optional values for specific countries"
+msgid "House name"
 msgstr ""
 
 msgid "Subdistrict"
@@ -20611,6 +20683,13 @@ msgstr ""
 msgid "VoGIS: DOM (Surface model)"
 msgstr ""
 
+msgid ""
+"AGIV(laanderen) aerial imagery (covers Brussels region as well) (2013)"
+msgstr ""
+
+msgid "Geoservices Wallonie aerial imagery (2009)"
+msgstr ""
+
 msgid "IBGE Mapa de Setores Urbanos"
 msgstr ""
 
@@ -20745,6 +20824,9 @@ msgstr ""
 msgid "Hamburg (40 cm)"
 msgstr ""
 
+msgid "Hamburg (20 cm)"
+msgstr ""
+
 msgid "Hamburg (DK5)"
 msgstr ""
 
@@ -20990,6 +21072,9 @@ msgstr ""
 msgid "Kanton Aargau 25cm (AGIS 2011)"
 msgstr ""
 
+msgid "Kanton Aargau 25cm (AGIS 2014)"
+msgstr ""
+
 msgid "Stadt Uster Orthophoto 2008 10cm"
 msgstr ""
 
@@ -21347,6 +21432,9 @@ msgstr ""
 msgid "{0} without {1}, {2} or {3}"
 msgstr ""
 
+msgid "{0} together with {1}"
+msgstr ""
+
 msgid "{0} on suspicious object"
 msgstr ""
 
@@ -21365,6 +21453,12 @@ 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 "{0}={1} is deprecated"
 msgstr ""
 
@@ -21401,6 +21495,9 @@ msgstr ""
 msgid "{0} should be replaced with {1}"
 msgstr ""
 
+msgid "{0} = {1}; remove {0}"
+msgstr ""
+
 msgid ""
 "{0}={1} is unspecific. Please replace ''{1}'' by ''left'', ''right'' or "
 "''both''."
@@ -21439,6 +21536,9 @@ msgstr ""
 msgid "Overlapping Identical Landuses"
 msgstr ""
 
+msgid "{0} must be connected to a way"
+msgstr ""
+
 msgid "abbreviated street name"
 msgstr ""
 
@@ -21460,9 +21560,17 @@ msgstr ""
 msgid "street name contains ss"
 msgstr ""
 
+msgid ""
+"Value of ''{0}'' should either be ''{1}'' or ''{2}''. For sidewalks use "
+"''{3}'' instead."
+msgstr ""
+
 msgid "{0} with multiple values"
 msgstr ""
 
+msgid "empty value in semicolon-separated ''{0}''"
+msgstr ""
+
 msgid "numerical key"
 msgstr ""
 
@@ -21497,6 +21605,9 @@ msgstr ""
 msgid "{0} must be a numeric value"
 msgstr ""
 
+msgid "{0} must be a positive integer number"
+msgstr ""
+
 msgid "relation without type"
 msgstr ""
 
@@ -22691,6 +22802,12 @@ msgstr ""
 msgid "merge nodes"
 msgstr ""
 
+msgid "How often thinning operation should be applied (Default {0})."
+msgstr ""
+
+msgid "Thinning Iterations"
+msgstr ""
+
 msgid "Street Name:"
 msgstr ""
 
@@ -25708,7 +25825,9 @@ msgstr ""
 msgid "Move and position photos"
 msgstr ""
 
-msgid "Click+drag photo or shift+click to position photo."
+msgid ""
+"Click+drag photo, shift+click to position photo, control+click to set "
+"direction."
 msgstr ""
 
 msgid "Please load some photos."
@@ -26369,6 +26488,9 @@ msgstr ""
 msgid "Reconstruct polygons from relation {0}"
 msgstr ""
 
+msgid "Reconstruct route"
+msgstr ""
+
 msgid "Open relation wiki page"
 msgstr ""
 
@@ -26408,6 +26530,12 @@ msgstr ""
 msgid "Way without ''inner'' or ''outer'' role found"
 msgstr ""
 
+msgid "Node without ''stop'' or ''platform'' role found"
+msgstr ""
+
+msgid "Way platform without ''platform'' role found"
+msgstr ""
+
 msgid "Revert changeset fully"
 msgstr ""
 
@@ -26898,7 +27026,7 @@ msgstr ""
 msgid "create an associatedStreet relation"
 msgstr ""
 
-msgid "delete outline way"
+msgid "keep outline way"
 msgstr ""
 
 msgid "Street name: "
diff --git a/i18n/po/ar.po b/i18n/po/ar.po
index 12b982e..090d29c 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: 2014-12-10 03:42+0100\n"
+"POT-Creation-Date: 2014-12-29 01:14+0100\n"
 "PO-Revision-Date: 2013-03-30 14:17+0000\n"
 "Last-Translator: Chdoula <chdoula at gmail.com>\n"
 "Language-Team: Arabic <ar at li.org>\n"
@@ -16,8 +16,8 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n % 100 >= "
 "3 && n % 100 <= 10 ? 3 : n % 100 >= 11 && n % 100 <= 99 ? 4 : 5;\n"
-"X-Launchpad-Export-Date: 2014-12-10 04:33+0000\n"
-"X-Generator: Launchpad (build 17283)\n"
+"X-Launchpad-Export-Date: 2014-12-29 04:34+0000\n"
+"X-Generator: Launchpad (build 17286)\n"
 "Language: ar\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -3743,6 +3743,9 @@ msgstr ""
 msgid "Checks for errors in internet-related tags."
 msgstr ""
 
+msgid " URL cannot be converted to ASCII: {0}"
+msgstr ""
+
 msgid "''{0}'': {1}"
 msgstr ""
 
@@ -3949,19 +3952,20 @@ msgstr ""
 msgid "Relation is empty"
 msgstr ""
 
-msgid "<empty>"
+msgid "Role member does not match expression {0} in template {1}"
 msgstr ""
 
-msgid "Role {0} unknown"
+msgid ""
+"Role member type {0} does not match accepted list of {1} in template {2}"
 msgstr ""
 
-msgid "Empty role found"
+msgid "<empty>"
 msgstr ""
 
-msgid "Member for role ''{0}'' does not match ''{1}''"
+msgid "Role {0} unknown in templates {1}"
 msgstr ""
 
-msgid "Member for role {0} of wrong type"
+msgid "Empty role type found when expecting one of {0}"
 msgstr ""
 
 msgid "Role {0} missing"
@@ -4501,10 +4505,35 @@ msgstr ""
 msgid "options provided as Java system properties"
 msgstr ""
 
-msgid "/PATH/TO/JOSM/FOLDER/         "
+msgid "/PATH/TO/JOSM/PREF    "
+msgstr ""
+
+msgid "Set the preferences directory"
+msgstr ""
+
+msgid "/PATH/TO/JOSM/USERDATA"
+msgstr ""
+
+msgid "Set the user data directory"
+msgstr ""
+
+msgid "/PATH/TO/JOSM/CACHE   "
+msgstr ""
+
+msgid "Set the cache directory"
 msgstr ""
 
-msgid "Change the folder for all user settings"
+msgid "/PATH/TO/JOSM/HOMEDIR "
+msgstr ""
+
+msgid ""
+"Relocate all 3 directories to homedir. Cache directory will be in "
+"homedir/cache"
+msgstr ""
+
+msgid ""
+"-Djosm.home has lower precedence, i.e. the specific setting overrides the "
+"general one"
 msgstr ""
 
 msgid ""
@@ -4759,6 +4788,21 @@ msgstr "الطبقة ليست في اللائحة."
 msgid "Layer ''{0}'' must be in list of layers"
 msgstr ""
 
+msgid "Default (open, closed, new)"
+msgstr ""
+
+msgid "Username"
+msgstr "إسم المستخدم"
+
+msgid "Created date"
+msgstr ""
+
+msgid "Last change date"
+msgstr ""
+
+msgid "Select note sorting method"
+msgstr ""
+
 msgid "Click to cancel the current operation"
 msgstr ""
 
@@ -6103,6 +6147,12 @@ msgstr ""
 msgid "Reopen note with message:"
 msgstr ""
 
+msgid "Sort notes"
+msgstr ""
+
+msgid "Sort"
+msgstr ""
+
 msgid "Object type:"
 msgstr ""
 
@@ -7085,9 +7135,6 @@ msgstr ""
 msgid "Sort the relation members"
 msgstr ""
 
-msgid "Sort"
-msgstr ""
-
 msgid "Relation Editor: Sort"
 msgstr ""
 
@@ -7870,9 +7917,6 @@ msgstr ""
 msgid "Enter credentials for HTTP proxy"
 msgstr ""
 
-msgid "Username"
-msgstr "إسم المستخدم"
-
 msgid "Password"
 msgstr "كلمة‌المرور"
 
@@ -8552,6 +8596,9 @@ msgstr ""
 msgid "Save Layer"
 msgstr "إحفظ الطبقة"
 
+msgid "Note"
+msgstr "الملاحظة"
+
 msgid "Notes layer"
 msgstr ""
 
@@ -8998,6 +9045,9 @@ msgstr ""
 msgid "Delete File from disk"
 msgstr ""
 
+msgid "Copy image path"
+msgstr ""
+
 msgid "Next"
 msgstr ""
 
@@ -12390,6 +12440,9 @@ msgstr ""
 msgid "Illegal long value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
+msgid "{0} bytes have been read"
+msgstr ""
+
 msgid "Prepare OSM data..."
 msgstr "حضّر المعطيات أو.أس.أم ..."
 
@@ -12570,7 +12623,7 @@ msgstr ""
 msgid "Cannot start remotecontrol server on port {0}: {1}"
 msgstr ""
 
-msgid "RemoteControl::Accepting connections on port {0}"
+msgid "RemoteControl::Accepting connections on {0}:{1}"
 msgstr ""
 
 msgid "RemoteControl::Server stopped."
@@ -12582,7 +12635,7 @@ msgstr ""
 msgid "Unable to initialize Remote Control HTTPS Server"
 msgstr ""
 
-msgid "RemoteControl::Accepting secure connections on port {0}"
+msgid "RemoteControl::Accepting secure connections on {0}:{1}"
 msgstr ""
 
 msgid "RemoteControl::Server (https) stopped."
@@ -13542,9 +13595,6 @@ msgid ""
 "contain any JOSM object or suitable text. </p></html>"
 msgstr ""
 
-msgid "Invalid bz2 file."
-msgstr ""
-
 msgid "ms"
 msgstr ""
 
@@ -14780,6 +14830,10 @@ msgstr ""
 msgid "Coins"
 msgstr "عملات معدنية"
 
+msgctxt "payment"
+msgid "Notes"
+msgstr ""
+
 msgid "Electronic purses and Charge cards"
 msgstr ""
 
@@ -15602,6 +15656,9 @@ msgstr ""
 msgid "Cross on horseback"
 msgstr ""
 
+msgid "Optional values for specific countries"
+msgstr ""
+
 msgid "Stop"
 msgstr "إشارة وقوف"
 
@@ -15659,6 +15716,18 @@ msgstr "الإسم الثاني"
 msgid "Speed Camera"
 msgstr "كاميرا مراقبة السير"
 
+msgid "Traffic Mirror"
+msgstr ""
+
+msgctxt "junction=yes"
+msgid "Named Junction"
+msgstr ""
+
+msgid ""
+"Used in some countries for a named road junction who’s name serves for local "
+"orientation."
+msgstr ""
+
 msgid "Elevator"
 msgstr ""
 
@@ -17103,6 +17172,9 @@ msgstr "موقع تنزه"
 msgid "Fireplace"
 msgstr ""
 
+msgid "Picnic Table"
+msgstr ""
+
 msgid "Public Grill"
 msgstr ""
 
@@ -17708,6 +17780,12 @@ msgstr ""
 msgid "Count"
 msgstr ""
 
+msgid "Advertising Column"
+msgstr ""
+
+msgid "Billboard"
+msgstr ""
+
 msgid "Sports"
 msgstr ""
 
@@ -19578,9 +19656,6 @@ msgstr "ألعاب"
 msgid "vouchers"
 msgstr "قسائم"
 
-msgid "Note"
-msgstr "الملاحظة"
-
 msgid "Geography"
 msgstr ""
 
@@ -19964,9 +20039,6 @@ msgstr ""
 msgid "House number"
 msgstr "رقم المنزل"
 
-msgid "House name"
-msgstr "تسمية المنزل"
-
 msgid "Street name"
 msgstr "إسم الشارع"
 
@@ -19979,8 +20051,8 @@ msgstr "إسم المدينة"
 msgid "Country code"
 msgstr "رمز البلد"
 
-msgid "Optional values for specific countries"
-msgstr ""
+msgid "House name"
+msgstr "تسمية المنزل"
 
 msgid "Subdistrict"
 msgstr ""
@@ -20651,6 +20723,13 @@ msgstr ""
 msgid "VoGIS: DOM (Surface model)"
 msgstr ""
 
+msgid ""
+"AGIV(laanderen) aerial imagery (covers Brussels region as well) (2013)"
+msgstr ""
+
+msgid "Geoservices Wallonie aerial imagery (2009)"
+msgstr ""
+
 msgid "IBGE Mapa de Setores Urbanos"
 msgstr ""
 
@@ -20785,6 +20864,9 @@ msgstr ""
 msgid "Hamburg (40 cm)"
 msgstr ""
 
+msgid "Hamburg (20 cm)"
+msgstr ""
+
 msgid "Hamburg (DK5)"
 msgstr ""
 
@@ -21030,6 +21112,9 @@ msgstr ""
 msgid "Kanton Aargau 25cm (AGIS 2011)"
 msgstr ""
 
+msgid "Kanton Aargau 25cm (AGIS 2014)"
+msgstr ""
+
 msgid "Stadt Uster Orthophoto 2008 10cm"
 msgstr ""
 
@@ -21387,6 +21472,9 @@ msgstr ""
 msgid "{0} without {1}, {2} or {3}"
 msgstr ""
 
+msgid "{0} together with {1}"
+msgstr ""
+
 msgid "{0} on suspicious object"
 msgstr ""
 
@@ -21405,6 +21493,12 @@ 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 "{0}={1} is deprecated"
 msgstr ""
 
@@ -21441,6 +21535,9 @@ msgstr ""
 msgid "{0} should be replaced with {1}"
 msgstr ""
 
+msgid "{0} = {1}; remove {0}"
+msgstr ""
+
 msgid ""
 "{0}={1} is unspecific. Please replace ''{1}'' by ''left'', ''right'' or "
 "''both''."
@@ -21479,6 +21576,9 @@ msgstr ""
 msgid "Overlapping Identical Landuses"
 msgstr ""
 
+msgid "{0} must be connected to a way"
+msgstr ""
+
 msgid "abbreviated street name"
 msgstr ""
 
@@ -21500,9 +21600,17 @@ msgstr ""
 msgid "street name contains ss"
 msgstr ""
 
+msgid ""
+"Value of ''{0}'' should either be ''{1}'' or ''{2}''. For sidewalks use "
+"''{3}'' instead."
+msgstr ""
+
 msgid "{0} with multiple values"
 msgstr ""
 
+msgid "empty value in semicolon-separated ''{0}''"
+msgstr ""
+
 msgid "numerical key"
 msgstr ""
 
@@ -21537,6 +21645,9 @@ msgstr ""
 msgid "{0} must be a numeric value"
 msgstr ""
 
+msgid "{0} must be a positive integer number"
+msgstr ""
+
 msgid "relation without type"
 msgstr ""
 
@@ -22731,6 +22842,12 @@ msgstr ""
 msgid "merge nodes"
 msgstr ""
 
+msgid "How often thinning operation should be applied (Default {0})."
+msgstr ""
+
+msgid "Thinning Iterations"
+msgstr ""
+
 msgid "Street Name:"
 msgstr ""
 
@@ -25748,7 +25865,9 @@ msgstr ""
 msgid "Move and position photos"
 msgstr ""
 
-msgid "Click+drag photo or shift+click to position photo."
+msgid ""
+"Click+drag photo, shift+click to position photo, control+click to set "
+"direction."
 msgstr ""
 
 msgid "Please load some photos."
@@ -26409,6 +26528,9 @@ msgstr ""
 msgid "Reconstruct polygons from relation {0}"
 msgstr ""
 
+msgid "Reconstruct route"
+msgstr ""
+
 msgid "Open relation wiki page"
 msgstr ""
 
@@ -26448,6 +26570,12 @@ msgstr ""
 msgid "Way without ''inner'' or ''outer'' role found"
 msgstr ""
 
+msgid "Node without ''stop'' or ''platform'' role found"
+msgstr ""
+
+msgid "Way platform without ''platform'' role found"
+msgstr ""
+
 msgid "Revert changeset fully"
 msgstr ""
 
@@ -26938,7 +27066,7 @@ msgstr ""
 msgid "create an associatedStreet relation"
 msgstr ""
 
-msgid "delete outline way"
+msgid "keep outline way"
 msgstr ""
 
 msgid "Street name: "
diff --git a/i18n/po/ast.po b/i18n/po/ast.po
index f7733d0..d86acfe 100644
--- a/i18n/po/ast.po
+++ b/i18n/po/ast.po
@@ -7,16 +7,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-12-10 03:42+0100\n"
-"PO-Revision-Date: 2014-10-04 23:51+0000\n"
-"Last-Translator: edrux <Unknown>\n"
+"POT-Creation-Date: 2014-12-29 01:14+0100\n"
+"PO-Revision-Date: 2014-12-28 13:03+0000\n"
+"Last-Translator: Don-vip <Unknown>\n"
 "Language-Team: Asturian <ast 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: 2014-12-10 04:35+0000\n"
-"X-Generator: Launchpad (build 17283)\n"
+"X-Launchpad-Export-Date: 2014-12-29 04:36+0000\n"
+"X-Generator: Launchpad (build 17286)\n"
 "Language: ast\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -50,10 +50,10 @@ msgid "Invalid value {0} for parameter ''has_arg''"
 msgstr "Valor {0} inválidu pal parámetru ''has_arg''"
 
 msgid "Background Terms of Use"
-msgstr "Condiciones d'usu del fondu"
+msgstr "Condiciones d''usu del fondu"
 
 msgid "Opening link not supported on current platform (''{0}'')"
-msgstr "Nun hai sofitu p'abrir l'enllaz na plataforma actual (''{0}'')"
+msgstr "Nun hai sofitu p''abrir l''enllaz na plataforma actual (''{0}'')"
 
 msgid "ERROR: {0}"
 msgstr "ERROR: {0}"
@@ -71,16 +71,16 @@ msgid "Cause: "
 msgstr "Causa: "
 
 msgid "Executing platform startup hook"
-msgstr "Executando l'enganche d'aniciu de la plataforma"
+msgstr "Executando l''enganche d''aniciu de la plataforma"
 
 msgid "Building main menu"
-msgstr "Construyendo'l menú principal"
+msgstr "Construyendo''l menú principal"
 
 msgid "Help"
 msgstr "Ayuda"
 
 msgid "Initializing OSM API"
-msgstr "Aniciando API d'OSM"
+msgstr "Aniciando API d''OSM"
 
 msgid "Initializing validator"
 msgstr "Aniciando validador"
@@ -92,10 +92,10 @@ msgid "Initializing map styles"
 msgstr "Aniciando estilos de mapa"
 
 msgid "Loading imagery preferences"
-msgstr "Cargando les preferencies d'imaxes"
+msgstr "Cargando les preferencies d''imaxes"
 
 msgid "Updating user interface"
-msgstr "Anovando interfaz d'usuariu"
+msgstr "Anovando interfaz d''usuariu"
 
 msgid "{0} completed in {1}"
 msgstr "{0} completáu en {1}"
@@ -137,7 +137,7 @@ msgid "Display the about screen."
 msgstr "Amosar la pantalla Tocante a..."
 
 msgid "Java OpenStreetMap Editor"
-msgstr "Editor Java d'OpenStreetMap"
+msgstr "Editor Java d''OpenStreetMap"
 
 msgid "Version {0}"
 msgstr "Versión {0}"
@@ -149,7 +149,7 @@ msgid "Java Version {0}"
 msgstr "Versión de Java {0}"
 
 msgid "Homepage"
-msgstr "Páxina d'aniciu"
+msgstr "Páxina d''aniciu"
 
 msgid "Bug Reports"
 msgstr "Informes de fallos"
@@ -183,10 +183,10 @@ msgid_plural ""
 "screen with browser windows<br>and take some time to finish."
 msgstr[0] ""
 "Ta a piques de llanzar una {0} ventana del navegador.<br>Esto pue apexar la "
-"so pantalla coles ventanes del navegador<br>y tardar un tiempu'n finar."
+"so pantalla coles ventanes del navegador<br>y tardar un tiempu''n finar."
 msgstr[1] ""
 "Ta a piques de llanzar una {0} ventana del navegador.<br>Esto pue apexar la "
-"so pantalla coles ventanes del navegador<br>y tardar un tiempu'n finar."
+"so pantalla coles ventanes del navegador<br>y tardar un tiempu''n finar."
 
 msgid "Continue"
 msgstr "Siguir"
@@ -228,7 +228,7 @@ msgid "Add imagery layer {0}"
 msgstr "Amestar capa de imaxes {0}"
 
 msgid "Select image format for WMS layer"
-msgstr "Escoyer formatu d'imaxe pa la capa WMS"
+msgstr "Escoyer formatu d''imaxe pa la capa WMS"
 
 msgid "Select WMS layers"
 msgstr "Escoyer capes WMS"
@@ -323,7 +323,7 @@ msgid "next"
 msgstr "siguiente"
 
 msgid "Nothing selected to zoom to."
-msgstr "Nun s'esbilló nada p'ampliar."
+msgstr "Nun s''esbilló nada p''ampliar."
 
 msgid "Information"
 msgstr "Información"
@@ -338,7 +338,7 @@ msgid "View: {0}"
 msgstr "Vista: {0}"
 
 msgid "No conflicts to zoom to"
-msgstr "Nun hai conflictos qu'ampliar."
+msgstr "Nun hai conflictos qu''ampliar."
 
 msgid "Changeset Manager"
 msgstr "Alministrador de cambios"
@@ -458,14 +458,14 @@ msgstr "Distribuir nodos"
 
 msgid "Distribute the selected nodes to equal distances along a line."
 msgstr ""
-"Distribuir los nodos seleicionaos a distancies iguales a lo llargo d'una "
+"Distribuir los nodos seleicionaos a distancies iguales a lo llargo d''una "
 "llinia."
 
 msgid "Ignoring {0} nodes with null coordinates"
 msgstr "Ignorando {0} nodos con coordenaes nules"
 
 msgid "Download from OSM..."
-msgstr "Descargar d'OSM..."
+msgstr "Descargar d''OSM..."
 
 msgid "Download map data from the OSM server."
 msgstr "Descargar datos del mapa del sirvidor OSM."
@@ -503,7 +503,7 @@ msgid "Exit"
 msgstr "Colar"
 
 msgid "Exit the application."
-msgstr "Colar de l'aplicación"
+msgstr "Colar de l''aplicación"
 
 msgid "Expert Mode"
 msgstr "Mou espertu"
@@ -543,7 +543,7 @@ msgstr "Historial"
 
 msgid "Display history information about OSM ways, nodes, or relations."
 msgstr ""
-"Amostrar la información del historial de víes, nodos o rellaciones d'OSM."
+"Amostrar la información del historial de víes, nodos o rellaciones d''OSM."
 
 msgid "Show history"
 msgstr "Amosar historial"
@@ -555,14 +555,14 @@ msgid ""
 "Display history information about OSM ways, nodes, or relations in web "
 "browser."
 msgstr ""
-"Amosar información del historial de les víes, nodos, o rellaciones d'OSM nel "
-"restolador web."
+"Amosar información del historial de les víes, nodos, o rellaciones d''OSM "
+"nel restolador web."
 
 msgid "New offset"
 msgstr "Nueva distancia"
 
 msgid "Adjust the position of this imagery layer"
-msgstr "Axusta la posición d'esta capa d'imaxes"
+msgstr "Axusta la posición d''esta capa d''imaxes"
 
 msgid "Adjust imagery offset"
 msgstr "Axusta la posición de les imaxes"
@@ -576,10 +576,10 @@ msgid ""
 "You can also enter east and north offset in the {0} coordinates.\n"
 "If you want to save the offset as bookmark, enter the bookmark name below"
 msgstr ""
-"Usa les fleches o arrastra la capa d'imaxes col mur p'axustar la posición de "
-"les imaxes.\n"
+"Usa les fleches o arrastra la capa d''imaxes col mur p''axustar la posición "
+"de les imaxes.\n"
 "Tamién puedes escribir la distancia al este y al norte nes coordenaes {0}.\n"
-"Si quies guardar la distancia nún marcador, escribi'l so nome abaxo"
+"Si quies guardar la distancia nún marcador, escribi''l so nome abaxo"
 
 msgid "Offset: "
 msgstr "Distancia: "
@@ -599,7 +599,8 @@ msgstr "Información avanzada"
 msgid ""
 "Display advanced object information about OSM nodes, ways, or relations."
 msgstr ""
-"Amosar información avanzada d'oxetu de les víes, nodos, o rellaciones d'OSM."
+"Amosar información avanzada d''oxetu de les víes, nodos, o rellaciones "
+"d''OSM."
 
 msgid "Advanced info (web)"
 msgstr "Información avanzada (web)"
@@ -608,7 +609,7 @@ msgid ""
 "Display object information about OSM nodes, ways, or relations in web "
 "browser."
 msgstr ""
-"Amosar información d'oxetu de les víes, nodos, o rellaciones d'OSM nel "
+"Amosar información d''oxetu de les víes, nodos, o rellaciones d''OSM nel "
 "restolador web."
 
 msgid "Join overlapping Areas"
@@ -647,10 +648,10 @@ msgid "Please abort if you are not sure"
 msgstr "Por favor, encaboxa si nun tas seguru"
 
 msgid "The selected area is incomplete. Continue?"
-msgstr "L'área seleicionada ta incompleta. ¿Siguir?"
+msgstr "L''área seleicionada ta incompleta. ¿Siguir?"
 
 msgid "No intersection found. Nothing was changed."
-msgstr "Nun s'alcontró denguna interseición. Nun se camudó ren."
+msgstr "Nun s''alcontró denguna interseición. Nun se camudó ren."
 
 msgid "Move tags from ways to relations"
 msgstr "Treslladar les etiquetes dende les víes a les relaciones"
@@ -662,7 +663,7 @@ msgid "Removed duplicate nodes"
 msgstr "Se desaniciaron nodos duplicaos"
 
 msgid "Added node on all intersections"
-msgstr "S'amestó un nodu en toles interseiciones"
+msgstr "S''amestó un nodu en toles interseiciones"
 
 msgid "Assemble new polygons"
 msgstr "Ensamblar nuevos polígonos"
@@ -671,7 +672,7 @@ msgid "Delete relations"
 msgstr "Desaniciar rellaciones"
 
 msgid "Delete Ways that are not part of an inner multipolygon"
-msgstr "Desaniciar víes que nun son parte d'un multipolígonu interior"
+msgstr "Desaniciar víes que nun son parte d''un multipolígonu interior"
 
 msgid "Joined overlapping areas"
 msgstr "Se xuntaron árees superpuestes"
@@ -681,10 +682,10 @@ msgid ""
 "verify no errors have been introduced."
 msgstr ""
 "Dalgunes de les víes formaba parte de relaciones que fueron "
-"modificaes.<br>Por favor verifique que nun s'introducieron erros."
+"modificaes.<br>Por favor verifique que nun s''introducieron erros."
 
 msgid "Fix tag conflicts"
-msgstr "Arreglar conflictos d'etiquetes"
+msgstr "Arreglar conflictos d''etiquetes"
 
 msgid "Split ways into fragments"
 msgstr "Dividir víes en fragmentos"
@@ -733,7 +734,7 @@ msgstr "Mover nodu so la vía"
 
 msgid "Move the node onto the nearest way segments and include it"
 msgstr ""
-"Mover el nodo sobre'l segmentu de vía más cercana ya incluyilo n'este"
+"Mover el nodo sobre''l segmentu de vía más cercana ya incluyilo n''este"
 
 msgid "No Shortcut"
 msgstr "Dengún atayu"
@@ -779,7 +780,7 @@ msgid "Lasso Mode"
 msgstr "Mou Lasso"
 
 msgid "Lasso selection mode: select objects within a hand-drawn region"
-msgstr "Mou de selección Lasso: escoyer oxetos dientro d'una rexón dibuxada"
+msgstr "Mou de selección Lasso: escoyer oxetos dientro d''una rexón dibuxada"
 
 msgid "Rectified Image..."
 msgstr "Imaxe rectificada..."
@@ -809,7 +810,7 @@ msgid ""
 "Couldn''t match the entered link or id to the selected service. Please try "
 "again."
 msgstr ""
-"Nun casen l'enllaz o la id escritos col serviciu seleicionáu. Vuelvi a "
+"Nun casen l''enllaz o la id escritos col serviciu seleicionáu. Vuelvi a "
 "tentalo."
 
 msgid "No valid WMS URL or id"
@@ -819,7 +820,7 @@ msgid "Merge layer"
 msgstr "Xunir capa"
 
 msgid "Merge the current layer into another layer"
-msgstr "Sumir la capa actual n'otra capa"
+msgstr "Sumir la capa actual n''otra capa"
 
 msgid "Merging layers with different upload policies"
 msgstr "Fundiendo capes con distintes polítiques de carga"
@@ -835,7 +836,7 @@ msgid ""
 msgstr ""
 "Ta a puntu de fundir datos ente les capes  ''{0}'' y ''{1}''.<br /><br "
 "/>Estes capes tienen distintes polítiques de carga y nun tendríen de ser "
-"fundíes.<br/>La fusión va dar llugar a l'aplicación de la política más "
+"fundíes.<br/>La fusión va dar llugar a l''aplicación de la política más "
 "estricta (prohibir la carga) a ''{1}''.<br /><br /><b>Esta nun ye la manera "
 "encamentada de fundir esti tipu de datos</b>.<br />Tendría de comprobar y "
 "fundir cada oxetu, ún por ún, usando''<i>Opción fundir</i>''.<br /><br />¿Ta "
@@ -878,7 +879,7 @@ msgid "Merge selection"
 msgstr "Xunir la seleición"
 
 msgid "Merge the currently selected objects into another layer"
-msgstr "Xune los oxetos seleicionaos anguaño n'otra capa"
+msgstr "Xune los oxetos seleicionaos anguaño n''otra capa"
 
 msgid "Merging too many objects with different upload policies"
 msgstr "Fundiendo demasiaos oxetos con distintes polítiques de carga"
@@ -925,13 +926,13 @@ msgid "Moves Objects {0}"
 msgstr "Mueve los oxetos {0}"
 
 msgid "Cannot move objects outside of the world."
-msgstr "Nun pueden movese oxetos pa fuera'l mundu."
+msgstr "Nun pueden movese oxetos pa fuera''l mundu."
 
 msgid "Move Node..."
 msgstr "Mover nodu..."
 
 msgid "Edit latitude and longitude of a node."
-msgstr "Editar la llatitú y llonxitú d'un nodu."
+msgstr "Editar la llatitú y llonxitú d''un nodu."
 
 msgid "New Layer"
 msgstr "Capa nueva"
@@ -1030,7 +1031,7 @@ msgid ""
 "patterns shown:<br>{1}"
 msgstr ""
 "Non se pue abrir la URL \"{0}\" <br> Les siguientes xeres de descarga "
-"acepten los patrones d'URL que s'amuesen de siguío:<br>{1}"
+"acepten los patrones d''URL que s''amuesen de siguío:<br>{1}"
 
 msgid ""
 "<h3>When one or more ways are selected, the shape is adjusted such, that all "
@@ -1039,10 +1040,10 @@ msgid ""
 "can undo the movement for certain nodes:<br>Select them and press the "
 "shortcut for Orthogonalize / Undo. The default is Shift-Q.)"
 msgstr ""
-"<h3>Al seleicionar una o más víes, la forma s'axusta de manera que tolos "
+"<h3>Al seleicionar una o más víes, la forma s''axusta de manera que tolos "
 "ángulos formen 90 ó 180 graos.</h3>Pues amestar dos nodos a la seleición. "
 "Entós, la direición la marquen esos dos nodos de referencia. (Dempués podrás "
-"desfacer el movimientu pa dellos nodos:<br>Seleiciónalos y calca l'atayu pa "
+"desfacer el movimientu pa dellos nodos:<br>Seleiciónalos y calca l''atayu pa "
 "Ortogonalizar / Desfacer. El predetermináu ye Mayús-Q.)"
 
 msgid "Orthogonalize Shape"
@@ -1161,9 +1162,9 @@ msgid ""
 "removed from the layer, but <i>not</i> deleted<br> on the server when "
 "uploading."
 msgstr ""
-"Esta operación fai que JOSM s'escaeza de los oxetos seleicionaos.<br> Se "
+"Esta operación fai que JOSM s''escaeza de los oxetos seleicionaos.<br> Se "
 "llimpiarán de la capa, pero <i>nun</i> se desaniciarán<br>cuando se faiga la "
-"xuba de datos al sirvidor"
+"xuba de datos al sirvidor."
 
 msgid ""
 "The following dependent objects will be purged<br> in addition to the "
@@ -1215,7 +1216,7 @@ msgid "Restart"
 msgstr "Reaniciar"
 
 msgid "Restart the application."
-msgstr "Reaniciar l'aplicación"
+msgstr "Reaniciar l''aplicación"
 
 msgid "Click to restart later."
 msgstr "Faiga clic pa reaniciar más tarde."
@@ -1245,7 +1246,7 @@ msgid "File {0} exists. Overwrite?"
 msgstr "El ficheru {0} esiste. ¿Sobroscribir?"
 
 msgid "No Exporter found! Nothing saved."
-msgstr "¡Nun s'alcontró esportador!. Nun se guardó nada."
+msgstr "¡Nun s''alcontró esportador!. Nun se guardó nada."
 
 msgid "File exists. Overwrite?"
 msgstr "Ficheru esistente. ¿Sobroscribir?"
@@ -1267,10 +1268,10 @@ msgstr ""
 "tamién seleiciona los oxetos incompletos."
 
 msgid "Non-branching way sequences"
-msgstr "Secuencies de víes que nun s'encrucien"
+msgstr "Secuencies de víes que nun s''encrucien"
 
 msgid "Select non-branching sequences of ways"
-msgstr "Escoyer secuencies de víes que nun s'encrucien"
+msgstr "Escoyer secuencies de víes que nun s''encrucien"
 
 msgid "Load Session"
 msgstr "Cargar sesión"
@@ -1326,19 +1327,19 @@ msgid "No exporter for this layer"
 msgstr "Nengún esportador pa esta capa"
 
 msgid "Show Status Report"
-msgstr "Amosar informe d'estáu"
+msgstr "Amosar informe d''estáu"
 
 msgid ""
 "Show status report with useful information that can be attached to bugs"
 msgstr ""
-"Amosar l'informe d'estáu con información útil que se pue axuntar a los "
+"Amosar l''informe d''estáu con información útil que se pue axuntar a los "
 "errores"
 
 msgid "Help: {0}"
 msgstr "Ayuda: {0}"
 
 msgid "Status Report"
-msgstr "Informe d'estáu"
+msgstr "Informe d''estáu"
 
 msgid "Copy to clipboard and close"
 msgstr "Copiar al cartafueyu y zarrar"
@@ -1350,7 +1351,7 @@ msgid "Simplify Way"
 msgstr "Simplificar vía"
 
 msgid "Delete unnecessary nodes from a way."
-msgstr "Desaniciar los nodos innecesarios d'una vía."
+msgstr "Desaniciar los nodos innecesarios d''una vía."
 
 msgid "Please select at least one way to simplify."
 msgstr "Seleiciona polo menos una vía pa simplificar."
@@ -1408,7 +1409,7 @@ msgid_plural ""
 "There is more than one way using the nodes you selected. Please select the "
 "way also."
 msgstr[0] ""
-"Hai más de una vía usando'l nodu que seleicionasti. Por favor seleiciona "
+"Hai más de una vía usando''l nodu que seleicionasti. Por favor seleiciona "
 "tamién la vía."
 msgstr[1] ""
 "Hai más de una vía usando los nodos que seleicionasti. Por favor seleiciona "
@@ -1465,10 +1466,10 @@ msgid "This node is not glued to anything else."
 msgstr "Esti nodo nun ta pegáu a nenguna otra cosa."
 
 msgid "None of these nodes are glued to anything else."
-msgstr "Nengún d'éstos nodos ta pegáu a nenguna otra cosa."
+msgstr "Nengún d''éstos nodos ta pegáu a nenguna otra cosa."
 
 msgid "None of this way''s nodes are glued to anything else."
-msgstr "Nengún de los nodos d'esta vía ta pegáu a nenguna otra cosa."
+msgstr "Nengún de los nodos d''esta vía ta pegáu a nenguna otra cosa."
 
 msgid "The current selection cannot be used for unglueing."
 msgstr "La selección actual non puede usase pa desapegar."
@@ -1480,19 +1481,19 @@ msgid "* One tagged node, or"
 msgstr "* Un nodo etiquetáu, o"
 
 msgid "* One node that is used by more than one way, or"
-msgstr "* Un nodo que sía usáu por más d'una vía, o"
+msgstr "* Un nodo que sía usáu por más d''una vía, o"
 
 msgid ""
 "* One node that is used by more than one way and one of those ways, or"
-msgstr "* Un nodo usáu por más d'una vía y una d'eses víes, o"
+msgstr "* Un nodo usáu por más d''una vía y una d''eses víes, o"
 
 msgid ""
 "* One way that has one or more nodes that are used by more than one way, or"
-msgstr "* Una vía que tenga un nodo o más usáu por más d'una vía, o"
+msgstr "* Una vía que tenga un nodo o más usáu por más d''una vía, o"
 
 msgid ""
 "* One way and one or more of its nodes that are used by more than one way."
-msgstr "* Una vía y un nodo o más de los sos nodos usaos por más d'una vía."
+msgstr "* Una vía y un nodo o más de los sos nodos usaos por más d''una vía."
 
 msgid ""
 "Note: If a way is selected, this way will get fresh copies of the unglued\n"
@@ -1534,13 +1535,13 @@ msgid ""
 "because you don''t see the real object.<br>Do you really want to unglue?"
 msgstr ""
 "Ta a puntu de desapegar oxetos incompletos.<br>Esto va causar problemes por "
-"cuenta de que nun va ver l'oxetu real.<br>¿Realmente quier desapegar?"
+"cuenta de que nun va ver l''oxetu real.<br>¿Realmente quier desapegar?"
 
 msgid "Disconnect Node from Way"
 msgstr "Desconectar nodo de la vía"
 
 msgid "Disconnect nodes from a way they currently belong to"
-msgstr "Desconectar nodos dende una vía a la qu'anguaño pertenecen"
+msgstr "Desconectar nodos dende una vía a la qu''anguaño pertenecen"
 
 msgid "Select at least one node to be disconnected."
 msgstr "Escueye siquier un nodo a ser desconectáu."
@@ -1580,7 +1581,7 @@ msgid "Update data"
 msgstr "Anovar datos"
 
 msgid "Updates the objects in the active data layer from the server."
-msgstr "Actualizar dende'l servidor los oxetos na capa de datos activa."
+msgstr "Actualizar dende''l servidor los oxetos na capa de datos activa."
 
 msgid "Update modified"
 msgstr "Anovamientu camudáu"
@@ -1588,8 +1589,8 @@ msgstr "Anovamientu camudáu"
 msgid ""
 "Updates the currently modified objects from the server (re-downloads data)"
 msgstr ""
-"Actualiza dende'l servidor los objectos anguaño modificaos (vuelve descargar "
-"los datos)"
+"Actualiza dende''l servidor los objectos anguaño modificaos (vuelve "
+"descargar los datos)"
 
 msgid "No current dataset found"
 msgstr "Actualización de datos non atopada"
@@ -1603,7 +1604,7 @@ msgstr "Anovar seleición"
 msgid ""
 "Updates the currently selected objects from the server (re-downloads data)"
 msgstr ""
-"Actualizar los oxetos anguaño escoyíos dende'l servidor (re-descarga de "
+"Actualizar los oxetos anguaño escoyíos dende''l servidor (re-descarga de "
 "datos)"
 
 msgid "There are no selected objects to update."
@@ -1692,7 +1693,7 @@ msgstr "Siguimientu automáticu"
 
 msgid "Enable/disable automatic moving of the map view to last placed node"
 msgstr ""
-"Habilitar / deshabilitar movimientu automáticu de la vista del mapa hasta'l "
+"Habilitar / deshabilitar movimientu automáticu de la vista del mapa hasta''l "
 "postreru nodo asitiáu"
 
 msgid "Toggle Viewport Following"
@@ -1726,16 +1727,16 @@ msgid "Zoom to the object the first selected member refers to"
 msgstr "Averar al oxetu al que se refier el primer miembru escoyíu"
 
 msgid "Zooming disabled because layer of this relation is not active"
-msgstr "Zoom desactiváu, porque la capa d'esta relación nun ta activa"
+msgstr "Zoom desactiváu, porque la capa d''esta relación nun ta activa"
 
 msgid "Zooming disabled because there is no selected member"
-msgstr "Desactivóse'l zoom por cuenta de que nun hai nengún miembru escoyíu"
+msgstr "Desactivóse''l zoom por cuenta de que nun hai nengún miembru escoyíu"
 
 msgid "Zoom to the first selected node"
 msgstr "Zoom al primer nodo escoyíu"
 
 msgid "Zooming disabled because layer of this way is not active"
-msgstr "Zoom desactiváu porque la capa d'esta vía nun ta activa"
+msgstr "Zoom desactiváu porque la capa d''esta vía nun ta activa"
 
 msgid "Zooming disabled because there is no selected node"
 msgstr "Zoom desactiváu porque nun hai nengún nodo escoyíu"
@@ -1834,7 +1835,7 @@ msgstr ""
 "Ignorando la esceición yá que la descarga foi atayada. La esceición yera: {0}"
 
 msgid "No data found in this area."
-msgstr "Nun s'alcontraron datos nesti área."
+msgstr "Nun s''alcontraron datos nesti área."
 
 msgid "OSM Server URL:"
 msgstr "URL del servidor OSM:"
@@ -2010,7 +2011,7 @@ msgid "Create new node."
 msgstr "Crear un nodu nuevu."
 
 msgid "Select node under cursor."
-msgstr "Seleicionar el nodu baxo'l cursor."
+msgstr "Seleicionar el nodu baxo''l cursor."
 
 msgid "Insert new node into way."
 msgid_plural "Insert new node into {0} ways."
@@ -2018,10 +2019,10 @@ msgstr[0] "Inxertar un nodu nuevu na vía."
 msgstr[1] "Inxertar un nodu nuevu en {0} víes."
 
 msgid "Start new way from last node."
-msgstr "Principiar una nueva vía dende'l caberu nodu."
+msgstr "Principiar una nueva vía dende''l caberu nodu."
 
 msgid "Continue way from last node."
-msgstr "Siguir la vía dende'l caberu nodu."
+msgstr "Siguir la vía dende''l caberu nodu."
 
 msgid "Angle snapping active."
 msgstr "Autoensambláu d`ángulos activu."
@@ -2060,16 +2061,16 @@ msgid "0,30,45,60,90,..."
 msgstr "0,30,45,60,90,..."
 
 msgid "Angle snapping"
-msgstr "Autoensambláu d'ángulos"
+msgstr "Autoensambláu d''ángulos"
 
 msgid "Switch angle snapping mode while drawing"
-msgstr "Conmutar el mou d'axuste d'ángulu mientres se dibuxa"
+msgstr "Conmutar el mou d''axuste d''ángulu mientres se dibuxa"
 
 msgid "Dual alignment"
 msgstr "Alliniadura dual"
 
 msgid "Switch dual alignment mode while extruding"
-msgstr "Mou d'alliniadura dual mientres la estrusión"
+msgstr "Mou d''alliniadura dual mientres la estrusión"
 
 msgid "Extrude"
 msgstr "Estrusionar"
@@ -2087,7 +2088,7 @@ msgid ""
 msgstr ""
 "Arrastra un segmentu de vía pa facer un rectángulu. Ctrl+Arrastrar pa mover "
 "un segmentu a lo llargo de la normal, Alt+Arrastrar pa crear un rectángulu "
-"nuevu, doble clic p'amestar un nodu nuevu."
+"nuevu, doble clic p''amestar un nodu nuevu."
 
 msgid "Dual alignment active."
 msgstr "Alliniadura dual activa"
@@ -2097,16 +2098,16 @@ msgstr "Segmentu colapsáu  por cuenta del so sentíu inversu."
 
 msgid "Move a segment along its normal, then release the mouse button."
 msgstr ""
-"Muevi un segmentu a lo llargo de la normal, y llueu suelta'l botón del mur."
+"Muevi un segmentu a lo llargo de la normal, y llueu suelta''l botón del mur."
 
 msgid ""
 "Move the node along one of the segments, then release the mouse button."
 msgstr ""
-"Mueva'l nodo a lo llargo de los segmentos, depués suelte'l botón del mure"
+"Mueva''l nodo a lo llargo de los segmentos, depués suelte''l botón del mure"
 
 msgid "Draw a rectangle of the desired size, then release the mouse button."
 msgstr ""
-"Dibuxa un rectángulu del tamañu deseáu, y llueu suelta'l botón del mur."
+"Dibuxa un rectángulu del tamañu deseáu, y llueu suelta''l botón del mur."
 
 msgid "Extrude: main line"
 msgstr "Estrusión: llínea principal"
@@ -2124,7 +2125,7 @@ msgid "Improve Way Accuracy mode"
 msgstr "Mou de meyora de la precisión de la vía"
 
 msgid "improve way accuracy helper line"
-msgstr "llínea guía p'ameyorar la precisión de la vía"
+msgstr "llínea guía p''ameyorar la precisión de la vía"
 
 msgid "Click on the way to start improving its shape."
 msgstr "Faiga click na vía pa entamar a ameyorar la so forma."
@@ -2136,7 +2137,7 @@ msgid ""
 "Click to add a new node. Release Ctrl to move existing nodes or hold Alt to "
 "delete."
 msgstr ""
-"Faiga clic p'añedir un nuevu nodo. Suelte la tecla Ctrl pa mover los nodos "
+"Faiga clic p''añedir un nuevu nodo. Suelte la tecla Ctrl pa mover los nodos "
 "esistentes o caltenga apertada la tecla Alt pa esaniciar."
 
 msgid ""
@@ -2144,17 +2145,17 @@ msgid ""
 "hold Ctrl to add new nodes."
 msgstr ""
 "Faiga clic pa esaniciar el nodo escoyíu. Suelte la tecla Alt pa mover los "
-"nodos esistentes o calten pulsiáu Ctrl p'añedir nuevos nodos."
+"nodos esistentes o calten pulsiáu Ctrl p''añedir nuevos nodos."
 
 msgid ""
 "Click to move the highlighted node. Hold Ctrl to add new nodes, or Alt to "
 "delete."
 msgstr ""
-"Faiga clic pa mover el nodo resaltáu. Caltenga pulsiáu Ctrl p'añedir nuevos "
+"Faiga clic pa mover el nodo resaltáu. Caltenga pulsiáu Ctrl p''añedir nuevos "
 "nodos o Alt pa esaniciar."
 
 msgid "Cannot place a node outside of the world."
-msgstr "Non puede asitiase un nodo fora'l mundu."
+msgstr "Non puede asitiase un nodo fora''l mundu."
 
 msgid "Add a new node to way"
 msgid_plural "Add a new node to {0} ways"
@@ -2182,7 +2183,7 @@ msgid ""
 msgstr ""
 "Esbilla víes como nel mou Seleición. Arrastra les víes esbillaes o una vía "
 "única pa crear una copia paralela (Alt activa o desactiva la conservación "
-"d'etiquetes)"
+"d''etiquetes)"
 
 msgid "Hold Ctrl to toggle snapping"
 msgstr "Caltener pulsiáu Ctrl pa conmutar el autoensambláu"
@@ -2205,7 +2206,7 @@ msgid ""
 "SHIFT+release to synchronize audio at that point."
 msgstr ""
 "Mueva la flecha de reproducción y suéltela cerca de la trazar pa reproducir "
-"audiu dende esi puntu; usa MAYUS+soltar pa sincronizar l'audiu nesi puntu."
+"audiu dende esi puntu; usa MAYUS+soltar pa sincronizar l''audiu nesi puntu."
 
 msgid "Select"
 msgstr "Escoyer"
@@ -2246,20 +2247,20 @@ msgid "Ctrl to merge with nearest node."
 msgstr "Ctrl pa xuntar nodos cercanos."
 
 msgid "Release the mouse button to stop moving."
-msgstr "Suelte'l botón del mure pa detener el movimientu."
+msgstr "Suelte''l botón del mure pa detener el movimientu."
 
 msgid "Release the mouse button to stop rotating."
 msgstr "Soltar el botón del mure pa dexar de rotar."
 
 msgid "Release the mouse button to stop scaling."
-msgstr "Suelte'l botón del mure pa detener l'escaláu"
+msgstr "Suelte''l botón del mure pa detener l''escaláu"
 
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
 "Ctrl to rotate selected; Alt-Ctrl to scale selected; or change selection"
 msgstr ""
-"Mover los oxetos abasnando'l mure: Shift p'añedir a la selección (Ctrl para "
-"conmutar); Shift-Ctrl pa rotar la selección; Alt-Ctrl pa esguilar la "
+"Mover los oxetos abasnando''l mure: Shift p''añedir a la selección (Ctrl "
+"para conmutar); Shift-Ctrl pa rotar la selección; Alt-Ctrl pa esguilar la "
 "selección; o camudar la selección"
 
 msgid "Add and move a virtual new node to way"
@@ -2309,7 +2310,7 @@ msgid "Download incomplete members"
 msgstr "Descargar miembros incompletos"
 
 msgid "Create a copy of this relation and open it in another editor window"
-msgstr "Crear una copia d'esta relación y abrir n'otra ventana d'edición."
+msgstr "Crear una copia d''esta relación y abrir n''otra ventana d''edición."
 
 msgid "Edit"
 msgstr "Editar"
@@ -2389,7 +2390,7 @@ msgid "<key>"
 msgstr "<clave>"
 
 msgid "<question mark>"
-msgstr "<signu d'interrogación>"
+msgstr "<signu d''interrogación>"
 
 msgid "<end-of-file>"
 msgstr "<fin-de-ficheru>"
@@ -2540,7 +2541,7 @@ msgid ""
 "<b>tags:</b>... - objects with given number of tags (<b>tags:</b>count, "
 "<b>tags:</b>min-max, <b>tags:</b>min- or <b>tags:</b>-max)"
 msgstr ""
-"<b>tags:</b>... - oxetos con un determináu númberu d'etiquetes "
+"<b>tags:</b>... - oxetos con un determináu númberu d''etiquetes "
 "(<b>tags:</b>contaos, <b>tags:</b>min-max, <b>tags:</b>min- o <b>tags:</b>-"
 "max)"
 
@@ -2621,11 +2622,11 @@ msgid ""
 "escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and <b>\\\\</b>)."
 msgstr ""
 "Dientro de les cadenes ente comines los carauteres <b>\"</b> y <b>\\</b> "
-"tienen d'escapase  poniendo antes <b>\\</b> (p.ex. <b>\\\"</b> y <b>\\\\"
+"tienen d''escapase  poniendo antes <b>\\</b> (p.ex. <b>\\\"</b> y <b>\\\\"
 "</b>)."
 
 msgid "Use <b>(</b> and <b>)</b> to group expressions"
-msgstr "Usar <b>(</b> y <b>)</b> p'agrupar espresiones"
+msgstr "Usar <b>(</b> y <b>)</b> p''agrupar espresiones"
 
 msgid "basic examples"
 msgstr "exemplos básicos"
@@ -2665,7 +2666,7 @@ msgstr "coincidencies si la \"clave\" esiste"
 
 msgid "matches if ''key'' is greater than ''value'' (analogously, less than)"
 msgstr ""
-"concuerda si ''clave'' ye menor que ''value'' (n'otres palabres, menor que)"
+"concuerda si ''clave'' ye menor que ''value'' (n''otres palabres, menor que)"
 
 msgid "combinators"
 msgstr "combinadores"
@@ -2681,7 +2682,7 @@ msgid "logical not"
 msgstr "non lóxicu"
 
 msgid "use parenthesis to group expressions"
-msgstr "usar paréntesis p'arrexuntar espresiones"
+msgstr "usar paréntesis p''arrexuntar espresiones"
 
 msgid ""
 "to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
@@ -2853,8 +2854,8 @@ msgstr "Rangu de versiones esperaos"
 
 msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
 msgstr ""
-"La clave nun puede tar vacida cuando s'usa l'operador d'etiqueta. Exemplu "
-"d'usu: clave=valor"
+"La clave nun puede tar vacida cuando s''usa l''operador d''etiqueta. Exemplu "
+"d''usu: clave=valor"
 
 msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
 msgstr ""
@@ -2865,7 +2866,7 @@ msgid "Positive integer expected"
 msgstr "Enteru positivu esperáu"
 
 msgid "Range of numbers expected"
-msgstr "S'esperaba un rangu de númberos"
+msgstr "S''esperaba un rangu de númberos"
 
 msgid "Unexpected token. Expected {0}, found {1}"
 msgstr "Elementu ensin esperar. Esperábase {0} pero atopóse {1}"
@@ -2945,7 +2946,7 @@ msgid ""
 "cancel this dialog, you can find the entries in the validator side panel to "
 "inspect them."
 msgstr ""
-"Los resultaos siguientes vienen d'una validación automática. Prueba a "
+"Los resultaos siguientes vienen d''una validación automática. Prueba a "
 "igualos, pero ten cuidáu (nun destruyas datos válidos). Si tienes duldes, "
 "inóralos.<br>Cuando encaboxes esti diálogu, pues alcontrar les entraes nel "
 "panel llateral del validador pa revisales."
@@ -2954,7 +2955,7 @@ msgid "Errors"
 msgstr "Fallos"
 
 msgid "Usually this should be fixed."
-msgstr "Normalmente esto tendría d'arreglase."
+msgstr "Normalmente esto tendría d''arreglase."
 
 msgid "Warnings"
 msgstr "Alvertencies"
@@ -2967,7 +2968,7 @@ msgstr "Otru"
 
 msgid "Informational warnings, expect many false entries."
 msgstr ""
-"Avisos informativos, anque ye probable qu'ente ellos esistan falsos "
+"Avisos informativos, anque ye probable qu''ente ellos esistan falsos "
 "problemes."
 
 msgid "Suspicious data found. Upload anyway?"
@@ -3055,7 +3056,7 @@ msgid "Change relation member role for {0} {1}"
 msgstr "Modificar la función del miembru de la relación pa {0} {1}"
 
 msgid "At least one object to delete required, got empty collection"
-msgstr "Ríquese siquier un oxetu pa borrar, nun s'escoyó nengún."
+msgstr "Ríquese siquier un oxetu pa borrar, nun s''escoyó nengún."
 
 msgid "Delete node {0}"
 msgstr "Desaniciar el nodu {0}"
@@ -3097,8 +3098,8 @@ msgid ""
 "downloaded.<br>This can cause problems because other objects (that you do "
 "not see) might use them.<br>Do you really want to delete?"
 msgstr ""
-"Ta a puntu d'esaniciar nodos fuera de la área que se descargó.<br>Esto puede "
-"causar problemes yá que otros oxetos (que nun puede ver) pueden tar "
+"Ta a puntu d''esaniciar nodos fuera de la área que se descargó.<br>Esto "
+"puede causar problemes yá que otros oxetos (que nun puede ver) pueden tar "
 "usándolos.<br>¿Ta seguru que quier borrar?"
 
 msgid ""
@@ -3106,7 +3107,7 @@ msgid ""
 "because you don''t see the real object.<br>Do you really want to delete?"
 msgstr ""
 "Va esaniciar oxetos incompletos.<br> Esto va causar problemes porque nun ve "
-"l'oxetu real.<br>¿Ta seguru que deseya borrar?"
+"l''oxetu real.<br>¿Ta seguru que deseya borrar?"
 
 msgid ""
 "You are about to delete {0} relation: {1}<br/>This step is rarely necessary "
@@ -3309,14 +3310,14 @@ msgid "Roles in relations referring to"
 msgstr "Roles nes rellaciones que refieren a"
 
 msgid "Automatic tag correction"
-msgstr "Correición automática d'etiquetes"
+msgstr "Correición automática d''etiquetes"
 
 msgid "Unable to create directory {0}, autosave will be disabled"
 msgstr ""
-"Nun se pue crear el directoriu {0}. Va evacuase'l guardáu automáticu."
+"Nun se pue crear el directoriu {0}. Va evacuase''l guardáu automáticu."
 
 msgid "Unable to create file {0}, other filename will be used"
-msgstr "Imposible crear l`arquivu {0}, va utilizase otru nome d'arquivu"
+msgstr "Imposible crear l`arquivu {0}, va utilizase otru nome d''arquivu"
 
 msgid "IOError while creating file, autosave will be skipped: {0}"
 msgstr "IOError creando l`arquivu. Nun se va guardar automáticamente: {0}"
@@ -3465,7 +3466,7 @@ msgstr ""
 "''{0}''"
 
 msgid "The revision file ''/REVISION'' is missing."
-msgstr "Falta l'arquivu de revisión ''/REVISION''."
+msgstr "Falta l''arquivu de revisión ''/REVISION''."
 
 msgid "Already registered a conflict for primitive ''{0}''."
 msgstr "Yá se rexistró un conflictu pa la primitiva «{0}»."
@@ -3499,7 +3500,7 @@ msgid "E"
 msgstr "E"
 
 msgid "Not in cache"
-msgstr "Nun ta'n caché"
+msgstr "Nun ta''n caché"
 
 msgid "Projection ''{0}'' is not found, bookmark ''{1}'' is not usable"
 msgstr ""
@@ -3578,7 +3579,7 @@ msgid ""
 "other is not"
 msgstr ""
 "Non puede realizase la unión porque una de de les primitives participantes "
-"ye nueva y l'otra non."
+"ye nueva y l''otra non."
 
 msgid ""
 "Cannot merge primitives with different ids. This id is {0}, the other is {1}"
@@ -3611,8 +3612,8 @@ msgid ""
 "Tag collection cannot be applied to a primitive because there are keys with "
 "multiple values."
 msgstr ""
-"Non puede aplicase el conxuntu d'etiquetes a una primitiva porque hai claves "
-"con múltiples valores."
+"Non puede aplicase el conxuntu d''etiquetes a una primitiva porque hai "
+"claves con múltiples valores."
 
 msgid "<anonymous>"
 msgstr "<anónimu>"
@@ -3669,15 +3670,15 @@ msgid "Wireframe Map Renderer"
 msgstr "Renderizador de mapa esquemáticu"
 
 msgid "Renders the map as simple wire frame."
-msgstr "Renderiza el mapa como un armazón d'alambre senciellu."
+msgstr "Renderiza el mapa como un armazón d''alambre senciellu."
 
 msgid "Styled Map Renderer"
 msgstr "Renderizador de mapa estilizáu"
 
 msgid "Renders the map using style rules in a set of style sheets."
 msgstr ""
-"Dibuxa'l mapa usando riegles d'estilu definíes nun conxuntu de fueyes "
-"d'estilu."
+"Dibuxa''l mapa usando riegles d''estilu definíes nun conxuntu de fueyes "
+"d''estilu."
 
 msgid "inactive"
 msgstr "inactivu"
@@ -3743,7 +3744,7 @@ msgid "Ellipsoid ''{0}'' not supported."
 msgstr "Elipsoide ''{0}'' non almitíu."
 
 msgid "Combination of ellipsoid parameters is not supported."
-msgstr "La combinación de parámetros d'elipsoide nun ye almitida"
+msgstr "La combinación de parámetros d''elipsoide nun ye almitida"
 
 msgid "Ellipsoid required (+ellps=* or +a=*, +b=*)"
 msgstr "Elipsoide riquíu (+ellps=* or +a=*, +b=*)"
@@ -3762,7 +3763,7 @@ msgstr "Riquise (+datum=*, +towgs84=* or +nadgrids=*)"
 msgid ""
 "Unexpected number of arguments for parameter ''towgs84'' (must be 3 or 7)"
 msgstr ""
-"Númberu inesperáu d'argumentos pal parámetru ''towgs84'' (tien de tener 3 o "
+"Númberu inesperáu d''argumentos pal parámetru ''towgs84'' (tien de tener 3 o "
 "7)"
 
 msgid "Unable to parse value of parameter ''towgs84'' (''{0}'')"
@@ -3776,7 +3777,7 @@ msgstr "Identificador de proyección desconocíu: ''{0}''."
 
 msgid "Unexpected number of arguments for parameter ''+bounds'' (must be 4)"
 msgstr ""
-"Númberu inesperáu d'argumentos pal parámetru \"+bounds\" (tien de ser 4)"
+"Númberu inesperáu d''argumentos pal parámetru \"+bounds\" (tien de ser 4)"
 
 msgid "Unknown parameter ''{0}''"
 msgstr "Parámetru ''{0}'' desconocíu"
@@ -3901,7 +3902,7 @@ msgstr "Capacidaes API"
 
 msgid "Checks for errors against API capabilities"
 msgstr ""
-"Comprueba la esistencia d'erros en contra de les capacidaes de la API"
+"Comprueba la esistencia d''erros en contra de les capacidaes de la API"
 
 msgid ""
 "Way contains more than {0} nodes. It should be replaced by a multipolygon"
@@ -3918,7 +3919,7 @@ msgid "Checks for errors in barriers and entrances."
 msgstr "Busca erros en barreres y entraes"
 
 msgid "Barrier entrance not set on a barrier"
-msgstr "Entrada de barrera fita fuera d'una barrera"
+msgstr "Entrada de barrera fita fuera d''una barrera"
 
 msgid "Coastlines"
 msgstr "Llínees de mariña"
@@ -3957,7 +3958,7 @@ msgid "Crossing ways"
 msgstr "Encruz de víes"
 
 msgid "Crossing buildings"
-msgstr "Edificios qu'intersecten"
+msgstr "Edificios qu''intersecten"
 
 msgid "Crossing waterways"
 msgstr "Encruz de víes navegables"
@@ -3988,7 +3989,7 @@ msgid "Mixed type duplicated nodes"
 msgstr "Amestar nodos con tipu duplicáu"
 
 msgid "Highway duplicated nodes"
-msgstr "Nodos doblaos d'autopista"
+msgstr "Nodos doblaos d''autopista"
 
 msgid "Railway duplicated nodes"
 msgstr "Nodos doblaos de fierrocarril"
@@ -4000,7 +4001,7 @@ msgid "Boundary duplicated nodes"
 msgstr "Nodos doblaos de frontera"
 
 msgid "Power duplicated nodes"
-msgstr "Nodos doblaos d'elletricidá"
+msgstr "Nodos doblaos d''elletricidá"
 
 msgid "Natural duplicated nodes"
 msgstr "Elementu natural con nodos duplicaos"
@@ -4065,10 +4066,10 @@ msgid "Incorrect roundabout (highway: {0} instead of {1})"
 msgstr "Rotonda incorreuta (camín: {0} en llugar de {1})"
 
 msgid "Highway link is not linked to adequate highway/link"
-msgstr "L'enllaz de vía nun ta conectáu a la vía/enllaz fayadizu"
+msgstr "L''enllaz de vía nun ta conectáu a la vía/enllaz fayadizu"
 
 msgid "Missing pedestrian crossing information"
-msgstr "Falta información d'encruz peatonal"
+msgstr "Falta información d''encruz peatonal"
 
 msgid "Unknown country code: {0}"
 msgstr "Códigu de país desconocíu: {0}"
@@ -4077,10 +4078,13 @@ msgid "Unknown source:maxspeed context: {0}"
 msgstr "Fuente desconocía: contestu maxspeed: {0}"
 
 msgid "Internet tags"
-msgstr "Etiquetes d'Internet"
+msgstr "Etiquetes d''Internet"
 
 msgid "Checks for errors in internet-related tags."
-msgstr "Busca erros n'etiquetes rellacionaes a Internet."
+msgstr "Busca erros n''etiquetes rellacionaes a Internet."
+
+msgid " URL cannot be converted to ASCII: {0}"
+msgstr ""
 
 msgid "''{0}'': {1}"
 msgstr "''{0}'': {1}"
@@ -4110,7 +4114,7 @@ msgstr ""
 "Númberu de valores dependientes del carril inconsistentes nel sen inversu"
 
 msgid "Tag checker (MapCSS based)"
-msgstr "Verificador d'etiquetes (basáu'n MapCSS)"
+msgstr "Verificador d''etiquetes (basáu''n MapCSS)"
 
 msgid "This test checks for errors in tag keys and values."
 msgstr ""
@@ -4150,7 +4154,7 @@ msgid "Role for ''{0}'' should be ''{1}''"
 msgstr "El rol pa ''{0}'' tendría de ser ''{1}''"
 
 msgid "No area style for multipolygon"
-msgstr "Nun hai un estilu d'área pa multipolígonu"
+msgstr "Nun hai un estilu d''área pa multipolígonu"
 
 msgid ""
 "Multipolygon relation should be tagged with area tags and not the outer way"
@@ -4164,16 +4168,16 @@ msgstr[1] ""
 "non de les víes esternes"
 
 msgid "Style for inner way equals multipolygon"
-msgstr "L'estilu de vía interna ye igual al del multipolígonu"
+msgstr "L''estilu de vía interna ye igual al del multipolígonu"
 
 msgid "Style for outer way mismatches"
 msgstr "Estilu pa vía esterna non compatible"
 
 msgid "Style for outer way mismatches polygon"
-msgstr "L'estilu de la vía esterna nun coincide col polígonu"
+msgstr "L''estilu de la vía esterna nun coincide col polígonu"
 
 msgid "Area style on outer way"
-msgstr "Estilu d'área en vía esterna"
+msgstr "Estilu d''área en vía esterna"
 
 msgid "Multipolygon is not closed"
 msgstr "El multipolígonu non tá peslláu"
@@ -4198,25 +4202,26 @@ msgid ""
 "to some ''name:*'' attribute and not a composition of ''name:*'' attributes, "
 "e.g., Italia - Italien - Italy."
 msgstr ""
-"Esta prueba detecta los oxetos multilingües que'l so atributu \"name\" nun "
+"Esta prueba detecta los oxetos multilingües que''l so atributu \"name\" nun "
 "coinciden con dalgún de los atributos \"name:*\" introducíos (por casu, "
 "España - Spanien - Spain)."
 
 msgid "A name:* translation is missing."
-msgstr "Un nome:* traducción nun s'atopa."
+msgstr "Un nome:* traducción nun s''atopa."
 
 msgid "A name is missing, even though name:* exists."
-msgstr "Un nome non s'atopa, anque'l nome: * esiste."
+msgstr "Un nome non s''atopa, anque''l nome: * esiste."
 
 msgid "Opening hours syntax"
-msgstr "Sintaxis d'horarios d'apertura"
+msgstr "Sintaxis d''horarios d''apertura"
 
 msgid "This test checks the correct usage of the opening hours syntax."
 msgstr ""
-"Esta prueba verifica el correuto usu de la sintaxis de l'horariu d'apertura."
+"Esta prueba verifica el correuto usu de la sintaxis de l''horariu "
+"d''apertura."
 
 msgid "opening_hours value can be prettified"
-msgstr "el valor d'opening_hours (horarios d'apertura) pue ser ameyoráu"
+msgstr "el valor d''opening_hours (horarios d''apertura) pue ser ameyoráu"
 
 msgid "Unexpected token:"
 msgstr "Elementu inesperáu:"
@@ -4237,7 +4242,7 @@ msgid "Unexpected token in month range:"
 msgstr "Elementu inesperáu nel rangu de meses:"
 
 msgid "Unexpected token in year range:"
-msgstr "Elementu inesperáu nel rangu d'años:"
+msgstr "Elementu inesperáu nel rangu d''años:"
 
 msgid "Invalid/unsupported syntax."
 msgstr "Sintaxis non válida o non soportada."
@@ -4249,11 +4254,11 @@ msgid ""
 "This test checks that a connection between two nodes is not used by more "
 "than one way."
 msgstr ""
-"Esti test comprueba si una conexón ente dos nodos nun s'usa por más d'una "
+"Esti test comprueba si una conexón ente dos nodos nun s''usa por más d''una "
 "vía."
 
 msgid "Areas share segment"
-msgstr "Segmentu d'árees compartíes"
+msgstr "Segmentu d''árees compartíes"
 
 msgid "Highways share segment with area"
 msgstr "Segmentu de carreteres compartíes con área"
@@ -4274,16 +4279,16 @@ msgid "Way contains segment twice"
 msgstr "La vía contien el mesmu segmentu 2 vegaes"
 
 msgid "Power lines"
-msgstr "Llínees d'enerxía"
+msgstr "Llínees d''enerxía"
 
 msgid ""
 "Checks for nodes in power lines that do not have a power=tower/pole tag."
 msgstr ""
-"Busca nodos en llínees d'enerxía que nun tienen una etiqueta "
+"Busca nodos en llínees d''enerxía que nun tienen una etiqueta "
 "power=tower/pole."
 
 msgid "Missing power tower/pole within power line"
-msgstr "Nun s'atopen torres o postes nel tendíu eléctricu"
+msgstr "Nun s''atopen torres o postes nel tendíu eléctricu"
 
 msgid "Role verification problem"
 msgstr "Problema de verificación de rol"
@@ -4306,20 +4311,21 @@ msgstr "Tipu de relación desconocía"
 msgid "Relation is empty"
 msgstr "La relación tá vacida"
 
-msgid "<empty>"
-msgstr "<vacíu>"
+msgid "Role member does not match expression {0} in template {1}"
+msgstr ""
 
-msgid "Role {0} unknown"
-msgstr "Rol {0} desconocíu"
+msgid ""
+"Role member type {0} does not match accepted list of {1} in template {2}"
+msgstr ""
 
-msgid "Empty role found"
-msgstr "Atopóse un rol vacíu"
+msgid "<empty>"
+msgstr "<vacíu>"
 
-msgid "Member for role ''{0}'' does not match ''{1}''"
-msgstr "El miembru pal rol ''{0}'' non concuerda con ''{1}''"
+msgid "Role {0} unknown in templates {1}"
+msgstr ""
 
-msgid "Member for role {0} of wrong type"
-msgstr "Miembru de rol {0} con tipu erróneu"
+msgid "Empty role type found when expecting one of {0}"
+msgstr ""
 
 msgid "Role {0} missing"
 msgstr "Falta el rol {0}"
@@ -4331,12 +4337,12 @@ msgid "Number of {0} roles too high ({1})"
 msgstr "{0} ye una cantidá de roles bien alta ({1})"
 
 msgid "Self-intersecting ways"
-msgstr "Víes que s'interseccionen elles mesmes"
+msgstr "Víes que s''interseccionen elles mesmes"
 
 msgid ""
 "This test checks for ways that contain some of their nodes more than once."
 msgstr ""
-"Esti test comprueba víes que contienen dalgunos de los sos nodos más d'una "
+"Esti test comprueba víes que contienen dalgunos de los sos nodos más d''una "
 "vegada."
 
 msgid "Similarly named ways"
@@ -4349,7 +4355,7 @@ msgstr ""
 "mal."
 
 msgid "Tag checker"
-msgstr "Correutor d'etiquetes"
+msgstr "Correutor d''etiquetes"
 
 msgid "Adding {0} to ignore tags"
 msgstr "Agregando {0} a les etiquetes a ignorar"
@@ -4371,7 +4377,7 @@ msgstr ""
 "{0}"
 
 msgid "Suspicious tag/value combinations"
-msgstr "Combinaciones d'etiquetes/valores estraños"
+msgstr "Combinaciones d''etiquetes/valores estraños"
 
 msgid "Key ''{0}'' invalid."
 msgstr "Clave ''{0}'' non válida."
@@ -4395,10 +4401,10 @@ msgid "Invalid property key"
 msgstr "Clave de propiedá non válida"
 
 msgid "Invalid white space in property key"
-msgstr "Espaciu'n blancu non válidu na clave de propiedá"
+msgstr "Espaciu''n blancu non válidu na clave de propiedá"
 
 msgid "Property values start or end with white space"
-msgstr "Los valores de la propiedá entamen y finen con un espaciu'n blancu"
+msgstr "Los valores de la propiedá entamen y finen con un espaciu''n blancu"
 
 msgid "Property values contain HTML entity"
 msgstr "Los valores de propiedá contienen entidá de HTML"
@@ -4430,10 +4436,10 @@ msgid "Use complex property checker."
 msgstr "Usar analizador de propiedá complexa."
 
 msgid "Validate property values and tags using complex rules."
-msgstr "Validar valores de propiedá y etiquetes qu'usen riegles complexes"
+msgstr "Validar valores de propiedá y etiquetes qu''usen riegles complexes"
 
 msgid "TagChecker source"
-msgstr "Fonte del validador d'etiquetes"
+msgstr "Fonte del validador d''etiquetes"
 
 msgid "Data sources ({0})"
 msgstr "Oríxenes de datos ({0})"
@@ -4450,19 +4456,19 @@ msgid "Check for FIXMES."
 msgstr "Comprobar FIXMES"
 
 msgid "Looks for nodes or ways with FIXME in any property value."
-msgstr "Buscar nodos o viales con FIXME'n cualesquier propiedá de valor"
+msgstr "Buscar nodos o viales con FIXME''n cualesquier propiedá de valor"
 
 msgid "Fix tags"
 msgstr "Correxir etiquetes"
 
 msgid "Could not find element type"
-msgstr "Non pudo atopase'l tipu d'elementu"
+msgstr "Non pudo atopase''l tipu d''elementu"
 
 msgid "Incorrect number of parameters"
 msgstr "Númberu incorreutu de parámetros"
 
 msgid "Could not find warning level"
-msgstr "Non pudo atopase'l nivel d'alerta"
+msgstr "Non pudo atopase''l nivel d''alerta"
 
 msgid "Illegal expression ''{0}''"
 msgstr "Espresión illegal ''{0}''"
@@ -4483,32 +4489,33 @@ msgid "Unknown member type"
 msgstr "Tipu de miembru desconocíu"
 
 msgid "More than one \"from\" way found"
-msgstr "Atopóse más d'una vía \"de\""
+msgstr "Atopóse más d''una vía \"de\""
 
 msgid "More than one \"to\" way found"
-msgstr "Atopóse más d'una vía \"A\""
+msgstr "Atopóse más d''una vía \"A\""
 
 msgid "More than one \"via\" node found"
-msgstr "Atopóse más d'un nodo \"vía\""
+msgstr "Atopóse más d''un nodo \"vía\""
 
 msgid "Cannot mix node and way for role \"via\""
 msgstr "Non se pue amestar el nodo y la vía pal rol \"via\""
 
 msgid "No \"from\" way found"
-msgstr "Non s'atopó una vía \"de\""
+msgstr "Non s''atopó una vía \"de\""
 
 msgid "No \"to\" way found"
-msgstr "Non s'atopó una vía \"a\""
+msgstr "Non s''atopó una vía \"a\""
 
 msgid "No \"via\" node or way found"
-msgstr "Non s'atopó un nodo o vía \"vía\""
+msgstr "Non s''atopó un nodo o vía \"vía\""
 
 msgid "The \"from\" way does not start or end at a \"via\" node."
 msgstr "La vía \"from\" non entama o non fina nun nodo \"via\"."
 
 msgid "Superfluous turnrestriction as \"to\" way is oneway"
 msgstr ""
-"Restricción de xiru redundante yá que la vía \"escontra\" ye d'un solu sentíu"
+"Restricción de xiru redundante yá que la vía \"escontra\" ye d''un solu "
+"sentíu"
 
 msgid "The \"to\" way does not start or end at a \"via\" node."
 msgstr "La vía \"to\" non entama o non fina nun nodo \"via\"."
@@ -4571,29 +4578,29 @@ msgid "Unconnected railways"
 msgstr "Víes de fierrocarril desconectaes"
 
 msgid "Unconnected waterways"
-msgstr "Cursos d'agua desconectaos"
+msgstr "Cursos d''agua desconectaos"
 
 msgid "Unconnected natural lands and landuses"
 msgstr "Usos del suelu y tierres naturales desconectaos"
 
 msgid "Unconnected power ways"
-msgstr "Llínees d'enerxía desconectaes"
+msgstr "Llínees d''enerxía desconectaes"
 
 msgid "This test checks if a way has an endpoint very near to another way."
 msgstr ""
 "Esti test comprueba si una vía tien un nodo final mui averáu a otra vía."
 
 msgid "Way end node near other highway"
-msgstr "Nodo d'estremu de vía averada a otra carretera"
+msgstr "Nodo d''estremu de vía averada a otra carretera"
 
 msgid "Way end node near other way"
-msgstr "Nodo d'estremu de vía averáu a otru vial"
+msgstr "Nodo d''estremu de vía averáu a otru vial"
 
 msgid "Way node near other way"
 msgstr "Nodo de vía averáu a otru vial"
 
 msgid "Connected way end node near other way"
-msgstr "Conectáu nodo d'estremu de vía averáu a otru vial"
+msgstr "Conectáu nodo d''estremu de vía averáu a otru vial"
 
 msgid "Untagged and unconnected nodes"
 msgstr "Nodos aislaos non etiquetaos"
@@ -4757,13 +4764,13 @@ msgid "Conflict"
 msgstr "Conflictu"
 
 msgid "Authentication Failed"
-msgstr "Falló l'autenticación"
+msgstr "Falló l''autenticación"
 
 msgid "Access to redacted version ''{0}'' of {1} {2} is forbidden."
 msgstr "Nun se dexa l´accesu a la versión redactada \"{0}\" de {1} {2}"
 
 msgid "Authorisation Failed"
-msgstr "Falló l'autorización"
+msgstr "Falló l''autorización"
 
 msgid "Client Time Out"
 msgstr "Desconexón por tiempu del veceru"
@@ -4775,7 +4782,7 @@ msgid "Communication with OSM server failed"
 msgstr "Comunicación fallida col servidor OSM"
 
 msgid "Authentication failed"
-msgstr "Falló l'autenticación"
+msgstr "Falló l''autenticación"
 
 msgid "Unknown host"
 msgstr "Host desconociu"
@@ -4786,7 +4793,7 @@ msgstr[0] "Oxetu desaniciáu"
 msgstr[1] "Oxetos desaniciaos"
 
 msgid "Show help information"
-msgstr "Amosar información d'ayuda"
+msgstr "Amosar información d''ayuda"
 
 msgid "Downloading \"Message of the day\""
 msgstr "Descargando \"Mensaxe del día\""
@@ -4801,7 +4808,7 @@ msgid "Click to close the dialog"
 msgstr "Faga clic pa zarrar el cuadru de diálogu"
 
 msgid "Imagery offset"
-msgstr "Desplazamientu d'imaxes"
+msgstr "Desplazamientu d''imaxes"
 
 msgid "Imagery"
 msgstr "Imaxes"
@@ -4824,24 +4831,24 @@ msgid "Show this help"
 msgstr "Amuesa esta axuda"
 
 msgid "Standard unix geometry argument"
-msgstr "Argumentu de xeometría standard d'unix"
+msgstr "Argumentu de xeometría standard d''unix"
 
 msgid "Download the bounding box"
-msgstr "Descargue'l cuadru allindiador"
+msgstr "Descargue''l cuadru allindiador"
 
 msgid "Download the location at the URL (with lat=x&lon=y&zoom=z)"
 msgstr "Descargar la localización na URL (con lat=x&lon=y&zoom=z)"
 
 msgid "Open a file (any file type that can be opened with File/Open)"
 msgstr ""
-"Abrir arquivu (cualesquier tipu d'arquivu que puede abrir con Arquivu/Abrir)"
+"Abrir arquivu (cualesquier tipu d''arquivu que puede abrir con Arquivu/Abrir)"
 
 msgid "Download the bounding box as raw GPS"
 msgstr "Descargar el cuadru de llende como GPS crudu"
 
 msgid "Download the location at the URL (with lat=x&lon=y&zoom=z) as raw GPS"
 msgstr ""
-"Descargar l'allugamientu na URL (con lat=x&lon=y&zoom=z) como datos GPS en "
+"Descargar l''allugamientu na URL (con lat=x&lon=y&zoom=z) como datos GPS en "
 "crudu"
 
 msgid "Select with the given search"
@@ -4854,7 +4861,7 @@ msgid "Reset the preferences to default"
 msgstr "Restablecer les preferencies a los valores predeterminaos"
 
 msgid "Changes preferences according to the XML file"
-msgstr "Camudar les preferencies según l'arquivu XML"
+msgstr "Camudar les preferencies según l''arquivu XML"
 
 msgid "Set preference key to value"
 msgstr "Asigna un valor a una entrada de les preferencies"
@@ -4869,16 +4876,41 @@ msgid "Print debugging messages to console"
 msgstr "Imprimir los mensaxes de depuración a la consola"
 
 msgid "Disable access to the given resource(s), separated by comma"
-msgstr "Evacuar l'accesu al recursu(s) dáu(s), dixebraos por comes"
+msgstr "Evacuar l''accesu al recursu(s) dáu(s), dixebraos por comes"
 
 msgid "options provided as Java system properties"
 msgstr "opciones proporcionaes como propiedaes de sistema Java"
 
-msgid "/PATH/TO/JOSM/FOLDER/         "
-msgstr "/PATH/TO/JOSM/FOLDER/         "
+msgid "/PATH/TO/JOSM/PREF    "
+msgstr ""
+
+msgid "Set the preferences directory"
+msgstr ""
+
+msgid "/PATH/TO/JOSM/USERDATA"
+msgstr ""
+
+msgid "Set the user data directory"
+msgstr ""
+
+msgid "/PATH/TO/JOSM/CACHE   "
+msgstr ""
+
+msgid "Set the cache directory"
+msgstr ""
+
+msgid "/PATH/TO/JOSM/HOMEDIR "
+msgstr ""
+
+msgid ""
+"Relocate all 3 directories to homedir. Cache directory will be in "
+"homedir/cache"
+msgstr ""
 
-msgid "Change the folder for all user settings"
-msgstr "Camudar la carpeta pa toles configuraciones d'usuariu"
+msgid ""
+"-Djosm.home has lower precedence, i.e. the specific setting overrides the "
+"general one"
+msgstr ""
 
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -5043,20 +5075,22 @@ msgstr "Editar barra de ferramientes"
 
 msgid "Toggles the visibility of the edit toolbar (i.e., the vertical tool)"
 msgstr ""
-"Alterna la visibilidá de la barra de ferramientes d'edición (esto ye, la "
+"Alterna la visibilidá de la barra de ferramientes d''edición (esto ye, la "
 "ferramienta vertical)"
 
 msgid "Preset preferences"
 msgstr "Preferencies de los predefiníos"
 
 msgid "Click to open the tagging presets tab in the preferences"
-msgstr "Faiga clic p'abrir la pestaña d'etiquetes prefixaes nes preferencies"
+msgstr ""
+"Faiga clic p''abrir la pestaña d''etiquetes prefixaes nes preferencies"
 
 msgid "Imagery preferences"
-msgstr "Preferencies d'imaxes"
+msgstr "Preferencies d''imaxes"
 
 msgid "Click to open the imagery tab in the preferences"
-msgstr "Faiga clic p'abrir la pestaña d'imaxes satelitales nes preferencies"
+msgstr ""
+"Faiga clic p''abrir la pestaña d''imaxes satelitales nes preferencies"
 
 msgid "Audio"
 msgstr "Audiu"
@@ -5068,7 +5102,7 @@ msgid "Hide this button"
 msgstr "Despintar esti botón"
 
 msgid "Click the arrow at the bottom to show it again."
-msgstr "Faiga clic na flecha na parte inferior p'amosar de nuevu."
+msgstr "Faiga clic na flecha na parte inferior p''amosar de nuevu."
 
 msgid "Hide edit toolbar"
 msgstr "Despintar la barra de ferramientes"
@@ -5101,16 +5135,16 @@ msgid "scale"
 msgstr "escala"
 
 msgid "Status bar background"
-msgstr "Fondu de la barra d'estáu"
+msgstr "Fondu de la barra d''estáu"
 
 msgid "Status bar background: active"
-msgstr "Fondu de la barra d'estáu: activu"
+msgstr "Fondu de la barra d''estáu: activu"
 
 msgid "Status bar foreground"
-msgstr "Frente de la barra d'estáu"
+msgstr "Frente de la barra d''estáu"
 
 msgid "Status bar foreground: active"
-msgstr "Frente de la barra d'estáu: activu"
+msgstr "Frente de la barra d''estáu: activu"
 
 msgid "{0} ({1})"
 msgstr "{0} ({1})"
@@ -5125,13 +5159,13 @@ msgid "The (compass) heading of the line segment being drawn."
 msgstr "La direición (brúxula) del segmentu de llínea que se ta dibuxando."
 
 msgid "The angle between the previous and the current way segment."
-msgstr "L'ángulu ente'l segmentu actual de vía y  l'anterior."
+msgstr "L''ángulu ente''l segmentu actual de vía y  l''anterior."
 
 msgid "The length of the new way segment being drawn."
 msgstr "El llargor del nuevu segmentu de llínea que se ta dibuxando."
 
 msgid "The name of the object at the mouse pointer."
-msgstr "El nome de l'oxetu nel punteru'l mure"
+msgstr "El nome de l''oxetu nel punteru''l mure"
 
 msgid ""
 "Middle click again to cycle through.<br>Hold CTRL to select directly from "
@@ -5147,7 +5181,7 @@ msgid "User:"
 msgstr "Usuariu:"
 
 msgid "Do not hide status bar"
-msgstr "Non despintar la barra d'estáu"
+msgstr "Non despintar la barra d''estáu"
 
 msgid "System of measurement changed to {0}"
 msgstr "El sistema de midida camudó a {0}"
@@ -5158,8 +5192,23 @@ msgstr "la capa no ta na llista"
 msgid "Layer ''{0}'' must be in list of layers"
 msgstr "La capa ''{0}'' tien de tar na llista de capes"
 
+msgid "Default (open, closed, new)"
+msgstr ""
+
+msgid "Username"
+msgstr "Nome d''usuariu"
+
+msgid "Created date"
+msgstr ""
+
+msgid "Last change date"
+msgstr ""
+
+msgid "Select note sorting method"
+msgstr ""
+
 msgid "Click to cancel the current operation"
-msgstr "Faga clic p'atayar la operación actual"
+msgstr "Faga clic p''atayar la operación actual"
 
 msgid "In background"
 msgstr "En segundu planu"
@@ -5171,7 +5220,7 @@ msgid ""
 "Aerial imagery might be misaligned. Please check its offset using GPS tracks!"
 msgstr ""
 "Les imaxes aérees puen tar equivocadamente alliniaes. ¡Por favor, "
-"compruebe'l so desplazamientu usando trazar de GPS!"
+"compruebe''l so desplazamientu usando trazar de GPS!"
 
 msgid "http://wiki.openstreetmap.org/wiki/Using_Imagery"
 msgstr "http://wiki.openstreetmap.org/wiki/Using_Imagery"
@@ -5186,7 +5235,7 @@ msgid ""
 "<html>Please confirm to remove <strong>1 object</strong> from <strong>1 "
 "relation</strong>.</html>"
 msgstr ""
-"<html>Confirme'l borráu de <strong>1 oxetu</strong> de <strong>1 "
+"<html>Confirme''l borráu de <strong>1 oxetu</strong> de <strong>1 "
 "relación</strong>.</html>"
 
 msgid ""
@@ -5225,7 +5274,7 @@ msgstr "Rol"
 
 msgid "Click to close the dialog and remove the object from the relations"
 msgstr ""
-"Faiga clic pa pesllar el cuadru de diálogu y esaniciar l'oxetu de les "
+"Faiga clic pa pesllar el cuadru de diálogu y esaniciar l''oxetu de les "
 "relaciones"
 
 msgid "Click to close the dialog and to abort deleting the objects"
@@ -5237,7 +5286,7 @@ msgid ""
 "<html>Please select a <strong>range of OSM tiles</strong> at a given zoom "
 "level.</html>"
 msgstr ""
-"<html>Escueya un <strong>rangu de teseles d'OSM</strong> nun nivel de zoom "
+"<html>Escueya un <strong>rangu de teseles d''OSM</strong> nun nivel de zoom "
 "dáu.</html>"
 
 msgid "Zoom level:"
@@ -5397,7 +5446,7 @@ msgid "Members"
 msgstr "Miembros"
 
 msgid "No pending tag conflicts to be resolved"
-msgstr "Nengún conflito d'etiqueta pendiente de ser resueltu"
+msgstr "Nengún conflito d''etiqueta pendiente de ser resueltu"
 
 msgid "Tags({0} conflict)"
 msgid_plural "Tags({0} conflicts)"
@@ -5416,13 +5465,13 @@ msgid ""
 "Merged node list frozen. No pending conflicts in the node list of this way"
 msgstr ""
 "Llista de nodos fundíos conxelada. Nun hai conflictos pindios na llista de "
-"nodos d'esta vía"
+"nodos d''esta vía"
 
 msgid "Nodes(with conflicts)"
 msgstr "Nodos (con conflictos)"
 
 msgid "Pending conflicts in the node list of this way"
-msgstr "Conflictos pendientes na llista de nodos d'esta vía"
+msgstr "Conflictos pendientes na llista de nodos d''esta vía"
 
 msgid "Members(resolved)"
 msgstr "Miembros (resueltos)"
@@ -5432,13 +5481,13 @@ msgid ""
 "relation"
 msgstr ""
 "Llista de miembros fundíos conxelada. Nun hai conflictos pendientes na "
-"llista de miembros d'esta relación"
+"llista de miembros d''esta relación"
 
 msgid "Members(with conflicts)"
 msgstr "Miembros (con conflictos)"
 
 msgid "Pending conflicts in the member list of this relation"
-msgstr "Conflictos pendientes na llista de miembros d'esta relación"
+msgstr "Conflictos pendientes na llista de miembros d''esta relación"
 
 msgid "No pending property conflicts"
 msgstr "Nengún conflictu de propiedaes pendiente"
@@ -5463,7 +5512,7 @@ msgstr ""
 "que fueron esaniciaos del conxuntu de datos destino:"
 
 msgid "Merging deleted objects failed"
-msgstr "Falló la unión d'oxetos esaniciaos"
+msgstr "Falló la unión d''oxetos esaniciaos"
 
 msgid "List in role {0} is currently not participating in a compare pair."
 msgstr ""
@@ -5486,7 +5535,7 @@ msgstr "La mio versión"
 
 msgid "List of elements in my dataset, i.e. the local dataset"
 msgstr ""
-"Llista d'elementos del mio conxuntu de datos, esto ye, el conxuntu de datos "
+"Llista d''elementos del mio conxuntu de datos, esto ye, el conxuntu de datos "
 "locales"
 
 msgid "Merged version"
@@ -5496,7 +5545,7 @@ msgid ""
 "List of merged elements. They will replace the list of my elements when the "
 "merge decisions are applied."
 msgstr ""
-"Llista d'elementos xuníos. Van reemplazar la llista de los mios elementos "
+"Llista d''elementos xuníos. Van reemplazar la llista de los mios elementos "
 "cuando la decisión de xunilos sía aplicada."
 
 msgid "Their version"
@@ -5504,7 +5553,7 @@ msgstr "La so versión"
 
 msgid "List of elements in their dataset, i.e. the server dataset"
 msgstr ""
-"Llista d'elementos del so conxuntu de datos, ye dicir el conxuntu de datos "
+"Llista d''elementos del so conxuntu de datos, ye dicir el conxuntu de datos "
 "del servidor"
 
 msgid "> top"
@@ -5519,7 +5568,7 @@ msgstr "> abaxo"
 
 msgid "Copy my selected elements to the end of the list of merged elements."
 msgstr ""
-"Copiar los mios elementos escoyíos a la fin de la llista d'elementos fundíos"
+"Copiar los mios elementos escoyíos a la fin de la llista d''elementos fundíos"
 
 msgid "> before"
 msgstr "> enantes"
@@ -5529,7 +5578,7 @@ msgid ""
 "merged elements."
 msgstr ""
 "Copiar los mios elementos escoyíos antes del primer elementu escoyíu na "
-"llista d'elementos fundíos"
+"llista d''elementos fundíos"
 
 msgid "> after"
 msgstr "> dempués"
@@ -5539,7 +5588,7 @@ msgid ""
 "merged elements."
 msgstr ""
 "Copiar los mios elementos escoyíos dempués del primer elementu escoyíu na "
-"llista d'elementos fundíos"
+"llista d''elementos fundíos"
 
 msgid "< top"
 msgstr "< enriba"
@@ -5547,7 +5596,7 @@ msgstr "< enriba"
 msgid ""
 "Copy their selected element to the start of the list of merged elements."
 msgstr ""
-"Copiar el so elementu escoyíu al entamu de la llista d'elementos fundíos"
+"Copiar el so elementu escoyíu al entamu de la llista d''elementos fundíos"
 
 msgid "< bottom"
 msgstr "< embaxo"
@@ -5555,7 +5604,7 @@ msgstr "< embaxo"
 msgid ""
 "Copy their selected elements to the end of the list of merged elements."
 msgstr ""
-"Copiar los sos elementos escoyíos a la fin de la llista d'elementos fundíos"
+"Copiar los sos elementos escoyíos a la fin de la llista d''elementos fundíos"
 
 msgid "< before"
 msgstr "< enantes"
@@ -5565,7 +5614,7 @@ msgid ""
 "of merged elements."
 msgstr ""
 "Copiar los sos elementos escoyíos antes del primer elementu escoyíu na "
-"llista d'elementos fundíos"
+"llista d''elementos fundíos"
 
 msgid "< after"
 msgstr "< dempués"
@@ -5574,8 +5623,8 @@ msgid ""
 "Copy their selected element after the first selected element in the list of "
 "merged elements"
 msgstr ""
-"Copia'l so elementu escoyíu dempués del primer elementu escoyíu na llista "
-"d'elementos fundíos"
+"Copia''l so elementu escoyíu dempués del primer elementu escoyíu na llista "
+"d''elementos fundíos"
 
 msgid "Copy all my elements to the target"
 msgstr "Copiar tolos mios elementos al destín"
@@ -5587,7 +5636,7 @@ msgid "Up"
 msgstr "Arriba"
 
 msgid "Move up the selected entries by one position."
-msgstr "Mueva les entraes escoyíes d'a una posición."
+msgstr "Mueva les entraes escoyíes d''a una posición."
 
 msgid "Down"
 msgstr "Abaxo"
@@ -5599,19 +5648,19 @@ msgid "Remove"
 msgstr "Desaniciar"
 
 msgid "Remove the selected entries from the list of merged elements."
-msgstr "Esaniciar les entraes escoyíes de la llista d'elementos fundíos"
+msgstr "Esaniciar les entraes escoyíes de la llista d''elementos fundíos"
 
 msgid "Freeze"
 msgstr "Conxelar"
 
 msgid "Freeze the current list of merged elements."
-msgstr "Conxelar la llista actual d'elementos fundíos"
+msgstr "Conxelar la llista actual d''elementos fundíos"
 
 msgid "Unfreeze"
 msgstr "Desconxelar"
 
 msgid "Unfreeze the list of merged elements and start merging."
-msgstr "Desconxelar la llista d'elementos fundíos y empezar la fusión"
+msgstr "Desconxelar la llista d''elementos fundíos y empezar la fusión"
 
 msgid ""
 "<html>Click <strong>{0}</strong> to start merging my and their "
@@ -5659,7 +5708,7 @@ msgid ""
 "elements when merge decisions are applied."
 msgstr ""
 "Propiedaes nel elementu fundíu. Van sustituyir a les propiedaes de los mios "
-"elementos cuando s'apliquen les decisiones de fundir."
+"elementos cuando s''apliquen les decisiones de fundir."
 
 msgid "Properties in their dataset, i.e. the server dataset"
 msgstr ""
@@ -5727,7 +5776,7 @@ msgid "Value"
 msgstr "Valor"
 
 msgid "Cannot apply undecided tag merge item."
-msgstr "Non pudo aplicase una etiqueta d'amiestu al artículu"
+msgstr "Non pudo aplicase una etiqueta d''amiestu al artículu"
 
 msgid "My version (local dataset)"
 msgstr "La mio versión (conxuntu de datos locales)"
@@ -5787,7 +5836,7 @@ msgid_plural ""
 "are shown a dialog to decide how to adapt the relations.<br/><br/>Do you "
 "want to continue?"
 msgstr[0] ""
-"Va combinar l'oxetu {1}, que ye parte de la relación {0}: <br/> {2}La unión "
+"Va combinar l´oxetu {1}, que ye parte de la relación {0}: <br/> {2}La unión "
 "d´estos oxetos puede romper esta relación. Si nun ta seguro, por favor ataye "
 "la operación. <br/> Si deseya siguir, va amosase un cuadru de diálogu pa "
 "decidir cómo afaer la relación a la nueva situación. <br/><br/> ¿Deseya "
@@ -5961,11 +6010,11 @@ msgid ""
 "ways that are members of the same relation: the combined way will take the "
 "place of the original way in the relation.</html>"
 msgstr ""
-"<html>Les víes combinaes son miembros d'una o más relaciones. Por favor "
+"<html>Les víes combinaes son miembros d''una o más relaciones. Por favor "
 "decida si deseya <strong>caltener</strong> estes membresías pa la vía "
 "combinada o si deseya <strong>quitar</strong>.<br>La opción por defectu ye "
 "<strong>caltener</strong> la membresía de la primer vía y "
-"<strong>quitar</strong> les de les otres víes que son miembros d'una mesma "
+"<strong>quitar</strong> les de les otres víes que son miembros d''una mesma "
 "relación: la vía combinada va tomar el llugar de la vía orixinal na "
 "relación.</html>"
 
@@ -5977,11 +6026,11 @@ msgid ""
 "other nodes that are members of the same relation: the target node will take "
 "the place of the original node in the relation.</html>"
 msgstr ""
-"<html>Los nodos combinaos son miembros d'una o más relaciones. Por favor "
+"<html>Los nodos combinaos son miembros d''una o más relaciones. Por favor "
 "decida si quier<strong>caltener</strong> estes membresías nel nodo en "
 "cuestión o si deseya <strong>quitar</strong>.<br>La opción por defectu ye "
 "<strong>caltener</strong> la membresía del primera nodo y "
-"<strong>quitar</strong> la de los otros que son miembros d'una mesma "
+"<strong>quitar</strong> la de los otros que son miembros d''una mesma "
 "relación: el nodo fundíu va tomar el llugar del nodo orixinal na "
 "relación.</html>"
 
@@ -6013,8 +6062,8 @@ msgid ""
 "only.<br>Unselect to show all changesets for objects in the current data "
 "layer.</html>"
 msgstr ""
-"<html>Activar p'amosar los cambeos de los oxetos escoyíos.<br>Desactivar "
-"p'amosar toes los cambeos de los oxetos de la capa actual.</html>"
+"<html>Activar p''amosar los cambeos de los oxetos escoyíos.<br>Desactivar "
+"p''amosar toes los cambeos de los oxetos de la capa actual.</html>"
 
 msgid "Changesets"
 msgstr "Cambeos"
@@ -6030,7 +6079,8 @@ msgstr "Descargar"
 
 msgid ""
 "Download information about the selected changesets from the OSM server"
-msgstr "Descarga información sobre los cambeos escoyíos dende'l servidor OSM"
+msgstr ""
+"Descarga información sobre los cambeos escoyíos dende''l servidor OSM"
 
 msgid "Closes the selected open changesets"
 msgstr "Peslla los cambeos abiertos escoyíos"
@@ -6045,10 +6095,10 @@ msgid "Details"
 msgstr "Detalles"
 
 msgid "Opens the Changeset Manager window for the selected changesets"
-msgstr "Abre'l xestor de cambeos pa los cambeos escoyíos"
+msgstr "Abre''l xestor de cambeos pa los cambeos escoyíos"
 
 msgid "Command Stack"
-msgstr "Pila d'ordes"
+msgstr "Pila d''ordes"
 
 msgid "Open a list of all commands (undo buffer)."
 msgstr "Abrir una llista de toles ordes (buffer desfacer)"
@@ -6075,7 +6125,7 @@ msgstr ""
 "esaniciaos) y faer zoom sobre ellos"
 
 msgid "Undo the selected and all later commands"
-msgstr "Desfae'l comandu escoyío y tolos posteriores"
+msgstr "Desfae''l comandu escoyío y tolos posteriores"
 
 msgid "Redo the selected and all earlier commands"
 msgstr "Refacer la orde escoyía y les anteriores"
@@ -6095,7 +6145,7 @@ msgid "Resolve"
 msgstr "Resolver"
 
 msgid "Open a merge dialog of all selected items in the list above."
-msgstr "Abrir un diálogu pa amestar tolos oxetos de la llista d'arriba"
+msgstr "Abrir un diálogu pa amestar tolos oxetos de la llista d''arriba"
 
 msgid ""
 "Set the selected elements on the map to the selected items in the list above."
@@ -6247,10 +6297,10 @@ msgstr[0] "<b>{0}</b> oxetu desactiváu"
 msgstr[1] "<b>{0}</b> oxetos desactivaos"
 
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
-msgstr "</p><p>Pieslle'l diálogu de peñeráu pa ver tolos oxetos.<p></html>"
+msgstr "</p><p>Pieslle''l diálogu de peñeráu pa ver tolos oxetos.<p></html>"
 
 msgid "Advanced object info"
-msgstr "Información ampliada sobre l'oxetu"
+msgstr "Información ampliada sobre l''oxetu"
 
 msgid "map style"
 msgstr "estilu de mapa"
@@ -6333,7 +6383,7 @@ msgid "Bounding box (projected): "
 msgstr "Cuadru allindiador (proyectáu): "
 
 msgid "Center of bounding box: "
-msgstr "Centru'l Cuadru allindiador: "
+msgstr "Centru''l Cuadru allindiador: "
 
 msgid "Coordinates: "
 msgstr "Coordenaes: "
@@ -6382,10 +6432,10 @@ msgid ""
 msgstr ""
 "\n"
 "\n"
-"Llista d'Estilos xeneraos:\n"
+"Llista d''Estilos xeneraos:\n"
 
 msgid "The 2 selected objects have identical style caches."
-msgstr "Los 2 oxetos escoyíos tienen caxés d'idénticu estilu."
+msgstr "Los 2 oxetos escoyíos tienen caxés d''idénticu estilu."
 
 msgid "The 2 selected objects have different style caches."
 msgstr "Los 2 oxetos escoyíos tienen caxés de distintu estilu."
@@ -6393,7 +6443,7 @@ msgstr "Los 2 oxetos escoyíos tienen caxés de distintu estilu."
 msgid ""
 "Warning: The 2 selected objects have equal, but not identical style caches."
 msgstr ""
-"Atención: los dos oxetos escoyíos tienen caxés d'estilos iguales, pero non "
+"Atención: los dos oxetos escoyíos tienen caxés d''estilos iguales, pero non "
 "idéntiques."
 
 msgid "xml"
@@ -6525,7 +6575,7 @@ msgid "Map Paint Styles"
 msgstr "Estilos de semiología cartográfica"
 
 msgid "configure the map painting style"
-msgstr "Configurar l'estilo de dibuxáu del mapa"
+msgstr "Configurar l''estilo de dibuxáu del mapa"
 
 msgid "MapPaint"
 msgstr "MapPaint"
@@ -6537,10 +6587,10 @@ msgid "Turn selected styles on or off"
 msgstr "Activar o desactivar los estilos escoyíos"
 
 msgid "Move the selected entry one row down."
-msgstr "Mueve escontra baxo l'elementu escoyíu una fila."
+msgstr "Mueve escontra baxo l''elementu escoyíu una fila."
 
 msgid "Move the selected entry one row up."
-msgstr "Mueve escontra riba l'elementu escoyíu una fila."
+msgstr "Mueve escontra riba l''elementu escoyíu una fila."
 
 msgid "Reload from file"
 msgstr "Recargar dende ficheru"
@@ -6552,25 +6602,25 @@ msgid "Save as..."
 msgstr "Grabar como..."
 
 msgid "Save a copy of this Style to file and add it to the list"
-msgstr "Guarda una copia d'esti estilu a un arquivu y añedir a la llista"
+msgstr "Guarda una copia d''esti estilu a un arquivu y añedir a la llista"
 
 msgid "Map paint style file (*.mapcss, *.zip)"
-msgstr "Arquivu d'estilu de representación de mapa (*.mapcss, *.zip)"
+msgstr "Arquivu d''estilu de representación de mapa (*.mapcss, *.zip)"
 
 msgid "Map paint style file (*.xml, *.zip)"
-msgstr "Arquivu d'estilu de representación de mapa (*.xml, *.zip)"
+msgstr "Arquivu d''estilu de representación de mapa (*.xml, *.zip)"
 
 msgid "Reloading style sources"
-msgstr "Volviendo a cargar fuentes d'estilos"
+msgstr "Volviendo a cargar fuentes d''estilos"
 
 msgid "Save style ''{0}'' as ''{1}''"
 msgstr "Grabar estilu \"{0}\" como \"{1}\""
 
 msgid "view meta information, error log and source definition"
-msgstr "ver información meta, rexistru d'erros y definición de la fonte"
+msgstr "ver información meta, rexistru d''erros y definición de la fonte"
 
 msgid "Map Style info"
-msgstr "Información d'estilu de mapa"
+msgstr "Información d''estilu de mapa"
 
 msgid "Source"
 msgstr "Fonte"
@@ -6594,7 +6644,7 @@ msgid "Background:"
 msgstr "Fondu:"
 
 msgid "Style is currently active?"
-msgstr "¿Ta activu anguaño l'estilo?"
+msgstr "¿Ta activu anguaño l''estilo?"
 
 msgid "No"
 msgstr "Non"
@@ -6603,7 +6653,7 @@ msgid "Style settings"
 msgstr "Estilu de axustes"
 
 msgid "Customize the style"
-msgstr "Personaliza l'estilu"
+msgstr "Personaliza l''estilu"
 
 msgid "Add comment"
 msgstr ""
@@ -6638,15 +6688,21 @@ msgstr ""
 msgid "Reopen note with message:"
 msgstr ""
 
+msgid "Sort notes"
+msgstr ""
+
+msgid "Sort"
+msgstr "Axeitar"
+
 msgid "Object type:"
-msgstr "Triba d'oxetu:"
+msgstr "Triba d''oxetu:"
 
 msgctxt "osm object types"
 msgid "mixed"
 msgstr "amestáu"
 
 msgid "Choose the OSM object type"
-msgstr "Escueyi la triba d'oxetu OSM"
+msgstr "Escueyi la triba d''oxetu OSM"
 
 msgid "Object ID:"
 msgstr "ID del oxetu:"
@@ -6698,10 +6754,10 @@ msgid "Current Selection"
 msgstr "Seleición actual"
 
 msgid "Search for objects"
-msgstr "Busca d'oxetos"
+msgstr "Busca d''oxetos"
 
 msgid "Display the history of the selected objects."
-msgstr "Amosar l'hestóricu de los oxetos escoyíos."
+msgstr "Amosar l''hestóricu de los oxetos escoyíos."
 
 msgid "Zoom to selection"
 msgstr "Zoom a la escoyeta"
@@ -6713,7 +6769,7 @@ msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}"
 msgstr "Sel.: Rel.:{0} / Víes:{1} / Nodos:{2}"
 
 msgid "Unselectable now"
-msgstr "Non se pue escoyer n'esti momentu"
+msgstr "Non se pue escoyer n''esti momentu"
 
 msgid "Selection: {0}"
 msgstr "Escoyeta: {0}"
@@ -6763,7 +6819,7 @@ msgid "Select objects submitted by this user"
 msgstr "Escoyer oxetos unviaos por esti usuariu"
 
 msgid "Launches a browser with information about the user"
-msgstr "Llanza un buscador con información sobre l'usuariu"
+msgstr "Llanza un buscador con información sobre l''usuariu"
 
 msgid "Only launching info browsers for the first {0} of {1} selected users"
 msgstr ""
@@ -6784,7 +6840,7 @@ msgid "Author"
 msgstr "Autor"
 
 msgid "# Objects"
-msgstr "Nº d'oxetos"
+msgstr "Nº d''oxetos"
 
 msgid "Validation Results"
 msgstr "Resultaos de la validación"
@@ -6799,10 +6855,10 @@ msgid "Fix"
 msgstr "Iguar"
 
 msgid "Fix the selected issue."
-msgstr "Igua'l problema escoyíu."
+msgstr "Igua''l problema escoyíu."
 
 msgid "Ignore the selected issue next time."
-msgstr "Ignora'l problema escoyíu la próxima vegada"
+msgstr "Ignora''l problema escoyíu la próxima vegada"
 
 msgid "Whole group"
 msgstr "Tol grupu"
@@ -6851,7 +6907,7 @@ msgid "Display the public discussion around this changeset"
 msgstr ""
 
 msgid "Changeset Management Dialog"
-msgstr "Diálogu d'alministración de conxuntos de cambeos"
+msgstr "Diálogu d''alministración de conxuntos de cambeos"
 
 msgid "Close the dialog"
 msgstr "Zarrar el diálogu"
@@ -6860,7 +6916,7 @@ msgid "Query"
 msgstr "Consulta"
 
 msgid "Launch the dialog for querying changesets"
-msgstr "Amuesa'l diálogu pa consultar cambeos"
+msgstr "Amuesa''l diálogu pa consultar cambeos"
 
 msgid "Remove from cache"
 msgstr "Esaniciar de la memoria"
@@ -6869,20 +6925,21 @@ msgid "Remove the selected changesets from the local cache"
 msgstr "Esanicia los cambeos escoyíos de la memoria local"
 
 msgid "Close the selected changesets"
-msgstr "Peslla'l cambéu escoyíu"
+msgstr "Peslla''l cambéu escoyíu"
 
 msgid "Update changeset"
 msgstr "Actualizar la modificación"
 
 msgid "Updates the selected changesets with current data from the OSM server"
 msgstr ""
-"Actualiza'l conxuntu de cambeos escoyíu colos datos actuales del servidor OSM"
+"Actualiza''l conxuntu de cambeos escoyíu colos datos actuales del servidor "
+"OSM"
 
 msgid "Download changeset content"
-msgstr "Descarga'l conteníu de les modificaciones"
+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"
+msgstr "Descarga''l conteníu de los cambeos escoyíos dende''l servidor"
 
 msgid "My changesets"
 msgstr "Los mios cambeos"
@@ -6897,7 +6954,8 @@ msgid ""
 msgstr ""
 "<html>JOSM ta executándose anguaño con un usuariu anónimu. Nun puede "
 "descargar <br>los sos sets de cambeos del servidor de OSM  sacantes "
-"qu'introduza el so nome d'usuariu de OSM<br>nes preferencies de JOSM.</html>"
+"qu''introduza el so nome d''usuariu de OSM<br>nes preferencies de "
+"JOSM.</html>"
 
 msgctxt "changeset.upload-comment"
 msgid "empty"
@@ -6954,16 +7012,16 @@ msgid "Download content"
 msgstr "Descargar conteníu"
 
 msgid "Download the changeset content from the OSM server"
-msgstr "Descarga'l conteníu del cambéu del servidor OSM"
+msgstr "Descarga''l conteníu del cambéu del servidor OSM"
 
 msgid "Update content"
 msgstr "Actualizar conteníu"
 
 msgid "Update the changeset content from the OSM server"
-msgstr "Actualiza'l conteníu del conxuntu de cambeos dende'l servidor OSM"
+msgstr "Actualiza''l conteníu del conxuntu de cambeos dende''l servidor OSM"
 
 msgid "Download and show the history of the selected objects"
-msgstr "Descarga y amuesa l'historial de los oxetos escoyíos"
+msgstr "Descarga y amuesa l''historial de los oxetos escoyíos"
 
 msgid "Select in layer"
 msgstr "Escoyer en capa"
@@ -6981,16 +7039,16 @@ msgid "Zoom to the corresponding objects in the current data layer"
 msgstr "Facer zoom a los oxetos correspondientes na capa de datos actual"
 
 msgid "Nothing to zoom to"
-msgstr "Naa p'agrandar"
+msgstr "Naa p''agrandar"
 
 msgid "The content of this changeset is not downloaded yet."
-msgstr "Nun se descargó'l conteníu d'esti cambéu."
+msgstr "Nun se descargó''l conteníu d''esti cambéu."
 
 msgid "Download now"
 msgstr "Descargar agora"
 
 msgid "Download the changeset content"
-msgstr "Descarga'l conteníu del cambéu"
+msgstr "Descarga''l conteníu del cambéu"
 
 msgid "Created"
 msgstr "Creáu"
@@ -7027,13 +7085,13 @@ msgstr ""
 "Esaniciar el cambéu nel panel de la vista de detalle de la memoria local"
 
 msgid "Update the changeset from the OSM server"
-msgstr "Actualizar el conxuntu de cambeos dende'l servidor de OSM"
+msgstr "Actualizar el conxuntu de cambeos dende''l servidor de OSM"
 
 msgid ""
 "Select the primitives in the content of this changeset in the current data "
 "layer"
 msgstr ""
-"Escoyer les primitives nel conteníu d'esti conxuntu de cambeos na capa de "
+"Escoyer les primitives nel conteníu d''esti conxuntu de cambeos na capa de "
 "datos actual"
 
 msgid ""
@@ -7047,7 +7105,7 @@ msgid ""
 "Zoom to the objects in the content of this changeset in the current data "
 "layer"
 msgstr ""
-"Facer zoom a los oxetos que formen parte d'esti conxuntu de cambeos na capa "
+"Facer zoom a los oxetos que formen parte d''esti conxuntu de cambeos na capa "
 "de datos actual"
 
 msgid "Update changeset discussion"
@@ -7075,12 +7133,12 @@ msgid "Changeset ID: "
 msgstr "ID de la modificación: "
 
 msgid "Enter a changeset id"
-msgstr "Introduza la id d'un conxuntu de cambeos"
+msgstr "Introduza la id d''un conxuntu de cambeos"
 
 msgid ""
 "Download the changeset with the specified id, including the changeset content"
 msgstr ""
-"Descarga'l cambéu col id especificáu, incluyendo'l conteníu del cambéu"
+"Descarga''l cambéu col id especificáu, incluyendo''l conteníu del cambéu"
 
 msgid "Select changesets owned by specific users"
 msgstr "Escoyer los cambeos efectuaos por un usuariu específicu"
@@ -7091,7 +7149,7 @@ msgstr "Escueye los cambeos dependiendo de si tán abiertes o zarraes"
 msgid ""
 "Select changesets based on the date/time they have been created or closed"
 msgstr ""
-"Escueye'l cambeos basándose na fecha/hora en que fueren creaos o zarraos"
+"Escueye''l cambeos basándose na fecha/hora en que fueren creaos o zarraos"
 
 msgid "Select only changesets related to a specific bounding box"
 msgstr ""
@@ -7110,7 +7168,7 @@ msgid "User ID:"
 msgstr "ID Usuariu:"
 
 msgid "User name:"
-msgstr "Nome d'usuariu:"
+msgstr "Nome d''usuariu:"
 
 msgid "Only changesets owned by myself"
 msgstr "Namá cambeos realizaos por mi"
@@ -7133,7 +7191,7 @@ msgid ""
 "is anonymous"
 msgstr ""
 "Non puede acutase la consulta del conxuntu de cambeos al usuariu actual  por "
-"cuenta de que'l mesmu ye anónimu"
+"cuenta de que''l mesmu ye anónimu"
 
 msgid "Current value ''{0}'' for user ID is not valid"
 msgstr "El valor actual \"{0}\" nun ye válidu pa la ID d´usuariu"
@@ -7144,16 +7202,16 @@ msgstr ""
 "\"{0}\""
 
 msgid "Please enter a valid user ID"
-msgstr "Por favor, introduza un ID d'usuariu válidu"
+msgstr "Por favor, introduza un ID d''usuariu válidu"
 
 msgid "Invalid user ID"
-msgstr "ID d'usuariu inválida"
+msgstr "ID d''usuariu inválida"
 
 msgid "Please enter a non-empty user name"
-msgstr "Por favor, introduza un nome d'usuariu non valeru"
+msgstr "Por favor, introduza un nome d''usuariu non valeru"
 
 msgid "Invalid user name"
-msgstr "Nome d'usuariu inválidu"
+msgstr "Nome d''usuariu inválidu"
 
 msgid "Date: "
 msgstr "Fecha: "
@@ -7175,13 +7233,13 @@ msgstr "Namá los cambeos zarraos dempués de fechar/hora siguiente"
 
 msgid "Only changesets closed after and created before a specific date/time"
 msgstr ""
-"Namá los cambeos zarraos dempués y creaos antes d'una fecha/hora determinada"
+"Namá los cambeos zarraos dempués y creaos antes d''una fecha/hora determinada"
 
 msgid ""
 "Cannot build changeset query with time based restrictions. Input is not "
 "valid."
 msgstr ""
-"Non puede construyise un pidimientu d'un conxuntu de cambeos con "
+"Non puede construyise un pidimientu d''un conxuntu de cambeos con "
 "restricciones de tiempu. La entrada nun ye válida."
 
 msgid ""
@@ -7198,7 +7256,7 @@ msgid ""
 "Cannot restrict the changeset query to a specific bounding box. The input is "
 "invalid."
 msgstr ""
-"Non puede acutase el pidimientu d'un conxuntu de cambeos a una ventana de "
+"Non puede acutase el pidimientu d''un conxuntu de cambeos a una ventana de "
 "selección específica. La entrada nun ye válida."
 
 msgid ""
@@ -7206,16 +7264,16 @@ msgid ""
 "changeset query to a specific bounding box.</html>"
 msgstr ""
 "<html>Por favor, introduza valores válidos de llonxitú/llatitú "
-"p'acutar<br>la consulta de cambeos a una ventana de selección "
+"p''acutar<br>la consulta de cambeos a una ventana de selección "
 "específica.</html>"
 
 msgid "Invalid bounding box"
-msgstr "Ventana d'escoyeta inválida"
+msgstr "Ventana d''escoyeta inválida"
 
 msgid ""
 "The current value is not a valid user ID. Please enter an integer value > 0"
 msgstr ""
-"El valor actual nun ye una ID d'usuariu válida. Por favor, introduza un "
+"El valor actual nun ye una ID d''usuariu válida. Por favor, introduza un "
 "valor enteru mayor que cero"
 
 msgid "Please enter an integer value > 0"
@@ -7225,11 +7283,11 @@ msgid ""
 "<html>The  current value is not a valid user name.<br>Please enter an non-"
 "empty user name.</html>"
 msgstr ""
-"<html>El valor actual nun ye un nome d'usuariu válidu.<br>Introduza un nome "
-"d'usuariu non valeru.</html>"
+"<html>El valor actual nun ye un nome d''usuariu válidu.<br>Introduza un nome "
+"d''usuariu non valeru.</html>"
 
 msgid "Please enter an non-empty user name"
-msgstr "Por favor, introduza un nome d'usuariu non valeru"
+msgstr "Por favor, introduza un nome d''usuariu non valeru"
 
 msgid ""
 "Please enter a date in the usual format for your locale.<br>Example: "
@@ -7252,7 +7310,7 @@ msgid ""
 "<html>Select to restrict the query to your changesets only.<br>Unselect to "
 "include all changesets in the query.</html>"
 msgstr ""
-"<html>Escueya p'acutar la consulta a los sos cambeos "
+"<html>Escueya p''acutar la consulta a los sos cambeos "
 "solamente.<br>Deseleccione pa incluyir tolos cambeos na busca.</html>"
 
 msgid ""
@@ -7263,7 +7321,7 @@ msgid ""
 msgstr ""
 "<html>Por favor, escueya una de les siguientes <strong>búsqueda "
 "estándar</strong>. Si solamente deseya descargar conxuntos de cambeos creaos "
-"por usté, escueya <strong>Descargar solamente'l mio conxuntu de "
+"por usté, escueya <strong>Descargar solamente''l mio conxuntu de "
 "cambeos</strong>.<br>Tenga en cuenta que JOSM va descargar un máximu 100 "
 "conxuntos de cambeos.</html>"
 
@@ -7275,7 +7333,7 @@ msgid ""
 "user name in the preferences first.</em></html>"
 msgstr ""
 "<html>Descargar los mios conxuntos de cambeos abiertos<br><em>Desactiváu. "
-"Por favor, primero indique'l so usuariu OSM en preferencies.</em></html>"
+"Por favor, primero indique''l so usuariu OSM en preferencies.</em></html>"
 
 msgid "<html>Download my open changesets</html>"
 msgstr "<html>Descargar los mios conxuntos de cambeos abiertos</html>"
@@ -7341,7 +7399,7 @@ msgid "Querying and downloading changesets"
 msgstr "Consultando y descargando cambeos"
 
 msgid "Determine user id for current user..."
-msgstr "Determinar l'ID d'usuariu pal usuariu actual..."
+msgstr "Determinar l''ID d''usuariu pal usuariu actual..."
 
 msgid "Query and download changesets ..."
 msgstr "Consultar y descargar cambeos..."
@@ -7429,16 +7487,16 @@ msgid "Edit Tags"
 msgstr "Editar etiquetes"
 
 msgid "Go to OSM wiki for tag help (F1)"
-msgstr "Ir a la wiki d'OSM p'axuda sobre cómo etiquetar (F1)"
+msgstr "Ir a la wiki d''OSM p''axuda sobre cómo etiquetar (F1)"
 
 msgid "Launch browser with wiki help for selected object"
-msgstr "Empecipia'l navegador con ayuda de la wiki pal oxetu escoyíu"
+msgstr "Empecipia''l navegador con ayuda de la wiki pal oxetu escoyíu"
 
 msgid "Paste Value"
 msgstr "Apegar Valor"
 
 msgid "Paste the value of the selected tag from clipboard"
-msgstr "Apegar el valor de la etiqueta escoyida dende'l portapapeles"
+msgstr "Apegar el valor de la etiqueta escoyida dende''l portapapeles"
 
 msgid "Copy Value"
 msgstr "Copiar valor"
@@ -7466,8 +7524,8 @@ msgid ""
 "Search with the key and value of the selected tag, restrict to type (i.e., "
 "node/way/relation)"
 msgstr ""
-"Buscar cola clave y valor de la etiqueta escoyida, acutando'l tipu (por casu "
-"nodo/camino/relación)"
+"Buscar cola clave y valor de la etiqueta escoyida, acutando''l tipu (por "
+"casu nodo/camino/relación)"
 
 msgid "Search Key/Value"
 msgstr "Buscar clave/valor"
@@ -7496,7 +7554,7 @@ msgstr[0] "Va camudase {0} objeto."
 msgstr[1] "Van camudase {0} objetos."
 
 msgid "An empty value deletes the tag."
-msgstr "Un valor valeru borra'l atributu."
+msgstr "Un valor valeru borra''l atributu."
 
 msgid "You changed the key from ''{0}'' to ''{1}''."
 msgstr "Camudó la clave de ''{0}'' a ''{1}''."
@@ -7507,7 +7565,7 @@ msgstr[0] "Camudar les propiedaes de fasta {0} oxetu"
 msgstr[1] "Camudar les propiedaes de fasta {0} objetos"
 
 msgid "Use English language for tag by default"
-msgstr "Usar l'idioma Inglés pa les etiquetes por omisión"
+msgstr "Usar l''idioma Inglés pa les etiquetes por omisión"
 
 msgid "Add value?"
 msgstr "¿Añedir valor?"
@@ -7524,13 +7582,14 @@ msgid "Please select a value"
 msgstr "Escueye un valor"
 
 msgid "Set number of recently added tags"
-msgstr "Establecer el númberu d'etiquetes añedíes pocayá"
+msgstr "Establecer el númberu d''etiquetes añedíes pocayá"
 
 msgid "Remember last used tags after a restart"
 msgstr ""
 
 msgid "Please enter the number of recently added tags to display"
-msgstr "Por favor, introduza'l númberu d'etiquetes añedíes apocayá a amosar"
+msgstr ""
+"Por favor, introduza''l númberu d''etiquetes añedíes apocayá a amosar"
 
 msgid "Please enter integer number between 0 and {0}"
 msgstr "Por favor, introduza un númberu enteru ente 0 y {0}"
@@ -7723,14 +7782,11 @@ msgstr "Escoyer los oxetos pa los miembros de la relación indicaos"
 msgid "Sort the relation members"
 msgstr "Ordenar los miembros de la relación"
 
-msgid "Sort"
-msgstr "Axeitar"
-
 msgid "Relation Editor: Sort"
 msgstr "Editor de rellaciones: axeitar"
 
 msgid "Reverse the order of the relation members"
-msgstr "Invertir l'orde de los miembros de la relación"
+msgstr "Invertir l''orde de los miembros de la relación"
 
 msgid "Reverse"
 msgstr "Inversu"
@@ -7748,7 +7804,7 @@ msgid "Relation Editor: Move Down"
 msgstr "Editor de relaciones: Mover escontra baxo"
 
 msgid "Remove the currently selected members from this relation"
-msgstr "Quitar los miembros escoyíos d'esta relación"
+msgstr "Quitar los miembros escoyíos d''esta relación"
 
 msgid "Relation Editor: Remove"
 msgstr "Editor de relaciones: Borrar"
@@ -7761,7 +7817,7 @@ msgid ""
 "relation editor\n"
 "was open. They have been removed from the relation members list."
 msgstr ""
-"Borróse unu o más miembros d'esta nueva relación mientres l'editor de "
+"Borróse unu o más miembros d''esta nueva relación mientres l''editor de "
 "relaciones\n"
 "taba abiertu. Estos miembros esaniciáronse de la llista de miembros de "
 "relación."
@@ -7786,7 +7842,7 @@ msgid ""
 msgstr ""
 "<html>Esta relación foi camudada fora del editor.<br>Nun puede aplicar los "
 "cambeos y siguir editando.<br><br>¿Deseya crear un conflictu y cerrar "
-"l'editor?</html>"
+"l''editor?</html>"
 
 msgid ""
 "<html>Layer ''{0}'' already has a conflict for object<br>''{1}''.<br>Please "
@@ -7854,7 +7910,7 @@ msgstr[0] "Configurasti una función valera en {0} oxetu."
 msgstr[1] "Configurasti una función valera en {0} oxetos."
 
 msgid "This is equal to deleting the roles of these objects."
-msgstr "Esto equival a borrar les funciones d'esos oxetos."
+msgstr "Esto equival a borrar les funciones d''esos oxetos."
 
 msgid "Do you really want to apply the new role?"
 msgstr "¿Quier aplicar la nueva función?"
@@ -7954,7 +8010,7 @@ msgid "{0} - {1} ({2})"
 msgstr "{0} - {1} ({2})"
 
 msgid "Wrong number of arguments for bookmark"
-msgstr "Númberu d'argumentos erróneos pal marcador"
+msgstr "Númberu d''argumentos erróneos pal marcador"
 
 msgid "Error reading bookmark entry: %s"
 msgstr "Erru al lleer la entrá del marcador: %s"
@@ -7963,7 +8019,7 @@ msgid "Bookmarks"
 msgstr "Marcadores"
 
 msgid "<html>There is currently no download area selected.</html>"
-msgstr "<html>Nun s'escoyó nengún área de descarga.</html>"
+msgstr "<html>Nun s''escoyó nengún área de descarga.</html>"
 
 msgid ""
 "<html><strong>Current download area</strong> (minlon, minlat, maxlon, "
@@ -8068,14 +8124,14 @@ msgid ""
 "started.<br>You can open it manually from File menu or toolbar.</html>"
 msgstr ""
 "<html>Empecipiar automáticamente el diálogu \"Descargar dende OSM\" cada vez "
-"que s'empecipia JOSM.<br>Puede abrir manualmente del menú Archivo o dende la "
-"barra de ferramientes.</html>"
+"que s''empecipia JOSM.<br>Puede abrir manualmente del menú Archivo o dende "
+"la barra de ferramientes.</html>"
 
 msgid ""
 "Use left click&drag to select area, arrows or right mouse button to scroll "
 "map, wheel or +/- to zoom."
 msgstr ""
-"Pulsie y arrastre col mure pa escoyer una área, utilice les fleches o'l "
+"Pulsie y arrastre col mure pa escoyer una área, utilice les fleches o''l "
 "botón derechu del mure pa movese, y la rueda del mure o les tecles +/- pal "
 "zoom."
 
@@ -8095,7 +8151,7 @@ msgid "Click to close the dialog and to abort downloading"
 msgstr "Faiga clic pa pesllar la caxa de diálogu y albortar la descarga"
 
 msgid "Click to download the currently selected area"
-msgstr "Faiga click pa descargar l'área anguaño escoyida"
+msgstr "Faiga click pa descargar l''área anguaño escoyida"
 
 msgid "Please select a download area first."
 msgstr "Por favor, escueya primero una área pa descargar."
@@ -8126,7 +8182,7 @@ msgstr ""
 
 msgid "Select if the members of a relation should be downloaded as well"
 msgstr ""
-"Seleicionar si los miembros d'una rellación tienen de descargase tamién"
+"Seleicionar si los miembros d''una rellación tienen de descargase tamién"
 
 msgid "Download referrers (parent relations and ways)"
 msgstr "Descargar referencies (víes y rellaciones padre)"
@@ -8141,10 +8197,10 @@ msgid "Choose the server for searching:"
 msgstr "Escoyer el servidor pa la busca:"
 
 msgid "Enter a place name to search for:"
-msgstr "Introduza'l nome d'un llugar pa buscalo:"
+msgstr "Introduza''l nome d''un llugar pa buscalo:"
 
 msgid "Enter a place name to search for"
-msgstr "Introduza'l nome d'un llugar que buscar"
+msgstr "Introduza''l nome d''un llugar que buscar"
 
 msgid "Areas around places"
 msgstr "Árees en redol a llugares"
@@ -8228,10 +8284,10 @@ msgid "Failed to open URL"
 msgstr "Non se pudo abrir la URL"
 
 msgid "Open the current help page in an external browser"
-msgstr "Abrir la páxina actual d'axuda nun navegador esternu"
+msgstr "Abrir la páxina actual d''axuda nun navegador esternu"
 
 msgid "Edit the current help page"
-msgstr "Editar la páxina d'axuda actual"
+msgstr "Editar la páxina d''axuda actual"
 
 msgid ""
 "<html>The current URL <tt>{0}</tt><br>is an external URL. Editing is only "
@@ -8242,7 +8298,7 @@ msgstr ""
 "<tt>{1}</tt>.</html>"
 
 msgid "Reload the current help page"
-msgstr "Recarga la páxina d'axuda actual"
+msgstr "Recarga la páxina d''axuda actual"
 
 msgid "Go to the previous page"
 msgstr "Dir a la páxina anterior"
@@ -8251,16 +8307,16 @@ msgid "Go to the next page"
 msgstr "Dir a la páxina siguiente"
 
 msgid "Go to the JOSM help home page"
-msgstr "Dir a la páxina d'axuda de JOSM"
+msgstr "Dir a la páxina d''axuda de JOSM"
 
 msgid "Bad location in HTML document. Exception was: {0}"
 msgstr "Mal allugamientu nel documentu HTML. La esceición foi: {0}"
 
 msgid "Failed to open help page. The target URL is empty."
-msgstr "Non pudo abrir la páxina d'ayuda. La URL de destín ta valera."
+msgstr "Non pudo abrir la páxina d''ayuda. La URL de destín ta valera."
 
 msgid "Failed to open help page"
-msgstr "Fallu al abrir la páxina d'axuda"
+msgstr "Fallu al abrir la páxina d''axuda"
 
 msgid "Latitude: "
 msgstr "Llatitú: "
@@ -8284,11 +8340,11 @@ msgid "History for relation {0}"
 msgstr "Historial de la relación {0}"
 
 msgid "Reload the history from the server"
-msgstr "Recargar l'historial dende'l servidor"
+msgstr "Recargar l''historial dende''l servidor"
 
 msgid "History not initialized yet. Failed to set reference primitive."
 msgstr ""
-"L'historial nun s'empecipió entá. Non pudo establecese la referencia "
+"L''historial nun s''empecipió entá. Non pudo establecese la referencia "
 "primitiva."
 
 msgid ""
@@ -8305,7 +8361,7 @@ msgstr ""
 
 msgid "History not initialized yet. Failed to set current primitive."
 msgstr ""
-"L'historial nun s'empecipió entá. Non pudo establecese la referencia "
+"L''historial nun s''empecipió entá. Non pudo establecese la referencia "
 "primitiva actual."
 
 msgid ""
@@ -8337,7 +8393,7 @@ msgid "Zoom to this node in the current data layer"
 msgstr "Zoom a esti nodo na actual capa de datos"
 
 msgid "Open a history browser with the history of this node"
-msgstr "Abrir un navegador d'hestóricos col historial d'esti nodo"
+msgstr "Abrir un navegador d''hestóricos col historial d''esti nodo"
 
 msgid "Way {0}"
 msgstr "Vía {0}"
@@ -8377,7 +8433,7 @@ msgid "Changeset info"
 msgstr "Información del coxuntu de cambeos"
 
 msgid "Launch browser with information about the changeset"
-msgstr "Abrir el navegador con información sobre'l conxuntu de cambeos"
+msgstr "Abrir el navegador con información sobre''l conxuntu de cambeos"
 
 msgid "Show changeset {0}"
 msgstr "Amosar conxuntu de cambeos {0}"
@@ -8386,7 +8442,7 @@ msgid "User info"
 msgstr "Información del usuariu"
 
 msgid "Launch browser with information about the user"
-msgstr "Empecipiar navegador con información sobre l'usuariu"
+msgstr "Empecipiar navegador con información sobre l''usuariu"
 
 msgid "Show user {0}"
 msgstr "Amosar usuariu {0}"
@@ -8477,7 +8533,7 @@ msgid "Click to download all referring objects for {0}"
 msgstr "Faiga click pa descargar tolos oxetos referenciaos por {0}"
 
 msgid "Click to cancel and to resume editing the map"
-msgstr "Fai click p'atayar y siguir editando'l mapa"
+msgstr "Fai click p''atayar y siguir editando''l mapa"
 
 msgid ""
 "Click <strong>{0}</strong> to load them now.<br>If necessary JOSM will "
@@ -8488,7 +8544,7 @@ msgstr ""
 "Resolvimientu de Conflictos."
 
 msgid "Object still in use"
-msgstr "L'oxetu inda ta n'usu."
+msgstr "L''oxetu inda ta n''usu."
 
 msgid "Error header \"{0}\" did not match with an expected pattern"
 msgstr ""
@@ -8515,7 +8571,7 @@ msgid "Enter an upload comment"
 msgstr "Introduza un comentariu de xubida"
 
 msgid "Specify the data source for the changes"
-msgstr "Especifique l'orixe de datos pa los cambeos"
+msgstr "Especifique l''orixe de datos pa los cambeos"
 
 msgid "obtain from current layers"
 msgstr "obtener de les capes actuales"
@@ -8572,7 +8628,7 @@ msgstr "Cerrar el conxuntu de cambeos escoyíu abiertu"
 
 msgid "<html>Please select the changesets you want to close</html>"
 msgstr ""
-"<html>Por favor, escueya'l conxuntu de cambeos que deseya cerrar</html>"
+"<html>Por favor, escueya''l conxuntu de cambeos que deseya cerrar</html>"
 
 msgid "Open changesets"
 msgstr "Abrir conxuntu de cambeos"
@@ -8599,7 +8655,7 @@ msgstr ""
 "una esceición de seguridá."
 
 msgid "Enter credentials for OSM API"
-msgstr "Introduza les credenciales pa la API d'OSM"
+msgstr "Introduza les credenciales pa la API d''OSM"
 
 msgid "Enter credentials for host"
 msgstr "Introduza les credenciales pal servidor"
@@ -8607,9 +8663,6 @@ msgstr "Introduza les credenciales pal servidor"
 msgid "Enter credentials for HTTP proxy"
 msgstr "Introducir les credenciales pal proxy HTTP"
 
-msgid "Username"
-msgstr "Nome d'usuariu"
-
 msgid "Password"
 msgstr "Clave"
 
@@ -8617,10 +8670,10 @@ msgid "Warning: The password is transferred unencrypted."
 msgstr "Alvertencia: La contraseña va tresferise ensin cifrar."
 
 msgid "Please enter the user name of your OSM account"
-msgstr "Por favor, introduza'l nome d'usuariu de la so cuenta d'OSM"
+msgstr "Por favor, introduza''l nome d''usuariu de la so cuenta d''OSM"
 
 msgid "Please enter the password of your OSM account"
-msgstr "Introduza la contraseña de la so cuenta d'OSM"
+msgstr "Introduza la contraseña de la so cuenta d''OSM"
 
 msgid ""
 "Authenticating at the OSM API ''{0}'' failed. Please enter a valid username "
@@ -8630,7 +8683,7 @@ msgstr ""
 "contraseña válidos."
 
 msgid "Please enter the user name of your account"
-msgstr "Por favor, introduza'l nome d'usuariu de la so cuenta"
+msgstr "Por favor, introduza''l nome d''usuariu de la so cuenta"
 
 msgid "Please enter the password of your account"
 msgstr "Por favor, introduza la contraseña de la so cuenta"
@@ -8644,7 +8697,7 @@ msgstr ""
 
 msgid "Please enter the user name for authenticating at your proxy server"
 msgstr ""
-"Por favor, introduza'l nome d'usuariu pa la autentificación nel servidor "
+"Por favor, introduza''l nome d''usuariu pa la autentificación nel servidor "
 "proxy"
 
 msgid "Please enter the password for authenticating at your proxy server"
@@ -8662,14 +8715,14 @@ msgid ""
 "Warning: depending on the authentication method the proxy server uses the "
 "password may be transferred unencrypted."
 msgstr ""
-"Atención: dependiendo del métodu de autentificación qu'use'l servidor proxy "
-"pue que la contraseña sía tresmitida ensin encriptar."
+"Atención: dependiendo del métodu de autentificación qu''use''l servidor "
+"proxy pue que la contraseña sía tresmitida ensin encriptar."
 
 msgid "Authenticate"
 msgstr "Autentificar"
 
 msgid "Authenticate with the supplied username and password"
-msgstr "Autentificase col nome d'usuario y contraseña suministraos"
+msgstr "Autentificase col nome d''usuario y contraseña suministraos"
 
 msgid "Cancel authentication"
 msgstr "Atayar autentificación"
@@ -8701,11 +8754,11 @@ msgid ""
 msgstr ""
 "Non pudo recuperase la llista de los sos conxuntos de cambeos abiertos "
 "porque<br>JOSM nun conoz la so identidá.<br>Escoyó trabayar anonimamente o "
-"nun tener derechu a conocer<br> la identidá del usuariu en que'l so nome ta "
+"nun tener derechu a conocer<br> la identidá del usuariu en que''l so nome ta "
 "trabayando."
 
 msgid "Missing user identity"
-msgstr "Identidá d'usuariu perdía"
+msgstr "Identidá d''usuariu perdía"
 
 msgid ""
 "Failed to retrieve user infos for the current JOSM user. Exception was: {0}"
@@ -8721,7 +8774,7 @@ msgstr "Anicializando nodos a descargar..."
 
 msgid "Object could not be downloaded"
 msgid_plural "Some objects could not be downloaded"
-msgstr[0] "L'oxetu nun se pudo descargar"
+msgstr[0] "L''oxetu nun se pudo descargar"
 msgstr[1] "Dellos oxetos nun se pudieron descargar"
 
 msgid "One object could not be downloaded.<br>"
@@ -8734,7 +8787,7 @@ msgid ""
 "does not know an object with the requested id."
 msgstr ""
 "El sirvidor devolvió un códigu de rempuesta 404.<br>Polo xeneral esto "
-"significa que'l sirvidor nun conuez dengún oxetu cola id que se pidió."
+"significa que''l sirvidor nun conuez dengún oxetu cola id que se pidió."
 
 msgid "missing objects:"
 msgstr "oxetos que falten:"
@@ -8749,7 +8802,7 @@ msgid ""
 "to open a file chooser."
 msgstr ""
 "Edite la ruta manualmente na caxa de testu o faiga clic nel botón \"...\" "
-"por que se abrir un selector d'arquivu."
+"por que se abrir un selector d''arquivu."
 
 msgid "The bold text is the name of the layer."
 msgstr "El testu en negrina correspuende al nome de la capa"
@@ -8776,13 +8829,13 @@ msgid "Open Recent"
 msgstr "Abrir recién"
 
 msgid "List of recently opened files"
-msgstr "Llista d'arquivos abiertos recientemente"
+msgstr "Llista d''arquivos abiertos recientemente"
 
 msgid "Clear"
 msgstr "Llimpiar"
 
 msgid "Clear the list of recently opened files"
-msgstr "Llimpiar la llista d'arquivos abiertos recientemente"
+msgstr "Llimpiar la llista d''arquivos abiertos recientemente"
 
 msgid "Saving layer to ''{0}'' ..."
 msgstr "Guardando la capa \"{0}\"..."
@@ -8829,7 +8882,7 @@ msgstr[1] ""
 "ensin ficheru:</html>"
 
 msgid "Unsaved data and missing associated file"
-msgstr "Datos ensin guardar y perda d'arquivu asociáu"
+msgstr "Datos ensin guardar y perda d''arquivu asociáu"
 
 msgid ""
 "<html>{0} layer needs saving but has an associated file<br>which cannot be "
@@ -8849,7 +8902,7 @@ msgstr[1] ""
 "refugue los cambeos.<br>Capes con un ficheru de namá llectura:</html>"
 
 msgid "Unsaved data non-writable files"
-msgstr "Datos ensin guardar d'arquivos non modificables"
+msgstr "Datos ensin guardar d''arquivos non modificables"
 
 msgid "Close this dialog and resume editing in JOSM"
 msgstr "Zarrar esti diálogu y siguir la edición en JOSM"
@@ -8875,12 +8928,12 @@ msgstr ""
 "guardase."
 
 msgid "Perform actions before deleting"
-msgstr "Realizar acciones enantes d'esaniciar"
+msgstr "Realizar acciones enantes d''esaniciar"
 
 msgid "Save/Upload layers before deleting. Unsaved changes are not lost."
 msgstr ""
-"Guardar/xubir capes enantes d'esaniciar. Los cambeos ensin grabar nun se van "
-"perder."
+"Guardar/xubir capes enantes d''esaniciar. Los cambeos ensin grabar nun se "
+"van perder."
 
 msgid "Preparing layer ''{0}'' for upload ..."
 msgstr "Preparando capa ''{0}'' pa xubir..."
@@ -8892,7 +8945,7 @@ msgid_plural ""
 "<html>Upload and/or save operations of {0} layers with modifications<br>were "
 "canceled or have failed.</html>"
 msgstr[0] ""
-"<html>La operación de xubida y/o grabación d'una capa con cambeos<br>foi "
+"<html>La operación de xubida y/o grabación d''una capa con cambeos<br>foi "
 "atayada o falló.</html>"
 msgstr[1] ""
 "<html>Les operaciones de xubida y/o grabación de {0} capes con "
@@ -8979,7 +9032,7 @@ msgid "Upload the changed primitives"
 msgstr "Xubir les primitives que se camudaron"
 
 msgid "Please revise upload comment"
-msgstr "Por favor revise'l comentariu de xubida"
+msgstr "Por favor revise''l comentariu de xubida"
 
 msgid ""
 "Your upload comment is <i>empty</i>, or <i>very short</i>.<br /><br />This "
@@ -9005,12 +9058,12 @@ msgid ""
 "origins of the data.<br /><br />If you spend a minute now to explain your "
 "change, you will make life<br />easier for many other mappers."
 msgstr ""
-"Nun especificó la fonte d'orixe de los sos cambeos. Esto ta dexáu "
-"técnicamente, pero esta información ayuda a otros usuarios a entender d'onde "
-"proceden esos los datos (conocencia local, ortofoto, etc.). \r\n"
+"Nun especificó la fonte d''orixe de los sos cambeos. Esto ta dexáu "
+"técnicamente, pero esta información ayuda a otros usuarios a entender "
+"d''onde proceden esos los datos (conocencia local, ortofoto, etc.). \r\n"
 "<br/> \r\n"
 "Si usté dedica unos segundos a esplicar los sos cambeos va facilitar "
-"descomanadamente'l llabor de otru collaboradores de OpenStreetMap."
+"descomanadamente''l llabor de otru collaboradores de OpenStreetMap."
 
 msgid "Revise"
 msgstr "Revisar"
@@ -9025,7 +9078,7 @@ msgid "Cancel and return to the previous dialog"
 msgstr "Atayar y volver al diálogu anterior"
 
 msgid "Please enter a valid chunk size first"
-msgstr "Por favor, introduza primero un tamañu d'elementu válidu"
+msgstr "Por favor, introduza primero un tamañu d''elementu válidu"
 
 msgid "Illegal chunk size"
 msgstr "Tamañu de fragmentu illegal"
@@ -9079,12 +9132,12 @@ msgstr ""
 msgid ""
 "The changeset is going to be <strong>closed</strong> after this upload"
 msgstr ""
-"El conxuntu de cambeos va a <strong>pesllase</strong> dempués d'esta xubida"
+"El conxuntu de cambeos va a <strong>pesllase</strong> dempués d''esta xubida"
 
 msgid "The changeset is <strong>left open</strong> after this upload"
 msgstr ""
 "El conxuntu de cambeos ta <strong>parcialmente abiertu</strong> dempués "
-"d'esta xubida"
+"d''esta xubida"
 
 msgid "configure changeset"
 msgstr "configurar conxuntu de cambeos"
@@ -9151,13 +9204,13 @@ msgid "Go back to Upload Dialog"
 msgstr "Volver al diálogu de xubida"
 
 msgid "Click to return to the Upload Dialog"
-msgstr "Prima'l botón esquierdu pa volver al diálogu de xubida"
+msgstr "Prima''l botón esquierdu pa volver al diálogu de xubida"
 
 msgid "Abort"
 msgstr "Albortar"
 
 msgid "Click to abort uploading"
-msgstr "Faiga clic p'albortar la xubida"
+msgstr "Faiga clic p''albortar la xubida"
 
 msgid ""
 "The server reported that the current changeset was closed.<br>This is most "
@@ -9197,7 +9250,7 @@ msgid "Relation ''{0}'' is already deleted. Skipping object in upload."
 msgstr "Relación ''{0}'' ta esaniciada. Omitiendo na xubida."
 
 msgid "Object ''{0}'' is already deleted. Skipping object in upload."
-msgstr "L´oxetu \"{0}\" yá foi borráu. Omítese l'oxetu na xubida."
+msgstr "L´oxetu \"{0}\" yá foi borráu. Omítese l''oxetu na xubida."
 
 msgid "Uploading {0} object..."
 msgid_plural "Uploading {0} objects..."
@@ -9244,7 +9297,7 @@ msgid "Upload data in one request"
 msgstr "Xubir datos nun únicu pidimientu"
 
 msgid "Upload data in chunks of objects. Chunk size: "
-msgstr "Xubir los datos en grupos d'oxetos. Tamañu del grupu: "
+msgstr "Xubir los datos en grupos d''oxetos. Tamañu del grupu: "
 
 msgid "Upload each object individually"
 msgstr "Xubir cada oxetu individualmente"
@@ -9264,7 +9317,8 @@ msgstr "Abrir y usar tantos conxuntos de cambeos nuevos como sía necesariu"
 
 msgid "Upload in one request not possible (too many objects to upload)"
 msgstr ""
-"Nun ye posible xubir datos d'una sola vegada (hai demasiaos oxetos por xubir)"
+"Nun ye posible xubir datos d''una sola vegada (hai demasiaos oxetos por "
+"xubir)"
 
 msgid ""
 "<html>Cannot upload {0} objects in one request because the<br>max. changeset "
@@ -9373,7 +9427,7 @@ msgid "Save GPX file"
 msgstr "Guardar ficheru GPX"
 
 msgid "Imagery fade"
-msgstr "Tresparencia d'imaxes"
+msgstr "Tresparencia d''imaxes"
 
 msgid "ERROR"
 msgstr "ERRU"
@@ -9405,6 +9459,9 @@ msgstr ""
 msgid "Save Layer"
 msgstr "Guardar capa"
 
+msgid "Note"
+msgstr "Nota"
+
 msgid "Notes layer"
 msgstr "Capa de Notes"
 
@@ -9438,7 +9495,7 @@ msgid "API version: {0}"
 msgstr "Versión del API: {0}"
 
 msgid "Upload is discouraged"
-msgstr "Nun s'encamienta la xubida"
+msgstr "Nun s''encamienta la xubida"
 
 msgid "Convert to GPX layer"
 msgstr "Convertir a capa GPX"
@@ -9450,7 +9507,7 @@ msgid "Dataset consistency test"
 msgstr "Preba de consistencia del conxuntu de datos"
 
 msgid "No problems found"
-msgstr "Nun s'alcontraron problemes"
+msgstr "Nun s''alcontraron problemes"
 
 msgid "Following problems found:"
 msgstr "Atopáronse los siguientes problemes:"
@@ -9537,7 +9594,7 @@ msgid "zoom in to load more tiles"
 msgstr "faiga zoom averando pa cargar más teseles"
 
 msgid "increase zoom level to see more detail"
-msgstr "aumenta'l nivel de zoom pa ver más detalles"
+msgstr "aumenta''l nivel de zoom pa ver más detalles"
 
 msgid "No tiles at this zoom level"
 msgstr "Non hai teseles a esti nivel de zoom"
@@ -9584,8 +9641,8 @@ msgstr "Descarga teseles visibles"
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
 msgstr ""
-"La área solicitada ye demasiáu grande. Por favor, amplíe'l zoom un pocu más, "
-"o camude'l resolvimientu"
+"La área solicitada ye demasiáu grande. Por favor, amplíe''l zoom un pocu "
+"más, o camude''l resolvimientu"
 
 msgid "Change resolution"
 msgstr "Camudar resolvimientu"
@@ -9639,7 +9696,7 @@ msgid ""
 msgstr ""
 "<html>Tome una semeya del so receptor GPS mientres amuesa la hora "
 "esacta.<br>Esponga esa semeya equí.<br>Y dempués, cenciellamente tome la "
-"hora qu'usté llee na semeya y escueya una zona horaria<hr></html>"
+"hora qu''usté llee na semeya y escueya una zona horaria<hr></html>"
 
 msgid "Photo time (from exif):"
 msgstr "Hora de la semeya (dende exif)"
@@ -9657,14 +9714,14 @@ msgid "Open another photo"
 msgstr "Abrir otra semeya"
 
 msgid "Synchronize time from a photo of the GPS receiver"
-msgstr "Sincronizar el tiempu d'una semeya col receptor GPS"
+msgstr "Sincronizar el tiempu d''una semeya col receptor GPS"
 
 msgid ""
 "Error while parsing the date.\n"
 "Please use the requested format"
 msgstr ""
 "Erru al analizar la fecha.\n"
-"Por favor, utilice'l formatu riquíu."
+"Por favor, utilice''l formatu riquíu."
 
 msgid "Invalid date"
 msgstr "Fecha non válida"
@@ -9681,7 +9738,7 @@ msgstr "Abrir otra traza GPX"
 msgid ""
 "<html>Use photo of an accurate clock,<br>e.g. GPS receiver display</html>"
 msgstr ""
-"<html>Usar fotografía d'un reló precisu, <br>p.e. la pantalla del GPS cola "
+"<html>Usar fotografía d''un reló precisu, <br>p.e. la pantalla del GPS cola "
 "hora</html>"
 
 msgid "Auto-Guess"
@@ -9730,7 +9787,7 @@ msgid "No images could be matched!"
 msgstr "¡Non pudo apariase imaxe dalguna!"
 
 msgid "No gpx selected"
-msgstr "Nun s'escoyó nengún arquivu GPX"
+msgstr "Nun s''escoyó nengún arquivu GPX"
 
 msgid "<html>Matched <b>{0}</b> of <b>{1}</b> photo to GPX track.</html>"
 msgid_plural ""
@@ -9787,10 +9844,10 @@ msgid "GPX Track has no time information"
 msgstr "La traza GPX nun tener información horaria"
 
 msgid "You should select a GPX track"
-msgstr "Tien d'escoyer una traza GPX"
+msgstr "Tien d''escoyer una traza GPX"
 
 msgid "No selected GPX track"
-msgstr "Nun s'escoyó una traza GPX"
+msgstr "Nun s''escoyó una traza GPX"
 
 msgid ""
 "Error while parsing timezone.\n"
@@ -9840,11 +9897,11 @@ msgstr[1] "{0} imaxes cargaes."
 
 msgid "{0} was found to be GPS tagged."
 msgid_plural "{0} were found to be GPS tagged."
-msgstr[0] "Atopóse {0} elementu p'asitiar con GPS."
-msgstr[1] "Atopáronse {0} elementos p'asitiar con GPS"
+msgstr[0] "Atopóse {0} elementu p''asitiar con GPS."
+msgstr[1] "Atopáronse {0} elementos p''asitiar con GPS"
 
 msgid "Delete image file from disk"
-msgstr "Borrar arquivu d'imaxe del discu"
+msgstr "Borrar arquivu d''imaxe del discu"
 
 msgid ""
 "<html><h3>Delete the file {0} from disk?<p>The image file will be "
@@ -9854,7 +9911,7 @@ msgstr ""
 "l´arquivu!</h3></html>"
 
 msgid "Image file could not be deleted."
-msgstr "L'arquivu d'imaxe non pudo ser borráu."
+msgstr "L''arquivu d''imaxe non pudo ser borráu."
 
 msgid "No image"
 msgstr "Nenguna imaxe"
@@ -9883,6 +9940,9 @@ msgstr "Esaniciar semeya de la capa"
 msgid "Delete File from disk"
 msgstr "Borrar arquivu del discu"
 
+msgid "Copy image path"
+msgstr ""
+
 msgid "Next"
 msgstr "Siguiente"
 
@@ -10023,16 +10083,16 @@ msgid "Click to download"
 msgstr "Faiga clic pa descargar"
 
 msgid "Click to cancel"
-msgstr "Faiga clic p'atayar"
+msgstr "Faiga clic p''atayar"
 
 msgid "Download from OSM along this track"
-msgstr "Descargar datos de OSM a lo llargo d'esta traza"
+msgstr "Descargar datos de OSM a lo llargo d''esta traza"
 
 msgid "Calculating Download Area"
 msgstr "Calculando área a descargar"
 
 msgid "Precache imagery tiles along this track"
-msgstr "Precargar les imaxes de fondu a lo llargo d'esta pista."
+msgstr "Precargar les imaxes de fondu a lo llargo d''esta pista."
 
 msgid "Precaching WMS"
 msgstr "Precargando WMS"
@@ -10041,13 +10101,13 @@ msgid "Please select the imagery layer."
 msgstr "Escueya la capa de fondu."
 
 msgid "Select imagery layer"
-msgstr "Escueya capa d'imaxes"
+msgstr "Escueya capa d''imaxes"
 
 msgid "There are no imagery layers."
-msgstr "Nun hai capes d'imaxes disponibles."
+msgstr "Nun hai capes d''imaxes disponibles."
 
 msgid "No imagery layers"
-msgstr "Nun hai capes d'imaxes"
+msgstr "Nun hai capes d''imaxes"
 
 msgid "Velocity, km/h"
 msgstr "Velocidá, km/h"
@@ -10072,9 +10132,9 @@ msgid ""
 "server.<br>Because its way points do not include a timestamp we cannot "
 "correlate them with audio data.</html>"
 msgstr ""
-"<html>Descargar del servidor los datos de la capa GPX \"{0}\", br <>Cuidao "
+"<html>Descargar del servidor los datos de la capa GPX \"{0}\", <br>Cuidao "
 "que los puntos de vía nun inclúin una marca de tiempu, nun se pueden "
-"correlacionar con datos d'audiu.</html>"
+"correlacionar con datos d''audiu.</html>"
 
 msgid "Import not possible"
 msgstr "Nun ye posible importar"
@@ -10086,13 +10146,13 @@ msgid "Audio markers from {0}"
 msgstr "Marcadores d´audiu dende {0}"
 
 msgid "No GPX track available in layer to associate audio with."
-msgstr "Nun hai traza gpx disponible na capa p'acomuñar l'audiu"
+msgstr "Nun hai traza gpx disponible na capa p''acomuñar l''audiu"
 
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
 "the end were omitted or moved to the start."
 msgstr ""
-"Dellos puntos d'interés con marques temporales anteriores al entamu de "
+"Dellos puntos d''interés con marques temporales anteriores al entamu de "
 "trazar o posterior a la so finalización fueron omitíos o treslladaos al "
 "empiezu."
 
@@ -10111,7 +10171,7 @@ msgid ""
 "server.<br>Because its way points do not include a timestamp we cannot "
 "correlate them with images.</html>"
 msgstr ""
-"<html>Descargar del servidor los datos na capa GPX \"{0}\", br<>Cuidao que "
+"<html>Descargar del servidor los datos na capa GPX \"{0}\", <br>Cuidao que "
 "los puntos de vía nun inclúin una marca de tiempu, nun se pueden "
 "correlacionar con imaxes.</html>"
 
@@ -10135,7 +10195,7 @@ msgstr[0] "{0} consiste nel marcador {1}"
 msgstr[1] "{0} consiste nos marcadores {1}"
 
 msgid "No existing audio markers in this layer to offset from."
-msgstr "Nun esisten marcadores d'audiu nesta capa dende los que mover."
+msgstr "Nun esisten marcadores d''audiu nesta capa dende los que mover."
 
 msgid "Show Text/Icons"
 msgstr "Amosar Testu/Iconos"
@@ -10150,42 +10210,43 @@ msgstr "Sincronizar audiu"
 msgid ""
 "You need to pause audio at the moment when you hear your synchronization cue."
 msgstr ""
-"Precisa pausar l'audiu nel momentu qu'oya la so entrada de sincronización"
+"Precisa pausar l''audiu nel momentu qu''oya la so entrada de sincronización"
 
 msgid "Audio synchronized at point {0}."
 msgstr "Audiu sincronizáu nel puntu {0}"
 
 msgid "Unable to synchronize in layer being played."
-msgstr "Non puede sincronizase na capa que s'escuchaba."
+msgstr "Non puede sincronizase na capa que s''escuchaba."
 
 msgid "Make Audio Marker at Play Head"
-msgstr "Crear un marcador d'audiu na cabecera d'escucha"
+msgstr "Crear un marcador d''audiu na cabecera d''escucha"
 
 msgid ""
 "You need to have paused audio at the point on the track where you want the "
 "marker."
 msgstr ""
-"Precisaba haber pausáu l'audiu nel puntu de la pista onde quería'l marcador."
+"Precisaba haber pausáu l''audiu nel puntu de la pista onde quería''l "
+"marcador."
 
 msgid ""
 "You need to drag the play head near to the GPX track whose associated sound "
 "track you were playing (after the first marker)."
 msgstr ""
 "Tien que mover el cursor de reproducción cerca de trazar GPX que la so pista "
-"de soníu taba reproduciendo (degoláu'l primer marcador)."
+"de soníu taba reproduciendo (degoláu''l primer marcador)."
 
 msgid ""
 "You need to SHIFT-drag the play head onto an audio marker or onto the track "
 "point where you want to synchronize."
 msgstr ""
-"Precisa mover, mientres pulsia mayúscules, la cabecera d'escucha a un "
-"marcador d'audiu o a un puntu de traza, onde quiera sincronizar."
+"Precisa mover, mientres pulsia mayúscules, la cabecera d''escucha a un "
+"marcador d''audiu o a un puntu de traza, onde quiera sincronizar."
 
 msgid "Unable to create new audio marker."
-msgstr "Nun se pudo crear un marcador d'audiu nuevu."
+msgstr "Nun se pudo crear un marcador d''audiu nuevu."
 
 msgid "There was an error while trying to display the URL for this marker"
-msgstr "Hubo un erru cuando s'intentaba amosar la URL d'esti marcador"
+msgstr "Hubo un erru cuando s''intentaba amosar la URL d''esti marcador"
 
 msgid "(URL was: "
 msgstr "(La URL yera: "
@@ -10236,20 +10297,20 @@ msgstr ""
 "{3}"
 
 msgid "Access Token Key:"
-msgstr "Llave d'accesu:"
+msgstr "Llave d''accesu:"
 
 msgid "Access Token Secret:"
-msgstr "Llave secreta d'accesu:"
+msgstr "Llave secreta d''accesu:"
 
 msgid "Save Access Token in preferences"
-msgstr "Almacenar llave d'accesu en preferencies"
+msgstr "Almacenar llave d''accesu en preferencies"
 
 msgid ""
 "<html>Select to save the Access Token in the JOSM preferences.<br>Unselect "
 "to use the Access Token in this JOSM session only.</html>"
 msgstr ""
-"<html>Escueya p'almacenar llave d'Accesu nes preferencies de "
-"JOSM.<br>Desmarque pa usar la llave d'Accesu namá nesta sesión de "
+"<html>Escueya p''almacenar llave d''Accesu nes preferencies de "
+"JOSM.<br>Desmarque pa usar la llave d''Accesu namá nesta sesión de "
 "JOSM.</html>"
 
 msgid "Use default settings"
@@ -10265,10 +10326,10 @@ msgid "Request Token URL:"
 msgstr "URL de solicitú de Llave"
 
 msgid "Access Token URL:"
-msgstr "URL de Llave d'Accesu"
+msgstr "URL de Llave d''Accesu"
 
 msgid "Authorize URL:"
-msgstr "URL d'Autorización:"
+msgstr "URL d''Autorización:"
 
 msgid "Click to reset the OAuth settings to default values"
 msgstr ""
@@ -10276,7 +10337,7 @@ msgstr ""
 
 msgid "Click to abort resetting to the OAuth default values"
 msgstr ""
-"Prima p'atayar el restablecimiento de valores predeterminados pa OAuth"
+"Prima p''atayar el restablecimiento de valores predeterminados pa OAuth"
 
 msgid ""
 "<html>JOSM is about to reset the OAuth settings to default values.<br>The "
@@ -10305,9 +10366,9 @@ msgid ""
 "Token.</html>"
 msgstr ""
 "<html>Executar un procedimientu totalmente automáticu pa llograr una llave "
-"d'accesu del sitio web OSM.<br>JOSM apuerta al sitiu OSM al traviés del "
-"usuariu JOSM y br<>autoriza total y automáticamente l'usuariu y descarga una "
-"llave d'accesu.</html>"
+"d''accesu del sitio web OSM.<br>JOSM apuerta al sitiu OSM al traviés del "
+"usuariu JOSM y <br>autoriza total y automáticamente l''usuariu y descarga "
+"una llave d''accesu.</html>"
 
 msgid ""
 "<html>Run a semi-automatic procedure to get an access token from the OSM "
@@ -10316,18 +10377,18 @@ msgid ""
 "external browser<br>to authenticate itself and to accept the request token "
 "submitted by JOSM.</html>"
 msgstr ""
-"<html>Executar un procesu semi automáticu pa llograr una llave d'accesu del "
+"<html>Executar un procesu semi automáticu pa llograr una llave d''accesu del "
 "sitiu OSM.<br>JOSM unvia les solicitúes estándar OAuth pa llograr una llave "
-"de solicitú y una <br>llave d'Accesu. Unvia al usuariu al sitiu OSM nun "
-"navegador estreme br<> para autenticarse y aceptar la solicitú de llave "
+"de solicitú y una <br>llave d''Accesu. Unvia al usuariu al sitiu OSM nun "
+"navegador estreme <br> para autenticarse y aceptar la solicitú de llave "
 "unviada por JOSM.</html>"
 
 msgid ""
 "<html>Enter an Access Token manually if it was generated and retrieved "
 "outside<br>of JOSM.</html>"
 msgstr ""
-"<html>Introducir una llave d'Accesu manualmente si foi xenerada y descargada "
-"fuera br<>de JOSM.</html>"
+"<html>Introducir una llave d''Accesu manualmente si foi xenerada y "
+"descargada fuera <br>de JOSM.</html>"
 
 msgid ""
 "Please enter your OSM user name and password. The password will "
@@ -10335,13 +10396,14 @@ msgid ""
 "will be submitted to the OSM server <strong>only once</strong>. Subsequent "
 "data upload requests don''t use your password any more."
 msgstr ""
-"Por favor, introduza'l so nome d'usuariu y contraseña de OSM. La contraseña "
-"strong <>non</strong> va ser guardada ensin cifrar nes preferencies de JOSM "
-"y va ser unviada al servidor de OSM <strong>namá una vegada</strong>. "
-"Posteriores pidimientos de xubida de datos yá nun van usar la so contraseña."
+"Por favor, introduza''l so nome d''usuariu y contraseña de OSM. La "
+"contraseña <strong>non</strong> va ser guardada ensin cifrar nes "
+"preferencies de JOSM y va ser unviada al servidor de OSM <strong>namá una "
+"vegada</strong>. Posteriores pidimientos de xubida de datos yá nun van usar "
+"la so contraseña."
 
 msgid "Username: "
-msgstr "Nome d'usuariu: "
+msgstr "Nome d''usuariu: "
 
 msgid "Password: "
 msgstr "Contraseña: "
@@ -10357,10 +10419,10 @@ msgid "Granted rights"
 msgstr "Derechos concedíos"
 
 msgid "Advanced OAuth properties"
-msgstr "Propiedaes avanzaes d'OAuth"
+msgstr "Propiedaes avanzaes d''OAuth"
 
 msgid "Accept Access Token"
-msgstr "Aceptar llave d'Accesu"
+msgstr "Aceptar llave d''Accesu"
 
 msgid ""
 "<html>You have successfully retrieved an OAuth Access Token from the OSM "
@@ -10375,24 +10437,24 @@ msgid "Authorize now"
 msgstr "Autorizar agora"
 
 msgid "Click to redirect you to the authorization form on the JOSM web site"
-msgstr "Prima pa redirixi-y al formulariu d'autorización nel sitiu JOSM"
+msgstr "Prima pa redirixi-y al formulariu d''autorización nel sitiu JOSM"
 
 msgid "Back"
 msgstr "Recular"
 
 msgid "Run the automatic authorization steps again"
-msgstr "Volver executar los pasos automáticos d'autorización"
+msgstr "Volver executar los pasos automáticos d''autorización"
 
 msgid "Test Access Token"
-msgstr "Probar llave d'Accesu"
+msgstr "Probar llave d''Accesu"
 
 msgid "Please enter your OSM user name"
-msgstr "Por favor, introduza'l so nome d'usuariu de OSM"
+msgstr "Por favor, introduza''l so nome d''usuariu de OSM"
 
 msgid "The user name cannot be empty. Please enter your OSM user name"
 msgstr ""
-"El nome d'usuariu nun puede tar vacíu. Por favor, introduza'l so nome "
-"d'usuariu de OSM"
+"El nome d''usuariu nun puede tar vacíu. Por favor, introduza''l so nome "
+"d''usuariu de OSM"
 
 msgid "Please enter your OSM password"
 msgstr "Por favor, introduza la so contraseña de OSM"
@@ -10403,20 +10465,20 @@ msgstr ""
 "de OSM"
 
 msgid "Authorize JOSM to access the OSM API"
-msgstr "Autorizar a JOSM p'aportar a la API de OSM"
+msgstr "Autorizar a JOSM p''aportar a la API de OSM"
 
 msgid ""
 "<html>The automatic process for retrieving an OAuth Access Token<br>from the "
 "OSM server failed.<br><br>Please try again or choose another kind of "
 "authorization process,<br>i.e. semi-automatic or manual authorization.</html>"
 msgstr ""
-"<html>El procesu automáticu de llograr una llave d'Accesu OAuth<br> del "
+"<html>El procesu automáticu de llograr una llave d''Accesu OAuth<br> del "
 "servidor OSM falló.<br><br>Por favor, inténtelo de nuevu o escueya otru "
-"esquema d'autorización, br<>por casu, autorización semi automática o "
+"esquema d''autorización, <br>por casu, autorización semi automática o "
 "manual.</html>"
 
 msgid "OAuth authorization failed"
-msgstr "Falló l'autorización OAuth"
+msgstr "Falló l''autorización OAuth"
 
 msgid ""
 "<html>The automatic process for retrieving an OAuth Access Token<br>from the "
@@ -10442,17 +10504,17 @@ msgid ""
 "Please enter an OAuth Access Token which is authorized to access the OSM "
 "server ''{0}''."
 msgstr ""
-"Por favor ingrese una llave d'Accesu Oauth que tea autorizada p'aportar al "
+"Por favor ingrese una llave d''Accesu Oauth que tea autorizada p''aportar al "
 "servidor OSM ''{0}''."
 
 msgid "Access Token"
-msgstr "Llave d'Accesu"
+msgstr "Llave d''Accesu"
 
 msgid "Advanced OAuth parameters"
-msgstr "Parámetros Avanzaos d'OAuth"
+msgstr "Parámetros Avanzaos d''OAuth"
 
 msgid "Enter the OAuth Access Token"
-msgstr "Introduza la Llave d'Accesu OAuth"
+msgstr "Introduza la Llave d''Accesu OAuth"
 
 msgid "Enter advanced OAuth properties"
 msgstr "Ingresar propiedaes avanzaes de OAuth"
@@ -10461,29 +10523,30 @@ msgid ""
 "<html><body>Please enter an OAuth Access Token which is authorized to access "
 "the OSM server ''{0}''.</body></html>"
 msgstr ""
-"<html><body>Por favor introduza una llave d'Accesu OAuth que tea autorizada "
-"p'aportar al servidor OSM \"{0}\".</body></html>"
+"<html><body>Por favor introduza una llave d''Accesu OAuth que tea autorizada "
+"p''aportar al servidor OSM \"{0}\".</body></html>"
 
 msgid "Please enter an Access Token Key"
-msgstr "Por favor, introduza una Llave d'Accesu"
+msgstr "Por favor, introduza una Llave d''Accesu"
 
 msgid ""
 "The Access Token Key must not be empty. Please enter an Access Token Key"
 msgstr ""
-"La llave d'Accesu nun puede tar vacida. Por favor ingrese una llave d'Accesu"
+"La llave d''Accesu nun puede tar vacida. Por favor ingrese una llave "
+"d''Accesu"
 
 msgid "Please enter an Access Token Secret"
-msgstr "Por favor ingrese llave d'Accesu secreta"
+msgstr "Por favor ingrese llave d''Accesu secreta"
 
 msgid ""
 "The Access Token Secret must not be empty. Please enter an Access Token "
 "Secret"
 msgstr ""
-"La llave d'Accesu secreta nun puede tar en blancu. Por favor, introduza una "
-"llave d'Accesu secreta"
+"La llave d''Accesu secreta nun puede tar en blancu. Por favor, introduza una "
+"llave d''Accesu secreta"
 
 msgid "Click to test the Access Token"
-msgstr "Prima pa probar la llave d'Accesu"
+msgstr "Prima pa probar la llave d''Accesu"
 
 msgid ""
 "With OAuth you grant JOSM the right to upload map data and GPS tracks on "
@@ -10493,7 +10556,7 @@ msgstr ""
 "usté (<a href=\"{0}\">más información...</a )..>"
 
 msgid "Please select an authorization procedure: "
-msgstr "Por favor, escueya un procedimientu d'autorización: "
+msgstr "Por favor, escueya un procedimientu d''autorización: "
 
 msgid "Get an Access Token for ''{0}''"
 msgstr "Llograr una llave d´Accesu pa ''{0}''"
@@ -10502,7 +10565,7 @@ msgid "Close the dialog and cancel authorization"
 msgstr "Cerrar el diálogu y atayar autorización"
 
 msgid "Close the dialog and accept the Access Token"
-msgstr "Cerrar el diálogu y aceptar la llave d'Autorización"
+msgstr "Cerrar el diálogu y aceptar la llave d''Autorización"
 
 msgid "Failed to cancel running OAuth operation"
 msgstr "Erru al atayar la operación de OAuth executándose"
@@ -10553,7 +10616,7 @@ msgstr "Dexar xubir traces GPS"
 
 msgid "Select to grant JOSM the right to upload GPS traces on your behalf"
 msgstr ""
-"Escueya p'aprovir a JOSM del permisu pa xubir traces de GPS al so nome"
+"Escueya p''aprovir a JOSM del permisu pa xubir traces de GPS al so nome"
 
 msgid "Allow to download your private GPS traces"
 msgstr "Dexar descargar los sos traces GPS privaes"
@@ -10562,7 +10625,7 @@ msgid ""
 "Select to grant JOSM the right to download your private GPS traces into JOSM "
 "layers"
 msgstr ""
-"Escoyer p'aprovir a JOSM el derechu pa descargar los sos traces GPS privaes "
+"Escoyer p''aprovir a JOSM el derechu pa descargar los sos traces GPS privaes "
 "en capes JOSM"
 
 msgid "Allow to read your preferences"
@@ -10588,11 +10651,11 @@ msgid "Select to grant JOSM the right to modify notes on your behalf"
 msgstr "Escueya pa garantizar a JOSM que va modificar notes del so parte."
 
 msgid "Retrieving OAuth Access Token..."
-msgstr "Llogrando llave d'Accesu OAuth..."
+msgstr "Llogrando llave d''Accesu OAuth..."
 
 msgid "<html>Retrieving an OAuth Access Token from ''{0}'' failed.</html>"
 msgstr ""
-"<html>Falló la descarga d'una llave d'Accesu OAuth de ''{0}''.</html>"
+"<html>Falló la descarga d''una llave d''Accesu OAuth de ''{0}''.</html>"
 
 msgid "Request Failed"
 msgstr "Solicitú fallida"
@@ -10613,17 +10676,17 @@ msgid ""
 "<html>Please click on <strong>{0}</strong> to retrieve an OAuth Request "
 "Token from ''{1}''.</html>"
 msgstr ""
-"<html>Por favor escueya strong <>{0}</strong> pa llograr una llave de "
+"<html>Por favor escueya <strong>{0}</strong> pa llograr una llave de "
 "solicitú OAuth de ''{1}''.</html>"
 
 msgid "<html>Step 1/3: Retrieve an OAuth Request Token</html>"
 msgstr "<html>Paso 1/3: Descarga de Llave de Solicitú OAuth</html>"
 
 msgid "<html>Step 2/3: Authorize and retrieve an Access Token</html>"
-msgstr "<html> Paso 2/3: Autorizar y descargar llave d'Accesu /html.<>"
+msgstr "<html>Paso 2/3: Autorizar y descargar llave d''Accesu</html>"
 
 msgid "Request Access Token"
-msgstr "Solicitar llave d'Accesu"
+msgstr "Solicitar llave d''Accesu"
 
 msgid ""
 "<html>JOSM successfully retrieved a Request Token. JOSM is now launching an "
@@ -10635,56 +10698,56 @@ msgid ""
 "browser.</html>"
 msgstr ""
 "<html> JOSM descargó correchamente una solicitú de credencial de "
-"autentificación. JOSM agora ta llanzando una páxina d'autorización nun "
-"navegador esternu. Por favor, introduza'l so nome d'usuariu y contraseña de "
-"OSM y siga les instrucciones p'autorizar la solicitú de credencial de "
+"autentificación. JOSM agora ta llanzando una páxina d''autorización nun "
+"navegador esternu. Por favor, introduza''l so nome d''usuariu y contraseña "
+"de OSM y siga les instrucciones p''autorizar la solicitú de credencial de "
 "autentificación. Dempués vuelva a esti diálogu y faiga clic en "
 "<strong>{0}</strong><br><br>Si falla al abrir el navegador esternu puede "
-"copiar la siguiente dirección d'autorización y pegala nel campu de dirección "
-"del navegador.</html>"
+"copiar la siguiente dirección d''autorización y pegala nel campu de "
+"dirección del navegador.</html>"
 
 msgid "Go back to step 1/3"
 msgstr "Tornar al pasu 1/3"
 
 msgid "<html>Step 3/3: Successfully retrieved an Access Token</html>"
-msgstr "<html>Paso 3/3: Recuperáu con ésitu un token d'accesu /html.<>"
+msgstr "<html>Paso 3/3: Recuperáu con ésitu un token d''accesu</html>"
 
 msgid ""
 "<html>JOSM has successfully retrieved an Access Token. You can now accept "
 "this token. JOSM will use it in the future for authentication and "
 "authorization to the OSM server.<br><br>The access token is: </html>"
 msgstr ""
-"<html>JOSM descargó correchamente la credencial de autentificación d'accesu. "
-"Agora puede aceptar esta credencial. JOSM va usar nel futuru pa "
+"<html>JOSM descargó correchamente la credencial de autentificación "
+"d''accesu. Agora puede aceptar esta credencial. JOSM va usar nel futuru pa "
 "autentificarse y autorizase nel servidor OSM.<br><br>La credencial de "
-"autentificación d'accesu ye: </html>"
+"autentificación d''accesu ye: </html>"
 
 msgid "Click to retrieve a Request Token"
 msgstr "Prima pa llograr una llave de Solicitú"
 
 msgid "Retrieve Access Token"
-msgstr "Llograr Llave de Solicitú d'Accesu"
+msgstr "Llograr Llave de Solicitú d''Accesu"
 
 msgid "Click to retrieve an Access Token"
-msgstr "Prima pa llograr llave d'Accesu"
+msgstr "Prima pa llograr llave d''Accesu"
 
 msgid "Testing OAuth Access Token"
-msgstr "Probando Llave d'Accesu OAuth"
+msgstr "Probando Llave d''Accesu OAuth"
 
 msgid "Retrieving user details with Access Token Key ''{0}'' was rejected."
 msgstr ""
-"Foi refugada la descarga de detalles d'usuariu cola Llave d'Accesu ''{0}''"
+"Foi refugada la descarga de detalles d''usuariu cola Llave d''Accesu ''{0}''"
 
 msgid "Retrieving user details with Access Token Key ''{0}'' was forbidden."
 msgstr ""
-"Nun ta dexada'l llogru de detalles usuarios cola llave d'Accesu ''{0}''."
+"Nun ta dexada''l llogru de detalles usuarios cola llave d''Accesu ''{0}''."
 
 msgid ""
 "<html>Successfully used the Access Token ''{0}'' to<br>access the OSM server "
 "at ''{1}''.<br>You are accessing the OSM server as user ''{2}'' with id "
 "''{3}''.</html>"
 msgstr ""
-"<html>Usóse satisfactoria mente la llave ''{0}'' pa br<>aportar al servidor "
+"<html>Usóse satisfactoria mente la llave ''{0}'' pa <br>aportar al servidor "
 "OSM en ''{1}''.<br>Ta aportando al servidor OSM col usuariu ''{2}'' con díi "
 "''{3}''.</html>"
 
@@ -10713,8 +10776,8 @@ msgid ""
 "other protected resources.</html>"
 msgstr ""
 "<html>El servidor OSM ''{0}'' conoz la llave d´Accesu ''{1}''.<br>Falló la "
-"prueba de llograr detalles d´usuarios pa esta llave,anque, br <> dependiendo "
-"de qué permisos tenga esta llave, va poder usala pa br<>xubir datos, traces "
+"prueba de llograr detalles d´usuarios pa esta llave,anque, <br> dependiendo "
+"de qué permisos tenga esta llave, va poder usala pa <br>xubir datos, traces "
 "y/o aportar a oros recursos protexíos.</html>"
 
 msgid "Token allows restricted access"
@@ -10728,8 +10791,8 @@ msgid ""
 msgstr ""
 "<html>Fallu al llograr información avera del usuariu actual del servidor OSM "
 "''{0}''.<br>Esto probablemente nun ye un problema causáu al probar la llave "
-"d'Accesu, br <>puede ser un problema de configuración del servidor. Revise "
-"curioso la br<>URL del servidor y la so conexón a Internet.</html>"
+"d''Accesu, <br>puede ser un problema de configuración del servidor. Revise "
+"curioso la <br>URL del servidor y la so conexón a Internet.</html>"
 
 msgid ""
 "<html>Failed to sign the request for the OSM server ''{0}'' with the token "
@@ -10743,12 +10806,12 @@ msgid ""
 "error.<br>JOSM could not decide whether the token is valid. Please try again "
 "later.</html>"
 msgstr ""
-"<html>Falló la prueba por cuenta de que'l servidor respondió con un erru "
+"<html>Falló la prueba por cuenta de que''l servidor respondió con un erru "
 "internu.<br>JOSM nun pudo identificar si la llave ye válida. Por favor "
 "intente más tarde.</html>"
 
 msgid "Retrieving user info..."
-msgstr "Llogrando información d'usuariu..."
+msgstr "Llogrando información d''usuariu..."
 
 msgid "Expert mode"
 msgstr "Manera Avanzada"
@@ -10802,13 +10865,13 @@ msgid "active"
 msgstr "activu"
 
 msgid "Map paint style file (*.xml, *.mapcss, *.zip)"
-msgstr "Arquivu d'estilu de representación de mapa (*.xml, *.mapcss, *.zip)"
+msgstr "Arquivu d''estilu de representación de mapa (*.xml, *.mapcss, *.zip)"
 
 msgid "Preset definition file (*.xml, *.zip)"
 msgstr "Arquivu de definiciones prefixaes (*.xml, *.zip)"
 
 msgid "Tag checker rule (*.validator.mapcss, *.zip)"
-msgstr "Riegla del validador d'etiquetes (*.validator.mapcss, *.zip)"
+msgstr "Riegla del validador d''etiquetes (*.validator.mapcss, *.zip)"
 
 msgid "Edit source entry:"
 msgstr "Editar entrada fonte:"
@@ -10836,10 +10899,10 @@ msgid "Add a new icon path"
 msgstr "Añedir una nueva ruta del iconu"
 
 msgid "Remove the selected icon paths"
-msgstr "Esaniciar les rutes d'iconos selecionadas"
+msgstr "Esaniciar les rutes d''iconos selecionadas"
 
 msgid "Edit the selected icon path"
-msgstr "Editar la ruta d'iconu escoyía"
+msgstr "Editar la ruta d''iconu escoyía"
 
 msgid "Tooltip"
 msgstr "Conseyu emerxente"
@@ -10878,7 +10941,7 @@ msgid "Available"
 msgstr "Disponible"
 
 msgid "Action parameters"
-msgstr "Parámetros d'acción"
+msgstr "Parámetros d''acción"
 
 msgid "Parameter name"
 msgstr "Nome del parámetru"
@@ -10935,7 +10998,8 @@ msgstr ""
 
 msgid "What to do with preference lists when this file is to be imported?"
 msgstr ""
-"¿Qué deseya faer coles llistes de preferencies cuando l'arquivu sía importáu?"
+"¿Qué deseya faer coles llistes de preferencies cuando l''arquivu sía "
+"importáu?"
 
 msgid "Append preferences from file to existing values"
 msgstr "Amestar les preferencies del arquivu a los valores esistentes"
@@ -10954,8 +11018,8 @@ msgid ""
 "by pressing \"Cancel\" in preferences dialog <br/>To activate some changes "
 "JOSM restart may be needed.</html>"
 msgstr ""
-"<html>Equí atópase'l resume d'importación del arquivu. <br/>Puede descargar "
-"los cambeos a les preferencies primiendo ''Atayar'' nel diálogu de "
+"<html>Equí atópase''l resume d''importación del arquivu. <br/>Puede "
+"descargar los cambeos a les preferencies primiendo ''Atayar'' nel diálogu de "
 "Preferencies<br/>Dellos cambeos riquen una reinicialización de JOSM pa "
 "surtir efectu.</html>"
 
@@ -10991,7 +11055,8 @@ msgstr "Guardar perfil {0}"
 
 msgid "All the preferences of this group are default, nothing to save"
 msgstr ""
-"Toles preferencies d'esti grupu tán predeterminadas, nun hai nada por guardar"
+"Toles preferencies d''esti grupu tán predeterminadas, nun hai nada por "
+"guardar"
 
 msgid "Choose profile file"
 msgstr "Escoyer arquivu de perfil"
@@ -11021,7 +11086,7 @@ msgid "Please select the row to edit."
 msgstr "Escueye la filera pa editar"
 
 msgid "Select Setting Type:"
-msgstr "Escueya'l tipu de propiedá:"
+msgstr "Escueya''l tipu de propiedá:"
 
 msgid "Simple"
 msgstr "Senciellu"
@@ -11048,7 +11113,7 @@ msgid "Advanced Background: NonDefault"
 msgstr "Fondu Avanzáu: NonDefault"
 
 msgid "Current value is default."
-msgstr "El valor actual ye'l predeterminado."
+msgstr "El valor actual ye''l predeterminado."
 
 msgid "Default value is ''{0}''."
 msgstr "El valor por omisión ye ''{0}''."
@@ -11064,19 +11129,19 @@ msgid "Value: "
 msgstr "Valor: "
 
 msgid "Audio Settings"
-msgstr "Configuración d'audiu"
+msgstr "Configuración d''audiu"
 
 msgid "Settings for the audio player and audio markers."
-msgstr "Configuración del reproductor d'audiu y de los marcadores."
+msgstr "Configuración del reproductor d''audiu y de los marcadores."
 
 msgid "Display the Audio menu."
 msgstr "Amosar el menú audiu."
 
 msgid "Label audio (and image and web) markers."
-msgstr "Etiquetar marcadores d'audiu (imaxes y web)."
+msgstr "Etiquetar marcadores d''audiu (imaxes y web)."
 
 msgid "Display live audio trace."
-msgstr "Amosar traza d'audiu en vivu."
+msgstr "Amosar traza d''audiu en vivu."
 
 msgid "Explicit waypoints with valid timestamps."
 msgstr "Nodos de vía esplícitos con marques de tiempu válides."
@@ -11089,7 +11154,7 @@ msgid "Named trackpoints."
 msgstr "Puntos de traza nomaos."
 
 msgid "Modified times (time stamps) of audio files."
-msgstr "Rexistru temporal de los arquivos d'audiu modificáu."
+msgstr "Rexistru temporal de los arquivos d''audiu modificáu."
 
 msgid "Start of track (will always do this if no other markers available)."
 msgstr ""
@@ -11104,15 +11169,15 @@ msgid ""
 "Display a moving icon representing the point on the synchronized track where "
 "the audio currently playing was recorded."
 msgstr ""
-"Amosar un iconu en movimientu representando'l puntu en trazar sincronizada "
-"onde l'audiu que s'escucha foi grabáu."
+"Amosar un iconu en movimientu representando''l puntu en trazar sincronizada "
+"onde l''audiu que s''escucha foi grabáu."
 
 msgid ""
 "Put text labels against audio (and image and web) markers as well as their "
 "button icons."
 msgstr ""
-"Poner etiquetes contra marcadores d'audiu (imaxe y web) según los sos iconos "
-"de botón."
+"Poner etiquetes contra marcadores d''audiu (imaxe y web) según los sos "
+"iconos de botón."
 
 msgid "When importing audio, make markers from..."
 msgstr "Al importar audiu, crear marcadores dende..."
@@ -11124,21 +11189,21 @@ msgid ""
 "Automatically create audio markers from trackpoints (rather than explicit "
 "waypoints) with names or descriptions."
 msgstr ""
-"Crear marcadores d'audiu automáticamente dende los nodos de traza (en cuenta "
-"de dende los nodos de vía esplícitos) con nomes o descripciones."
+"Crear marcadores d''audiu automáticamente dende los nodos de traza (en "
+"cuenta de dende los nodos de vía esplícitos) con nomes o descripciones."
 
 msgid ""
 "Create audio markers at the position on the track corresponding to the "
 "modified time of each audio WAV file imported."
 msgstr ""
-"Crear marcadores d'audiu na posición de la pista correspondiente a la fecha "
-"modificada de cada arquivu importáu d'audiu WAV."
+"Crear marcadores d''audiu na posición de la pista correspondiente a la fecha "
+"modificada de cada arquivu importáu d''audiu WAV."
 
 msgid ""
 "The number of seconds to jump forward or back when the relevant button is "
 "pressed"
 msgstr ""
-"El númberu de segundos que se salta palantre o escontra tras cuando'l botón "
+"El númberu de segundos que se salta palantre o escontra tras cuando''l botón "
 "pertinente ye pulsiáu"
 
 msgid "Forward/back time (seconds)"
@@ -11155,7 +11220,7 @@ msgid ""
 "audio track position requested"
 msgstr ""
 "Reproducir empezando este numbero de segundos despues (o antes si ye "
-"negativu) de la posición solicitada na pista d'audiu"
+"negativu) de la posición solicitada na pista d''audiu"
 
 msgid "Lead-in time (seconds)"
 msgstr "Tiempu introductoriu (segundos)"
@@ -11207,7 +11272,7 @@ msgid "Draw oneway arrows."
 msgstr "Dibuxa fleches de sentíu únicu."
 
 msgid "Draw segment order numbers"
-msgstr "Dibuxar los númberos d'orde de los segmentos"
+msgstr "Dibuxar los númberos d''orde de los segmentos"
 
 msgid "Draw boundaries of downloaded data"
 msgstr "Dibuxar les llendes de los datos descargaos"
@@ -11216,7 +11281,7 @@ msgid "Draw virtual nodes in select mode"
 msgstr "Dibuxar nodos virtuales nel mou selección"
 
 msgid "Draw inactive layers in other color"
-msgstr "Dibuxar les capes inactives n'otru color"
+msgstr "Dibuxar les capes inactives n''otru color"
 
 msgid "Display discardable keys"
 msgstr "Claves de visualización descartables"
@@ -11225,7 +11290,7 @@ msgid "Highlight target ways and nodes"
 msgstr "Resaltar víes y nodos oxetivu"
 
 msgid "Draw rubber-band helper line"
-msgstr "Dibuxar llínea d'ayuda"
+msgstr "Dibuxar llínea d''ayuda"
 
 msgid "Smooth map graphics (antialiasing)"
 msgstr "Anidiar los gráficos del mapa (antialias)"
@@ -11244,11 +11309,11 @@ msgstr "Dibuxar pistes de dirección pa los segmentos de vía."
 
 msgid "Draw arrows in the direction of oneways and other directed features."
 msgstr ""
-"Dibuxa fleches na dirección de les víes de sentíu únicu y n'otros elementos "
+"Dibuxa fleches na dirección de les víes de sentíu únicu y n''otros elementos "
 "con dirección."
 
 msgid "Draw the order numbers of all segments within their way."
-msgstr "Dibuxar los númberos d'orde de tolos segmentos d'una vía."
+msgstr "Dibuxar los númberos d''orde de tolos segmentos d''una vía."
 
 msgid "Draw the boundaries of data loaded from the server."
 msgstr "Dibuxar les llendes de los datos descargaos del servidor."
@@ -11258,7 +11323,7 @@ msgstr ""
 "Dibuxar nodos virtuales na manera selección pa modificar les vias fácilmente."
 
 msgid "Draw the inactive data layers in a different color."
-msgstr "Dibuxar les capes inactives n'un color distintu."
+msgstr "Dibuxar les capes inactives n''un color distintu."
 
 msgid ""
 "Apply antialiasing to the map view resulting in a smoother appearance."
@@ -11270,7 +11335,7 @@ msgid ""
 "Apply antialiasing to the map view in wireframe mode resulting in a smoother "
 "appearance."
 msgstr ""
-"Aplicar l'anidiáu a la vista del mapa na manera diseño provoca una "
+"Aplicar l''anidiáu a la vista del mapa na manera diseño provoca una "
 "apariencia con cantos menos definíos"
 
 msgid "Hightlight target nodes and ways while drawing or selecting"
@@ -11280,8 +11345,8 @@ msgid ""
 "This option suppresses the filling of areas, overriding anything specified "
 "in the selected style."
 msgstr ""
-"Esta opción suprime'l rellenu d'árees, anulando cualquier cosa especificada "
-"nel estilu escoyíu."
+"Esta opción suprime''l rellenu d''árees, anulando cualquier cosa "
+"especificada nel estilu escoyíu."
 
 msgid ""
 "Display keys which have been deemed uninteresting to the point that they can "
@@ -11291,7 +11356,7 @@ msgstr ""
 "pue ser esaniciaes en manera silenciosa."
 
 msgid "Options that affect drawing performance"
-msgstr "Opciones qu'afecten al rendimientu del dibuxáu"
+msgstr "Opciones qu''afecten al rendimientu del dibuxáu"
 
 msgid "Segment drawing options"
 msgstr "Opciones de dibuxu del segmentu"
@@ -11374,7 +11439,7 @@ msgid "Foot"
 msgstr "Pie"
 
 msgid "Create markers when reading GPX"
-msgstr "Crear marcadores al lleer l'arquivu GPX"
+msgstr "Crear marcadores al lleer l''arquivu GPX"
 
 msgid "Fast drawing (looks uglier)"
 msgstr "Visualización rápida (pocu vistosa)"
@@ -11433,7 +11498,7 @@ msgid ""
 "Do not draw arrows if they are not at least this distance away from the last "
 "one."
 msgstr ""
-"Nun dibuxar fleches si nun tán a lo menos a esta distancia de l'anterior."
+"Nun dibuxar fleches si nun tán a lo menos a esta distancia de l''anterior."
 
 msgid "Minimum distance (pixels)"
 msgstr "Distancia mínima en píxeles"
@@ -11448,12 +11513,12 @@ msgid "Width of drawn GPX line (0 for default)"
 msgstr "Anchu de la llínea GPX dibuxada (0 por omisión)"
 
 msgid "Drawing width of GPX lines"
-msgstr "Dibuxar l'anchu de les llínees GPX"
+msgstr "Dibuxar l''anchu de les llínees GPX"
 
 msgid ""
 "Apply antialiasing to the GPX lines resulting in a smoother appearance."
 msgstr ""
-"Aplicar l'anidiáu a les llínees de GPX provoca una apariencia con cantos "
+"Aplicar l''anidiáu a les llínees de GPX provoca una apariencia con cantos "
 "menos definíos."
 
 msgid ""
@@ -11475,7 +11540,7 @@ msgid ""
 msgstr ""
 "Colorea puntos y segmentos de la ruta a partir de la incertidume horizontal "
 "de la posición (HDOP). El so dispositivu de captura rique que dexe rexistro "
-"d'esta información."
+"d''esta información."
 
 msgid "Colors points and track segments by its timestamp."
 msgstr "Puntos de color y segmentos de rutes pola so fecha y hora."
@@ -11525,11 +11590,11 @@ msgstr "Amosar les feches ISO"
 
 msgid "Use native file choosers (nicer, but do not support file filters)"
 msgstr ""
-"Usu de selectores d'arquivos nativos (más prestosu, pero nun son compatibles "
-"colos filtros d'arquivu)"
+"Usu de selectores d''arquivos nativos (más prestosu, pero nun son "
+"compatibles colos filtros d''arquivu)"
 
 msgid "Show localized name in selection lists, if available"
-msgstr "Amosar nome alcontráu en llistes de selección, en casu de qu'haya"
+msgstr "Amosar nome alcontráu en llistes de selección, en casu de qu''haya"
 
 msgid "Do not require to switch modes (potlatch style workflow)"
 msgstr "Nun riquir camudar de moos (fluxu de trabayu estilu Potlatch)"
@@ -11537,7 +11602,7 @@ msgstr "Nun riquir camudar de moos (fluxu de trabayu estilu Potlatch)"
 msgid ""
 "Display buttons in right side menus only when mouse is inside the element"
 msgstr ""
-"Amosar botones nos menus de la derecha namá cuando'l mure ta dientro del "
+"Amosar botones nos menus de la derecha namá cuando''l mure ta dientro del "
 "elementu"
 
 msgid "ISO 8601"
@@ -11554,9 +11619,9 @@ msgid ""
 "Use file choosers that behave more like native ones. They look nicer but do "
 "not support some features like file filters"
 msgstr ""
-"Utilizar selectores d'arquivos que se porten más como los nativos. Son más "
+"Utilizar selectores d''arquivos que se porten más como los nativos. Son más "
 "prestosos a la vista, pero nun son compatibles con delles carauterístiques "
-"como filtros d'arquivos"
+"como filtros d''arquivos"
 
 msgid "Look and Feel"
 msgstr "Visualización y comportamientu"
@@ -11585,16 +11650,16 @@ msgid "{0} is replaced by X-coordinate of the tile"
 msgstr "{0} ye reemplazáu pola coordenada X del mosaicu"
 
 msgid "{0} is replaced by Y-coordinate of the tile"
-msgstr "{0} ye reemplazáu pola coordenada Y de'l mosaicu"
+msgstr "{0} ye reemplazáu pola coordenada Y de''l mosaicu"
 
 msgid "{0} is replaced by {1} (Yahoo style Y coordinate)"
-msgstr "{0} ye reemplazáu por {1} (coordenada Y de l'estilu Yahoo)"
+msgstr "{0} ye reemplazáu por {1} (coordenada Y de l''estilu Yahoo)"
 
 msgid ""
 "{0} is replaced by {1} (OSGeo Tile Map Service Specification style Y "
 "coordinate)"
 msgstr ""
-"{0} ye reemplazáu por {1} (coordenada Y de l'estilu OSGeo Tile Map Service)"
+"{0} ye reemplazáu por {1} (coordenada Y de l''estilu OSGeo Tile Map Service)"
 
 msgid ""
 "{0} is replaced by a random selection from the given comma separated list, "
@@ -11613,7 +11678,7 @@ msgid "4. Enter name for this layer"
 msgstr "4. Introducir un nome pa esta capa"
 
 msgid "Store WMS endpoint only, select layers at usage"
-msgstr "Guardar namá l'estremu WMS, escoyer la capa n'usu"
+msgstr "Guardar namá l''estremu WMS, escoyer la capa n''usu"
 
 msgid "Show bounds"
 msgstr "Amosar llendes"
@@ -11628,22 +11693,22 @@ msgid "2. Select layers"
 msgstr "2. Escoyer capes"
 
 msgid "3. Select image format"
-msgstr "3. Escueya'l formatu"
+msgstr "3. Escueya''l formatu"
 
 msgid "4. Verify generated WMS URL"
 msgstr "4. Verifique la URL de WMS xenerada"
 
 msgid "5. Enter name for this layer"
-msgstr "5. Ingrese'l nome pa esta capa"
+msgstr "5. Ingrese''l nome pa esta capa"
 
 msgid "Show Bounds"
 msgstr "Amosar llindar"
 
 msgid "No bounding box was found for this layer."
-msgstr "Nun s'atoparon les llendes pa esta capa."
+msgstr "Nun s''atoparon les llendes pa esta capa."
 
 msgid "imagery fade"
-msgstr "opacidá d'imaxes"
+msgstr "opacidá d''imaxes"
 
 msgid "Fade Color: "
 msgstr "Color de tresparencia: "
@@ -11661,10 +11726,10 @@ msgid "Sharpen (requires layer re-add): "
 msgstr "Enfoque (rique recarga la capa): "
 
 msgid "Imagery Preferences"
-msgstr "Preferencies d'imaxes"
+msgstr "Preferencies d''imaxes"
 
 msgid "Modify list of imagery layers displayed in the Imagery menu"
-msgstr "Modificar la llista de capes d'imaxes amosaes nel menú Imaxes"
+msgstr "Modificar la llista de capes d''imaxes amosaes nel menú Imaxes"
 
 msgid "Common Settings"
 msgstr "Configuraciones comunes"
@@ -11676,13 +11741,13 @@ msgid "TMS Settings"
 msgstr "Configuraciones de TMS"
 
 msgid "Imagery providers"
-msgstr "Provisores d'imaxes"
+msgstr "Provisores d''imaxes"
 
 msgid "Offset bookmarks"
 msgstr "Marcadores de desplazamientos"
 
 msgid "Imagery Background: Default"
-msgstr "Fondu de les capes d'imaxes: por defeutu"
+msgstr "Fondu de les capes d''imaxes: por defeutu"
 
 msgid "Available default entries:"
 msgstr "Entraes disponibles por defeutu:"
@@ -11730,10 +11795,10 @@ msgid "Layer"
 msgstr "Capa"
 
 msgid "Easting"
-msgstr "Escontra l'Este"
+msgstr "Escontra l''Este"
 
 msgid "Northing"
-msgstr "Escontra'l Norte"
+msgstr "Escontra''l Norte"
 
 msgid "Auto zoom by default: "
 msgstr "Zoom automáticu predetermináu: "
@@ -11770,10 +11835,10 @@ msgid "Overlap tiles"
 msgstr "Superposición de teseles"
 
 msgid "% of east:"
-msgstr "% escontra l'este:"
+msgstr "% escontra l''este:"
 
 msgid "% of north:"
-msgstr "% escontra'l norte:"
+msgstr "% escontra''l norte:"
 
 msgid "Auto save enabled"
 msgstr "Autoguardáu activáu"
@@ -11840,14 +11905,14 @@ msgid "New style entry:"
 msgstr "Nuevu estilu:"
 
 msgid "Remove the selected styles from the list of active styles"
-msgstr "Esaniciar los estilos escoyíos de la llista d'estilos activos"
+msgstr "Esaniciar los estilos escoyíos de la llista d''estilos activos"
 
 msgid "Edit the filename or URL for the selected active style"
-msgstr "Editar un nome d'arquivu o una URL d'un estilu activu"
+msgstr "Editar un nome d''arquivu o una URL d''un estilu activu"
 
 msgid "Add the selected available styles to the list of active styles"
 msgstr ""
-"Añedir los estilos escoyíos disponibles a la llista d'estilos activos"
+"Añedir los estilos escoyíos disponibles a la llista d''estilos activos"
 
 msgid "Reloads the list of available styles from ''{0}''"
 msgstr "Recarga la llista d´estilos disponibles dende ''{0}''"
@@ -11860,12 +11925,12 @@ msgid ""
 "from<br>''{0}''.<br><br>Details (untranslated):<br>{1}</html>"
 msgstr ""
 "<html>Falló la carga de la llista de fontes d´estilos dende "
-"br<>''{0}''.<br><br>Detalles (ensin traducir):<br>{1}</html>"
+"<br>''{0}''.<br><br>Detalles (ensin traducir):<br>{1}</html>"
 
 msgid "Warning: illegal format of entry in style list ''{0}''. Got ''{1}''"
 msgstr ""
-"Alvertencia: formatu illegal d'entrada na llista d'estilu ''{0}''. Llogróse "
-"''{1}''"
+"Alvertencia: formatu illegal d''entrada na llista d''estilu ''{0}''. "
+"Llogróse ''{1}''"
 
 msgid "JOSM default (XML; old version)"
 msgstr "JOSM por defectu (XML; versión antigua)"
@@ -11876,7 +11941,7 @@ msgstr "JOSM por defectu (MapCSS)"
 msgid ""
 "Internal style to be used as base for runtime switchable overlay styles"
 msgstr ""
-"Estilu internu a usase pa estilos intercambiables en tiempu d'execución"
+"Estilu internu a usase pa estilos intercambiables en tiempu d''execución"
 
 msgid "Potlatch 2"
 msgstr "Potlatch 2"
@@ -11888,7 +11953,7 @@ msgid "Map Settings"
 msgstr "Axustes del mapa"
 
 msgid "Settings for the map projection and data interpretation."
-msgstr "Axustes pa la proyección del mapa y l'interpretación de datos."
+msgstr "Axustes pa la proyección del mapa y l''interpretación de datos."
 
 msgid "Could not read tagging preset source: {0}"
 msgstr "Non pudo lleese la fonte de les preferencies d´etiquetes: {0}"
@@ -11949,7 +12014,7 @@ msgid "Active presets:"
 msgstr "Predefinidos activos:"
 
 msgid "Add a new preset by entering filename or URL"
-msgstr "Añedir un nuevu predefinido por aciu nome d'arquivu o URL"
+msgstr "Añedir un nuevu predefinido por aciu nome d''arquivu o URL"
 
 msgid "New preset entry:"
 msgstr "Nuevu predefiníu:"
@@ -11975,7 +12040,7 @@ msgid ""
 "from<br>''{0}''.<br><br>Details (untranslated):<br>{1}</html>"
 msgstr ""
 "<html>Fallu al cargar la llistes de fontes predefinidas dende "
-"br<>''{0}''.<br><br>Detalles (ensin traducir):<br>{1}</html>"
+"<br>''{0}''.<br><br>Detalles (ensin traducir):<br>{1}</html>"
 
 msgid "Warning: illegal format of entry in preset list ''{0}''. Got ''{1}''"
 msgstr ""
@@ -11986,7 +12051,7 @@ msgid "Internal Preset"
 msgstr "Axuste predetermináu internu"
 
 msgid "The default preset for JOSM"
-msgstr "L'axuste predetermináu de JOSM"
+msgstr "L''axuste predetermináu de JOSM"
 
 msgid "Plugin bundled with JOSM"
 msgstr "Complementu incluyíu en JOSM"
@@ -11995,7 +12060,7 @@ msgid ""
 "Please click on <strong>Download list</strong> to download and display a "
 "list of available plugins."
 msgstr ""
-"Por favor, prima en <strong>Descargar llista /strong<> pa descargar y amosar "
+"Por favor, prima en <strong>Descargar llista</strong> pa descargar y amosar "
 "una llista de complementos disponibles."
 
 msgid "Plugin {0} is still required by this plugin:"
@@ -12017,20 +12082,20 @@ msgid ""
 msgid_plural ""
 "The following {0} plugins have been downloaded <strong>successfully</strong>:"
 msgstr[0] ""
-"Descargóse strong <>correchamente /strong<> el siguiente complementu:"
+"Descargóse <strong>correchamente</strong> el siguiente complementu:"
 msgstr[1] ""
-"Descargar <strong>correchamente /strong<> los siguientes {0} complementos:"
+"Descargar <strong>correchamente</strong> los siguientes {0} complementos:"
 
 msgid "Downloading the following plugin has <strong>failed</strong>:"
 msgid_plural ""
 "Downloading the following {0} plugins has <strong>failed</strong>:"
 msgstr[0] ""
-"Hai strong <>falláu /strong<> la descarga del siguiente complementu:"
+"Hai <strong>falláu</strong> la descarga del siguiente complementu:"
 msgstr[1] ""
-"Hai strong <>falláu /strong<> la descarga de los siguientes {0} complementos:"
+"Hai <strong>falláu</strong> la descarga de los siguientes {0} complementos:"
 
 msgid "Please restart JOSM to activate the downloaded plugins."
-msgstr "Por favor, reanicie JOSM p'activar los complementos descargaos."
+msgstr "Por favor, reanicie JOSM p''activar los complementos descargaos."
 
 msgid "Update plugins"
 msgstr "Actualizar complementos"
@@ -12042,7 +12107,7 @@ msgid "Enter a search expression"
 msgstr "Introducir una espresión de busca"
 
 msgid "Plugin update policy"
-msgstr "Política d'actualización de complementos"
+msgstr "Política d''actualización de complementos"
 
 msgid "Accept the new plugin sites and close the dialog"
 msgstr "Aceptar el nuevu complementu y pesllar el diálogu"
@@ -12092,7 +12157,7 @@ msgid "JOSM Plugin description URL"
 msgstr "URL de descripción del complementu de JOSM"
 
 msgid "Ask before updating"
-msgstr "Preguntar enantes d'actualizar"
+msgstr "Preguntar enantes d''actualizar"
 
 msgid "Always update without asking"
 msgstr "Actualizar siempres ensin preguntar"
@@ -12105,10 +12170,10 @@ msgid ""
 "startup after an update of JOSM itself."
 msgstr ""
 "Por favor, decida si JOSM va actualizar automáticamente los componentes "
-"activos al empecipiase dempués d'una actualización de sigo mesmu."
+"activos al empecipiase dempués d''una actualización de sigo mesmu."
 
 msgid "Update interval (in days):"
-msgstr "Intervalu d'actualización (en díes):"
+msgstr "Intervalu d''actualización (en díes):"
 
 msgid ""
 "Please decide whether JOSM shall automatically update active plugins after a "
@@ -12130,10 +12195,10 @@ msgid "Validate"
 msgstr "Validar"
 
 msgid "Parameter information..."
-msgstr "Parámetros d'información..."
+msgstr "Parámetros d''información..."
 
 msgid "Parameter information"
-msgstr "Parametros d'información"
+msgstr "Parametros d''información"
 
 msgid "Projection name"
 msgstr "Nome de la proyección"
@@ -12151,7 +12216,7 @@ msgid "Central meridian"
 msgstr "Meridianu central"
 
 msgid "Scaling factor"
-msgstr "Factor d'escala"
+msgstr "Factor d''escala"
 
 msgid "Ellipsoid name"
 msgstr "Nome del elipsoide"
@@ -12318,7 +12383,7 @@ msgid ""
 "(https) on localhost.<br>These ports are not configurable because they are "
 "referenced by external applications talking to JOSM."
 msgstr ""
-"JOSM siempres va escuchar en <> el b puertu {0}</b> (http) y el <b>puertu "
+"JOSM siempres va escuchar en el <b>puertu {0}</b> (http) y el <b>puertu "
 "{1}</b> (https) en localhost.<br>Estos puertos nun son configurables por "
 "cuenta de que los mesmos son referencies por aplicaciones esternes que "
 "dialoguen con JOSM."
@@ -12442,14 +12507,14 @@ msgstr ""
 "métodu de autenticación ''Autenticación Básica''."
 
 msgid "OSM username:"
-msgstr "Nome d'usuariu OSM:"
+msgstr "Nome d''usuariu OSM:"
 
 msgid "OSM password:"
 msgstr "Contraseña OSM:"
 
 msgid "Failed to retrieve OSM credentials from credential manager."
 msgstr ""
-"Erru al recuperar les credenciales d'alministrador de credenciales de OSM."
+"Erru al recuperar les credenciales d''alministrador de credenciales de OSM."
 
 msgid "Current credential manager is of type ''{0}''"
 msgstr "L´alministrador de credenciales actual ye ''{0}''"
@@ -12466,43 +12531,43 @@ msgstr "Comprobar cada (minutos):"
 
 msgid "Failed to retrieve OAuth Access Token from credential manager"
 msgstr ""
-"Erru al recuperar el Token d'Accesu OAuth dende l'alministrador de "
+"Erru al recuperar el Token d''Accesu OAuth dende l''alministrador de "
 "credenciales"
 
 msgid "Failed to store OAuth Access Token to credentials manager"
 msgstr ""
-"Erru almacenando'l Token d'Accesu OAuth nel alministrador de credenciales"
+"Erru almacenando''l Token d''Accesu OAuth nel alministrador de credenciales"
 
 msgid ""
 "You do not have an Access Token yet to access the OSM server using OAuth. "
 "Please authorize first."
 msgstr ""
-"Nun tien accesu a la llave d'Accesu p'aportar al servidor OSM usando OAuth. "
-"Por favor autorícelo primeru."
+"Nun tien accesu a la llave d''Accesu p''aportar al servidor OSM usando "
+"OAuth. Por favor autorícelo primeru."
 
 msgid ""
 "You already have an Access Token to access the OSM server using OAuth."
 msgstr ""
-"Usté yá tien una llave d'Accesu p'aportar al servidor OSM usando OAuth"
+"Usté yá tien una llave d''Accesu p''aportar al servidor OSM usando OAuth"
 
 msgid "Save to preferences"
 msgstr "Guardar preferencies"
 
 msgid "Click to step through the OAuth authorization process"
-msgstr "Escueya pa siguir los pasos del procesu d'autorización OAuth"
+msgstr "Escueya pa siguir los pasos del procesu d''autorización OAuth"
 
 msgid "New Access Token"
-msgstr "Nueva llave d'Accesu"
+msgstr "Nueva llave d''Accesu"
 
 msgid ""
 "Click to step through the OAuth authorization process and generate a new "
 "Access Token"
 msgstr ""
-"Escueya pa siguir los pasos del procesu d'autorización OAuth y xenerar una "
-"nueva llave d'Accesu"
+"Escueya pa siguir los pasos del procesu d''autorización OAuth y xenerar una "
+"nueva llave d''Accesu"
 
 msgid "Click test access to the OSM server with the current access token"
-msgstr "Escueya probar accesu al servidor OSM cola llave d'Accesu actual"
+msgstr "Escueya probar accesu al servidor OSM cola llave d''Accesu actual"
 
 msgid "<html>Use the default OSM server URL (<strong>{0}</strong>)</html>"
 msgstr ""
@@ -12544,7 +12609,7 @@ msgstr "Puertu:"
 msgid ""
 "Please enter a username and a password if your proxy requires authentication."
 msgstr ""
-"Por favor, introduza un nome d'usuariu y contraseña si'l so proxy rique "
+"Por favor, introduza un nome d''usuariu y contraseña si''l so proxy rique "
 "autentificación."
 
 msgid "Password:"
@@ -12560,7 +12625,7 @@ msgid ""
 "Use standard system settings (disabled. Start JOSM with <tt>-"
 "Djava.net.useSystemProxies=true</tt> to enable)"
 msgstr ""
-"Usar les opciones estándar del sistema (evacuáu. P'habilitalo, llance JOSM "
+"Usar les opciones estándar del sistema (evacuáu. P''habilitalo, llance JOSM "
 "con <tt>-Djava.net.useSystemProxies=true</tt>)"
 
 msgid "Manually configure a HTTP proxy"
@@ -12618,7 +12683,7 @@ msgid ""
 "programs."
 msgstr ""
 "Un validador de datos OSM que verifica los erros más comunes producíos polos "
-"usuarios y los programes d'edición."
+"usuarios y los programes d''edición."
 
 msgid "Available rules:"
 msgstr "Riegles disponibles:"
@@ -12627,7 +12692,7 @@ msgid "Active rules:"
 msgstr "Riegles actives:"
 
 msgid "Add a new rule by entering filename or URL"
-msgstr "Añedir una nueva riegla ingresando un nome d'arquivu o URL"
+msgstr "Añedir una nueva riegla ingresando un nome d''arquivu o URL"
 
 msgid "New rule entry:"
 msgstr "Nueva entrada de riegla:"
@@ -12636,7 +12701,7 @@ msgid "Remove the selected rules from the list of active rules"
 msgstr "Quitar les riegles escoyíes de la llista de riegles actives"
 
 msgid "Edit the filename or URL for the selected active rule"
-msgstr "Ingresar el nome d'arquivu o URL de les riegles actives escoyíes"
+msgstr "Ingresar el nome d''arquivu o URL de les riegles actives escoyíes"
 
 msgid "Add the selected available rules to the list of active rules"
 msgstr ""
@@ -12652,8 +12717,8 @@ msgid ""
 "<html>Failed to load the list of rule sources "
 "from<br>''{0}''.<br><br>Details (untranslated):<br>{1}</html>"
 msgstr ""
-"<html>Hebo un fallu al cargar la llista d´oríxenes de riegles dende br "
-"<>''{0}''.<br><br>Detalles (ensin traducir):<br>{1}</html>"
+"<html>Hebo un fallu al cargar la llista d´oríxenes de riegles "
+"dende<br>''{0}''.<br><br>Detalles (ensin traducir):<br>{1}</html>"
 
 msgid "Warning: illegal format of entry in rule list ''{0}''. Got ''{1}''"
 msgstr ""
@@ -12664,7 +12729,7 @@ msgid "Checks for errors on addresses"
 msgstr "Comprueba si hai erros nes direcciones"
 
 msgid "Tag combinations"
-msgstr "Combinaciones d'etiquetes"
+msgstr "Combinaciones d''etiquetes"
 
 msgid "Checks for missing tag or suspicious combinations"
 msgstr ""
@@ -12680,10 +12745,10 @@ msgid "Geometry"
 msgstr "Xeometría"
 
 msgid "Checks for geometry errors"
-msgstr "Verifica la esistencia d'erros de xeometría"
+msgstr "Verifica la esistencia d''erros de xeometría"
 
 msgid "Checks for errors on highways"
-msgstr "Verifica la esistencia d'erros nos caminos"
+msgstr "Verifica la esistencia d''erros nos caminos"
 
 msgid "Multiple values"
 msgstr "Valores múltiples"
@@ -12701,13 +12766,13 @@ msgid "Power"
 msgstr "Enerxía"
 
 msgid "Checks for errors on power infrastructures"
-msgstr "Verifica que nun haya erros na infraestructura d'enerxía"
+msgstr "Verifica que nun haya erros na infraestructura d''enerxía"
 
 msgid "Religion"
 msgstr "Relixón"
 
 msgid "Checks for errors on religious objects"
-msgstr "Verifica que nun haya erros n'oxetos relixosos"
+msgstr "Verifica que nun haya erros n''oxetos relixosos"
 
 msgid "Checks for errors on relations"
 msgstr "Verifica que nun haya erros nes relaciones"
@@ -12716,34 +12781,34 @@ msgid "Unnecessary tags"
 msgstr "Etiquetes innecesaries"
 
 msgid "Checks for unnecessary tags"
-msgstr "Verifica la esistencia d'etiquetes innecesaries"
+msgstr "Verifica la esistencia d''etiquetes innecesaries"
 
 msgid "Wikipedia"
 msgstr "Wikipedia"
 
 msgid "Checks for wrong wikipedia tags"
-msgstr "Verifica la esistencia d'etiquetes wikipedia incorrectes"
+msgstr "Verifica la esistencia d''etiquetes wikipedia incorrectes"
 
 msgid "Tag checker rules"
-msgstr "Riegles del Validador d'etiquetes"
+msgstr "Riegles del Validador d''etiquetes"
 
 msgid "Choose Tag checker rules to enable"
-msgstr "Escueya les riegles del Validador d'Etiquetes que deseya activar"
+msgstr "Escueya les riegles del Validador d''Etiquetes que deseya activar"
 
 msgid "Use ignore list."
-msgstr "Usar llista d'omisiones."
+msgstr "Usar llista d''omisiones."
 
 msgid "Use the ignore list to suppress warnings."
-msgstr "Usar la llista d'omisiones pa suprimir alvertencies."
+msgstr "Usar la llista d''omisiones pa suprimir alvertencies."
 
 msgid "Use error layer."
-msgstr "Utilizar la capa d'erros."
+msgstr "Utilizar la capa d''erros."
 
 msgid "Use the error layer to display problematic elements."
-msgstr "Utilizar la capa d'erros p'amosar elementos problemáticos."
+msgstr "Utilizar la capa d''erros p''amosar elementos problemáticos."
 
 msgid "Show informational level."
-msgstr "Amosar nivel d'información."
+msgstr "Amosar nivel d''información."
 
 msgid "Show the informational tests."
 msgstr "Amosar los test informativos."
@@ -12753,7 +12818,7 @@ msgstr "Amosar información sobre la xubida de datos."
 
 msgid "Show the informational tests in the upload check windows."
 msgstr ""
-"Amosar les pruebes d'información na ventana de comprobación de xubida de "
+"Amosar les pruebes d''información na ventana de comprobación de xubida de "
 "datos."
 
 msgid "On demand"
@@ -12777,7 +12842,7 @@ msgstr[0] "Esaniciar les claves antigües d´hasta {0} oxetu"
 msgstr[1] "Esaniciar les claves antigües d´hasta {0} oxetos"
 
 msgid "Delete the selection in the tag table"
-msgstr "Borrar la selección na tabla d'etiquetes"
+msgstr "Borrar la selección na tabla d''etiquetes"
 
 msgid "Add a new tag"
 msgstr "Añedir una nueva etiqueta"
@@ -12848,7 +12913,7 @@ msgid "Select auto-increment of {0} for this field"
 msgstr "Escoyer un autoincremental de {0} pa esti campu"
 
 msgid "Cancel auto-increment for this field"
-msgstr "Atayar l´autoincrementu d'esti campu"
+msgstr "Atayar l´autoincrementu d''esti campu"
 
 msgid "{0}:"
 msgstr "{0}:"
@@ -12878,14 +12943,14 @@ msgid ""
 "Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' "
 "must be the same as in ''values''"
 msgstr ""
-"Etiquetáu predetermináu rotu ''{0}-{1}'' - el númberu d'oxetos en "
+"Etiquetáu predetermináu rotu ''{0}-{1}'' - el númberu d''oxetos en "
 "''display_values'' tien de coincidir con ''values''"
 
 msgid ""
 "Broken tagging preset \"{0}-{1}\" - number of items in "
 "''short_descriptions'' must be the same as in ''values''"
 msgstr ""
-"Etiquetáu predetermináu rotu ''{0}-{1}'' - el númberu d'oxetos en "
+"Etiquetáu predetermináu rotu ''{0}-{1}'' - el númberu d''oxetos en "
 "''short_descriptions'' tien de coincidir con ''values''"
 
 msgid "Unknown type: {0}"
@@ -12901,7 +12966,7 @@ msgid "Reference {0} is being used before it was defined"
 msgstr "La referencia {0} ta siendo usada antes de ser definida"
 
 msgid "Roles cannot appear more than once"
-msgstr "Los roles nun pueden apaecer más d'una vegada"
+msgstr "Los roles nun pueden apaecer más d''una vegada"
 
 msgid "Preset role element without parent"
 msgstr "Rol preestablecíu ensin padre"
@@ -12925,10 +12990,10 @@ msgid "Search for objects by preset"
 msgstr "Buscar oxetos per tipu predefiníu"
 
 msgid "Show only applicable to selection"
-msgstr "L'amuesa namá ye aplicable a la selección"
+msgstr "L''amuesa namá ye aplicable a la selección"
 
 msgid "Search in tags"
-msgstr "Buscar n'etiquetes"
+msgstr "Buscar n''etiquetes"
 
 msgid "Add toolbar button"
 msgstr "Añedir botón de barra de ferramientes"
@@ -12956,7 +13021,7 @@ msgid "All files (*.*)"
 msgstr "Tolos arquivos (*.*)"
 
 msgid "Received error page:"
-msgstr "Recibióse una páxina d'erru"
+msgstr "Recibióse una páxina d''erru"
 
 msgid "Min. latitude"
 msgstr "Llatitú min."
@@ -12981,7 +13046,7 @@ msgid ""
 "The current value is not a valid changeset ID. Please enter an integer value "
 "> 0"
 msgstr ""
-"El valor actual nun ye una ID d'un conxuntu de cambeos válida. Introduza un "
+"El valor actual nun ye una ID d''un conxuntu de cambeos válida. Introduza un "
 "valor enteru mayor que cero"
 
 msgid "Add a new source to the list."
@@ -13084,7 +13149,7 @@ msgid "Downloading points {0} to {1}..."
 msgstr "Baxando puntos {0} a {1}..."
 
 msgid "Contacting OSM Server..."
-msgstr "Contautando col Sirvidor d'OSM..."
+msgstr "Contautando col Sirvidor d''OSM..."
 
 msgid "Failed to open input stream for resource ''{0}''"
 msgstr "Fallu al abrir canal de llectura pal recursu ''{0}''"
@@ -13203,7 +13268,7 @@ msgid ""
 msgstr ""
 "La JVM nun ta configurada pa buscar los proxies de la configuración del "
 "sistema. Faltaba la propiedá ''java.net.useSystemProxies'' mientres "
-"l'entamu. Nun se va utilizar un proxy."
+"l''entamu. Nun se va utilizar un proxy."
 
 msgid "Parsing response from server..."
 msgstr "Revisando respuesta del servidor..."
@@ -13244,7 +13309,7 @@ msgid "GPS track description"
 msgstr "Descripción de traza GPS"
 
 msgid "Add author information"
-msgstr "Amestar información de l'autor"
+msgstr "Amestar información de l''autor"
 
 msgid "Real name"
 msgstr "Nome real"
@@ -13265,7 +13330,7 @@ msgid "Keywords"
 msgstr "Pallabres clave"
 
 msgid "Export options"
-msgstr "Opciones d'esportación"
+msgstr "Opciones d''esportación"
 
 msgid "Export and Save"
 msgstr "Esportar y guardar"
@@ -13312,16 +13377,16 @@ msgid "Unknown mode {0}."
 msgstr "mou desconocíu {0}."
 
 msgid "Image Files"
-msgstr "Arquivos d'imaxe"
+msgstr "Arquivos d''imaxe"
 
 msgid "folder"
 msgstr "carpeta"
 
 msgid "Looking for image files"
-msgstr "Buscando arquivos d'imaxes"
+msgstr "Buscando arquivos d''imaxes"
 
 msgid "No image files found."
-msgstr "Nun s'atoparon arquivos d'imaxes"
+msgstr "Nun s''atoparon arquivos d''imaxes"
 
 msgid "get number of unread messages"
 msgstr "Llograr el númberu de mensaxes ensin lleer"
@@ -13332,7 +13397,7 @@ msgstr[0] "Tien {0} mensaxe ensin lleer."
 msgstr[1] "Tien {0} mensaxes ensin lleer."
 
 msgid "Click here to see your inbox."
-msgstr "Faiga clic equí pa ver la bandexa d'entrada."
+msgstr "Faiga clic equí pa ver la bandexa d''entrada."
 
 msgid "Message notifier"
 msgstr "Mensaxe notificador"
@@ -13368,7 +13433,7 @@ msgstr ""
 "pidimientu individual pa cada oxetu."
 
 msgid "Downloading OSM data..."
-msgstr "Baxando datos d'OSM..."
+msgstr "Baxando datos d''OSM..."
 
 msgid "Fetching node with id {0} from ''{1}''"
 msgstr "Llogrando nodo con ID {0} de ''{1}''"
@@ -13463,7 +13528,7 @@ msgid "Closing changeset..."
 msgstr "Pesllando rexistru de cambéos..."
 
 msgid "No changeset present for diff upload."
-msgstr "Ensin nuevos cambeos qu'unviar"
+msgstr "Ensin nuevos cambeos qu''unviar"
 
 msgid "Preparing upload request..."
 msgstr "Preparando solicitú de xubida..."
@@ -13512,12 +13577,12 @@ msgstr "Arquivu estruyíos en bzip2 del Servidor OSM"
 
 msgid "Prolog of OsmChange document already written. Please write only once."
 msgstr ""
-"El Prolog del documentu OsmChange yá s'escribió. Por favor, escriba "
+"El Prolog del documentu OsmChange yá s''escribió. Por favor, escriba "
 "solamente una vegada."
 
 msgid "Prolog of OsmChange document not written yet. Please write first."
 msgstr ""
-"El Prolog del documentu OsmChange inda nun s'escribió. Por favor, escríbalo "
+"El Prolog del documentu OsmChange inda nun s''escribió. Por favor, escríbalo "
 "primeru."
 
 msgid "OsmChange File"
@@ -13634,7 +13699,7 @@ msgid "Missing mandatory attribute ''{0}'' on <nd> of way {1}."
 msgstr "Fai falta un aributo obligatoriu ''{0}'' en <nd> de la vía {1}."
 
 msgid "Illegal value of attribute ''ref'' of element <nd>. Got {0}."
-msgstr "Valor illegal del atributu ''ref'' del elementu nd <>. Ye {0}."
+msgstr "Valor illegal del atributu ''ref'' del elementu <nd>. Ye {0}."
 
 msgid "Deleted relation {0} contains members"
 msgstr "La relación borrada {0} contien miembros"
@@ -13661,7 +13726,7 @@ msgid "Incomplete <member> specification with ref=0"
 msgstr "Especificación <member> incompleta con ref=0"
 
 msgid "Missing key or value attribute in tag."
-msgstr "Fai falta la llave o'l valor del atributu na característica (tag)."
+msgstr "Fai falta la llave o''l valor del atributu na característica (tag)."
 
 msgid "Undefined element ''{0}'' found in input stream. Skipping."
 msgstr ""
@@ -13707,6 +13772,9 @@ msgid "Illegal long value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 "Hai un valor illegal númberu(llargor) pal atributu ''{0}''. Llogróse ''{1}''."
 
+msgid "{0} bytes have been read"
+msgstr ""
+
 msgid "Prepare OSM data..."
 msgstr "Preparando datos OSM..."
 
@@ -13767,7 +13835,7 @@ msgstr ""
 "Internet."
 
 msgid "Reading error text failed."
-msgstr "Falló la llectura del testu d'erru."
+msgstr "Falló la llectura del testu d''erru."
 
 msgid "XML tag <user> is missing."
 msgstr "Etiquetar XML <user> ta perdida."
@@ -13828,12 +13896,12 @@ msgid ""
 msgstr ""
 "<html><body><p class=''warning-body''><strong>Atención:</strong> La "
 "contraseña almacenar en testu planu nel arquivu de preferencies de JOSM. "
-"Amás, tresfierse strong <>ensin encriptar</strong> en cada solicitú unviada "
+"Amás, tresfierse <strong>ensin encriptar</strong> en cada solicitú unviada "
 "al servidor OSM. <strong> Nun utilice claves "
 "importantes.</strong></p></body></html>"
 
 msgid "Save user and password (unencrypted)"
-msgstr "Guardar nome d'usuariu y contraseña (ensin cifrar)"
+msgstr "Guardar nome d''usuariu y contraseña (ensin cifrar)"
 
 msgid "<delete from {0} objects>"
 msgstr "<esaniciar dende {0} oxetos>"
@@ -13863,13 +13931,13 @@ msgid "Existing values"
 msgstr "Valores esistentes"
 
 msgid "Enable the checkbox to accept the value"
-msgstr "Active'l caxellu p'aceptar el valor"
+msgstr "Active''l caxellu p''aceptar el valor"
 
 msgid "Accept all tags from {0} for this session"
 msgstr "Aceptar toles etiquetes dende {0} pa esta sesión"
 
 msgid "Load data from API"
-msgstr "Cargar datos dende'l API"
+msgstr "Cargar datos dende''l API"
 
 msgid "Import data from URL"
 msgstr "Importar datos dende la URL"
@@ -13878,7 +13946,7 @@ msgid "Open local files"
 msgstr "Abrir arquivos locales"
 
 msgid "Load imagery layers"
-msgstr "Cargar capes d'imaxes"
+msgstr "Cargar capes d''imaxes"
 
 msgid "Change the selection"
 msgstr "Camudar la selección"
@@ -13896,8 +13964,8 @@ msgid "Cannot start remotecontrol server on port {0}: {1}"
 msgstr ""
 "Non puede empecipiase el servidor de control remotu nel puertu {0}: {1}"
 
-msgid "RemoteControl::Accepting connections on port {0}"
-msgstr "ControlRemoto::Aceptando conexones nel puertu {0}"
+msgid "RemoteControl::Accepting connections on {0}:{1}"
+msgstr ""
 
 msgid "RemoteControl::Server stopped."
 msgstr "ControlRemoto::El servidor foi deteníu"
@@ -13908,8 +13976,8 @@ msgstr "Non puede empecipiase el servidor https nel puertu {0}: {1}"
 msgid "Unable to initialize Remote Control HTTPS Server"
 msgstr "Nun se puede anicializar Control Remotu sobre Servidor HTTPS"
 
-msgid "RemoteControl::Accepting secure connections on port {0}"
-msgstr "ControlRemoto::Aceptando conexones segures nel puertu {0}"
+msgid "RemoteControl::Accepting secure connections on {0}:{1}"
+msgstr ""
 
 msgid "RemoteControl::Server (https) stopped."
 msgstr "ControlRemotu:::Detúvose el servidor (https)."
@@ -13918,16 +13986,16 @@ msgid "Remote Control has been asked to create a new node."
 msgstr "El Control Remotu recibió una solicitú pa crear un nodo nuevu."
 
 msgid "There is no layer opened to add node"
-msgstr "Nun hai nenguna capa abierta p'añedir un nodo"
+msgstr "Nun hai nenguna capa abierta p''añedir un nodo"
 
 msgid "Remote Control has been asked to create a new way."
-msgstr "Solicitóse a Control Remotu la creación d'una nueva vía."
+msgstr "Solicitóse a Control Remotu la creación d''una nueva vía."
 
 msgid "Invalid coordinates: {0}"
 msgstr "Coordenaes inválides: {0}"
 
 msgid "There is no layer opened to add way"
-msgstr "Nun hai nenguna capa abierta p'añedir una vía"
+msgstr "Nun hai nenguna capa abierta p''añedir una vía"
 
 msgid "Add way"
 msgstr "Añedir vía"
@@ -13937,13 +14005,13 @@ msgid ""
 "web sites to guess a running JOSM version"
 msgstr ""
 "Control Remotu recibió un pidimientu de característiques soportaes. Esto "
-"dexa a los sitios web aldovinar la versión de JOSM que s'atopa executando."
+"dexa a los sitios web aldovinar la versión de JOSM que s''atopa executando."
 
 msgid ""
 "Remote Control has been asked to load an imagery layer from the following "
 "URL:"
 msgstr ""
-"El Control Remotu recibió una solicitú pa cargar una capa d'imaxe dende la "
+"El Control Remotu recibió una solicitú pa cargar una capa d''imaxe dende la "
 "siguiente URL:"
 
 msgid "Remote imagery"
@@ -13953,7 +14021,7 @@ msgid "Remote Control has been asked to import data from the following URL:"
 msgstr "Pidióse al control remotu importar datos de la siguiente URL:"
 
 msgid "Remote Control has been asked to load data from the API."
-msgstr "Pidióse al control remotu cagar datos dende'l API."
+msgstr "Pidióse al control remotu cagar datos dende''l API."
 
 msgid "The latitudes must be between {0} and {1}"
 msgstr "Les llatitúes tienen de tar ente {0} y {1}"
@@ -13974,17 +14042,17 @@ msgid ""
 "Remote Control has been asked to load objects (specified by their id) from "
 "the API."
 msgstr ""
-"Solicitóse a Control Remotu dende la API la carga d'oxetos (especificaos "
+"Solicitóse a Control Remotu dende la API la carga d''oxetos (especificaos "
 "polos sos ID)."
 
 msgid "Remote Control has been asked to open a local file."
-msgstr "Control Remotu recibió un pidimientu d'abrir un arquivu local"
+msgstr "Control Remotu recibió un pidimientu d''abrir un arquivu local"
 
 msgid "Do you want to allow this?"
 msgstr "¿Deseya permitir esto?"
 
 msgid "Confirm Remote Control action"
-msgstr "Confirmar l'acción del control remotu"
+msgstr "Confirmar l''acción del control remotu"
 
 msgid ""
 "Remote Control has been asked to report its protocol version. This enables "
@@ -14016,7 +14084,7 @@ msgid "Include GPX data in the .joz session file."
 msgstr "Incluyir datos GPX nel arquivu de sesión .joz."
 
 msgid "No file association"
-msgstr "Nenguna asociación d'arquivu"
+msgstr "Nenguna asociación d''arquivu"
 
 msgid "GPX data will be included in the session file."
 msgstr "Los datos GPX van ser incluyíos nel arquivu de sesión."
@@ -14045,7 +14113,7 @@ msgstr ""
 "Esperáu: 0.1"
 
 msgid "Layer contains unsaved data - save to file."
-msgstr "La capa contien datos ensin guardar - guardar n'arquivu."
+msgstr "La capa contien datos ensin guardar - guardar n''arquivu."
 
 msgid "Layer does not contain unsaved data."
 msgstr "La capa contien datos que nun fueron guardaos"
@@ -14083,7 +14151,7 @@ msgstr ""
 "La versión ''{0}'' del ficheru de sesión nun ta soportada. Esperábase 0.1"
 
 msgid "missing mandatory attribute ''index'' for element ''layer''"
-msgstr "falta l'atributu ''index'' obligatoriu pal elementu ''layer''"
+msgstr "falta l''atributu ''index'' obligatoriu pal elementu ''layer''"
 
 msgid "unexpected format of attribute ''index'' for element ''layer''"
 msgstr "formatu del atributu ''index'' inesperáu pal elementu ''layer''"
@@ -14095,10 +14163,10 @@ msgid "missing layer with index {0}"
 msgstr "falta la capa con índiz {0}"
 
 msgid "missing mandatory attribute ''name'' for element ''layer''"
-msgstr "falta l'atributu obligatoriu ''name'' pal elementu ''layer''"
+msgstr "falta l''atributu obligatoriu ''name'' pal elementu ''layer''"
 
 msgid "missing mandatory attribute ''type'' for element ''layer''"
-msgstr "falta l'atributu obligatoriu ''type'' pal elementu ''layer''"
+msgstr "falta l''atributu obligatoriu ''type'' pal elementu ''layer''"
 
 msgid "Unable to load layer"
 msgstr "Non puede cargase la capa"
@@ -14106,7 +14174,7 @@ msgstr "Non puede cargase la capa"
 msgid ""
 "Cannot load layer of type ''{0}'' because no suitable importer was found."
 msgstr ""
-"Non puede cargase la capa de tipu ''{0}'' porque nun s'atopó un importador "
+"Non puede cargase la capa de tipu ''{0}'' porque nun s''atopó un importador "
 "fayadizu."
 
 msgid ""
@@ -14198,48 +14266,48 @@ msgid ""
 "You updated your JOSM software.<br>To prevent problems the plugins should be "
 "updated as well.<br><br>Update plugins now?"
 msgstr ""
-"Actualizó'l to JOSM. <br>Pa evitar problemes los complementos tamién "
-"tendríen d'actualizase. <br><br> ¿Deseya actualizar los complementos agora?"
+"Actualizó''l to JOSM. <br>Pa evitar problemes los complementos tamién "
+"tendríen d''actualizase. <br><br> ¿Deseya actualizar los complementos agora?"
 
 msgid "Last plugin update more than {0} days ago."
 msgstr "La última actualización de los complementos foi fai más de {0} díes."
 
 msgid "Click to update the activated plugins"
-msgstr "Escueya p'actualizar los complementos activos"
+msgstr "Escueya p''actualizar los complementos activos"
 
 msgid "Skip update"
 msgstr "Omitir actualización"
 
 msgid "Click to skip updating the activated plugins"
-msgstr "Escueya pa omitir l'actualización de los complementos activos"
+msgstr "Escueya pa omitir l''actualización de los complementos activos"
 
 msgid ""
 "Skipping plugin update after JOSM upgrade. Automatic update at startup is "
 "disabled."
 msgstr ""
-"Omitir actualización de complementu dempués d'actualización de JOSM. "
-"L'actualización automática al entamu ta inactiva."
+"Omitir actualización de complementu dempués d''actualización de JOSM. "
+"L''actualización automática al entamu ta inactiva."
 
 msgid ""
 "Skipping plugin update after elapsed update interval. Automatic update at "
 "startup is disabled."
 msgstr ""
-"Omitir actualización de complementu dempués d'un intervalu de tiempu. "
-"L'actualización automática al entamu ta inactiva."
+"Omitir actualización de complementu dempués d''un intervalu de tiempu. "
+"L''actualización automática al entamu ta inactiva."
 
 msgid ""
 "Running plugin update after JOSM upgrade. Automatic update at startup is "
 "enabled."
 msgstr ""
-"Executar actualización de complementu dempués de l'actualización de JOSM. "
-"L'actualización automática al entamu ta activada."
+"Executar actualización de complementu dempués de l''actualización de JOSM. "
+"L''actualización automática al entamu ta activada."
 
 msgid ""
 "Running plugin update after elapsed update interval. Automatic update at "
 "startup is disabled."
 msgstr ""
-"Executar actualización de complementu dempués d'un intervalu de tiempu. "
-"L'actualización automática al entamu ta inactiva."
+"Executar actualización de complementu dempués d''un intervalu de tiempu. "
+"L''actualización automática al entamu ta inactiva."
 
 msgid ""
 "Unexpected value ''{0}'' for preference ''{1}''. Assuming value ''ask''."
@@ -14252,10 +14320,10 @@ msgid_plural ""
 "Plugin {0} requires {1} plugins which were not found. The missing plugins "
 "are:"
 msgstr[0] ""
-"El complementu {0} rique un complementu que nun s'atopó. El complementu que "
+"El complementu {0} rique un complementu que nun s''atopó. El complementu que "
 "falta ye:"
 msgstr[1] ""
-"El complementu {0} rique {1} complementos que nun s'atoparon. El plugin que "
+"El complementu {0} rique {1} complementos que nun s''atoparon. El plugin que "
 "falta ye:"
 
 msgid ""
@@ -14292,7 +14360,7 @@ msgstr "Cargando complementu ''{0}''..."
 
 msgid "JOSM could not find information about the following plugin:"
 msgid_plural "JOSM could not find information about the following plugins:"
-msgstr[0] "JOSM nun pudo atopar información sobre'l complementu siguiente:"
+msgstr[0] "JOSM nun pudo atopar información sobre''l complementu siguiente:"
 msgstr[1] ""
 "JOSM nun pudo atopar información sobre los complementos siguientes:"
 
@@ -14312,8 +14380,8 @@ msgstr "Esaniciando complementos ensin caltener..."
 
 msgid "Updating the following plugin has failed:"
 msgid_plural "Updating the following plugins has failed:"
-msgstr[0] "L'actualización del siguiente complementu falló:"
-msgstr[1] "L'actualización de los siguientes complementos falló:"
+msgstr[0] "L''actualización del siguiente complementu falló:"
+msgstr[1] "L''actualización de los siguientes complementos falló:"
 
 msgid ""
 "Please open the Preference Dialog after JOSM has started and try to update "
@@ -14322,20 +14390,20 @@ msgid_plural ""
 "Please open the Preference Dialog after JOSM has started and try to update "
 "them manually."
 msgstr[0] ""
-"Por favor abra'l diálogu de preferencies dempués d'empecipiáu JOSM ya "
+"Por favor abra''l diálogu de preferencies dempués d''empecipiáu JOSM ya "
 "intente actualizalo manualmente."
 msgstr[1] ""
-"Por favor abra'l diálogu de preferencies dempués d'empecipiáu JOSM ya "
+"Por favor abra''l diálogu de preferencies dempués d''empecipiáu JOSM ya "
 "intente actualizalos manualmente."
 
 msgid "Plugin update failed"
-msgstr "Falló l'actualización del complementu"
+msgstr "Falló l''actualización del complementu"
 
 msgid "Failed to find plugin {0}"
 msgstr "Non pudo atopase el complementu {0}"
 
 msgid "Failed to download plugin information list"
-msgstr "Erru al descargar la llista d'información del complementu"
+msgstr "Erru al descargar la llista d''información del complementu"
 
 msgid "Disable plugin"
 msgstr "Evacuar complementu"
@@ -14386,13 +14454,13 @@ msgid ""
 msgstr "Hubo una esceición inesperada que pudiere venir del plugin ''{0}''."
 
 msgid "According to the information within the plugin, the author is {0}."
-msgstr "D'alcuerdu cola información sacada del plugin, l'autor ye {0}."
+msgstr "D''alcuerdu cola información sacada del plugin, l''autor ye {0}."
 
 msgid ""
 "Try updating to the newest version of this plugin before reporting a bug."
 msgstr ""
-"Tenta actualizar a la versión más nueva d'esti plugin enantes d'informar "
-"d'un bug."
+"Tenta actualizar a la versión más nueva d''esti plugin enantes d''informar "
+"d''un bug."
 
 msgid ""
 "The plugin has been removed from the configuration. Please restart JOSM to "
@@ -14522,8 +14590,8 @@ msgid ""
 "file a bug report."
 msgstr ""
 "Asocedió una esceición inesperada.<br> Esto siempres ye un erru de "
-"codificación. Si ta executando la postrera br<>versión de JOSM, por favor "
-"sía tan atenta de presentar un informe d'erru."
+"codificación. Si ta executando la postrera <br>versión de JOSM, por favor "
+"sía tan atenta de presentar un informe d''erru."
 
 msgid "Update JOSM"
 msgstr "Actualizar JOSM"
@@ -14537,28 +14605,28 @@ msgid ""
 msgstr ""
 "Un erru inesperáu asocedió. Esto ye debíu siempres a un erru de "
 "programación. <br><br> Sicasí, si tas utilizando una versión antigua de JOSM "
-"({0}), br<> en cuenta de usar la versión probada actual "
-"(<b>{1}</b>).<br><br><b>Por favor actualiza JOSM</br> antes d'unviar un "
-"informe d'erru."
+"({0}), <br> en cuenta de usar la versión probada actual "
+"(<b>{1}</b>).<br><br><b>Por favor actualiza JOSM</br> antes d''unviar un "
+"informe d''erru."
 
 msgid "Unexpected Exception"
 msgstr "Esceición inesperada"
 
 msgid "Suppress further error dialogs for this session."
-msgstr "Suprimir otros mensaxes d'erru mientres esta sesión."
+msgstr "Suprimir otros mensaxes d''erru mientres esta sesión."
 
 msgid ""
 "You have encountered an error in JOSM. Before you file a bug report make "
 "sure you have updated to the latest version of JOSM here:"
 msgstr ""
-"Atopó un erru en JOSM. Antes d'informar d'un fallu asegúrese d'actualizar a "
-"la última versión de JOSM equí:"
+"Atopó un erru en JOSM. Antes d''informar d''un fallu asegúrese d''actualizar "
+"a la última versión de JOSM equí:"
 
 msgid ""
 "You should also update your plugins. If neither of those help please file a "
 "bug report in our bugtracker using this link:"
 msgstr ""
-"Tamién tendría d'actualizar los sos complementos. Si nenguna opción ayuda, "
+"Tamién tendría d''actualizar los sos complementos. Si nenguna opción ayuda, "
 "por favor, presente un informe de erroren el nuesu sistema de siguimientu de "
 "fallos na siguiente dirección:"
 
@@ -14568,7 +14636,7 @@ msgid ""
 "supply as much detail as possible."
 msgstr ""
 "Ellí la información del erru yá tendrá de ser rellenada por usté. Por favor "
-"incluya información de cómo reproducir l'erru ya intente ufiertar tanto "
+"incluya información de cómo reproducir l''erru ya intente ufiertar tanto "
 "detalle como-y sía posible."
 
 msgid ""
@@ -14598,9 +14666,9 @@ msgid ""
 "Access Token.</html>"
 msgstr ""
 "<html>Fallu al autenticar nel servidor OSM ''{0}''.<br>Ta usando OAuth para "
-"autenticarse pero agora mesmu nun hai br> una lleva d'Accesu OAuth "
-"configurada.<br>Por favor abra'l diálogu de preferencies y xenere o "
-"introduza una llave d'Accesu.</html>"
+"autenticarse pero agora mesmu nun hai br> una lleva d''Accesu OAuth "
+"configurada.<br>Por favor abra''l diálogu de preferencies y xenere o "
+"introduza una llave d''Accesu.</html>"
 
 msgid ""
 "<strong>Failed</strong> to delete <strong>node {0}</strong>. It is still "
@@ -14611,11 +14679,11 @@ msgid_plural ""
 "referred to by nodes {1}.<br>Please load the nodes, remove the reference to "
 "the node, and upload again."
 msgstr[0] ""
-"<strong>Falló /strong<> el borráu del <strong>nodo {0}</strong>. Inda ta "
-"referenciáu pol nodo {1}.<br> Cargue'l nodo, esanicie la referencia al nodo "
+"<strong>Falló</strong> el borráu del <strong>nodo {0}</strong>. Inda ta "
+"referenciáu pol nodo {1}.<br> Cargue''l nodo, esanicie la referencia al nodo "
 "a borrar y vuelva unviar al servidor."
 msgstr[1] ""
-"<strong>Falló /strong<> el borráu del <strong>nodo {0}</strong>. Inda ta "
+"<strong>Falló</strong> el borráu del <strong>nodo {0}</strong>. Inda ta "
 "referenciáu polos nodos {1}.<br> Cargue los nodos, esanicie la referencia al "
 "nodo a borrar y vuelva unviar al servidor."
 
@@ -14628,12 +14696,12 @@ msgid_plural ""
 "referred to by ways {1}.<br>Please load the ways, remove the reference to "
 "the node, and upload again."
 msgstr[0] ""
-"<strong>Falló /strong<> la eliminación del <strong>nodo {0}</strong>. Inda "
-"ye referenciáu pela vía {1}.<br>Cargue la vía, esanicie la referencia al "
-"nodo y vuelva unviar al servidor."
+"<strong>Falló</strong> la eliminación del <strong>nodo {0}</strong>. Inda ye "
+"referenciáu pela vía {1}.<br>Cargue la vía, esanicie la referencia al nodo y "
+"vuelva unviar al servidor."
 msgstr[1] ""
-"<strong>Falló /strong<> la eliminación del <strong>nodo {0}</strong>. Inda "
-"ye referenciáu peles víes {1}.<br>Cargue la víes, esanicie la referencia al "
+"<strong>Falló</strong> la eliminación del <strong>nodo {0}</strong>. Inda ye "
+"referenciáu peles víes {1}.<br>Cargue la víes, esanicie la referencia al "
 "nodo y vuelva unviar al servidor."
 
 msgid ""
@@ -14645,12 +14713,12 @@ msgid_plural ""
 "referred to by relations {1}.<br>Please load the relations, remove the "
 "reference to the node, and upload again."
 msgstr[0] ""
-"<strong>Falló /strong<> la eliminación del <strong>nodo {0}</strong>. Inda "
-"ye referenciáu pola relación {1}.<br>Cargue la relación, esanicie la "
-"referencia al nodo y vuelva unviar al servidor."
+"<strong>Falló</strong> la eliminación del <strong>nodo {0}</strong>. Inda ye "
+"referenciáu pola relación {1}.<br>Cargue la relación, esanicie la referencia "
+"al nodo y vuelva unviar al servidor."
 msgstr[1] ""
-"<strong>Falló /strong<> la eliminación del <strong>nodo {0}</strong>. Inda "
-"ye referenciáu poles relación {1}.<br>Cargue la relaciones, esanicie la "
+"<strong>Falló</strong> la eliminación del <strong>nodo {0}</strong>. Inda ye "
+"referenciáu poles relación {1}.<br>Cargue la relaciones, esanicie la "
 "referencia al nodo y vuelva unviar al servidor."
 
 msgid ""
@@ -14662,11 +14730,11 @@ msgid_plural ""
 "referred to by nodes {1}.<br>Please load the nodes, remove the reference to "
 "the way, and upload again."
 msgstr[0] ""
-"<strong>Falló /strong<> la eliminación de la strong <>vía {0}</strong>. Inda "
-"ye referenciada pol nodo {1}.<br>Cargue'l nodo, esanicie la referencia a la "
+"<strong>Falló</strong> la eliminación de la <strong>vía {0}</strong>. Inda "
+"ye referenciada pol nodo {1}.<br>Cargue''l nodo, esanicie la referencia a la "
 "vía y vuelva unviar al servidor."
 msgstr[1] ""
-"<strong>Falló /strong<> la eliminación de la strong <>vía {0}</strong>. Inda "
+"<strong>Falló</strong> la eliminación de la <strong>vía {0}</strong>. Inda "
 "ye referenciada polos nodos {1}.<br>Cargue los nodos, esanicie la referencia "
 "a la vía y vuelva unviar al servidor."
 
@@ -14679,11 +14747,11 @@ msgid_plural ""
 "referred to by ways {1}.<br>Please load the ways, remove the reference to "
 "the way, and upload again."
 msgstr[0] ""
-"<strong>Falló /strong<> la eliminación de la strong <>vía {0}</strong>. Inda "
+"<strong>Falló</strong> la eliminación de la <strong>vía {0}</strong>. Inda "
 "ye referenciada pela vía {1}.<br>Cargue dicha vía, esanicie la referencia a "
 "la vía que deseya esaniciar y vuelva unviar al servidor."
 msgstr[1] ""
-"<strong>Falló /strong<> la eliminación de la strong <>vía {0}</strong>. Inda "
+"<strong>Falló</strong> la eliminación de la <strong>vía {0}</strong>. Inda "
 "ye referenciada pela víes {1}.<br>Cargue diches víes, esanicie la referencia "
 "a la vía que deseya borrar y vuelva unviar al servidor."
 
@@ -14696,11 +14764,11 @@ msgid_plural ""
 "referred to by relations {1}.<br>Please load the relations, remove the "
 "reference to the way, and upload again."
 msgstr[0] ""
-"<strong>Falló /strong<> la eliminación de la strong <>vía {0}</strong>. Inda "
+"<strong>Falló</strong> la eliminación de la <strong>vía {0}</strong>. Inda "
 "ye referenciada pola relación {1}.<br>Cargue la relación, esanicie la "
 "referencia a la vía y vuelva unviar al servidor."
 msgstr[1] ""
-"<strong>Falló /strong<> la eliminación de la strong <>vía {0}</strong>. Inda "
+"<strong>Falló</strong> la eliminación de la <strong>vía {0}</strong>. Inda "
 "ye referenciada pola relación {1}.<br>Cargue les relaciones, esanicie la "
 "referencia a la vía y vuelva unviar al servidor."
 
@@ -14713,11 +14781,11 @@ msgid_plural ""
 "referred to by nodes {1}.<br>Please load the nodes, remove the reference to "
 "the relation, and upload again."
 msgstr[0] ""
-"<strong>Falló /strong<> la eliminación de la strong <>relación {0}</strong>. "
-"Inda ye referenciada pol nodo {1}.<br>Cargue'l nodo, esanicie la referencia "
+"<strong>Falló</strong> la eliminación de la <strong>relación {0}</strong>. "
+"Inda ye referenciada pol nodo {1}.<br>Cargue''l nodo, esanicie la referencia "
 "a la relación y vuelva unviar al servidor."
 msgstr[1] ""
-"<strong>Falló /strong<> la eliminación de la strong <>relación {0}</strong>. "
+"<strong>Falló</strong> la eliminación de la <strong>relación {0}</strong>. "
 "Inda ye referenciada polos nodos {1}.<br>Cargue los nodos, esanicie la "
 "referencia a la relación y vuelva unviar al servidor."
 
@@ -14730,11 +14798,11 @@ msgid_plural ""
 "referred to by ways {1}.<br>Please load the ways, remove the reference to "
 "the relation, and upload again."
 msgstr[0] ""
-"<strong>Falló /strong<> la eliminación de la strong <>relación {0}</strong>. "
+"<strong>Falló</strong> la eliminación de la <strong>relación {0}</strong>. "
 "Inda ye referenciada pela vía {1}.<br>Cargue la vía, esanicie la referencia "
 "a la relación y vuelva unviar al servidor."
 msgstr[1] ""
-"<strong>Falló /strong<> la eliminación de la strong <>relación {0}</strong>. "
+"<strong>Falló</strong> la eliminación de la <strong>relación {0}</strong>. "
 "Inda ye referenciada peles víes {1}.<br>Cargue les víes, esanicie la "
 "referencia a la relación y vuelva unviar al servidor."
 
@@ -14747,11 +14815,11 @@ msgid_plural ""
 "referred to by relations {1}.<br>Please load the relations, remove the "
 "reference to the relation, and upload again."
 msgstr[0] ""
-"<strong>Falló /strong<> la eliminación de la strong <>relación {0}</strong>. "
+"<strong>Falló</strong> la eliminación de la <strong>relación {0}</strong>. "
 "Inda ye referenciada pola relación {1}.<br>Cargue dicha relación, esanicie "
 "la referencia a la relación que deseya borrar y vuelva unviar al servidor."
 msgstr[1] ""
-"<strong>Falló /strong<> la eliminación de la strong <>relación {0}</strong>. "
+"<strong>Falló</strong> la eliminación de la <strong>relación {0}</strong>. "
 "Inda ye referenciada poles relación {1}.<br>Cargue diches relaciones, "
 "esanicie la referencia a la relación que deseya borrar y vuelva unviar al "
 "servidor."
@@ -14761,8 +14829,8 @@ msgid ""
 "current<br>dataset violates a precondition.<br>The error message "
 "is:<br>{0}</html>"
 msgstr ""
-"<html> Xubida al servidor <strong>fallida /strong<> por cuenta que'l so "
-"actual conxuntu de datos viola una condición previa.<br> El mensaxe d'erru "
+"<html> Xubida al servidor <strong>fallida</strong> por cuenta que''l so "
+"actual conxuntu de datos viola una condición previa.<br> El mensaxe d''erru "
 "ye:<br>{0}</html>"
 
 msgid ""
@@ -14779,7 +14847,7 @@ msgid ""
 "token.</html>"
 msgstr ""
 "<html>Falló la autenticación frente al servidor OSM cola llave OAuth "
-"''{0}''.<br>Por favor llance'l diálogu de preferencies y descargue otra "
+"''{0}''.<br>Por favor llance''l diálogu de preferencies y descargue otra "
 "llave OAuth.</html>"
 
 msgid ""
@@ -14790,7 +14858,7 @@ msgstr ""
 "siguiente erru:<br>''{0}''</html>"
 
 msgid "<html>Authorisation at the OSM server failed.<br></html>"
-msgstr "<html>L'autorización nel servidor de OSM falló.<br></html>"
+msgstr "<html>L''autorización nel servidor de OSM falló.<br></html>"
 
 msgid ""
 "<html>Authorisation at the OSM server with the OAuth token ''{0}'' "
@@ -14800,7 +14868,7 @@ msgid ""
 msgstr ""
 "<html>Falló l´autorización frente al servidor OSM cola llave OAuth "
 "''{0}''.<br>La llave nun ta autorizada p´aportar al recursu protexíu "
-"br<>''{1}''.<br>Por favor llance´l diálogu de preferencies y llogre otra "
+"<br>''{1}''.<br>Por favor llance´l diálogu de preferencies y llogre otra "
 "llave OAuth.</html>"
 
 msgid ""
@@ -14811,7 +14879,7 @@ msgstr ""
 "inténtelo más tarde.</html>"
 
 msgid "no error message available"
-msgstr "Nun hai mensaxe d'erru disponible"
+msgstr "Nun hai mensaxe d''erru disponible"
 
 msgid ""
 "<html>Communication with the OSM server ''{0}''failed. The server "
@@ -14820,7 +14888,7 @@ msgid ""
 "(untranslated)</strong>: {2}</html>"
 msgstr ""
 "<html>Falló la comunicación col servidor OSM ''{0}''. El servidor respondió "
-"br<>col siguiente códigu d´erru y el siguiente mensaxe "
+"<br>col siguiente códigu d´erru y el siguiente mensaxe "
 "d´erru:<br><strong>Códigu d´Erru:</strong> {1}<br><strong>Mensaxe d´Erru "
 "(ensin traducir)</strong>:{2}</html>"
 
@@ -14860,22 +14928,22 @@ msgid ""
 "security reasons. This is most likely because you are running<br>in an "
 "applet and because you did not load your applet from ''{1}''."
 msgstr ""
-"<html>Falló l'apertura d'una conexón al servidor remotu br<>''{0}''<br> por "
-"motivos de seguridá. De normal esto ta causáu porque ta executando br <> "
+"<html>Falló l''apertura d''una conexón al servidor remotu <br>''{0}''<br> "
+"por motivos de seguridá. De normal esto ta causáu porque ta executando <br> "
 "JOSM un applet que nun foi cargáu dende ''{1}''."
 
 msgid ""
 "<html>Failed to open a connection to the remote server<br>''{0}''.<br>Please "
 "check your internet connection."
 msgstr ""
-"<html>Falló l'apertura d'una conexón al servidor remotu "
-"br<>''{0}''.<br>Compruebe la so conexón a internet."
+"<html>Falló l''apertura d''una conexón al servidor remotu "
+"<br>''{0}''.<br>Compruebe la so conexón a internet."
 
 msgid ""
 "<html>Failed to upload data to or download data from<br>''{0}''<br>due to a "
 "problem with transferring data.<br>Details (untranslated): {1}</html>"
 msgstr ""
-"<html>Non pudo cargase datos o descargar datos dende br<>''{0}''<br>por "
+"<html>Non pudo cargase datos o descargar datos dende <br>''{0}''<br>por "
 "cuenta de un problema cola tresferencia de datos.<br>Detalles (ensin "
 "traducir): {1}</html>"
 
@@ -14898,14 +14966,14 @@ msgstr ""
 "más tarde."
 
 msgid "The OSM server ''{0}'' reported a bad request.<br>"
-msgstr "El servidor OSM ''{0}'' informa d'una mala solicitú.<br>"
+msgstr "El servidor OSM ''{0}'' informa d''una mala solicitú.<br>"
 
 msgid ""
 "The area you tried to download is too big or your request was too "
 "large.<br>Either request a smaller area or use an export file provided by "
 "the OSM community."
 msgstr ""
-"La área qu'intentó descargar ye demasiáu grande o la so solicitú yera "
+"La área qu''intentó descargar ye demasiáu grande o la so solicitú yera "
 "demasiada amplia. <br> Solicite un área más pequena o utilize un arquivu "
 "esportáu proporcionáu pola comunidá de OSM."
 
@@ -14918,17 +14986,17 @@ msgid ""
 "server or you are using an invalid URL to access<br>it. Please carefully "
 "check the server''s address ''{0}'' for typos."
 msgstr ""
-"El servidor OSM ''{0}'' nun sabe alrodiu de un oxetu br<>qu'usté trató de "
-"lleer, actualizar o borrar. Puede ser que l'oxetu<br>nun esista nel servidor "
-"o que ta usando un URL non válidu p'aportar a él<br>. Por favor revise "
-"curioso la dirección del servidor ''{0}''."
+"El servidor OSM ''{0}'' nun sabe alrodiu de un oxetu <br>qu''usté trató de "
+"lleer, actualizar o borrar. Puede ser que l''oxetu<br>nun esista nel "
+"servidor o que ta usando un URL non válidu p''aportar a él<br>. Por favor "
+"revise curioso la dirección del servidor ''{0}''."
 
 msgid ""
 "<html>Failed to open a connection to the remote server<br>''{0}''.<br>Host "
 "name ''{1}'' could not be resolved. <br>Please check the API URL in your "
 "preferences and your internet connection."
 msgstr ""
-"<html>Falló l'apertura d'una conexón al servidor remotu br<>''{0}''.<br>El "
+"<html>Falló l''apertura d''una conexón al servidor remotu <br>''{0}''.<br>El "
 "nome del servidor ''{1}'' non pudo resolvese.<br>Compruebe la URL de la API "
 "nes sos preferencies y la so conexón a internet."
 
@@ -14940,8 +15008,8 @@ msgid ""
 msgstr ""
 "<html>El servidor reporta qu´un oxetu foi borráu.<br><strong>Falló la xubida "
 "de datos</strong> si usté taba tratando d´actualizar o borrar esti "
-"oxetu.<br> <strong>Falló la descarga /strong<> en casu de que tuviera "
-"intentando descargar esti oxetu br<><br>L´erru del mensaxe ye:<br>{0}</html>"
+"oxetu.<br> <strong>Falló la descarga</strong> en casu de que tuviera "
+"intentando descargar esti oxetu <br><br>L´erru del mensaxe ye:<br>{0}</html>"
 
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
 msgstr "Non puede atopase la traducción pal idioma {0}. Revertiendo a {1}."
@@ -15028,7 +15096,7 @@ msgid ""
 "A previous version of JOSM has installed a custom certificate in order to "
 "provide HTTPS support for Remote Control:"
 msgstr ""
-"Una versión previa de JOSM instaló un certificáu personalizáu p'aprovir "
+"Una versión previa de JOSM instaló un certificáu personalizáu p''aprovir "
 "soporte HTTPS pal Control Remotu:"
 
 msgid ""
@@ -15036,9 +15104,9 @@ msgid ""
 "going to be prompted by Windows to remove this insecure certificate.<br>For "
 "your own safety, <b>please click Yes</b> in next dialog."
 msgstr ""
-"Aparentemente podría haber un importante b <>riesgu de seguridá "
-"/b<>.<br><br>Agora Windows preguntará-y si deseya esaniciar esti certificáu "
-"inseguru.<br>Pola so propia seguridá b<>por favor faiga clic en sí</b> nel "
+"Aparentemente podría haber un importante <b>riesgu de seguridá "
+"</b>.<br><br>Agora Windows preguntará-y si deseya esaniciar esti certificáu "
+"inseguru.<br>Pola so propia seguridá <b>por favor faiga clic en sí</b> nel "
 "siguiente diálogu."
 
 msgid "Removing insecure certificate from {0} keystore: {1}"
@@ -15059,10 +15127,10 @@ msgid ""
 "next dialog.<br><br>If unsure, you can also click No then disable HTTPS "
 "support in Remote Control preferences."
 msgstr ""
-"El Control Remotu ta configuráu p'aprovir soporte a HTTPS.<br>Esto rique "
+"El Control Remotu ta configuráu p''aprovir soporte a HTTPS.<br>Esto rique "
 "añedir un certificáu personalizáu xeneráu por JOSM a la tienda de Windows "
 "Root CA.<br><br>Windows solicitará-y que confirme esta operación.<br>pa "
-"dexar el soporte apropiáu a HTTPS, b <>por favor faiga clic en sí</b> nel "
+"dexar el soporte apropiáu a HTTPS, <b>por favor faiga clic en sí</b> nel "
 "siguiente diálogu.<br><br>Si nun ta seguro, tamién puede faer clic en Non y "
 "de esa forma desactivar el soporte de HTTPS nes preferencies de Control "
 "Remotu."
@@ -15106,9 +15174,6 @@ msgstr ""
 "<html><p> Sentir, ye imposible pegar etiquetes dende la memoria. Nun contien "
 "nengún oxetu de JOSM o un testu fayadizu. </p></html>"
 
-msgid "Invalid bz2 file."
-msgstr "Arquivu bz2 inválidu"
-
 msgid "ms"
 msgstr "ms"
 
@@ -15160,7 +15225,7 @@ msgid "Ignoring malformed geometry: {0}"
 msgstr "Ignorando xeometría mal formada: {0}"
 
 msgid "Failed to load XML schema."
-msgstr "Erru al cargar l'esquema XML."
+msgstr "Erru al cargar l''esquema XML."
 
 msgid ""
 "Error in search expression on position {0} - right side of or(|) expression "
@@ -15211,7 +15276,7 @@ msgid ""
 "area, or use planet.osm"
 msgstr ""
 "Solicitó demasiaos nodos (>50.000). Descargue un área más pequena o use "
-"l'arquivu planet.osm"
+"l''arquivu planet.osm"
 
 msgid "Database offline for maintenance"
 msgstr "La base de datos ta fora de llínea por caltenimientu"
@@ -15224,16 +15289,16 @@ msgid ""
 "request a smaller area, or use planet.osm"
 msgstr ""
 "El tamañu máximu de bbox (cuadru de llende) ye de 0,25 y la so solicitú foi "
-"demasiáu grande. Solicite un área más pequena o utilice l'arquivu planet.osm"
+"demasiáu grande. Solicite un área más pequena o utilice l''arquivu planet.osm"
 
 msgid "JOSM-Trac login at josm.openstreetmap.de"
 msgstr "Ingresu con JOSM-Trac en josm.openstreetmap.de"
 
 msgid "could not get audio input stream from input URL"
-msgstr "Nun ye posible llograr un fluxu d'audiu dende la URL"
+msgstr "Nun ye posible llograr un fluxu d''audiu dende la URL"
 
 msgid "Audio Device Unavailable"
-msgstr "Dispositivu d'audiu non disponible"
+msgstr "Dispositivu d''audiu non disponible"
 
 msgid "You must make your edits public to upload new data"
 msgstr "Tien de facer públiques les sos ediciones pa xubir nuevos datos"
@@ -15368,10 +15433,10 @@ msgid "Attributes"
 msgstr "Atributos"
 
 msgid "Abort file chooser dialog"
-msgstr "Atayar el diálogu d'elección d'arquivu"
+msgstr "Atayar el diálogu d''elección d''arquivu"
 
 msgid "Abort file chooser dialog."
-msgstr "Diálogu d'elección d'arquivu p'atayar"
+msgstr "Diálogu d''elección d''arquivu p''atayar"
 
 msgid "Create New Folder"
 msgstr "Crear Nuevu Directoriu"
@@ -15398,7 +15463,7 @@ msgid "File Name:"
 msgstr "Nome de ficheru:"
 
 msgid "FileChooser help."
-msgstr "Ayuda d'elección de ficheru"
+msgstr "Ayuda d''elección de ficheru"
 
 msgid "Files"
 msgstr "Ficheros"
@@ -15503,13 +15568,13 @@ msgid ""
 msgstr ""
 "Arrexunta les entraes comunes de ''Interpolación de direcciones'' nun mesmu "
 "cuadru de diálogu, según una opción pa xenerar automáticamente los nodos "
-"individuales de los númberos de portal d'una vía."
+"individuales de los númberos de portal d''una vía."
 
 msgid ""
 "Makes a pair of selected way segments parallel by rotating one of them "
 "around a chosen pivot."
 msgstr ""
-"Allinia una par de segmentos de víes escoyíos faciendo xirar unu d'ellos "
+"Allinia una par de segmentos de víes escoyíos faciendo xirar unu d''ellos "
 "alredor del designáu como pivós."
 
 msgid ""
@@ -15535,7 +15600,7 @@ msgid ""
 msgstr ""
 "Superpón la rexilla de telesa canvec nel mapa ya imprime les URL a los "
 "arquivos .zip. Oxetivos futuros: dexar la descarga y carga automática "
-"d'arquivos canvec .osm"
+"d''arquivos canvec .osm"
 
 msgid ""
 "Allows the user to create different color schemes and to switch between "
@@ -15544,9 +15609,9 @@ msgid ""
 "sunlight. See dialog in display preferences."
 msgstr ""
 "Dexa al usuariu crear esquemes de color distintos pa poder intercambiar ente "
-"ellos. Escueya'l colores y cree un nuevu esquema. Usáu pa intercambiar con "
+"ellos. Escueya''l colores y cree un nuevu esquema. Usáu pa intercambiar con "
 "un fondu blancu y colories acordes pa una visibilidá mayor so una redolada "
-"de lluz solar. Consulte'l diálogu nes preferencies de visualización."
+"de lluz solar. Consulte''l diálogu nes preferencies de visualización."
 
 msgid ""
 "Imports proprietary CSV files of the Columbus/Visiontac V-900 GPS logger "
@@ -15560,7 +15625,7 @@ msgid ""
 "standard commands (arc, circle etc.)"
 msgstr ""
 "Implementa una llínea de comandos y dexa crear los tos comandos. Vea "
-"l'enllaz pa los comandos estándar (arcu, círculu, etc)"
+"l''enllaz pa los comandos estándar (arcu, círculu, etc)"
 
 msgid "(Warning: Experimental!) Tool for conflating (merging) data."
 msgstr "(Peligru: ¡Esperimental!) Ferramienta pa fusionar (entemecer) datos."
@@ -15601,7 +15666,7 @@ msgstr ""
 
 msgid "Shows the elevation profile and some statistical data of a GPX track."
 msgstr ""
-"Amuesa'l perfil d'elevación y dellos datos estadísticos d'una traza GPX"
+"Amuesa''l perfil d''elevación y dellos datos estadísticos d''una traza GPX"
 
 msgid "Handling of French EPCIs (boundary=local_authority)"
 msgstr "Xestión de EPCIs franceses (llende = autoridá local)"
@@ -15614,7 +15679,7 @@ msgstr "Dibuxu rápidu de víes col ratón"
 
 msgid "Finds and fixes invalid street addresses in a comfortable way."
 msgstr ""
-"Identifica y corrixe les direcciones de cais non válides d'un mou cómodu."
+"Identifica y corrixe les direcciones de cais non válides d''un mou cómodu."
 
 msgid ""
 "Talk with users editing the map nearby, be notified when someone comes close."
@@ -15633,7 +15698,7 @@ msgstr ""
 msgid ""
 "Download GPS points from Globalsat dg100 data logger directly in JOSM."
 msgstr ""
-"Descargar puntos GPS dende'l rexistrador de datos GlobalSat DG100 "
+"Descargar puntos GPS dende''l rexistrador de datos GlobalSat DG100 "
 "directamente en JOSM"
 
 msgid ""
@@ -15652,33 +15717,34 @@ msgid "Simple tool to tag house numbers."
 msgstr "Cenciella ferramienta pa etiquetar númberos de cases."
 
 msgid "Generate Imagery XML bounds from a multipolygon"
-msgstr "Xenera imagen XML a partir de les llendes d'un multipolígono"
+msgstr "Xenera imagen XML a partir de les llendes d''un multipolígono"
 
 msgid ""
 "Database of imagery offsets: share and aquire imagery offsets with one "
 "button."
 msgstr ""
-"Base de datos d'imaxes rectificaes: comparte y llogra por aciu un botón "
+"Base de datos d''imaxes rectificaes: comparte y llogra por aciu un botón "
 "imaxes aérees movíes yá compensaes."
 
 msgid "WMSPlugin-style imagery adjustment mapmode"
-msgstr "Mou de mapa con axuste d'imaxes aérees por aciu el WMSPlugin-style"
+msgstr "Mou de mapa con axuste d''imaxes aérees por aciu el WMSPlugin-style"
 
 msgid ""
 "This experimental plugin allows JOSM to store tile cache in database files, "
 "not in huge cache directories"
 msgstr ""
 "Esti componente esperimental dexa a JOSM almacenar el caxé de teseles "
-"n'arquivos de base de datos, non en grandes directorios de caxé."
+"n''arquivos de base de datos, non en grandes directorios de caxé."
 
 msgid ""
 "Another plugin to match images to the waypoints in a GPX file. A match is "
 "made when the ''name'', ''cmt'' or ''desc'' attribute of a waypoint tag "
 "matches the filename of an image."
 msgstr ""
-"Componente pa faer coincidir les fotografíes colos puntos d'interés recoyíos "
-"nun arquivu GPX. La correlación produzse cuando los atributos ''name'', "
-"''cmt'' o ''desc'' d'un puntu coinciden col nome del arquivu d'una imaxe."
+"Componente pa faer coincidir les fotografíes colos puntos d''interés "
+"recoyíos nun arquivu GPX. La correlación produzse cuando los atributos "
+"''name'', ''cmt'' o ''desc'' d''un puntu coinciden col nome del arquivu "
+"d''una imaxe."
 
 msgid "Plugin for importing spatial referenced images"
 msgstr "Componente pa importar imaxes georreferenciaes"
@@ -15716,16 +15782,16 @@ msgid ""
 msgstr ""
 "Corrector de conexones utilizáu pa la busca y revisión de cruces de la rede "
 "de carreteres de OSM. El componente nun funcionar colos datos de OSM "
-"orixinales, sinón qu'estos se tresformen nuna canal de digrafos."
+"orixinales, sinón qu''estos se tresformen nuna canal de digrafos."
 
 msgid "Helps vectorizing WMS images."
-msgstr "Ayuda a vectorizar imaxes d'un serviciu WMS"
+msgstr "Ayuda a vectorizar imaxes d''un serviciu WMS"
 
 msgid ""
 "Support live GPS input (moving dot) through a connection to gpsd server."
 msgstr ""
-"Soporte GPS pa dispositivos d'entrada (puntu en movimientu) al traviés d'una "
-"conexón con un servidor DSGP."
+"Soporte GPS pa dispositivos d''entrada (puntu en movimientu) al traviés "
+"d''una conexón con un servidor DSGP."
 
 msgid ""
 "Provides the Log4j library for other JOSM plugins. Not meant to be installed "
@@ -15733,16 +15799,16 @@ msgid ""
 msgstr ""
 "Apurre la biblioteca Log4j pa otros componentes de JOSM. Nun se pretende que "
 "sía instaláu directamente polos usuarios, sinón más bien que sirva como una "
-"dependencia d'otros componentes."
+"dependencia d''otros componentes."
 
 msgid ""
 "The MapDust Plug-In shows the MapDust bug reports on the map. You can "
 "create, close,invalidate, re-open and comment bug reports by using this "
 "plugin."
 msgstr ""
-"El componente MapDust amuesa los informes d'erros del mapa recoyíos nel "
+"El componente MapDust amuesa los informes d''erros del mapa recoyíos nel "
 "sitiu web de MapDust. Puede crear, pesllar, invalidar, reabrir y comentar "
-"los informes d'erros esistentes por aciu l'usu d'esti componente."
+"los informes d''erros esistentes por aciu l''usu d''esti componente."
 
 msgid ""
 "Provide a measurement dialog and a layer to measure length and angle of "
@@ -15763,7 +15829,7 @@ msgid "Simplifies download from different read-only APIs."
 msgstr "Simplifica la descarga dende distintes APIs de namá llectura."
 
 msgid "Allows to attribute tags to all objects in any selected area at once"
-msgstr "Dexa asignar al empar etiquetes a tolos oxetos d'una área escoyida."
+msgstr "Dexa asignar al empar etiquetes a tolos oxetos d''una área escoyida."
 
 msgid "NanoLog adjustment and browsing layer"
 msgstr "Axuste NanoLog y capa de navegación"
@@ -15772,14 +15838,14 @@ msgid ""
 "Use your system''s password manager to store the API username and password. "
 "(KWallet and gnome-keyring are supported.)"
 msgstr ""
-"Utiliza l'alministrador de claves del sistema p'almacenar el nome d'usuariu "
-"y contraseña (ye compatible con KWallet y GNOME Keyring.)"
+"Utiliza l''alministrador de claves del sistema p''almacenar el nome "
+"d''usuariu y contraseña (ye compatible con KWallet y GNOME Keyring.)"
 
 msgid ""
 "Disallow using JOSM forever (WARNING: this plugin prevents JOSM from loading "
 "and is hard to rid of)"
 msgstr ""
-"Evacuar de forma permanente l'usu de JOSM (ALVERTENCIA: esti complementu "
+"Evacuar de forma permanente l''usu de JOSM (ALVERTENCIA: esti complementu "
 "torga que JOSM execútese y ye complicáu de desfaer)"
 
 msgid "Convert data from Open Data portals to OSM layer"
@@ -15790,7 +15856,7 @@ msgstr ""
 
 msgid "extended options for editing opening_hours"
 msgstr ""
-"Opciones estendíes pa editar l'horariu d'apertura d'establecimientos y "
+"Opciones estendíes pa editar l''horariu d''apertura d''establecimientos y "
 "llugares"
 
 msgid ""
@@ -15821,8 +15887,8 @@ msgid ""
 "right click menu of the image layer."
 msgstr ""
 "Amiesta información sobre la posición del GPS na cabecera del arquivu "
-"d'imaxe. Apuerte a esta característica pulsiando'l botón derechu del mure "
-"sobre la capa d'imaxe."
+"d''imaxe. Apuerte a esta característica pulsiando''l botón derechu del mure "
+"sobre la capa d''imaxe."
 
 msgid "Make photos movable and position them on the map."
 msgstr "Faer que les semeyes sían movibles y asitiales nel mapa"
@@ -15848,7 +15914,7 @@ msgid "Read and write osmosis poly filter files"
 msgstr "Lleer y escribir los arquivos de filtru osmosis poly"
 
 msgid "Adds map printing to JOSM"
-msgstr "Añede la posibilidá d'impresión del mapa a JOSM"
+msgstr "Añede la posibilidá d''impresión del mapa a JOSM"
 
 msgid "adds projections from Proj4J"
 msgstr ""
@@ -15857,11 +15923,11 @@ msgstr ""
 msgid ""
 "This plugin simplifies the mapping and editing of public transport routes."
 msgstr ""
-"Esti componente simplifica'l cartografiáu y edición de rutes de tresportes "
+"Esti componente simplifica''l cartografiáu y edición de rutes de tresportes "
 "públicos."
 
 msgid "Relation and multipolygon creating and editing panel."
-msgstr "Panel d'edición y creación de multipolígonos y relación"
+msgstr "Panel d''edición y creación de multipolígonos y relación"
 
 msgid "Plugin for reverting changesets"
 msgstr "Componente pa revertir conxuntos de cambeos"
@@ -15872,7 +15938,7 @@ msgid ""
 "properties window. Available country presets: Germany, Poland, Slovakia, "
 "Spain."
 msgstr ""
-"Componente pal etiquetáu d'oxetos en función d'una selección de señales de "
+"Componente pal etiquetáu d''oxetos en función d''una selección de señales de "
 "tráficu. El cuadru de diálogu puede abrir faciendo clic nun pequenu iconu de "
 "la esquina cimera derecha de la ventana de propiedaes. Predefinidos "
 "disponibles de los países: Alemaña, Polonia, Eslovaquia, España."
@@ -15886,7 +15952,7 @@ msgstr ""
 "de complementos"
 
 msgid "Provides routing capabilities."
-msgstr "Apurre capacidaes d'enrutamientu."
+msgstr "Apurre capacidaes d''enrutamientu."
 
 msgid "Loads data from SDS"
 msgstr "Carga datos dende SDS"
@@ -15895,8 +15961,8 @@ msgid ""
 "Simplify area by removing nodes on very obtuse angles. This can be "
 "constrained by maximum removed area size. Also average nearby nodes."
 msgstr ""
-"Simplifica árees por aciu la eliminación de nodos n'ángulos bien obtusos. "
-"Esto puede condicionase al tamañu d'área máximu a esaniciar. Fai amás un "
+"Simplifica árees por aciu la eliminación de nodos n''ángulos bien obtusos. "
+"Esto puede condicionase al tamañu d''área máximu a esaniciar. Fai amás un "
 "promediu de los nodos cercanos."
 
 msgid "Edit features for OpenSeaMap"
@@ -15909,19 +15975,19 @@ msgid ""
 "Launch browser to a Web resource about a selected object having known tags, "
 "such as Wikipedia"
 msgstr ""
-"Empecipia'l navegador amosando un recursu Web avera del oxetu escoyíu "
+"Empecipia''l navegador amosando un recursu Web avera del oxetu escoyíu "
 "recoyíu nes etiquetes, tales como la Wikipedia."
 
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr ""
-"Apurre un cuadru de diálogu pa la edición d'etiquetes nuna rejilla tabular."
+"Apurre un cuadru de diálogu pa la edición d''etiquetes nuna rejilla tabular."
 
 msgid ""
 "Adds a tagging preset tester to the help 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 ""
-"Apurre botones d'ayuda pa dexar trabayar con un únicu botón de mure (mou "
+"Apurre botones d''ayuda pa dexar trabayar con un únicu botón de mure (mou "
 "stylus). Actívelo calteniendo pulsiada la tecla T y moviendo el mapa col "
 "botón esquierdu del mure."
 
@@ -15932,7 +15998,7 @@ msgid ""
 "Provides helper buttons to allow working with single button mouse (stylus). "
 "Activate by holding T and slip map with left mouse button"
 msgstr ""
-"Apurre botones d'ayuda pa dexar trabayar con un únicu botón de mure (mou "
+"Apurre botones d''ayuda pa dexar trabayar con un únicu botón de mure (mou "
 "stylus). Actívelo calteniendo pulsiada la tecla T y moviendo el mapa col "
 "botón esquierdu del mure."
 
@@ -15947,7 +16013,7 @@ msgid ""
 "Traces buildings and other shapes from a map. Needs Tracer2Server to be "
 "running."
 msgstr ""
-"Traza edificios y otres figures a partir d'un mapa. Precisa que "
+"Traza edificios y otres figures a partir d''un mapa. Precisa que "
 "Tracer2Server tea executándose."
 
 msgid "Plugin to digital sign OSM-Data"
@@ -15959,15 +16025,15 @@ msgstr ""
 msgid ""
 "Provides a straightforward GUI for adding, editing and deleting turn lanes."
 msgstr ""
-"Apurre una senciella interfaz gráfica d'usuariu p'amestar, editar y suprimir "
-"carriles de xiru."
+"Apurre una senciella interfaz gráfica d''usuariu p''amestar, editar y "
+"suprimir carriles de xiru."
 
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
 "restrictions in the OpenStreetMap database."
 msgstr ""
-"El complementu turnrestrictions facilita la introducción d'información sobre "
-"restricciones de xiru a la base de datos OpenStreetMap."
+"El complementu turnrestrictions facilita la introducción d''información "
+"sobre restricciones de xiru a la base de datos OpenStreetMap."
 
 msgid "Allows undeleting object from OSM database"
 msgstr "Dexa recuperar un oxetu esaniciáu dende la base de datos OSM"
@@ -15981,7 +16047,7 @@ msgid ""
 "objects."
 msgstr ""
 "(¡Esti componente anguaño ye un trabayu en desenvolvimientu!) Enllaza y "
-"sincroniza un vídeu georreferenciáu afaciéndolo a'l so posición na traza "
+"sincroniza un vídeu georreferenciáu afaciéndolo a''l so posición na traza "
 "GPS. Preséu pa identificar oxetos visibles."
 
 msgid ""
@@ -15993,25 +16059,25 @@ msgstr ""
 
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr ""
-"Descargar fácilmente a lo llargo d'una llarga serie de víes interconectaes"
+"Descargar fácilmente a lo llargo d''una llarga serie de víes interconectaes"
 
 msgid "Enables searching for waypoint imported from gpx file."
 msgstr ""
-"Habilitar busca pa puntos de referencies (waypoints) importaos d'un arquivu "
+"Habilitar busca pa puntos de referencies (waypoints) importaos d''un arquivu "
 "gpx."
 
 msgid "Select a sequence of non-branching connected ways"
 msgstr "Escueye una secuencia de víes conectaes non ramificaes"
 
 msgid "Simplifies linking OSM objects to Wikipedia articles"
-msgstr "Simplifica la vinculación d'oxetos OSM con artículos de Wikipedia"
+msgstr "Simplifica la vinculación d''oxetos OSM con artículos de Wikipedia"
 
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
 "behind."
 msgstr ""
-"Conduz un coche de carreres dende'l puntu A al B sobre una imaxe aérea. Dexa "
-"a los cactus tras..."
+"Conduz un coche de carreres dende''l puntu A al B sobre una imaxe aérea. "
+"Dexa a los cactus tras..."
 
 msgid "Surface"
 msgstr "Superficie"
@@ -16259,7 +16325,7 @@ msgid "week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00"
 msgstr "selmana 1-53/2 V 09:00-12:00; selmana 2-52/2 Mi 09:00-12:00"
 
 msgid "Opening Hours"
-msgstr "Horariu d'apertura"
+msgstr "Horariu d''apertura"
 
 msgid "24/7"
 msgstr "24/7"
@@ -16439,7 +16505,7 @@ msgstr "h.oquei"
 
 msgctxt "sport"
 msgid "horse_racing"
-msgstr "carreres d'hípica"
+msgstr "carreres d''hípica"
 
 msgctxt "sport"
 msgid "motor"
@@ -16496,6 +16562,10 @@ msgstr "tenis"
 msgid "Coins"
 msgstr "Monedes"
 
+msgctxt "payment"
+msgid "Notes"
+msgstr ""
+
 msgid "Electronic purses and Charge cards"
 msgstr "Tarxetes de recarga y monederos electrónicos"
 
@@ -16573,7 +16643,7 @@ msgid "forestry"
 msgstr "forestal"
 
 msgid "Population"
-msgstr "Númberu d'habitantes"
+msgstr "Númberu d''habitantes"
 
 msgid "Post code"
 msgstr "Códigu postal"
@@ -16755,10 +16825,10 @@ msgid "kiosk"
 msgstr "gabinete"
 
 msgid "Start date"
-msgstr "Fecha d'entamu"
+msgstr "Fecha d''entamu"
 
 msgid "Output forms of energy:"
-msgstr "Formes de salida d'enerxía:"
+msgstr "Formes de salida d''enerxía:"
 
 msgid "biogas"
 msgstr "biogás"
@@ -16812,7 +16882,7 @@ msgid "Motorway"
 msgstr "Autopista"
 
 msgid "Motorway Link"
-msgstr "Enllaz d'autopista"
+msgstr "Enllaz d''autopista"
 
 msgid "Trunk"
 msgstr "Carretera principal"
@@ -16845,7 +16915,7 @@ msgid "Unclassified"
 msgstr "Carretera ensin clasificación"
 
 msgid "Passing Places"
-msgstr "Llugares d'encruz frecuente de la vía"
+msgstr "Llugares d''encruz frecuente de la vía"
 
 msgid "Residential"
 msgstr "Cai urbana"
@@ -16901,10 +16971,10 @@ msgid "alley"
 msgstr "caleyón"
 
 msgid "driveway"
-msgstr "camín d'entrada (a garage, casa, finca, etc.)"
+msgstr "camín d''entrada (a garage, casa, finca, etc.)"
 
 msgid "parking_aisle"
-msgstr "pasiellu d'aparcamientu"
+msgstr "pasiellu d''aparcamientu"
 
 msgid "drive-through"
 msgstr ""
@@ -16912,7 +16982,7 @@ msgstr ""
 "etc.)"
 
 msgid "Parking Aisle"
-msgstr "Pasiellu d'aparcamientu"
+msgstr "Pasiellu d''aparcamientu"
 
 msgid "Road (Unknown Type)"
 msgstr "Carretera (tipoloxía desconocida)"
@@ -16969,10 +17039,10 @@ msgid "Agricultural"
 msgstr "Agrícola"
 
 msgid "Emergency vehicles"
-msgstr "Vehículos d'emerxencia"
+msgstr "Vehículos d''emerxencia"
 
 msgid "High-occupancy vehicles (hov)"
-msgstr "Vehículos d'alta ocupación (VAO)"
+msgstr "Vehículos d''alta ocupación (VAO)"
 
 msgid "Public Service Vehicles (psv)"
 msgstr "Vehículos de serviciu públicu (SP)"
@@ -17120,7 +17190,7 @@ msgid ""
 "jagged rocks"
 msgstr ""
 "llugares espuestos aseguraos con cuerdes o cadenes, con posible necesidá "
-"d'utilizar les manos pa caltener l'equilibriu. Sitios parcialmente "
+"d''utilizar les manos pa caltener l''equilibriu. Sitios parcialmente "
 "comprometíos con peligru de cayida, pedregales, senderos con roques dentaes."
 
 msgid "T4 - difficult, exposed, steep alpine trail"
@@ -17130,7 +17200,7 @@ msgid ""
 "sometimes need for hand use to get ahead. Terrain quite exposed, precarious "
 "grassy acclivities, jagged rocks, facile snow-free glaciers"
 msgstr ""
-"n'ocasiones ye necesariu pal usu manual siguir alantre. Terrén bien "
+"n''ocasiones ye necesariu pal usu manual siguir alantre. Terrén bien "
 "espuestu, pindios con cubierta vexetal precaria, roques apuntiaes, glaciares "
 "llibres de nieve na superficie"
 
@@ -17141,7 +17211,7 @@ msgid ""
 "single plainly climbing up to second grade. Exposed, demanding terrain, "
 "jagged rocks, few dangerous glacier and snow"
 msgstr ""
-"esguilada senciella hasta'l segundu grau. Espuestu, terrén esixente, roques "
+"esguilada senciella hasta''l segundu grau. Espuestu, terrén esixente, roques "
 "dentaes, glaciar y nieve poco peligrosa."
 
 msgid "T6 - hazardous alpine trail with climbing"
@@ -17152,7 +17222,7 @@ msgid ""
 "glacier with danger to slip and fall"
 msgstr ""
 "esguilada de segundu grau. De cutiu bien espuesta, roques dentaes precaries, "
-"glaciar con peligru d'esnidiar y cayese"
+"glaciar con peligru d''esnidiar y cayese"
 
 msgid "Visibility"
 msgstr "Visibilidá"
@@ -17257,7 +17327,7 @@ msgid "Waypoints"
 msgstr "Nodos de vía"
 
 msgid "Motorway Junction"
-msgstr "Salida d'autopista"
+msgstr "Salida d''autopista"
 
 msgid "Number"
 msgstr "Númberu"
@@ -17275,16 +17345,16 @@ msgid "Rest Area"
 msgstr "Área de descansu"
 
 msgid "Drinking Water"
-msgstr "Fonte d'agua potable"
+msgstr "Fonte d''agua potable"
 
 msgid "Traffic Signal"
 msgstr "Semáforu"
 
 msgid "Optional crossing attributes:"
-msgstr "Atributos opcionales d'encruz:"
+msgstr "Atributos opcionales d''encruz:"
 
 msgid "Pedestrian crossing type"
-msgstr "Tipu d'encruz piatonal"
+msgstr "Tipu d''encruz piatonal"
 
 msgid "uncontrolled"
 msgstr "ensin supervisión"
@@ -17299,7 +17369,7 @@ msgid "unmarked"
 msgstr "ensin marcar"
 
 msgid "Crossing type name (UK)"
-msgstr "Tipu de nome d'encruz (Reinu Uníu)"
+msgstr "Tipu de nome d''encruz (Reinu Uníu)"
 
 msgid "zebra"
 msgstr "cebra"
@@ -17334,11 +17404,14 @@ msgstr "Encruz de bicicletes"
 msgid "Cross on horseback"
 msgstr "Encruz de caballos"
 
+msgid "Optional values for specific countries"
+msgstr "Valores opcionales pa países específicos"
+
 msgid "Stop"
 msgstr "Stop"
 
 msgid "Give Way"
-msgstr "Dexe'l pasu"
+msgstr "Dexe''l pasu"
 
 msgid "Mini-Roundabout"
 msgstr "Mini-rotonda"
@@ -17374,7 +17447,7 @@ msgid "table"
 msgstr "plataforma elevada"
 
 msgid "Passing Place"
-msgstr "Llugar d'encruz frecuente de la vía"
+msgstr "Llugar d''encruz frecuente de la vía"
 
 msgid "Turning Circle"
 msgstr "Círculu de xiru"
@@ -17391,6 +17464,18 @@ msgstr "Nome alternativu"
 msgid "Speed Camera"
 msgstr "Rádar de tráficu"
 
+msgid "Traffic Mirror"
+msgstr ""
+
+msgctxt "junction=yes"
+msgid "Named Junction"
+msgstr ""
+
+msgid ""
+"Used in some countries for a named road junction who’s name serves for local "
+"orientation."
+msgstr ""
+
 msgid "Elevator"
 msgstr "Ascensor"
 
@@ -17422,7 +17507,7 @@ msgid "Bollard type"
 msgstr "Tipu de bolardu"
 
 msgid "rising"
-msgstr "n'ascensu"
+msgstr "n''ascensu"
 
 msgid "removable"
 msgstr "removible"
@@ -17440,7 +17525,7 @@ msgid "Bus Trap"
 msgstr "Trampa pa coches"
 
 msgid "Spikes"
-msgstr "Resorte con pinchos (pal control d'accesu unidireccional)"
+msgstr "Resorte con pinchos (pal control d''accesu unidireccional)"
 
 msgid "Toll Booth"
 msgstr "Cabina de peaxe"
@@ -17464,7 +17549,7 @@ msgid "Fence"
 msgstr "Valla o cerca"
 
 msgid "barbed_wire"
-msgstr "alambre d'espín"
+msgstr "alambre d''espín"
 
 msgid "chain_link"
 msgstr "cadena"
@@ -17528,7 +17613,7 @@ msgstr "Portiella de malla metálica"
 
 msgid "Bump Gate"
 msgstr ""
-"Puerta de golpe (en finques ganaderes, que s'abrir ensin salir del vehículu)"
+"Puerta de golpe (en finques ganaderes, que s''abrir ensin salir del vehículu)"
 
 msgid "Kissing Gate"
 msgstr "Portiella xiratoria"
@@ -17558,7 +17643,7 @@ msgid "Passageways"
 msgstr "Pasaxes"
 
 msgid "Building Passage"
-msgstr "Pasaxe per interior d'edificiu"
+msgstr "Pasaxe per interior d''edificiu"
 
 msgid "Arcade"
 msgstr "Arcada (portalada de arquería, galería, claustru, etc.)"
@@ -17576,7 +17661,7 @@ msgid "Avalanche Protector"
 msgstr "Falsu túnel contra ábanos"
 
 msgid "Water"
-msgstr "Llámina d'agua"
+msgstr "Llámina d''agua"
 
 msgid "Drain"
 msgstr "Desaguadoriu"
@@ -17604,7 +17689,7 @@ msgid ""
 "underground."
 msgstr ""
 "Un puntu nel cual les agües soterrañes flúin de forma natural a la "
-"superficie dende l'interior de la tierra."
+"superficie dende l''interior de la tierra."
 
 msgid "Waterfall"
 msgstr "Cascada"
@@ -17631,13 +17716,13 @@ msgid "Reservoir"
 msgstr "Banzáu"
 
 msgid "Covered Reservoir"
-msgstr "Depósitu d'agua"
+msgstr "Depósitu d''agua"
 
 msgid "A body of standing water, such as a lake or pond."
-msgstr "Un cuerpu d'agua enllancada, tal como un llagu o un estanque."
+msgstr "Un cuerpu d''agua enllancada, tal como un llagu o un estanque."
 
 msgid "Water Body"
-msgstr "Cuerpu d'agua"
+msgstr "Cuerpu d''agua"
 
 msgid "canal"
 msgstr "canal"
@@ -17664,14 +17749,15 @@ msgid "Salt Water"
 msgstr "Agua Salao"
 
 msgid "Is the water body intermittent (disappears seasonally)?"
-msgstr "¿Ye la masa d'agua intermitente (sumi estacionalmente)?"
+msgstr "¿Ye la masa d''agua intermitente (sumi estacionalmente)?"
 
 msgid "Coastline"
 msgstr "Llínea de mariña"
 
 msgid ""
 "Line between the sea and land (with the water on the right side of the way)."
-msgstr "Llínea ente'l mar y la tierra (col agua nel llau derechu de la vía)."
+msgstr ""
+"Llínea ente''l mar y la tierra (col agua nel llau derechu de la vía)."
 
 msgid "Riverbank"
 msgstr "Ribera (pa veres de ríos anchos)"
@@ -17729,7 +17815,7 @@ msgstr "Badea"
 msgid ""
 "A large body of water partially enclosed by land but with a wide mouth."
 msgstr ""
-"Un gran cuerpu d'agua parcialmente cerráu per tierra pero con una gran boca."
+"Un gran cuerpu d''agua parcialmente cerráu per tierra pero con una gran boca."
 
 msgid "Cliff"
 msgstr "Cantil"
@@ -17738,8 +17824,9 @@ msgid ""
 "A steep rock face exposure, with a significant vertical, or near vertical "
 "(leave the lower face to the right of the way)."
 msgstr ""
-"Esposición de la cara empinada d'una piedra, con una vertical significativa, "
-"o casi vertical (dexar la cara inferior a la derecha de la vía)."
+"Esposición de la cara empinada d''una piedra, con una vertical "
+"significativa, o casi vertical (dexar la cara inferior a la derecha de la "
+"vía)."
 
 msgid "Shipping"
 msgstr "Saléu"
@@ -17840,7 +17927,7 @@ msgid "Tram"
 msgstr "Tranvía"
 
 msgid "Bus Guideway"
-msgstr "Vía p'autobús empuestu"
+msgstr "Vía p''autobús empuestu"
 
 msgid "Disused Rail"
 msgstr "Vía de fierrocarril en desusu"
@@ -18149,13 +18236,13 @@ msgid "Wash"
 msgstr "Llimpieza"
 
 msgid "Car Dealer"
-msgstr "Concesionariu d'automóviles"
+msgstr "Concesionariu d''automóviles"
 
 msgid "Repair"
 msgstr "Taller"
 
 msgid "Parts"
-msgstr "Componentes d'automóvil"
+msgstr "Componentes d''automóvil"
 
 msgid "Tires"
 msgstr "Ruedes"
@@ -18251,11 +18338,11 @@ msgid "Bicycles are rented"
 msgstr "Arriéndense bicicletes"
 
 msgid "Free bicycle pump"
-msgstr "Serviciu gratuitu de compresor d'aire"
+msgstr "Serviciu gratuitu de compresor d''aire"
 
 msgid "Tools for do-it-yourself repair (may be a bike co-operative)"
 msgstr ""
-"Ferramientes pa realizar l'arreglu unu mesmu (pue ser una cooperativa de "
+"Ferramientes pa realizar l''arreglu unu mesmu (pue ser una cooperativa de "
 "bicicletes)"
 
 msgid "Bicycles are washed (for a fee)"
@@ -18381,7 +18468,7 @@ msgid "Bus"
 msgstr "Autobús"
 
 msgid "Bus stop (legacy)"
-msgstr "Parada d'autobús (etiqueta en desusu)"
+msgstr "Parada d''autobús (etiqueta en desusu)"
 
 msgid "Tram stop (legacy)"
 msgstr "Parada de tranvía (etiqueta en desusu)"
@@ -18478,16 +18565,16 @@ msgid "Reference (track number)"
 msgstr "Referencia (númberu de pista)"
 
 msgid "Bus Station"
-msgstr "Estación d'autobús"
+msgstr "Estación d''autobús"
 
 msgid "Bus Stop"
-msgstr "Parada d'autobús"
+msgstr "Parada d''autobús"
 
 msgid "Tactile Paving"
 msgstr "Pavimentu táctil"
 
 msgid "Bus Platform"
-msgstr "Andén d'autobús"
+msgstr "Andén d''autobús"
 
 msgid "Taxi"
 msgstr "Taxi"
@@ -18496,7 +18583,7 @@ msgid "Airport"
 msgstr "Aeropuertu"
 
 msgid "Airport Ground"
-msgstr "Campu d'aviación"
+msgstr "Campu d''aviación"
 
 msgid "IATA"
 msgstr "IATA"
@@ -18511,10 +18598,10 @@ msgid "Taxiway"
 msgstr "Pista de rodaxe"
 
 msgid "Helipad"
-msgstr "Pista d'aterrizaxe d'helicópteros"
+msgstr "Pista d''aterrizaxe d''helicópteros"
 
 msgid "Apron"
-msgstr "Plataforma d'estacionamientu"
+msgstr "Plataforma d''estacionamientu"
 
 msgid "Hangar"
 msgstr "Hangar"
@@ -18566,13 +18653,13 @@ msgid "Number of places"
 msgstr "Númberu de places"
 
 msgid "Power supply"
-msgstr "Fonte d'alimentación"
+msgstr "Fonte d''alimentación"
 
 msgid "Tents allowed"
 msgstr "Permítense tiendes de campaña"
 
 msgid "Camping Site"
-msgstr "Llugar d'acampada"
+msgstr "Llugar d''acampada"
 
 msgid "Food+Drinks"
 msgstr "Comida+Bebíes"
@@ -18668,7 +18755,7 @@ msgid "Night Club"
 msgstr "Club nocherniegu"
 
 msgid "Strip Club"
-msgstr "Club d'alterne (striptease)"
+msgstr "Club d''alterne (striptease)"
 
 msgid "Tourism"
 msgstr "Turismu"
@@ -18683,10 +18770,10 @@ msgid "Look-Out Tower"
 msgstr "Torre de vixía"
 
 msgid "Information Office"
-msgstr "Oficina d'información"
+msgstr "Oficina d''información"
 
 msgid "An office where you can get information about a town or region."
-msgstr "Una oficina onde s'ufierta información sobre una ciudá o rexón."
+msgstr "Una oficina onde s''ufierta información sobre una ciudá o rexón."
 
 msgid "Map"
 msgstr "Mapa"
@@ -18707,7 +18794,7 @@ msgid "scheme"
 msgstr "esquema"
 
 msgid "toposcope"
-msgstr "toposcopiu (pilar d'orientación)"
+msgstr "toposcopiu (pilar d''orientación)"
 
 msgid "Shown Area"
 msgstr "Área amosada"
@@ -18752,7 +18839,7 @@ msgid "A board with information."
 msgstr "Un panel con información."
 
 msgid "Board Content"
-msgstr "Tablón d'anuncios"
+msgstr "Tablón d''anuncios"
 
 msgid "notice"
 msgstr "avisu"
@@ -18780,10 +18867,10 @@ msgid ""
 msgstr "Una señal o cartelu pa indicar les direcciones a distintos destinos."
 
 msgid "Information Terminal"
-msgstr "Puntu d'información"
+msgstr "Puntu d''información"
 
 msgid "Information access via electronic methods."
-msgstr "Información d'accesu por métodos electrónicos."
+msgstr "Información d''accesu por métodos electrónicos."
 
 msgid "Closer description"
 msgstr "Descripción detallada"
@@ -18801,7 +18888,7 @@ msgid "Phone number"
 msgstr "Númberu de teléfonu"
 
 msgid "Other Information Point"
-msgstr "Otros puntos d'información"
+msgstr "Otros puntos d''información"
 
 msgid "Leisure"
 msgstr "Ociu"
@@ -18822,7 +18909,7 @@ msgid "wall"
 msgstr "muriu"
 
 msgid "Amusement/Theme Park"
-msgstr "Parque d'atracciones"
+msgstr "Parque d''atracciones"
 
 msgid "Water Park"
 msgstr "Parque acuáticu"
@@ -18845,6 +18932,9 @@ msgstr "Zona de picnic"
 msgid "Fireplace"
 msgstr "Barbacoa"
 
+msgid "Picnic Table"
+msgstr ""
+
 msgid "Public Grill"
 msgstr "Barbacoa pública"
 
@@ -18877,10 +18967,10 @@ msgid "Library"
 msgstr "Biblioteca"
 
 msgid "Arts Centre"
-msgstr "Centru d'arte"
+msgstr "Centru d''arte"
 
 msgid "Artwork"
-msgstr "Obra d'arte"
+msgstr "Obra d''arte"
 
 msgid "mural"
 msgstr "mural"
@@ -18910,7 +19000,7 @@ msgid "Church"
 msgstr "Ilesia"
 
 msgid "Building type"
-msgstr "Tipu d'edificiu"
+msgstr "Tipu d''edificiu"
 
 msgid "basilica"
 msgstr "basílica"
@@ -19094,7 +19184,7 @@ msgid "Education"
 msgstr "Educación"
 
 msgid "Kindergarten"
-msgstr "Xardín d'infancia"
+msgstr "Xardín d''infancia"
 
 msgid "School"
 msgstr "Colexu"
@@ -19103,7 +19193,7 @@ msgid "University"
 msgstr "Universidá"
 
 msgid "College"
-msgstr "Institutu d'enseñanza secundaria"
+msgstr "Institutu d''enseñanza secundaria"
 
 msgid "Driving School"
 msgstr "Autoescuela"
@@ -19153,7 +19243,7 @@ msgid "Baby Hatch/Safe Haven"
 msgstr "Abelugu pa ñácaros"
 
 msgid "Emergency Access Point"
-msgstr "Puntu d'accesu pa emerxencies"
+msgstr "Puntu d''accesu pa emerxencies"
 
 msgid "Point Number"
 msgstr "Númberu de puntu"
@@ -19171,7 +19261,7 @@ msgid "Toilets/Restrooms"
 msgstr "Baños"
 
 msgid "Access rights"
-msgstr "Permisos d'accesu"
+msgstr "Permisos d''accesu"
 
 msgid "public"
 msgstr "públicu"
@@ -19192,7 +19282,7 @@ msgid "bucket"
 msgstr "balde"
 
 msgid "Usage Position"
-msgstr "Posición d'usu"
+msgstr "Posición d''usu"
 
 msgid "seated"
 msgstr "sentáu"
@@ -19225,7 +19315,7 @@ msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; Su,PH off"
 msgstr "Llu-Vi 09:00-12:00,17:15; Sá 14:00; Do,festivos zarráu"
 
 msgid "Drive through"
-msgstr "Utilizable dende'l volante"
+msgstr "Utilizable dende''l volante"
 
 msgid "Telephone"
 msgstr "Teléfonu"
@@ -19234,7 +19324,7 @@ msgid "Telephone cards"
 msgstr "Tarxetes telefóniques"
 
 msgid "Emergency Phone"
-msgstr "Teléfonu d'emerxencia"
+msgstr "Teléfonu d''emerxencia"
 
 msgid "Internet Access"
 msgstr "Accesu a Internet"
@@ -19243,7 +19333,7 @@ msgid "Automated Defibrillator"
 msgstr "Desfibrilador automáticu"
 
 msgid "Located inside a building?"
-msgstr "¿Allugáu dientro d'un edificiu?"
+msgstr "¿Allugáu dientro d''un edificiu?"
 
 msgid "Last check date (YYYY-MM-DD)"
 msgstr "Última fecha de verificación (YYYY-MM-DD)"
@@ -19298,7 +19388,7 @@ msgid "street (up to 20m)"
 msgstr "vial (hasta 20 m)"
 
 msgid "area (more than 20m)"
-msgstr "d'área (hasta 20 m)"
+msgstr "d''área (hasta 20 m)"
 
 msgid "Shows current date"
 msgstr "Amuesa la fecha actual"
@@ -19310,7 +19400,7 @@ msgid "Shows barometric pressure"
 msgstr "Amuesa la presión barométrica"
 
 msgid "Shows humidity"
-msgstr "Amuesa'l mugor"
+msgstr "Amuesa''l mugor"
 
 msgid "Recycling"
 msgstr "Reciclaje"
@@ -19346,7 +19436,7 @@ msgid "Backrest"
 msgstr "Respaldu"
 
 msgid "Amount of Seats"
-msgstr "Númberu d'asientos"
+msgstr "Númberu d''asientos"
 
 msgid "Type of shelter"
 msgstr "Tipu de vivienda"
@@ -19373,7 +19463,7 @@ msgstr "abelugu contra inclemencies climátiques"
 
 msgctxt "shelter"
 msgid "wildlife_hide"
-msgstr "xoril d'observación de vida selvaxe"
+msgstr "xoril d''observación de vida selvaxe"
 
 msgid "Hunting Stand"
 msgstr "Puestu de caza"
@@ -19419,13 +19509,13 @@ msgstr "muriu"
 
 msgctxt "pipeline"
 msgid "pond"
-msgstr "balsa d'agua"
+msgstr "balsa d''agua"
 
 msgid "Diameter (in mm)"
 msgstr "Diámetru (en mm)"
 
 msgid "Hydrant Position"
-msgstr "Posición d'hidrante"
+msgstr "Posición d''hidrante"
 
 msgctxt "hydrant position"
 msgid "lane"
@@ -19452,6 +19542,12 @@ msgstr "succión"
 msgid "Count"
 msgstr "Cuenta"
 
+msgid "Advertising Column"
+msgstr ""
+
+msgid "Billboard"
+msgstr ""
+
 msgid "Sports"
 msgstr "Deportes"
 
@@ -19563,7 +19659,7 @@ msgid "Scuba Diving"
 msgstr ""
 
 msgid "Piste type"
-msgstr "Tipu de pista d'esquí"
+msgstr "Tipu de pista d''esquí"
 
 msgid "downhill"
 msgstr "de descensu"
@@ -20031,22 +20127,22 @@ msgid "Length in meters"
 msgstr "Llargor en metros"
 
 msgid "Water Tower"
-msgstr "Torre d'agua"
+msgstr "Torre d''agua"
 
 msgid "Water Works"
 msgstr "Obres hidráuliques"
 
 msgid "Wastewater Treatment Plant"
-msgstr "Planta de tratamientu d'agües residuales"
+msgstr "Planta de tratamientu d''agües residuales"
 
 msgid "Watermill"
-msgstr "Molín d'agua"
+msgstr "Molín d''agua"
 
 msgid "Fountain"
 msgstr "Fonte o surtidor ornamental"
 
 msgid "Water Well"
-msgstr "Pozu d'agua"
+msgstr "Pozu d''agua"
 
 msgid "Lighthouse"
 msgstr "Faru"
@@ -20067,7 +20163,7 @@ msgid "Monitoring:"
 msgstr "Monitoreo:"
 
 msgid "Water level"
-msgstr "Nivel de l'agua"
+msgstr "Nivel de l''agua"
 
 msgid "Tide Level"
 msgstr "Nivel de la marea"
@@ -20205,7 +20301,7 @@ msgid "covered"
 msgstr "cubiertu"
 
 msgid "low_water_crossing"
-msgstr "pasu d'agües baxes"
+msgstr "pasu d''agües baxes"
 
 msgid "trestle"
 msgstr "atirantado"
@@ -20280,16 +20376,16 @@ msgid "Bridge outline"
 msgstr ""
 
 msgid "Power Plant"
-msgstr "Planta xeneradora d'enerxía"
+msgstr "Planta xeneradora d''enerxía"
 
 msgid "Output forms of energy (optional):"
-msgstr "Formes de salida d'enerxía (opcional):"
+msgstr "Formes de salida d''enerxía (opcional):"
 
 msgid "Power Generator"
-msgstr "Xenerador d'enerxía"
+msgstr "Xenerador d''enerxía"
 
 msgid "Biofuel Power Generator"
-msgstr "Xenerador d'enerxía de Biocombustible"
+msgstr "Xenerador d''enerxía de Biocombustible"
 
 msgid "Generator Type"
 msgstr "Tipu de xenerador"
@@ -20304,10 +20400,10 @@ msgid "steam_generator"
 msgstr "xenerador de vapor"
 
 msgid "Biogas Power Generator"
-msgstr "Xenerador d'enerxía de Biogas"
+msgstr "Xenerador d''enerxía de Biogas"
 
 msgid "Biomass Power Generator"
-msgstr "Xenerador d'enerxía de Biomasa"
+msgstr "Xenerador d''enerxía de Biomasa"
 
 msgid "Method"
 msgstr "Métodu"
@@ -20340,22 +20436,22 @@ msgid "steam_turbine"
 msgstr "turbina de vapor"
 
 msgid "Coal Power Generator"
-msgstr "Xenerador d'enerxía de Carbón"
+msgstr "Xenerador d''enerxía de Carbón"
 
 msgid "Gas Power Generator"
-msgstr "Xenerador d'Enerxía de Gas"
+msgstr "Xenerador d''Enerxía de Gas"
 
 msgid "combined_cycle"
 msgstr "ciclu combináu"
 
 msgid "Oil Power Generator"
-msgstr "Xenerador d'enerxía de Petróleu"
+msgstr "Xenerador d''enerxía de Petróleu"
 
 msgid "Diesel Power Generator"
-msgstr "Xenerador d'enerxía Diesel"
+msgstr "Xenerador d''enerxía Diesel"
 
 msgid "Gasoline Power Generator"
-msgstr "Xenerador d'enerxía de Gasolína"
+msgstr "Xenerador d''enerxía de Gasolína"
 
 msgid "Nuclear Reactor"
 msgstr "Reactor Nuclear"
@@ -20369,28 +20465,28 @@ msgid "fusion"
 msgstr "fusión"
 
 msgid "Boiling Water Reactor 1 (BWR-1)"
-msgstr "Reactor d'agua hirviente 1 (BWR-1)"
+msgstr "Reactor d''agua hirviente 1 (BWR-1)"
 
 msgid "fission"
 msgstr "fisión"
 
 msgid "Boiling Water Reactor 2 (BWR-2)"
-msgstr "Reactor d'agua hirviente 2 (BWR-2)"
+msgstr "Reactor d''agua hirviente 2 (BWR-2)"
 
 msgid "Boiling Water Reactor 3 (BWR-3)"
-msgstr "Reactor d'agua hirviente 3 (BWR-3)"
+msgstr "Reactor d''agua hirviente 3 (BWR-3)"
 
 msgid "Boiling Water Reactor 4 (BWR-4)"
-msgstr "Reactor d'agua hirviente 4 (BWR-4)"
+msgstr "Reactor d''agua hirviente 4 (BWR-4)"
 
 msgid "Boiling Water Reactor 5 (BWR-5)"
-msgstr "Reactor d'agua hirviente 5 (BWR-5)"
+msgstr "Reactor d''agua hirviente 5 (BWR-5)"
 
 msgid "Boiling Water Reactor 6 (BWR-6)"
-msgstr "Reactor d'agua hirviente 6 (BWR-6)"
+msgstr "Reactor d''agua hirviente 6 (BWR-6)"
 
 msgid "CANada Deuterium Uranium reactor (CANDU)"
-msgstr "Reactor d'Uraniu Deuteriu CANadá (CANDU)"
+msgstr "Reactor d''Uraniu Deuteriu CANadá (CANDU)"
 
 msgid "cold-fusion"
 msgstr "fusión-fria"
@@ -20408,7 +20504,7 @@ msgid "Inertial Confinement Fusion (ICF)"
 msgstr "Fusión de Confinamientu Inercial (ICF)"
 
 msgid "Pressurized water reactor (PWR)"
-msgstr "Reactor d'Agua Presurizada (PWR)"
+msgstr "Reactor d''Agua Presurizada (PWR)"
 
 msgid "Reactor Bolshoy Moshchnosti Kanalniy 1000 (RBMK-1000)"
 msgstr "Reactor Bolshoy Moshchnosti Kanalniy 1000 (RBMK-1000)"
@@ -20426,7 +20522,7 @@ msgid "Vodo-Vodyanoi Energetichesky Reactor (VVER)"
 msgstr "Reactor Vodo-Vodyanoi Energetichesky (VVER)"
 
 msgid "Solar Power Generator"
-msgstr "Xenerador d'enerxía Solar"
+msgstr "Xenerador d''enerxía Solar"
 
 msgctxt "generator method"
 msgid "photovoltaic"
@@ -20449,7 +20545,7 @@ msgid "thermal"
 msgstr "termal"
 
 msgid "Waste Power Generator"
-msgstr "Xenerador d'enerxía de Borrafes"
+msgstr "Xenerador d''enerxía de Borrafes"
 
 msgctxt "generator method"
 msgid "pyrolysis"
@@ -20459,7 +20555,7 @@ msgid "gasification"
 msgstr "gasificación"
 
 msgid "Water Turbine"
-msgstr "Turbina d'Agua"
+msgstr "Turbina d''Agua"
 
 msgctxt "generator method"
 msgid "run-of-the-river"
@@ -20471,7 +20567,7 @@ msgstr "agua bombiada del almacenaxe"
 
 msgctxt "generator method"
 msgid "water-storage"
-msgstr "almacenamientu d'agua"
+msgstr "almacenamientu d''agua"
 
 msgid "francis_turbine"
 msgstr "turbina Francis"
@@ -20515,13 +20611,13 @@ msgid "vertical_axis"
 msgstr "exa vertical"
 
 msgid "Wave Energy Converter"
-msgstr "Conversor d'enerxía d'onda"
+msgstr "Conversor d''enerxía d''onda"
 
 msgid "Osmotic Power Generator"
-msgstr "Gnerador d'enerxía osmótica"
+msgstr "Gnerador d''enerxía osmótica"
 
 msgid "Geothermal Power Generator"
-msgstr "Xenerador d'enerxía Geotérmica"
+msgstr "Xenerador d''enerxía Geotérmica"
 
 msgid "heat_pump"
 msgstr "bombéu de calor"
@@ -20589,7 +20685,7 @@ msgid "Gas insulated"
 msgstr "aisllada en gas"
 
 msgid "Power Transformer"
-msgstr "Tresformador d'enerxía"
+msgstr "Tresformador d''enerxía"
 
 msgid "Type of transformer"
 msgstr "Tipu de tresformador"
@@ -20604,7 +20700,7 @@ msgstr "automáticu"
 
 msgctxt "power"
 msgid "phase_angle_regulator"
-msgstr "regulador d'ángulu de fase"
+msgstr "regulador d''ángulu de fase"
 
 msgctxt "power"
 msgid "yes"
@@ -20620,20 +20716,20 @@ msgid ""
 "(Please only use this tag if more detailed mapping using busbars and bays is "
 "impossible!)"
 msgstr ""
-"(¡Por favor utilice esta etiqueta si'l mapeo usando barres d'alta tensión y "
-"badees ye simposible!)"
+"(¡Por favor utilice esta etiqueta si''l mapeo usando barres d''alta tensión "
+"y badees ye simposible!)"
 
 msgid "Power Busbar"
-msgstr "Barres d'alta tensión"
+msgstr "Barres d''alta tensión"
 
 msgid "Power Bay"
-msgstr "Badea d'Enerxía"
+msgstr "Badea d''Enerxía"
 
 msgid "Power Switch"
 msgstr "Interruptor de Corriente"
 
 msgid "Power Converter"
-msgstr "Conversor d'enerxía"
+msgstr "Conversor d''enerxía"
 
 msgid "Type of converter"
 msgstr "Tipu de conversor"
@@ -20663,7 +20759,7 @@ msgid "Power rating (MVA)"
 msgstr "Potencia nominal (MVA)"
 
 msgid "Power Compensator"
-msgstr "Compensador d'Enerxía"
+msgstr "Compensador d''Enerxía"
 
 msgid "Type of compensator"
 msgstr "Tipu de compensador"
@@ -20716,7 +20812,7 @@ msgid "Cable Distribution Cabinet"
 msgstr "Armariu eléctricu"
 
 msgid "Power Tower"
-msgstr "Torre d'eletricidá"
+msgstr "Torre d''eletricidá"
 
 msgid "Type of construction"
 msgstr "Tipu de construcción"
@@ -20944,7 +21040,7 @@ msgid "Used for data communications"
 msgstr "Utilizáu pa comunicaciones de datos"
 
 msgid "Power Cable"
-msgstr "Cable d'enerxía"
+msgstr "Cable d''enerxía"
 
 msgctxt "power cable"
 msgid "underground"
@@ -21028,7 +21124,7 @@ msgid "Supermarket"
 msgstr "Supermercáu"
 
 msgid "Convenience Store"
-msgstr "Tienda d'alimentación"
+msgstr "Tienda d''alimentación"
 
 msgid "Kiosk"
 msgstr "Quioscu"
@@ -21088,7 +21184,7 @@ msgid "Shoes"
 msgstr "Zapatería"
 
 msgid "Outdoor"
-msgstr "Tienda d'actividaes al campu"
+msgstr "Tienda d''actividaes al campu"
 
 msgid "Dry Cleaning"
 msgstr "Tintorería"
@@ -21106,7 +21202,7 @@ msgid "Electronic"
 msgstr "Elleutrónica"
 
 msgid "Computer"
-msgstr "Tienda d'informática"
+msgstr "Tienda d''informática"
 
 msgid "Electronics"
 msgstr "Elleutrónica y elleutrodomésticos"
@@ -21115,7 +21211,7 @@ msgid "Mobile Phone"
 msgstr "Telefonía móvil"
 
 msgid "Vacuum Cleaner"
-msgstr "Tienda d'aspiradores"
+msgstr "Tienda d''aspiradores"
 
 msgid "Hifi"
 msgstr "Soníu"
@@ -21130,7 +21226,7 @@ msgid "Music"
 msgstr ""
 
 msgid "Cash"
-msgstr "Dineru n'efectivu"
+msgstr "Dineru n''efectivu"
 
 msgid "Bank"
 msgstr "Bancu"
@@ -21142,7 +21238,7 @@ msgid "Money Exchange"
 msgstr "Cambéu de moneda"
 
 msgid "Pawnbroker"
-msgstr "Casa d'enfotu"
+msgstr "Casa d''enfotu"
 
 msgid "Home decoration"
 msgstr "Decoración del llar"
@@ -21166,7 +21262,7 @@ msgid "Bed"
 msgstr "Cama"
 
 msgid "Interior Decoration"
-msgstr "Decoración d'interiores"
+msgstr "Decoración d''interiores"
 
 msgid "Antiques"
 msgstr ""
@@ -21268,7 +21364,7 @@ msgid "Vending products"
 msgstr "Espendedor automáticu de productos"
 
 msgid "animal_food"
-msgstr "comida p'animales"
+msgstr "comida p''animales"
 
 msgid "bicycle_tube"
 msgstr "neumáticu de bicicleta"
@@ -21292,7 +21388,7 @@ msgid "news_papers"
 msgstr "Periódicos"
 
 msgid "parking_tickets"
-msgstr "billetes d'aparcamientu"
+msgstr "billetes d''aparcamientu"
 
 msgid "photos"
 msgstr "semeyes"
@@ -21324,9 +21420,6 @@ msgstr "xuguetes"
 msgid "vouchers"
 msgstr "Bonos"
 
-msgid "Note"
-msgstr "Nota"
-
 msgid "Geography"
 msgstr "Xeografía"
 
@@ -21409,7 +21502,7 @@ msgid "Farm"
 msgstr "Granxa"
 
 msgid "A farm within a bigger settlement"
-msgstr "Una granxa dientro d'un establecimientu mayor"
+msgstr "Una granxa dientro d''un establecimientu mayor"
 
 msgid "(please use isolated_dwelling for an isolated farm)"
 msgstr "(por favor utilice isolated_dwelling pa una granxa aisllada)"
@@ -21419,7 +21512,7 @@ msgstr "Vivienda aisllada"
 
 msgid "Neighbourhood"
 msgstr ""
-"Vecinderu (área d'un llugar habitáu, urbanización, colonia, barriu, etc.)"
+"Vecinderu (área d''un llugar habitáu, urbanización, colonia, barriu, etc.)"
 
 msgid "Locality"
 msgstr "Paraxa"
@@ -21428,7 +21521,7 @@ msgid "Peak"
 msgstr "Picu"
 
 msgid "The top (summit) of a mountain or hill."
-msgstr "El cume d'un monte o llomba"
+msgstr "El cume d''un monte o llomba"
 
 msgid "Saddle"
 msgstr "Collá"
@@ -21465,7 +21558,7 @@ msgid "stratovolcano"
 msgstr "estratovolcán"
 
 msgid "shield"
-msgstr "Volcán n'escudu"
+msgstr "Volcán n''escudu"
 
 msgid "scoria"
 msgstr "escoria"
@@ -21501,16 +21594,16 @@ msgid "Botanical Name"
 msgstr "Nome botánicu"
 
 msgid "Tree Row"
-msgstr "Filera d'árboles"
+msgstr "Filera d''árboles"
 
 msgid "A line of trees."
-msgstr "Una filera d'árboles"
+msgstr "Una filera d''árboles"
 
 msgid "Wood"
 msgstr "Monte natural"
 
 msgid "Woodland where timber production does not dominate use."
-msgstr "Área forestada onde la producción de lleña nun apodera l'usu."
+msgstr "Área forestada onde la producción de lleña nun apodera l''usu."
 
 msgid "Forest"
 msgstr "Plantíu forestal"
@@ -21631,7 +21724,7 @@ msgid "Plant Nursery"
 msgstr "Viveru de plantes"
 
 msgid "Allotments"
-msgstr "Güertos d'ociu"
+msgstr "Güertos d''ociu"
 
 msgid "Garden"
 msgstr "Xardín"
@@ -21647,20 +21740,20 @@ msgstr ""
 
 msgid "Common"
 msgstr ""
-"Espaciu onde'l propietariu dexa'l pasu y esfrute (tipoloxía característica "
+"Espaciu onde''l propietariu dexa''l pasu y esfrute (tipoloxía característica "
 "en Reinu Uníu, nun ye servidume de camín)"
 
 msgid "Park"
 msgstr "Parque"
 
 msgid "Recreation Ground"
-msgstr "Área d'esparcimientu"
+msgstr "Área d''esparcimientu"
 
 msgid "Residential Area"
 msgstr "Zona residencial"
 
 msgid "Graveyard"
-msgstr "Campusantu (p'antiguos llugares d'enterramientu)"
+msgstr "Campusantu (p''antiguos llugares d''enterramientu)"
 
 msgid "Cemetery"
 msgstr "Campusantu"
@@ -21731,9 +21824,6 @@ msgstr "Abreviatura común del nome"
 msgid "House number"
 msgstr "Númberu de portal"
 
-msgid "House name"
-msgstr "Nome del edificiu"
-
 msgid "Street name"
 msgstr "Nome de la cai"
 
@@ -21746,8 +21836,8 @@ msgstr "Nome de la ciudá"
 msgid "Country code"
 msgstr "Códigu del país"
 
-msgid "Optional values for specific countries"
-msgstr "Valores opcionales pa países específicos"
+msgid "House name"
+msgstr "Nome del edificiu"
 
 msgid "Subdistrict"
 msgstr "Subdistritu"
@@ -22026,7 +22116,7 @@ msgid "no_straight_on"
 msgstr "prohibíu siguir rectu"
 
 msgid "no_u_turn"
-msgstr "prohibíu xiru n'U"
+msgstr "prohibíu xiru n''U"
 
 msgid "only_right_turn"
 msgstr "namá xiru a la derecha"
@@ -22080,10 +22170,10 @@ msgid "location of enforcement device"
 msgstr "Situación del dispositivu de control"
 
 msgid "node on way where enforcement starts"
-msgstr "nodo de la vía nel qu'empieza'l control"
+msgstr "nodo de la vía nel qu''empieza''l control"
 
 msgid "where enforcement ends"
-msgstr "onde termina'l control"
+msgstr "onde termina''l control"
 
 msgid "traffic light or barrier that stops you"
 msgstr "semáforu o barrera que-y detien"
@@ -22134,19 +22224,19 @@ msgid "Piste Route"
 msgstr "Ruta de pista"
 
 msgid "link segment"
-msgstr "segmentu d'enllaz"
+msgstr "segmentu d''enllaz"
 
 msgid "shortcut segment"
-msgstr "segmentu d'atayu"
+msgstr "segmentu d''atayu"
 
 msgid "variant segment"
 msgstr "segmentu de variante"
 
 msgid "entry points"
-msgstr "puntos d'entrada"
+msgstr "puntos d''entrada"
 
 msgid "Ski Route"
-msgstr "Ruta d'esquí"
+msgstr "Ruta d''esquí"
 
 msgid "alpine"
 msgstr "alpín"
@@ -22158,13 +22248,13 @@ msgid "Destination"
 msgstr "Destín"
 
 msgid "Ref of the way this is a detour to"
-msgstr "Referencia de la vía en qu'esta ye una esviadura escontra"
+msgstr "Referencia de la vía en qu''esta ye una esviadura escontra"
 
 msgid "fork node for alternative routes"
 msgstr "Puntu de bifurcación pa rutes alternatives"
 
 msgid "Power Route"
-msgstr "Ruta d'enerxía"
+msgstr "Ruta d''enerxía"
 
 msgid "Railway Route"
 msgstr "Ruta de ferrocarril"
@@ -22218,7 +22308,7 @@ msgid "Colour of border/arrow"
 msgstr "Color del cantu/flecha"
 
 msgid "last way before junction"
-msgstr "última vía antes d'un encruz"
+msgstr "última vía antes d''un encruz"
 
 msgid "node of the intersection"
 msgstr "nodo de la intersección"
@@ -22233,7 +22323,7 @@ msgid "Waterway"
 msgstr "Vía fluvial"
 
 msgid "Subtype of waterway (largest one of members)"
-msgstr "Subtipu de vía fluvial (más d'un miembru)"
+msgstr "Subtipu de vía fluvial (más d''un miembru)"
 
 msgid "stream"
 msgstr "regueru"
@@ -22418,6 +22508,13 @@ msgstr "VoGIS: DGM (Modelu del Terrén)"
 msgid "VoGIS: DOM (Surface model)"
 msgstr "VoGIS: DOM (Modelu de Superficie)"
 
+msgid ""
+"AGIV(laanderen) aerial imagery (covers Brussels region as well) (2013)"
+msgstr ""
+
+msgid "Geoservices Wallonie aerial imagery (2009)"
+msgstr ""
+
 msgid "IBGE Mapa de Setores Urbanos"
 msgstr "IBGE Mapa de Setores Urbanos"
 
@@ -22425,7 +22522,7 @@ msgid "IBGE Mapa de Setores Rurais"
 msgstr "IBGE Mapa de Setores Rurais"
 
 msgid "Geobase Hydrography"
-msgstr "Xeobase d'Hidrografía"
+msgstr "Xeobase d''Hidrografía"
 
 msgid "Geobase Roads"
 msgstr "Xeobase de Carreteres"
@@ -22554,6 +22651,9 @@ msgstr "OpenStreetMap (Sorbian Language)"
 msgid "Hamburg (40 cm)"
 msgstr "Hamburg (40 cm)"
 
+msgid "Hamburg (20 cm)"
+msgstr ""
+
 msgid "Hamburg (DK5)"
 msgstr "Hamburg (DK5)"
 
@@ -22802,6 +22902,9 @@ msgstr "GRAFCAN Express - Canary Islands"
 msgid "Kanton Aargau 25cm (AGIS 2011)"
 msgstr "Kanton Aargau 25cm (AGIS 2011)"
 
+msgid "Kanton Aargau 25cm (AGIS 2014)"
+msgstr ""
+
 msgid "Stadt Uster Orthophoto 2008 10cm"
 msgstr "Stadt Uster Orthophoto 2008 10cm"
 
@@ -23159,6 +23262,9 @@ msgstr "{0} ensin {1} o {2}"
 msgid "{0} without {1}, {2} or {3}"
 msgstr "{0} ensin {1}, {2} o {3}"
 
+msgid "{0} together with {1}"
+msgstr ""
+
 msgid "{0} on suspicious object"
 msgstr "{0} n´oxetu sospechosu"
 
@@ -23177,6 +23283,12 @@ 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 "{0}={1} is deprecated"
 msgstr "{0}={1} ta obsoleto"
 
@@ -23218,6 +23330,9 @@ msgstr ""
 msgid "{0} should be replaced with {1}"
 msgstr ""
 
+msgid "{0} = {1}; remove {0}"
+msgstr ""
+
 msgid ""
 "{0}={1} is unspecific. Please replace ''{1}'' by ''left'', ''right'' or "
 "''both''."
@@ -23239,10 +23354,10 @@ msgid "{0} on a node"
 msgstr "{0} nun nodo"
 
 msgid "Building inside building"
-msgstr "Edificiu dientro d'un edificiu"
+msgstr "Edificiu dientro d''un edificiu"
 
 msgid "Overlapping Water Areas"
-msgstr "Llámines d'agua superpuestes"
+msgstr "Llámines d''agua superpuestes"
 
 msgid "Overlapping Areas"
 msgstr "Árees superpuestes"
@@ -23256,6 +23371,9 @@ 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"
+msgstr ""
+
 msgid "abbreviated street name"
 msgstr "nome de cai embrivíu"
 
@@ -23263,7 +23381,7 @@ msgid "wrong highway tag on a node"
 msgstr "etiqueta de carretera incorrecta nun nodo"
 
 msgid "wrong crossing tag on a way"
-msgstr "etiqueta d'encruz incorrecta nuna vía"
+msgstr "etiqueta d''encruz incorrecta nuna vía"
 
 msgid "Unnamed unclassified highway"
 msgstr "carretera ensin clasificación ensin nome"
@@ -23272,14 +23390,22 @@ msgid "highway without a reference"
 msgstr "carretera ensin una referencia"
 
 msgid "temporary highway type"
-msgstr "tipu de carretera d'usu temporal"
+msgstr "tipu de carretera d''usu temporal"
 
 msgid "street name contains ss"
 msgstr "nome de cai contien ss"
 
+msgid ""
+"Value of ''{0}'' should either be ''{1}'' or ''{2}''. For sidewalks use "
+"''{3}'' instead."
+msgstr ""
+
 msgid "{0} with multiple values"
 msgstr "{0} con múltiples valores"
 
+msgid "empty value in semicolon-separated ''{0}''"
+msgstr ""
+
 msgid "numerical key"
 msgstr "clave numbérica"
 
@@ -23295,7 +23421,7 @@ msgstr "level tendría de ser un númberu con opcional de .5 medríes"
 msgid ""
 "{0}: meters is default; period is separator; if units, put space then unit"
 msgstr ""
-"{0}: metros ye'l valor por omisión; el puntu ye'l separador; pa otres "
+"{0}: metros ye''l valor por omisión; el puntu ye''l separador; pa otres "
 "unidaes, introduza un espaciu y depués la unidá"
 
 msgid "unusual {0} format"
@@ -23317,6 +23443,9 @@ msgstr "enclín inusual; usar porcentaxes/graos o enriba/embaxo"
 msgid "{0} must be a numeric value"
 msgstr "{0} ten de ser un valor numbéricu"
 
+msgid "{0} must be a positive integer number"
+msgstr ""
+
 msgid "relation without type"
 msgstr "relation ensin tipu"
 
@@ -23354,7 +23483,7 @@ msgstr ""
 "páxina''"
 
 msgid "unknown language prefix in wikipedia tag"
-msgstr "prefixu d'idioma desconocíu na etiqueta wikipedia"
+msgstr "prefixu d''idioma desconocíu na etiqueta wikipedia"
 
 msgid "deprecated format for wikipedia tag"
 msgstr "Formatu obsoletu pa la etiqueta wikipedia"
@@ -23363,10 +23492,10 @@ msgid "''wikipedia''=''language:page title''"
 msgstr "''wikipedia''=''Códigu del idioma:Títulu del artículu''"
 
 msgid "Hide icons at low zoom"
-msgstr "Esconder iconos a un nivel baxu d'acercamientu"
+msgstr "Esconder iconos a un nivel baxu d''acercamientu"
 
 msgid "Less obtrusive node symbols at low zoom"
-msgstr "Símbolos de nodos más estenos a un nivel baxu d'acercamientu"
+msgstr "Símbolos de nodos más estenos a un nivel baxu d''acercamientu"
 
 msgid "Display street labels (at high zoom)"
 msgstr "Amosar etiquetes de les víes (con zoom altu)"
@@ -23399,7 +23528,7 @@ msgid "configure the connected DG100"
 msgstr "Configurar la conexón DG100"
 
 msgid "delete data after import"
-msgstr "Esaniciar los datos dempués d'importalos"
+msgstr "Esaniciar los datos dempués d''importalos"
 
 msgid "Columbus V-900 CSV Files"
 msgstr "Arquivos CSV Columbus V-900"
@@ -23411,7 +23540,7 @@ msgid "Markers of "
 msgstr "Marcadores de "
 
 msgid "Show summary after import"
-msgstr "Amosar resume n'importando"
+msgstr "Amosar resume n''importando"
 
 msgid "Do not zoom after import"
 msgstr "Non zoom dempués de la importación"
@@ -23420,7 +23549,7 @@ msgid "Ignore hdop/vdop/pdop entries"
 msgstr "Ignorar entraes hdop/vdop/pdop"
 
 msgid "Warn on missing audio files"
-msgstr "Alvertir sobre los arquivos d'audiu perdíos"
+msgstr "Alvertir sobre los arquivos d''audiu perdíos"
 
 msgid "Warn on conversion errors"
 msgstr "Alvertir sobre los erros de conversión"
@@ -23429,7 +23558,7 @@ msgid "Error in line "
 msgstr "Erru en llínea "
 
 msgid "Missing audio file"
-msgstr "Arquivos d'audiu perdíos"
+msgstr "Arquivos d''audiu perdíos"
 
 msgid "Commands"
 msgstr "Comandos"
@@ -23438,7 +23567,7 @@ msgid ""
 "No command has been found. Would you like to download and install default "
 "commands now?"
 msgstr ""
-"Non s'atopó nengún comandu. ¿Deseya descargar ya instalar comandos por "
+"Non s''atopó nengún comandu. ¿Deseya descargar ya instalar comandos por "
 "defeuto agora?"
 
 msgid "No command found"
@@ -23510,7 +23639,7 @@ msgid ""
 "in common"
 msgstr ""
 "Forma una cuadrícula de viales basándose en dos víes yá esistentes que "
-"tienen dellos nodos y unu d'ellos de mancomún"
+"tienen dellos nodos y unu d''ellos de mancomún"
 
 msgid "Select two ways with a node in common"
 msgstr "Escoyer dos víes con un nodo de mancomún"
@@ -23547,7 +23676,7 @@ msgid "Download Track"
 msgstr "Descargando traza"
 
 msgid "Filename"
-msgstr "Nome d'arquivu"
+msgstr "Nome d''arquivu"
 
 msgid "Private (only shared as anonymous, unordered points)"
 msgstr "Priváu (namá compartir como anónimu, desordenar puntos)"
@@ -23614,7 +23743,7 @@ msgid "GPX upload was successful"
 msgstr "GPX xubíu correchamente"
 
 msgid "Upload failed. Server returned the following message: "
-msgstr "Xubida fallida. El servidor retorna'l siguiente mensaxe "
+msgstr "Xubida fallida. El servidor retorna''l siguiente mensaxe "
 
 msgid "Uploading GPX track: {0}% ({1} of {2})"
 msgstr "Xubiendo traza GPX: {0}% ({1} de {2})"
@@ -23630,25 +23759,25 @@ msgid "Uploads traces to openstreetmap.org"
 msgstr "Traces xubíes a openstreetmap.org"
 
 msgid "Shows elevation profile"
-msgstr "Amuesa'l perfil d'elevación"
+msgstr "Amuesa''l perfil d''elevación"
 
 msgid "Elevation Profile"
-msgstr "Perfil d'elevación"
+msgstr "Perfil d''elevación"
 
 msgid "Elevation Grid Layer (experimental!)"
-msgstr "Capa d'Elevación d'Alluna (¡esperimental!)"
+msgstr "Capa d''Elevación d''Alluna (¡esperimental!)"
 
 msgid "Shows elevation grid layer"
-msgstr "Amosar la capa d'alluna d'elevación"
+msgstr "Amosar la capa d''alluna d''elevación"
 
 msgid "Elevation Grid"
-msgstr "Alluna d'elevación"
+msgstr "Alluna d''elevación"
 
 msgid "No SRTM data"
 msgstr "Nun hai datos de SRTM"
 
 msgid "Open the elevation profile window."
-msgstr "Abrir la ventana del perfil d'elevación."
+msgstr "Abrir la ventana del perfil d''elevación."
 
 msgid "Min"
 msgstr "Mín"
@@ -23675,7 +23804,7 @@ msgid "Elevation profile"
 msgstr "Perfil del terrén"
 
 msgid "(No elevation data)"
-msgstr "(Nun hai datos d'elevación)"
+msgstr "(Nun hai datos d''elevación)"
 
 msgid "Can not save preferences"
 msgstr "Non puede guardase les preferencies"
@@ -23737,7 +23866,7 @@ 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 ""
-"Faiga clic o clic y abasnar pa siguir, Ctrl-clic p'añedir un nodo fixu, "
+"Faiga clic o clic y abasnar pa siguir, Ctrl-clic p''añedir un nodo fixu, "
 "Mayus-clic pa borrar, Enter pa simplificar o guardar, Ctrl-Mayus-Clic pa "
 "volver empecipiar."
 
@@ -23748,7 +23877,7 @@ msgid "Fast drawing mode"
 msgstr "mou de dibuxu rápidu"
 
 msgid "Please move the mouse to draw new way"
-msgstr "Por favor, mueva'l mure pa dibuxar nueva forma"
+msgstr "Por favor, mueva''l mure pa dibuxar nueva forma"
 
 msgid "Are you sure you do not want to save the line containing {0} points?"
 msgstr "¿Tas seguru de nun querer guardar la llínea que contien {0} puntos?"
@@ -23765,7 +23894,7 @@ msgstr ""
 "{3} puntos por km (promediu)"
 
 msgid "Line information"
-msgstr "llínea d'información"
+msgstr "llínea d''información"
 
 msgid "Cannot place node outside of the world."
 msgstr "Non puede allugase un nodo fuera del mundu."
@@ -23874,7 +24003,8 @@ msgid "Postcode"
 msgstr "Códigu postal"
 
 msgid "Turns all guesses into the corresponding tag values."
-msgstr "Convierte toles conxetures nos valores d'etiquetes correspondientes."
+msgstr ""
+"Convierte toles conxetures nos valores d''etiquetes correspondientes."
 
 msgid "Applied guessed values"
 msgstr "Aplicáu a los valores supuestos"
@@ -23917,8 +24047,8 @@ msgid ""
 "Tries to guess address data by picking the name of the closest object with "
 "according tag."
 msgstr ""
-"Tratar d'envalorar los datos de la dirección escoyendo'l nome del oxetu más "
-"cercanu acordies con les etiquetes."
+"Tratar d''envalorar los datos de la dirección escoyendo''l nome del oxetu "
+"más cercanu acordies con les etiquetes."
 
 msgid "Guessing address values"
 msgstr "Envalorar valores de dirección"
@@ -23953,7 +24083,7 @@ msgstr[0] "Actualizar les propiedaes d´hasta {0} oxetu"
 msgstr[1] "Actualizar les propiedaes d´hasta {0} oxetos"
 
 msgid "Default image projection"
-msgstr "Proyección d'imaxes per omisión"
+msgstr "Proyección d''imaxes per omisión"
 
 msgid "JOSM''s current projection"
 msgstr "Proyección actual de JOSM"
@@ -23967,7 +24097,7 @@ msgstr ""
 "Nun s´atopó l´arquivu de proyección (.prj).<br>Puede escoyer la proyección "
 "d´imaxes per omisión ({0}) o l´editor de proyección actual de JOSM ({1}) "
 "como la proyección orixinal de la imaxe .<br>(Puede camudase depués col menú "
-"contextual de la capa d'imaxe)."
+"contextual de la capa d´imaxe)."
 
 msgid "Layer Properties"
 msgstr "Propiedaes de la capa"
@@ -23991,7 +24121,7 @@ msgid "NanoLog of {0} entries"
 msgstr "NanoLog de {0} entraes"
 
 msgid "NanoLog of {0} lines, {1} of them with coordinates."
-msgstr "NanoLog de {0} llínees, {1} d'elles con coordenaes."
+msgstr "NanoLog de {0} llínees, {1} d''elles con coordenaes."
 
 msgid "Correlate with GPX..."
 msgstr "Correlacionar con GPX..."
@@ -24012,17 +24142,17 @@ msgid "Open NanoLog panel"
 msgstr "Abrir el panel NanoLog"
 
 msgid "Open NanoLog file..."
-msgstr "Abrir l'arquivu NanoLog..."
+msgstr "Abrir l''arquivu NanoLog..."
 
 msgid "Could not read NanoLog file:"
-msgstr "Non pudo lleese l'arquivu NanoLog:"
+msgstr "Non pudo lleese l''arquivu NanoLog:"
 
 msgid "Edit opening hours"
-msgstr "Horarios d'apertura"
+msgstr "Horarios d''apertura"
 
 msgid "Edit time-tag of selected element in a graphical interface"
 msgstr ""
-"Editar por aciu una interfaz gráfica etiquetar sobre l'horariu del elementu "
+"Editar por aciu una interfaz gráfica etiquetar sobre l''horariu del elementu "
 "escoyíu."
 
 msgid "edit existing tag"
@@ -24050,7 +24180,7 @@ msgid "Correct the value manually and than press Enter."
 msgstr "Corrixa´l valor manualmente y prima Enter."
 
 msgid "Error in timeformat"
-msgstr "Erru en formatu d'hora"
+msgstr "Erru en formatu d''hora"
 
 msgid "open end"
 msgstr "terminación accesible"
@@ -24162,12 +24292,12 @@ msgstr "Información opcional:"
 
 msgid "Please select a street to associate with address interpolation way"
 msgstr ""
-"Por favor, escueya una cai p'acomuñar cola mou de interpolación de númberos "
+"Por favor, escueya una cai p''acomuñar cola mou de interpolación de númberos "
 "de portales"
 
 msgid "Please select address interpolation way for this street"
 msgstr ""
-"Por favor, escueya mou de interpolación de númberos de portales d'esta cai"
+"Por favor, escueya mou de interpolación de númberos de portales d''esta cai"
 
 msgid "Expected odd numbers for addresses"
 msgstr "Prevíase númberu de portal impar"
@@ -24183,7 +24313,7 @@ msgstr "El códigu de país tien de tener 2 lletres"
 
 msgid "Please enter valid number for starting and ending address"
 msgstr ""
-"Por favor, introduza un númberu válidu d'entamu y finalización del númberu "
+"Por favor, introduza un númberu válidu d''entamu y finalización del númberu "
 "de portal"
 
 msgid "Alphabetic address must end with a letter"
@@ -24196,18 +24326,18 @@ msgstr ""
 
 msgid "Starting address letter must be less than ending address letter"
 msgstr ""
-"La lletra del portal d'entamu tien de ser inferior a la lletra del últimu "
+"La lletra del portal d''entamu tien de ser inferior a la lletra del últimu "
 "portal"
 
 msgid "Please enter valid number for starting address"
-msgstr "Por favor, introduza un númberu valíu pal portal d'entamu"
+msgstr "Por favor, introduza un númberu valíu pal portal d''entamu"
 
 msgid "Please enter valid number for ending address"
 msgstr "Por favor, introduza un númberu valíu pal portal final"
 
 msgid "Starting address number must be less than ending address number"
 msgstr ""
-"El númberu de portal d'entamu tien de ser menor que'l númberu del últimu "
+"El númberu de portal d''entamu tien de ser menor que''l númberu del últimu "
 "portal."
 
 msgid "Align Way Segments"
@@ -24227,8 +24357,8 @@ msgid ""
 "Aligning would result nodes ''outside the world''.\n"
 "Alignment not possible.\n"
 msgstr ""
-"L'alliniadura daría como resultáu nodos ''fuera del mundu''.\n"
-"Nun ye posible l'alliniadura.\n"
+"L''alliniadura daría como resultáu nodos ''fuera del mundu''.\n"
+"Nun ye posible l''alliniadura.\n"
 
 msgid ""
 "There is at least a non-pivot endpoint of the alignee that joins more than "
@@ -24237,23 +24367,23 @@ msgid ""
 msgstr ""
 "Hai siquier un puntu final que nun ye pivós del alliniáu y xune más de dos "
 "segmentos\n"
-"Nun ye posible l'alliniadura calteniendo los ángulos.\n"
+"Nun ye posible l''alliniadura calteniendo los ángulos.\n"
 
 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 ""
-"Nun ye posible l'alliniadura calteniendo los ángulos de los segmentos "
+"Nun ye posible l''alliniadura calteniendo los ángulos de los segmentos "
 "xuníos.\n"
-"Escueya'l métodu d'alliniadura ''caltener el llargor'' o escueya otros "
+"Escueya''l métodu d''alliniadura ''caltener el llargor'' o escueya otros "
 "segmentos.\n"
 
 msgid ""
 "An intersection point would fall outside its adjacent nodes.\n"
 "This is an unsupported scenario.\n"
 msgstr ""
-"Un puntu d'intersección cayería fora de les sos nodos axacentes.\n"
+"Un puntu d''intersección cayería fora de les sos nodos axacentes.\n"
 "Esti escenariu nun ta previstu.\n"
 
 msgid "Undocumented problem occured.\n"
@@ -24270,19 +24400,19 @@ msgid ""
 " or put the pivot on their common node.\n"
 msgstr ""
 "Por favor escueya dos segmentos que nun compartan nodos\n"
-"o ponga'l pivós nel nodo común.\n"
+"o ponga''l pivós nel nodo común.\n"
 
 msgid "Align Way Segments: Modes"
 msgstr "Alliniar Segmentos de Víes: Moos"
 
 msgid "Align Ways control panel"
-msgstr "Panel de control d'Alliniar Víes"
+msgstr "Panel de control d''Alliniar Víes"
 
 msgid "This panel activates in Align Ways mode:"
 msgstr "Esti panel activar na mou Alliniar Víes"
 
 msgid "Length preserved"
-msgstr "Caltiense'l llargor"
+msgstr "Caltiense''l llargor"
 
 msgid "Angle preserved"
 msgstr "Caltiénense los ángulos"
@@ -24294,7 +24424,7 @@ msgid ""
 "<html>Aligns the way segment to the reference so that its length is "
 "preserved.</html>"
 msgstr ""
-"<html>Allinia'l segmentu a la referencia de tal mou que caltien el so "
+"<html>Allinia''l segmentu a la referencia de tal mou que caltien el so "
 "llargor.</html>"
 
 msgid ""
@@ -24302,7 +24432,7 @@ msgid ""
 "adjacent segments are preserved.<br/>The length of the aligned segment is "
 "likely to change as result.</html>"
 msgstr ""
-"<html>Allinia'l segmentu de la vía a la referencia de tal mou que los "
+"<html>Allinia''l segmentu de la vía a la referencia de tal mou que los "
 "ángulos de los segmentos axacentes calténganse.<br/>El llargor de los "
 "segmentos alliniaos de xuru va sufrir cambeos.</html>"
 
@@ -24310,13 +24440,13 @@ msgid "I''m ready!"
 msgstr "Toi list@!"
 
 msgid "AlignWays Tips"
-msgstr "Conseyos p'alliniar víes"
+msgstr "Conseyos p''alliniar víes"
 
 msgid "AlignWays: What''s New..."
 msgstr "Alliniar Víes: Novedaes..."
 
 msgid "Align Ways mode"
-msgstr "mou d'alliniación de víes"
+msgstr "mou d''alliniación de víes"
 
 msgid "Parameter ''{0}'' must not be null"
 msgstr "El parámetru''{0}'' nun tien de ser nulu"
@@ -24325,18 +24455,18 @@ msgid ""
 "Segment to be aligned cannot be the same with the reference segment.\n"
 "Please choose a different segment to be aligned."
 msgstr ""
-"El segmentu a alliniase nun puede ser el mesmu que'l segmentu de "
+"El segmentu a alliniase nun puede ser el mesmu que''l segmentu de "
 "referencia.\n"
 "Por favor, escueya un segmentu distintu pa ser alliniáu."
 
 msgid "AlignWayS message"
-msgstr "Mensaxe d'Alliniar Víes"
+msgstr "Mensaxe d''Alliniar Víes"
 
 msgid ""
 "Reference segment cannot be the same with the segment to be aligned.\n"
 "Please choose a different reference segment."
 msgstr ""
-"El segmentu de referencia nun puede ser el mesmu que l'elementu a ser "
+"El segmentu de referencia nun puede ser el mesmu que l''elementu a ser "
 "alliniáu.\n"
 "Por favor escueya un segmentu de referencia distintu."
 
@@ -24379,7 +24509,7 @@ msgstr ""
 "<span style=''font-size: xx-large;''>Complemento Alliniar Vía "
 "span<style=''color: rgb(204, 85, 0);''>S</span><br>\n"
 "</span><span style=''font-size: medium;''><br>\n"
-"...qu'en realidá tendría de ser llamáu br <>\n"
+"...qu''en realidá tendría de ser llamáu<br>\n"
 "Complementu span <style=''font-size: large;''>AlinearVíaS(egmentos)</span>..."
 
 msgid ""
@@ -24400,7 +24530,7 @@ msgstr ""
 "exemplu traza víes y deseya que les llaterales tean paraleles a el\n"
 "camín o la cai.<br>\n"
 "<br>\n"
-"Dellos conseyos antes d'empezar::\n"
+"Dellos conseyos antes d''empezar::\n"
 "</p>\n"
 "</html>\n"
 "\n"
@@ -24421,9 +24551,9 @@ msgstr ""
 "<html>\n"
 "<div style=''font-family: sans-serif;''>\n"
 "<ul>\n"
-"<li><b>Escueya un segmentu de referencia.</b> Puede faelo con <>< b i><span "
+"<li><b>Escueya un segmentu de referencia.</b> Puede faelo con <b><i><span "
 "style=''color:green''>Ctrl-click</span></i></b>\n"
-"nun segmentu. L'otru, va faese paralelu a \n"
+"nun segmentu. L''otru, va faese paralelu a \n"
 "este. </li>\n"
 "</ul>\n"
 "</div>\n"
@@ -24448,8 +24578,8 @@ msgstr ""
 "<html>\n"
 "<div style=''font-family:sans-serif''>\n"
 "<ul>\n"
-"<li><b>Escueya l'elementu a ser alliniáu.</b> Cenciellamente b <><i><span "
-"style=''color:green''>prima'l botón del mouse</span></i></b>\n"
+"<li><b>Escueya l''elementu a ser alliniáu.</b> Cenciellamente <b><i><span "
+"style=''color:green''>prima''l botón del mouse</span></i></b>\n"
 "nun segmentu distintu.\n"
 "El pivós de rotación va señalar de forma predeterminá nel \n"
 "centru del segmentu.\n"
@@ -24477,10 +24607,10 @@ msgstr ""
 "<html>\n"
 "<div style=''font-family:sans-serif''>\n"
 "<ul>\n"
-"<li>Puede b <>camudar el pivós de rotación</b> si deseyar. Col fin "
-"d'ameyorar la paralelización frente al segmentu de referencia, el segmentu "
-"que se va alliniar rotará alredor d'esti puntu. Puede escoyer los dos "
-"estremidaes o'l centru del segmentu b <><i><span "
+"<li>Puede <b>camudar el pivós de rotación</b> si deseyar. Col fin "
+"d''ameyorar la paralelización frente al segmentu de referencia, el segmentu "
+"que se va alliniar rotará alredor d''esti puntu. Puede escoyer los dos "
+"estremidaes o''l centru del segmentu <b><i><span "
 "style=''color:green''>faciendo click</span></i></b>cerca.\n"
 "</li>\n"
 "</ul>\n"
@@ -24505,10 +24635,10 @@ msgstr ""
 "<html>\n"
 "<div style=''font-family:sans-serif''>\n"
 "<ul>\n"
-"<li><b>Alliniar los oxetos.</b> Pulsie b <><i><span "
+"<li><b>Alliniar los oxetos.</b> Pulsie <b><i><span "
 "style=''color:green''>{0}</span></i></b>. De forma alternativa va atopar el "
-"comandu nel menú b <>Ferramientes</b>\n"
-"o tamién puede añedir el botón a <> la b barra de ferramientes</b>.\n"
+"comandu nel menú <b>Ferramientes</b>\n"
+"o tamién puede añedir el botón a <b> la barra de ferramientes</b>.\n"
 "</li>\n"
 "</ul>\n"
 "</div>\n"
@@ -24541,10 +24671,10 @@ msgid "What''s new..."
 msgstr "Novedaes..."
 
 msgid "Added <b>angle preserving</b> aligning mode"
-msgstr "Añedióse el mou b <>caltener ángulu /b.<>"
+msgstr "Añedióse el mou <b>caltener ángulu.</b>"
 
 msgid "Various improvements and bugfixes"
-msgstr "Meyores varies y correción d'erros"
+msgstr "Meyores varies y correción d''erros"
 
 msgid "Errr..."
 msgstr "Eeeeehh..."
@@ -24553,7 +24683,7 @@ msgid "Browser not supported."
 msgstr "Navegador ensin soportar."
 
 msgid "Building address"
-msgstr "Dirección d'edificación"
+msgstr "Dirección d''edificación"
 
 msgid "empty"
 msgstr "valeru"
@@ -24595,13 +24725,13 @@ msgid "Tools: {0}"
 msgstr "Ferramientes: {0}"
 
 msgid "Area Selection"
-msgstr "Selección d'Área"
+msgstr "Selección d''Área"
 
 msgid "Select an area (e.g. building) from an underlying image."
-msgstr "Escueya una área (por casu, construcción) d'una imaxe subxacente."
+msgstr "Escueya una área (por casu, construcción) d''una imaxe subxacente."
 
 msgid "Area Selector"
-msgstr "Selector d'Área"
+msgstr "Selector d''Área"
 
 msgid "Created area"
 msgstr "Área creada"
@@ -24610,21 +24740,21 @@ msgid "Unable to detect a polygon where you clicked."
 msgstr "Non puede detectase un polígonu onde fixo clic."
 
 msgid "Error Report"
-msgstr "Notificación d'Erru"
+msgstr "Notificación d''Erru"
 
 msgid "Something went wrong!"
 msgstr "Daqué salió mal!"
 
 msgid "Please file a bug report on the github project page under"
 msgstr ""
-"Por favor presente un informe d'erru del proyectu github na páxina de baxo"
+"Por favor presente un informe d''erru del proyectu github na páxina de baxo"
 
 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 ""
 "Fáiganos saber lo que fixo y lo que asocedió amestando el siguiente testu "
-"nel informe d'erru, pa que podamos atopar l'orixe del problema."
+"nel informe d''erru, pa que podamos atopar l''orixe del problema."
 
 msgid "Area detection algorithm settings."
 msgstr ""
@@ -24636,8 +24766,8 @@ msgid ""
 "The color threshold defines how far the color can be of the original color "
 "to be selected (Default: {0})."
 msgstr ""
-"L'estragal de color define qué llueñe puede tar el color orixinal d'el color "
-"a escoyer (por defectu: {0})."
+"L''estragal de color define qué llueñe puede tar el color orixinal d''el "
+"color a escoyer (por defectu: {0})."
 
 msgid "Color Threshold"
 msgstr "Estragal de color"
@@ -24673,6 +24803,12 @@ msgstr "Combinar nodos colos sos vecinos"
 msgid "merge nodes"
 msgstr "combinar nodos"
 
+msgid "How often thinning operation should be applied (Default {0})."
+msgstr ""
+
+msgid "Thinning Iterations"
+msgstr ""
+
 msgid "Street Name:"
 msgstr "Nome de Cai:"
 
@@ -24686,7 +24822,7 @@ msgid "Advanced settings"
 msgstr "Axustes avanzaos"
 
 msgid "Buildings tags:"
-msgstr "Etiquetes d'edificaciones"
+msgstr "Etiquetes d''edificaciones"
 
 msgid "Cannot place building outside of the world."
 msgstr "Nun puede allugar la edificación fora del planeta."
@@ -24734,7 +24870,7 @@ msgid "Add address"
 msgstr "Añedir dirección"
 
 msgid "Helping tool for tag address"
-msgstr "Ferramienta d'ayuda pa establecer dirección"
+msgstr "Ferramienta d''ayuda pa establecer dirección"
 
 msgid "CadastreFR - Buildings"
 msgstr "CadastreFR - Edificios"
@@ -24798,7 +24934,7 @@ msgid ""
 msgstr ""
 "Nun s´atopó o nun ta disponible\n"
 "el barriu o la ciudá {0}, o atayóse\n"
-"l'acción"
+"l''acción"
 
 msgid "Choose from..."
 msgstr "Escoyer dende..."
@@ -24818,9 +24954,9 @@ msgid ""
 "The new grabbing key is F10, but you can change the key\n"
 "in the shortcut settings if you want."
 msgstr ""
-"El complementu Cadastre-fr utilizaba l' atayu F11 pa grabar,\n"
+"El complementu Cadastre-fr utilizaba l''atayu F11 pa grabar,\n"
 "el cual agora ye utilizáu pa camudar al mou pantalla completa.\n"
-"El nuevu atayu ye F10, pero puede camudar l'atayu de tecláu\n"
+"El nuevu atayu ye F10, pero puede camudar l''atayu de tecláu\n"
 "nes preferencies si asina lu deseya."
 
 msgid ""
@@ -24843,7 +24979,7 @@ msgid ""
 "the current projection to one of the cadastre\n"
 "projections and retry"
 msgstr ""
-"P'habilitar el plugin de catastru WMS, camude la\n"
+"P''habilitar el plugin de catastru WMS, camude la\n"
 "proyección actual a una de proyección catastral\n"
 "y reintente"
 
@@ -24868,7 +25004,7 @@ msgid "Disable image cropping during georeferencing."
 msgstr "Evacuar sesgar(crop) la imaxe mientres la georeferencia."
 
 msgid "Use \"Tableau d''assemblage\""
-msgstr "Usar ''Tableau d'assemblage''"
+msgstr "Usar ''Tableau d''assemblage''"
 
 msgid "Replace grey shades by white color only"
 msgstr "Reemplazar solombres grises por color blancu namá"
@@ -24932,8 +25068,8 @@ msgid ""
 "<BR>before any upload of data created by this plugin."
 msgstr ""
 "Un componente especial pal manexu del servidor WMS del catastru francés en "
-"www.cadastre.gouv.fr<br><br>Por favor, llea los Términos y Condiciones d'Usu "
-"equí (en francés):<br><a "
+"www.cadastre.gouv.fr<br><br>Por favor, llea los Términos y Condiciones "
+"d''Usu equí (en francés):<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 > "
@@ -24941,8 +25077,8 @@ msgstr ""
 
 msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
 msgstr ""
-"<html>Valor de la clave ''source'' cuando'l rexistru automáticu ta activu "
-"/html.<>"
+"<html>Valor de la clave ''source'' cuando''l rexistru automáticu ta activu "
+".</html>"
 
 msgid ""
 "Replace the original white background by the background color defined in "
@@ -24983,7 +25119,7 @@ msgid "Low resolution (600x400)"
 msgstr "Resolvimientu baxu (600x400)"
 
 msgid "Image filter interpolation:"
-msgstr "Filtru de interpolación d'imaxe:"
+msgstr "Filtru de interpolación d''imaxe:"
 
 msgid "Nearest-Neighbor (fastest) [ Default ]"
 msgstr "Vecín más cercanu (La más rápida) [ Predeterminá ]"
@@ -24995,7 +25131,7 @@ msgid "Bicubic (slow)"
 msgstr "Bicúbica (lenta)"
 
 msgid "Vector images grab multiplier:"
-msgstr "Teselador d'imaxes vectorizaes a descargar."
+msgstr "Teselador d''imaxes vectorizaes a descargar."
 
 msgid "Grab one image full screen"
 msgstr "Llograr una imaxe de pantalla completa"
@@ -25041,7 +25177,7 @@ msgid "Municipality administrative borders."
 msgstr "Frontera alministrativa municipal."
 
 msgid "Raster images grab multiplier:"
-msgstr "Multiplicador de toma d'imaxes raster"
+msgstr "Multiplicador de toma d''imaxes raster"
 
 msgid ""
 "Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
@@ -25093,11 +25229,11 @@ msgid ""
 "building import size is limited to 1 km2 max."
 msgstr ""
 "Pa evitar sobrecargar el servidor WMS del Catastru\n"
-"la importación d'arquivu ta llindada a 1km2 a lo más."
+"la importación d''arquivu ta llindada a 1km2 a lo más."
 
 msgid "Please, enable auto-sourcing and check cadastre millesime."
 msgstr ""
-"Por favor, active'l´autoabastecimiento y compruebe el catastru Millesime."
+"Por favor, active''l´autoabastecimiento y compruebe el catastru Millesime."
 
 msgid "Extract SVG ViewBox..."
 msgstr "Estrayer SVG de la caxa de vista..."
@@ -25119,7 +25255,7 @@ msgid ""
 "Use the normal Cadastre Grab menu."
 msgstr ""
 "Conceyu vectorizáu!\n"
-"Use'l menú de llogru avezáu de Catastru."
+"Use''l menú de llogru avezáu de Catastru."
 
 msgid ""
 "This commune is not vectorized.\n"
@@ -25144,7 +25280,7 @@ msgid "Cadastre grab"
 msgstr "Suxetar catastru"
 
 msgid "Download Image from French Cadastre WMS"
-msgstr "Descargando imaxes dende'l servidor francés WMS del Catastru"
+msgstr "Descargando imaxes dende''l servidor francés WMS del Catastru"
 
 msgid "Cadastre: {0}"
 msgstr "Catastru: {0}"
@@ -25183,7 +25319,7 @@ msgstr ""
 msgid ""
 "Selected file {0} is not a cache file from this plugin (invalid extension)"
 msgstr ""
-"El ficheru escoyíu {0} nun ye un ficheru de caxé d'esti plugin(estensión "
+"El ficheru escoyíu {0} nun ye un ficheru de caxé d''esti plugin (estensión "
 "inválida)"
 
 msgid "The location {0} is already on screen. Cache not loaded."
@@ -25208,7 +25344,7 @@ msgid ""
 "<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
 "known by www.cadastre.gouv.fr .</html>"
 msgstr ""
-"<html>Introduza'l nome de la población.<br>Utilice la sintaxis y la "
+"<html>Introduza''l nome de la población.<br>Utilice la sintaxis y la "
 "puntuación conocida por www.cadastre.gouv.fr.</html>"
 
 msgid "Departement"
@@ -25283,13 +25419,13 @@ msgid "Enter cadastre east,north position"
 msgstr "Introduza posición de catastru este,norte"
 
 msgid "(Warning: verify north with arrow !!)"
-msgstr "(Alvertencia: verifique'l norte cola flecha !!)"
+msgstr "(Alvertencia: verifique''l norte cola flecha !!)"
 
 msgid "East"
 msgstr "Este"
 
 msgid "I use the mouse"
-msgstr "Uso'l mure"
+msgstr "Uso''l mure"
 
 msgid "Set {0} Lambert coordinates"
 msgstr "Establecer {0} coordenaes Lambert"
@@ -25310,8 +25446,8 @@ msgid ""
 "More than one WMS layer present\n"
 "Select one of them first, then retry"
 msgstr ""
-"Más d'una capa WMS presente\n"
-"Escueya primero una d'elles y reinténtelo"
+"Más d''una capa WMS presente\n"
+"Escueya primero una d''elles y reinténtelo"
 
 msgid "Reset offset"
 msgstr "Reiniciar rectificación"
@@ -25367,22 +25503,22 @@ msgid "Color Scheme"
 msgstr "Esquema de color"
 
 msgid "Please select the scheme to delete."
-msgstr "Por favor, escueya l'esquema que quier esaniciar"
+msgstr "Por favor, escueya l''esquema que quier esaniciar"
 
 msgid "Use the selected scheme from the list."
-msgstr "Utilizar l'esquema escoyíu de la llista"
+msgstr "Utilizar l''esquema escoyíu de la llista"
 
 msgid "Use the current colors as a new color scheme."
 msgstr "Utilizar los colores actuales como un nuevu esquema de color."
 
 msgid "Delete the selected scheme from the list."
-msgstr "Esaniciar l'esquema escoyíu de la llista"
+msgstr "Esaniciar l''esquema escoyíu de la llista"
 
 msgid "Color Schemes"
 msgstr "Esquemes de color"
 
 msgid "Conflate object pair"
-msgstr "Par d'oxetos combinaos"
+msgstr "Par d''oxetos combinaos"
 
 msgid "Added {0} object to subject layer"
 msgid_plural "Added {0} objects to subject layer"
@@ -25393,7 +25529,7 @@ msgid "Conflation"
 msgstr "Combinación"
 
 msgid "Activates the conflation plugin"
-msgstr "Activa'l complementu de combinación"
+msgstr "Activa''l complementu de combinación"
 
 msgid "Matches"
 msgstr "Coincidencies"
@@ -25447,10 +25583,10 @@ msgid "Select the primitives currently selected in the list"
 msgstr "Escoyer les primitives anguaño escoyíes na llista"
 
 msgid "Match finder settings"
-msgstr "Preferencies del buscador d'axugamientos"
+msgstr "Preferencies del buscador d''axugamientos"
 
 msgid "Match finder method"
-msgstr "Métodu del buscador d'axugamientos"
+msgstr "Métodu del buscador d''axugamientos"
 
 msgid "Threshold distance"
 msgstr "Estragal de distancia"
@@ -25490,7 +25626,7 @@ msgid "Freeze subject selection"
 msgstr "Conxelar la selección de suxetu"
 
 msgid "No valid OSM data layer present."
-msgstr "Nun s'atopa nenguna capa de datos OSM válida"
+msgstr "Nun s''atopa nenguna capa de datos OSM válida"
 
 msgid "Error freezing selection"
 msgstr "Erru al conxelar la selección"
@@ -25519,7 +25655,7 @@ msgid ""
 "Remove the area from the relation before splitting it."
 msgstr ""
 "La área escoyida nun puede estremase porque ye miembru de dalguna relación.\n"
-"Esanicie la área de la relación antes d'estremalo."
+"Esanicie la área de la relación antes d''estremalo."
 
 msgid "TangoGPS Files (*.log)"
 msgstr "Arquivos TangoGPS (*.log)"
@@ -25582,13 +25718,13 @@ msgid "Drop existing path"
 msgstr "Soltar camín esistente"
 
 msgid "No GPX data layer found."
-msgstr "Nun s'atopó la capa de datos GPX"
+msgstr "Nun s''atopó la capa de datos GPX"
 
 msgid "External tool error"
 msgstr "Erru de ferramienta esterno"
 
 msgid "Error executing the script:"
-msgstr "Erru executando'l script:"
+msgstr "Erru executando''l script:"
 
 msgid ""
 "Child script have returned invalid data.\n"
@@ -25606,7 +25742,7 @@ msgid "External Tool: {0}"
 msgstr "Ferramienta esterno: {0}"
 
 msgid "Edit tool"
-msgstr "Ferramienta d'Edición"
+msgstr "Ferramienta d''Edición"
 
 msgid "CmdLine:"
 msgstr "Llínea de Comandu:"
@@ -25636,7 +25772,7 @@ msgid "Failed to login as {0}:"
 msgstr "Hubo una falla al intentar ingresar como {0}:"
 
 msgid "The server did not return user ID"
-msgstr "El servidor nun devolvió un ID d'usuariu"
+msgstr "El servidor nun devolvió un ID d''usuariu"
 
 msgid "Failed to get messages as {0}:"
 msgstr "Hebo un fallu al llograr mensaxes de {0}:"
@@ -25662,7 +25798,7 @@ msgstr[0] "{0} usuariu"
 msgstr[1] "{0} usuarios"
 
 msgid "not logged in"
-msgstr "nun s'anició sesión"
+msgstr "nun s''anició sesión"
 
 msgid "Failed to log in to GeoChat:"
 msgstr "Hebo un fallu al aportar a GeoChat:"
@@ -25737,7 +25873,7 @@ msgid "Configure Device"
 msgstr "Configurar dispositivu"
 
 msgid "Importing data from device."
-msgstr "Importando datos dende'l dispositivu."
+msgstr "Importando datos dende''l dispositivu."
 
 msgid "Importing data from DG100..."
 msgstr "Importando datos dende DG100..."
@@ -25749,7 +25885,7 @@ msgid "imported data from {0}"
 msgstr "Datos importaos de {0}"
 
 msgid "No data found on device."
-msgstr "Nun s'atoparon datos nel dispositivu."
+msgstr "Nun s''atoparon datos nel dispositivu."
 
 msgid "Connection failed."
 msgstr "Conexón fallida."
@@ -25799,10 +25935,10 @@ msgstr "elementu de clase ensin nome"
 
 msgid "Tag element outside basetag and implication elements"
 msgstr ""
-"Etiqueta d'elementu fora de la base d'etiquetes y elementos d'implicación"
+"Etiqueta d''elementu fora de la base d''etiquetes y elementos d''implicación"
 
 msgid "Implications element below root child level"
-msgstr "Elementu de impliaciones debaxo del nivel d'hijo raíz"
+msgstr "Elementu de impliaciones debaxo del nivel d''hijo raíz"
 
 msgid "Tag without key"
 msgstr "Etiqueta ensin clave"
@@ -25821,22 +25957,22 @@ msgid "Closed class element while none was open"
 msgstr "Elementu de clase cerráu siendo que nengún foi abiertu"
 
 msgid "Closed basetags while it was not open"
-msgstr "Base d'etiquetes zarrada cuando entá nun foi abiertu"
+msgstr "Base d''etiquetes zarrada cuando entá nun foi abiertu"
 
 msgid "Closed implications while it was not open"
 msgstr "Implicaciones zarraes cuando entá nun foi abiertu"
 
 msgid "Tag element inside other tag element"
-msgstr "Elementu d'etiqueta dientro d'otru elementu d'etiqueta"
+msgstr "Elementu d''etiqueta dientro d''otru elementu d''etiqueta"
 
 msgid "Invalid opening xml tag <{0}> in state {1}"
 msgstr "Etiqueta d´apertura de xml <{0}> n´estáu {1} inválida"
 
 msgid "Condition isn''t finished at </condition> tag"
-msgstr "La condición nun foi rematada cola etiqueta /condition. <>"
+msgstr "La condición nun foi rematada cola etiqueta </condition>"
 
 msgid "Closing tag element that was not open"
-msgstr "Zarrando elementu d'etiqueta que nun foi abiertu"
+msgstr "Zarrando elementu d''etiqueta que nun foi abiertu"
 
 msgid "Invalid closing xml tag </{0}> in state {1}"
 msgstr "Etiqueta xml de zarru </{0}> n´estáu {1} inválida"
@@ -25881,7 +26017,7 @@ msgid "Collection must contain at least one condition"
 msgstr "La colección tien de contener siquier una condición"
 
 msgid "No ruleset has been selected!"
-msgstr "¡Nun s'escoyó nengún conxuntu de riegles!"
+msgstr "¡Nun s''escoyó nengún conxuntu de riegles!"
 
 msgid "No ruleset"
 msgstr "ensin conxuntu de riegles"
@@ -25941,13 +26077,13 @@ msgid "Bookmark name must not contain ''{0}''!"
 msgstr "¡El nome del marcador nun tien de contener ''{0}''!"
 
 msgid "Access class"
-msgstr "Clase d'accesu"
+msgstr "Clase d''accesu"
 
 msgid "Access class must not contain ''{0}''!"
 msgstr "Clase d´accesu nun tien de contener ''{0}''!"
 
 msgid "Access types"
-msgstr "Tipos d'accesu"
+msgstr "Tipos d''accesu"
 
 msgid "Vehicle properties"
 msgstr "Propiedaes del vehículu"
@@ -25959,7 +26095,7 @@ msgid "Max. incline up (%, pos.)"
 msgstr "Max. enclín ascendente (%, pos.)"
 
 msgid "Maximum incline the vehicle can go up"
-msgstr "Enclín máximu del vehículu n'ascensu"
+msgstr "Enclín máximu del vehículu n''ascensu"
 
 msgid "Max. incline down (%, pos.)"
 msgstr "Max. enclín descendente (%, pos.)"
@@ -25982,19 +26118,19 @@ msgstr "gradiente máximu de tipu de pista"
 
 msgid "Worst tracktype (1-5) the vehicle can still use, 0 for none"
 msgstr ""
-"Peor tipu de pista (1-5) que'l vehículu nun puede utilizar, 0 pa nengunu"
+"Peor tipu de pista (1-5) que''l vehículu nun puede utilizar, 0 pa nengunu"
 
 msgid "Change bookmark"
 msgstr "Camudar marcador"
 
 msgid "Edit access parameters"
-msgstr "Editar parámetros d'accesu"
+msgstr "Editar parámetros d''accesu"
 
 msgid "Graph View Dialog"
 msgstr "Diálogu de vista gráfica"
 
 msgid "Open the dialog for graph view configuration."
-msgstr "Abra'l cuadru de diálogu pa la configuración de la vista gráfica."
+msgstr "Abra''l cuadru de diálogu pa la configuración de la vista gráfica."
 
 msgid "default"
 msgstr "predetermináu"
@@ -26117,7 +26253,7 @@ msgid ""
 "Alternatively, the format FEET'' INCHES\" can be used."
 msgstr ""
 "Los llargores tienen de ser ingresaes con númberos decimales positivos y "
-"l'unidá ''m'', ''km'', ''la mio'' o ensin unidá.\n"
+"l''unidá ''m'', ''km'', ''la mio'' o ensin unidá.\n"
 "Tamién puede utilizar el formatu PIES'' PULGAES''."
 
 msgid ""
@@ -26146,22 +26282,22 @@ msgstr ""
 "calteres:: '','', '' '{' '', '' '}' '', ''='', ''|''"
 
 msgid "Imagery XML Files"
-msgstr "Arquivu XML d'Imaxes Aérees"
+msgstr "Arquivu XML d''Imaxes Aérees"
 
 msgid "Save Imagery XML file"
-msgstr "Guardar archivo XML d'Imaxe Aérea"
+msgstr "Guardar archivo XML d''Imaxe Aérea"
 
 msgid "XML Imagery Bounds"
-msgstr "Llendes del XML d'Imaxe Aérea"
+msgstr "Llendes del XML d''Imaxe Aérea"
 
 msgid "Generate Imagery XML bounds for the selection"
-msgstr "Xenerar llendes pal XML d'imaxe aérea pa la selección"
+msgstr "Xenerar llendes pal XML d''imaxe aérea pa la selección"
 
 msgid "edit bounds for selected defaults"
 msgstr "editar llendes pa los predefinidos escoyíos"
 
 msgid "Download imagery XML bounds"
-msgstr "Descargar les llendes del XML d'imaxe aérea"
+msgstr "Descargar les llendes del XML d''imaxe aérea"
 
 msgid ""
 "Validating error in file {0}:\n"
@@ -26170,10 +26306,10 @@ msgid ""
 msgstr ""
 "Validando erru nel arquivu {0}:\n"
 "{1}\n"
-"¿Deseya siguir ensin validar l'arquivu?"
+"¿Deseya siguir ensin validar l''arquivu?"
 
 msgid "Open Imagery XML file"
-msgstr "Abrir arquivu de XML d'imaxe aérea"
+msgstr "Abrir arquivu de XML d''imaxe aérea"
 
 msgid "Calibration Layer"
 msgstr "Capa de Calibración"
@@ -26191,24 +26327,24 @@ msgid "Deprecate Offset"
 msgstr "Rectificación obsoleta"
 
 msgid "Are you sure this imagery offset is wrong?"
-msgstr "¿Ta seguro de qu'esti desplazamientu d'imaxes ye incorrectu?"
+msgstr "¿Ta seguro de qu''esti desplazamientu d''imaxes ye incorrectu?"
 
 msgid "Are you sure this calibration geometry is aligned badly?"
 msgstr ""
-"¿Ta seguro de qu'esta xeometría de calibración atópase mal alliniada?"
+"¿Ta seguro de qu''esta xeometría de calibración atópase mal alliniada?"
 
 msgid "Warning: deprecation is basically irreversible!"
 msgstr "Alvertencia: ¡la depreciación ye básicamente irreversible!"
 
 msgid "To store imagery offsets you must be a registered OSM user."
 msgstr ""
-"P'almacenar imaxes rectificaes ten de ser un usuariu rexistráu de OSM."
+"P''almacenar imaxes rectificaes ten de ser un usuariu rexistráu de OSM."
 
 msgid ""
 "Please enter the reason why you mark this imagery offset as deprecated"
 msgstr ""
-"Por favor, introduza la razón pola que marca esta rectificación d'imaxe como "
-"obsoleta"
+"Por favor, introduza la razón pola que marca esta rectificación d''imaxe "
+"como obsoleta"
 
 msgid ""
 "Please enter the reason why you mark this calibration geometry as deprecated"
@@ -26223,12 +26359,12 @@ msgid "Get Imagery Offset..."
 msgstr "Llogrando imaxes rectificaes..."
 
 msgid "Download offsets for current imagery from a server"
-msgstr "Descargar rectificaciones pa les imaxes actuales dende'l servidor"
+msgstr "Descargar rectificaciones pa les imaxes actuales dende''l servidor"
 
 msgid ""
 "No data for this region. Please adjust imagery layer and upload an offset."
 msgstr ""
-"Nun hai datos pa esta rexón. Por favor, axuste la capa d'imaxes y xuba la "
+"Nun hai datos pa esta rexón. Por favor, axuste la capa d''imaxes y xuba la "
 "rectificación."
 
 msgid "Loading imagery offsets..."
@@ -26241,7 +26377,7 @@ msgid "Offset"
 msgstr "Desplazamientu"
 
 msgid "Imagery Offset Database"
-msgstr "Bases de datos d'imaxes rectificaes"
+msgstr "Bases de datos d''imaxes rectificaes"
 
 msgid "mm"
 msgstr "mm"
@@ -26266,8 +26402,8 @@ msgid ""
 "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 ""
-"La capa cimera d'imaxes foi camudada pa presumiblemente coincidir\n"
-"colos datos de OSM de la zona. Por favor, compruebe que'l desplazamientu "
+"La capa cimera d''imaxes foi camudada pa presumiblemente coincidir\n"
+"colos datos de OSM de la zona. Por favor, compruebe que''l desplazamientu "
 "sigue siendo válidu\n"
 "en descargando trazar GPS, y compáreles colos datos OSM y les imaxes."
 
@@ -26287,13 +26423,14 @@ msgid "Created by {0} on {1}"
 msgstr "Creáu por {0} el {1}"
 
 msgid "Offset Information"
-msgstr "Información sobre'l desplazamientu"
+msgstr "Información sobre''l desplazamientu"
 
 msgid "Report this offset"
-msgstr "Informe d'esti desplazamientu"
+msgstr "Informe d''esti desplazamientu"
 
 msgid "You are to notify moderators of this offset. Why?"
-msgstr "Tas echando voz de a'l moderadores d'esti desplazamientu. ¿Por qué?"
+msgstr ""
+"Tas echando voz de a''l moderadores d''esti desplazamientu. ¿Por qué?"
 
 msgid "Reporting the offset..."
 msgstr "Informando del desplazamientu..."
@@ -26326,33 +26463,33 @@ msgid "Unable to connect to the server"
 msgstr "Non puede conectase col servidor"
 
 msgid "Store Imagery Offset..."
-msgstr "Almacenar rectificación d'imaxes..."
+msgstr "Almacenar rectificación d''imaxes..."
 
 msgid ""
 "Upload an offset for current imagery (or calibration object geometry) to a "
 "server"
 msgstr ""
-"Xubir una rectificación pa les imaxes actuales (o xeometría d'oxetu de "
+"Xubir una rectificación pa les imaxes actuales (o xeometría d''oxetu de "
 "calibración) a un servidor"
 
 msgid "Store calibration geometry"
 msgstr "Almacenar la xeometría de calibración"
 
 msgid "Store imagery offset"
-msgstr "Almacenar rectificación d'imaxes"
+msgstr "Almacenar rectificación d''imaxes"
 
 msgid ""
 "The selected object can be used as a calibration geometry. What do you "
 "intend to do?"
 msgstr ""
-"L'oxetu escoyíu pue ser utilizáu como una xeometría de calibración. ¿Qué "
+"L''oxetu escoyíu pue ser utilizáu como una xeometría de calibración. ¿Qué "
 "deseya faer?"
 
 msgid ""
 "The topmost imagery layer has no offset. Are you sure you want to upload "
 "this?"
 msgstr ""
-"La capa d'imaxes cimera nun tien nenguna rectificación. ¿Ta seguru que "
+"La capa d''imaxes cimera nun tien nenguna rectificación. ¿Ta seguru que "
 "deseya xubilo?"
 
 msgid ""
@@ -26361,8 +26498,8 @@ msgid ""
 "Please make sure it is as precise as possible, and describe a region this "
 "offset is applicable to."
 msgstr ""
-"Ta rexistrando un desplazamientu d'imaxes. Otros usuarios nesta área van ser "
-"capaces d'utilizalo pa cartografiar.\n"
+"Ta rexistrando un desplazamientu d''imaxes. Otros usuarios nesta área van "
+"ser capaces d''utilizalo pa cartografiar.\n"
 "Por favor, asegúrese de que tea lo más preciso posible y describa una rexón "
 "pa la que ye aplicable esta rectificación."
 
@@ -26372,8 +26509,8 @@ msgid ""
 "clearly visible boundaries on various satellite imagery. Please describe "
 "this object and its whereabouts."
 msgstr ""
-"Ta rexistrando un desplazamientu d'imaxes. Otros usuarios nesta área van ser "
-"capaces d'utilizalo pa cartografiar.\n"
+"Ta rexistrando un desplazamientu d''imaxes. Otros usuarios nesta área van "
+"ser capaces d''utilizalo pa cartografiar.\n"
 "Por favor, asegúrese de que tea lo más preciso posible y describa una rexón "
 "pa la que ye aplicable esta rectificación."
 
@@ -26388,19 +26525,19 @@ msgid "Adjust imagery"
 msgstr "Axustar imaxe aérea"
 
 msgid "Adjust the position of the selected imagery layer"
-msgstr "Axustar la posición de la capa d'imaxe aérea escoyida"
+msgstr "Axustar la posición de la capa d''imaxe aérea escoyida"
 
 msgid "Please select the imagery layer to adjust."
-msgstr "Por favor escueya la capa d'imaxe aérea a axustar."
+msgstr "Por favor escueya la capa d''imaxe aérea a axustar."
 
 msgid "Start adjusting"
-msgstr "Empecipiar l'axuste."
+msgstr "Empecipiar l''axuste."
 
 msgid "There are currently no imagery layer to adjust."
-msgstr "Anguaño nun hai nenguna capa d'imaxe aérea p'afaer."
+msgstr "Anguaño nun hai nenguna capa d''imaxe aérea p''afaer."
 
 msgid "No layers to adjust"
-msgstr "Nun hai capes p'axustar"
+msgstr "Nun hai capes p''axustar"
 
 msgid "Normal"
 msgstr "Normal"
@@ -26442,7 +26579,7 @@ msgid "Imported Images"
 msgstr "Imaxes importaes"
 
 msgid "Image files (*.jpg, *.jpeg, *.png, *.gif)"
-msgstr "Arquivos d'imaxe (*.jpg, *.jpeg, *.png, *.gif)"
+msgstr "Arquivos d''imaxe (*.jpg, *.jpeg, *.png, *.gif)"
 
 msgid "Import vector graphics"
 msgstr "Importar gráficos vectoriales"
@@ -26472,8 +26609,8 @@ msgid ""
 "Move the mouse to show trackpoint info for current layer. Hold shift to "
 "highlight tracks"
 msgstr ""
-"Mueva'l punteru del mure p'amosar información de trazáu pa la capa actual. "
-"Caltenga'l desplazamientu pa marcar les pistes"
+"Mueva''l punteru del mure p''amosar información de trazáu pa la capa actual. "
+"Caltenga''l desplazamientu pa marcar les pistes"
 
 msgid "Delete this"
 msgstr "Esaniciar esto"
@@ -26488,7 +26625,7 @@ msgid "Track name: "
 msgstr "Nome de pista: "
 
 msgid "Update IRS adjustment layer"
-msgstr "Actualizar la capa d'axuste IRS"
+msgstr "Actualizar la capa d''axuste IRS"
 
 msgid ""
 "This option creates IRS adjustment layer and a little way inside it. You "
@@ -26496,7 +26633,7 @@ msgid ""
 "Resulting layer is to be saved as .osm and sent to Komzpa (me at komzpa.net) "
 "with [irs rectify] in subject."
 msgstr ""
-"Esta opción crea una capa d'axuste IRS y una vía pequena dientro d'ella. "
+"Esta opción crea una capa d''axuste IRS y una vía pequena dientro d''ella. "
 "Rique afaer el llugar de la so capa WMS primeru.\n"
 "La capa resultante va guardase como .osm y va ser unviada a Komzpa "
 "(me at komzpa.net) cola tema [irs rectify]."
@@ -26553,7 +26690,7 @@ msgid "Junctionchecking/junctions searching"
 msgstr "Busca de cruces/verificación de cruces"
 
 msgid "order of junction (n):"
-msgstr "Grau d'encruz (n):"
+msgstr "Grau d''encruz (n):"
 
 msgid "produce OSM-Relations: junction"
 msgstr "producir Relaciones-OSM: encruz"
@@ -26561,7 +26698,7 @@ msgstr "producir Relaciones-OSM: encruz"
 msgid ""
 "if enabled the plugin produces osm-relations from the junction subgraphs"
 msgstr ""
-"Si ta activáu'l componente crea relaciones OSM a partir de la unión de "
+"Si ta activáu''l componente crea relaciones OSM a partir de la unión de "
 "subgrafos"
 
 msgid "create the channel digraph"
@@ -26611,7 +26748,7 @@ msgid "Looking for shoreline..."
 msgstr "Buscando llínea de mariña..."
 
 msgid "{0} nodes so far..."
-msgstr "{0} nodos hasta'l momentu..."
+msgstr "{0} nodos hasta''l momentu..."
 
 msgid "Lake Walker."
 msgstr "Lake Walker."
@@ -26692,10 +26829,10 @@ msgid "Size of Landsat tiles (pixels)"
 msgstr "Tamañu de les teseles del Landsat (píxeles)"
 
 msgid "Shift all traces to east (degrees)"
-msgstr "Dirixir toes trazar escontra l'Este (graos)"
+msgstr "Dirixir toes trazar escontra l''Este (graos)"
 
 msgid "Shift all traces to north (degrees)"
-msgstr "Dirixir toes trazar escontra'l Norte (graos)"
+msgstr "Dirixir toes trazar escontra''l Norte (graos)"
 
 msgid "Direction to search for land"
 msgstr "Dirección pa buscar pela tierra"
@@ -26719,7 +26856,7 @@ msgid "Lakewalker Plugin Preferences"
 msgstr "Preferencies de Lakewalker Plugin"
 
 msgid "A plugin to trace water bodies on Landsat imagery."
-msgstr "Un componente p'alcontrar les llámines d'agua nes imaxes Landsat."
+msgstr "Un componente p''alcontrar les llámines d''agua nes imaxes Landsat."
 
 msgid ""
 "Maximum number of segments allowed in each generated way. Default 250."
@@ -26738,7 +26875,7 @@ msgid ""
 "in the range 0-255. Default 90."
 msgstr ""
 "Máximu valor de gris a aceptar como enagua (basáu en datos Landsat DIR-1). "
-"Puede tar ente l'intervalu 0-255. Por omisión 90."
+"Puede tar ente l''intervalu 0-255. Por omisión 90."
 
 msgid ""
 "Accuracy of Douglas-Peucker line simplification, measured in "
@@ -26756,7 +26893,7 @@ msgstr ""
 "4000."
 
 msgid "Size of one landsat tile, measured in pixels. Default 2000."
-msgstr "Tamañu d'una tesela Landsat, midíu en píxeles. Por omisión 2000."
+msgstr "Tamañu d''una tesela Landsat, midíu en píxeles. Por omisión 2000."
 
 msgid "Offset all points in East direction (degrees). Default 0."
 msgstr "Mover tolos puntos en dirección Esti (por omisión 0 graos)."
@@ -26851,13 +26988,13 @@ msgid "Open MapDust"
 msgstr "Abrir MapDust"
 
 msgid "MapDust bug reports"
-msgstr "Informes d'erru de MapDust"
+msgstr "Informes d''erru de MapDust"
 
 msgid "Activates the MapDust bug reporter plugin"
-msgstr "Activar el complementu d'informes d'erru de MapDust"
+msgstr "Activar el complementu d''informes d''erru de MapDust"
 
 msgid "Missing input data"
-msgstr "Falten datos d'entrada"
+msgstr "Falten datos d''entrada"
 
 msgid "Measured values"
 msgstr "Valores midíos"
@@ -26927,7 +27064,7 @@ msgstr "Añedir xiros prohibíos a la izquierda pal conxuntu de 4 o 5 víes."
 
 msgid "Please select 4 or 5 ways to assign no left turns."
 msgstr ""
-"Por favor, escueya 4 o 5 víes p'asignar xiros prohibíos a la izquierda."
+"Por favor, escueya 4 o 5 víes p''asignar xiros prohibíos a la izquierda."
 
 msgid "Please select 4 ways that form a closed relation."
 msgstr "Por favor, escueya 4 víes que conformen una relación zarrada"
@@ -26939,7 +27076,7 @@ msgid "Create Michigan left turn restriction"
 msgstr "Crear Michigan left turn restriction"
 
 msgid "Unable to find via nodes. Please check your selection"
-msgstr "Nun s'atoparon nodos de vía. Por favor revise la so selección"
+msgstr "Nun s''atoparon nodos de vía. Por favor revise la so selección"
 
 msgid ""
 "XAPI query, e.g., '''' (to download all data), ''[highway=*]'', or "
@@ -26949,7 +27086,7 @@ msgstr ""
 "''[[network=VRR][ref=603|613]''"
 
 msgid "Download from OSM mirror..."
-msgstr "Descargar dende'l servidor espeyu OSM..."
+msgstr "Descargar dende''l servidor espeyu OSM..."
 
 msgid "This XAPI query seems to be invalid, please doublecheck"
 msgstr ""
@@ -26957,10 +27094,10 @@ msgstr ""
 "verificación"
 
 msgid "Object type: "
-msgstr "Tipu d'oxetu: "
+msgstr "Tipu d''oxetu: "
 
 msgid "OSM object type to download (''*'' stands for any)"
-msgstr "Tipu d'oxetu OSM a descargase (utilizar ''*'' pa cualesquier)"
+msgstr "Tipu d''oxetu OSM a descargase (utilizar ''*'' pa cualesquier)"
 
 msgid "XAPI query: "
 msgstr "Consulta XAPI: "
@@ -26969,7 +27106,7 @@ msgid "Download from Overpass API ..."
 msgstr "Descargando dende la API Overpass..."
 
 msgid "Download map data from Overpass API server."
-msgstr "Descargar datos del mapa dende'l servidor API Overpass."
+msgstr "Descargar datos del mapa dende''l servidor API Overpass."
 
 msgid "Overpass query: "
 msgstr "Consulta de nivel superior: "
@@ -26988,7 +27125,7 @@ msgid "Enforce meta data"
 msgstr "Forzar metadatu"
 
 msgid "About Plugin"
-msgstr "So'l plugin"
+msgstr "So''l plugin"
 
 msgid "Native password manager plugin"
 msgstr "Complementu de xestión de contraseñes natives"
@@ -27005,13 +27142,14 @@ msgstr ""
 
 msgid "No thanks, use JOSM''s plain text preferences storage"
 msgstr ""
-"Non gracies, utilice les preferencies d'almacenamientu de JOSM en testu claru"
+"Non gracies, utilice les preferencies d''almacenamientu de JOSM en testu "
+"claru"
 
 msgid ""
 "Found sensitive data that is still saved in JOSM''s preference file (plain "
 "text)."
 msgstr ""
-"Atopáronse datos sensibles qu'inda tán almacenaos nel arquivu de "
+"Atopáronse datos sensibles qu''inda tán almacenaos nel arquivu de "
 "preferencies de JOSM (testu claru)."
 
 msgid "Transfer to password manager and remove from preference file"
@@ -27022,7 +27160,7 @@ msgid "No, just keep it"
 msgstr "Non, solo calténgalo"
 
 msgid "Close the dialog and discard all changes"
-msgstr "Zarre'l diálogu y refugue tolos cambeos"
+msgstr "Zarre''l diálogu y refugue tolos cambeos"
 
 msgid "Proceed and go to the next page"
 msgstr "Proceda y siga a la siguente páxina"
@@ -27034,7 +27172,7 @@ msgid "Confirm the setup and close this dialog"
 msgstr "Confirmar la configuración y pesllar esti cuadru de diálogu"
 
 msgid "JOSM/OSM API/Username"
-msgstr "Nome d'usuariu"
+msgstr "Nome d''usuariu"
 
 msgid "JOSM/OSM API/Password"
 msgstr "Contraseña/API JOSM/OSM"
@@ -27046,7 +27184,7 @@ msgid "{0}/Password"
 msgstr "{0}/Contraseña"
 
 msgid "JOSM/Proxy/Username"
-msgstr "JOSM/Proxy/Nome d'usuariu"
+msgstr "JOSM/Proxy/Nome d''usuariu"
 
 msgid "JOSM/Proxy/Password"
 msgstr "JOSM/Proxy/Contraseña"
@@ -27064,13 +27202,13 @@ msgid "The username and password is protected by {0}."
 msgstr "El nome d´usuariu y la contraseña tán protexíos por {0}."
 
 msgid "username"
-msgstr "nome d'usuariu"
+msgstr "nome d''usuariu"
 
 msgid "password"
 msgstr "contraseña"
 
 msgid "proxy username"
-msgstr "Nome d'usuariu del proxy"
+msgstr "Nome d''usuariu del proxy"
 
 msgid "proxy password"
 msgstr "contraseña del proxy"
@@ -27098,7 +27236,7 @@ msgid "Use {0}"
 msgstr "Utilizar {0}"
 
 msgid "Encrypt data with Windows logon credentials"
-msgstr "Cifrar los datos con credenciales d'entamu de sesión de Windows"
+msgstr "Cifrar los datos con credenciales d''entamu de sesión de Windows"
 
 msgid "The native password manager plugin detected {0} on your system."
 msgstr ""
@@ -27154,7 +27292,7 @@ msgid "I understand and accept these terms and conditions"
 msgstr "Entiendo y acepto estos términos y condiciones"
 
 msgid "View the full text of this license"
-msgstr "Ver el testu completu d'esta llicencia"
+msgstr "Ver el testu completu d''esta llicencia"
 
 msgid "I refuse these terms and conditions. Cancel download."
 msgstr "Refugo estos términos y condiciones. Atayar la descarga."
@@ -27166,7 +27304,7 @@ msgid ""
 "Please click on <strong>Download list</strong> to download and display a "
 "list of available modules."
 msgstr ""
-"Por favor, prima en <strong>Descargar llista /strong<> pa descargar y amosar "
+"Por favor, prima en <strong>Descargar llista</strong> pa descargar y amosar "
 "una llista de módulos disponibles."
 
 msgid ""
@@ -27203,7 +27341,7 @@ msgid "Update the selected modules"
 msgstr "Actualizar los módulos escoyíos"
 
 msgid "Please restart JOSM to activate the downloaded modules."
-msgstr "Por favor reinice JOSM p'activar los módulos escoyíos"
+msgstr "Por favor reinice JOSM p''activar los módulos escoyíos"
 
 msgid ""
 "All installed modules are up to date. JOSM does not have to download newer "
@@ -27216,7 +27354,7 @@ msgid "Modules up to date"
 msgstr "Módulos actualizaos"
 
 msgid "Configure the list of sites where modules are downloaded from"
-msgstr "Configurar la llista de sitios d'onde se descarguen los módulos:"
+msgstr "Configurar la llista de sitios d''onde se descarguen los módulos:"
 
 msgid "Add Open Data Module description URL."
 msgstr "Añedir URL descriptiva de módulu de datos abiertos."
@@ -27235,7 +27373,7 @@ msgstr "Diferencies"
 
 msgid "Perform diff between current data set and existing OSM data."
 msgstr ""
-"Visualizar les diferencies ente'l conjutno de datos actuales y los datos "
+"Visualizar les diferencies ente''l conjutno de datos actuales y los datos "
 "esistentes en OSM."
 
 msgid "Open tools menu for this data."
@@ -27256,8 +27394,8 @@ msgid ""
 "loaded by this plugin."
 msgstr ""
 "Componente pa utilizar dellos portales de datos abiertos.<br/><br/> Por "
-"favor, llea los términos y condiciones d'usu de cada portal antes de xubir a "
-"OSM cualquier datu cargáu con esti componente."
+"favor, llea los términos y condiciones d''usu de cada portal antes de xubir "
+"a OSM cualquier datu cargáu con esti componente."
 
 msgid "General settings"
 msgstr "Configuración xeneral"
@@ -27282,7 +27420,7 @@ msgid ""
 "XAPI server used to download OSM data when Overpass API is not available"
 msgstr ""
 "El servidor XAPI utilizáu pa descargar datos OSM por aciu API Overpass nun "
-"s'atopa disponible"
+"s''atopa disponible"
 
 msgid "Download modules"
 msgstr "Módulos descargaos"
@@ -27331,10 +27469,10 @@ msgid ""
 "km</b>) ?<br/><br/>If so, <b>do NOT upload</b> such data to OSM !"
 msgstr ""
 "JOSM nun pudo atopar un tresformamientu matemáticu estricta ente ''{0}'' y "
-"WGS84.<br /><br />¿Deseya intentar un métodu i <>tolerante /i<> method, que "
-"va executar un tresformamientu non-precisu (<b>con erros d'allugamientu "
-"d'hasta 1 km</b>) ?<br/><br/>Si asina lu deseya, ¡<b>NUN publicar</b> dichos "
-"datos en OSM !"
+"WGS84.<br /><br />¿Deseya intentar un métodu <i>tolerante</i> method, que va "
+"executar un tresformamientu non-precisu (<b>con erros d''allugamientu "
+"d''hasta 1 km</b>) ?<br/><br/>Si asina lu deseya, ¡<b>NUN publicar</b> "
+"dichos datos en OSM !"
 
 msgid "Try lenient method"
 msgstr "Intentar un métodu tolerante"
@@ -27377,7 +27515,7 @@ msgid "ODS files"
 msgstr "Arquivos ODS"
 
 msgid "No valid coordinates have been found."
-msgstr "Nun s'atoparon coordenaes válides."
+msgstr "Nun s''atoparon coordenaes válides."
 
 msgid "Invalid file. Bad length on line {0}. Expected {1} columns, got {2}."
 msgstr ""
@@ -27452,24 +27590,24 @@ msgid "Last module update more than {0} days ago."
 msgstr "La última actualización del módulu foi fai más de {0} díes."
 
 msgid "Click to update the activated modules"
-msgstr "Faiga clic p'actualizar los módulos activaos"
+msgstr "Faiga clic p''actualizar los módulos activaos"
 
 msgid "Click to skip updating the activated modules"
-msgstr "Faiga clic pa omitir l'actualización de los módulos activaos"
+msgstr "Faiga clic pa omitir l''actualización de los módulos activaos"
 
 msgid ""
 "Skipping module update after elapsed update interval. Automatic update at "
 "startup is disabled."
 msgstr ""
-"Suspender l'actualización del modulo una vegada trescurríu l'intervalu "
-"d'actualización. L'actualización automática nel entamu va evacuase."
+"Suspender l''actualización del modulo una vegada trescurríu l''intervalu "
+"d''actualización. L''actualización automática nel entamu va evacuase."
 
 msgid ""
 "Running module update after elapsed update interval. Automatic update at "
 "startup is disabled."
 msgstr ""
-"Executar el módulu dempués de trescurríu l'intervalu d'actualización. "
-"L'actualización automática al entamu va evacuase."
+"Executar el módulu dempués de trescurríu l''intervalu d''actualización. "
+"L''actualización automática al entamu va evacuase."
 
 msgid "Could not load module {0}. Delete from preferences?"
 msgstr "Non pudo cargase el módulu {0}. ¿Esanicialo de les preferencies?"
@@ -27496,7 +27634,7 @@ msgstr "Cargando módulu ''{0}''..."
 
 msgid "JOSM could not find information about the following module:"
 msgid_plural "JOSM could not find information about the following modules:"
-msgstr[0] "JOSM nun pudo atopar información sobre'l siguiente módulu:"
+msgstr[0] "JOSM nun pudo atopar información sobre''l siguiente módulu:"
 msgstr[1] "JOSM nun pudo atopar información sobre los siguientes módulos:"
 
 msgid "The module is not going to be loaded."
@@ -27506,14 +27644,15 @@ msgstr[1] "Los módulos nun van ser cargaos."
 
 msgid "Updating the following module has failed:"
 msgid_plural "Updating the following modules has failed:"
-msgstr[0] "L'actualización del módulu siguiente falló:"
-msgstr[1] "L'actualización de los módulos siguientes falló:"
+msgstr[0] "L''actualización del módulu siguiente falló:"
+msgstr[1] "L''actualización de los módulos siguientes falló:"
 
 msgid "Module update failed"
-msgstr "Falló l'actualización del módulu"
+msgstr "Falló l''actualización del módulu"
 
 msgid "Warning: failed to download module information list"
-msgstr "Alvertencia: falló la descarga de la llista d'información de módulos"
+msgstr ""
+"Alvertencia: falló la descarga de la llista d''información de módulos"
 
 msgid "Disable module"
 msgstr "Deshabilitar módulu"
@@ -27728,7 +27867,7 @@ msgid "Orthogonal shapes"
 msgstr "Formes ortogonales"
 
 msgid "Import settings"
-msgstr "Axustes d'importación"
+msgstr "Axustes d''importación"
 
 msgid "Introduce separate layers for:"
 msgstr "Introducir capes separaes pa:"
@@ -27790,13 +27929,13 @@ msgid "Tolerance is not a number"
 msgstr "La tolerancia non ye un númberu"
 
 msgid "Could not parse color"
-msgstr "No pudo analizase'l color"
+msgstr "No pudo analizase''l color"
 
 msgid "Could not parse max path count"
 msgstr "Non pudo traducise el contador máximu de caminos"
 
 msgid "Parsing file"
-msgstr "Analizando sintáuticamente l'arquivu"
+msgstr "Analizando sintáuticamente l''arquivu"
 
 msgid "File not found."
 msgstr "Ficheru non alcontráu."
@@ -27868,13 +28007,13 @@ msgid "Encrypted documents not supported."
 msgstr "Los documentos encriptaos nun tán soportaos"
 
 msgid "The PDF file must have exactly one page."
-msgstr "L'arquivu PDF tien de tener exáctamente una páxina"
+msgstr "L''arquivu PDF tien de tener exáctamente una páxina"
 
 msgid "Read error: "
 msgstr "Erru de lectura: "
 
 msgid "Write error: "
-msgstr "Erru d'escritura: "
+msgstr "Erru d''escritura: "
 
 msgid "Write coordinates to image header"
 msgstr "Escribir coordenaes na encabezadura de la imaxe"
@@ -27904,7 +28043,7 @@ msgid "Photo Geotagging Plugin"
 msgstr "Plugin pa geolocalización de fotografíes"
 
 msgid "Writing position information to image files..."
-msgstr "Escribiendo información de posición a ficheros d'imaxes..."
+msgstr "Escribiendo información de posición a ficheros d''imaxes..."
 
 msgid "Could not read mtime."
 msgstr "Non pudo lleese mtime."
@@ -27916,7 +28055,7 @@ msgid "File could not be deleted!"
 msgstr "¡Non pudo desaniciar el ficheru!"
 
 msgid "Could not rename file!"
-msgstr "¡Non pudo reñomase'l ficheru!"
+msgstr "¡Non pudo reñomase''l ficheru!"
 
 msgid "Could not rename file {0} to {1}!"
 msgstr "¡No pudo reñomase´l arquivu {0} a {1}!"
@@ -27924,7 +28063,7 @@ msgstr "¡No pudo reñomase´l arquivu {0} a {1}!"
 msgid "<html><h3>There are old backup files in the image directory!</h3>"
 msgstr ""
 "<html><h3>Hai vieyos arquivos de copia de seguridá nel directoriu "
-"d'imaxes</h3>"
+"d''imaxes</h3>"
 
 msgid "Override old backup files?"
 msgstr "¿Sobreescribir copies de seguridá vieyes?"
@@ -27936,7 +28075,7 @@ msgid "Override"
 msgstr "Anular"
 
 msgid "Could not delete temporary file!"
-msgstr "¡Non pudo borrase'l ficheru temporal!"
+msgstr "¡Non pudo borrase''l ficheru temporal!"
 
 msgid "Test failed: Could not read mtime."
 msgstr "La prueba falló: Non pudo lleese el mtime."
@@ -27950,8 +28089,10 @@ msgstr "Axuntar semeyes"
 msgid "Move and position photos"
 msgstr "Mover y asitiar semeyes"
 
-msgid "Click+drag photo or shift+click to position photo."
-msgstr "Faiga clic y arrastre la semeya o Mayús+clic p'asitiar la semeya"
+msgid ""
+"Click+drag photo, shift+click to position photo, control+click to set "
+"direction."
+msgstr ""
 
 msgid "Please load some photos."
 msgstr "Por favor cargue delles semeyes."
@@ -27960,7 +28101,7 @@ msgid "Toggle the image thumbnail preview"
 msgstr "Activar/desactivar la previsualización en miniatures de la imaxe"
 
 msgid "New layer for untagged images"
-msgstr "Nueva capa d'imaxes ensin etiquetar"
+msgstr "Nueva capa d''imaxes ensin etiquetar"
 
 msgid "Untagged Images"
 msgstr "Imaxes ensin etiquetar"
@@ -27969,10 +28110,10 @@ msgid "Do you want to save current calibration of layer {0}?"
 msgstr "¿Deseya guardar la calibración de la capa actual {0}?"
 
 msgid "Load Picture Calibration..."
-msgstr "Cargar calibración d'imaxes..."
+msgstr "Cargar calibración d''imaxes..."
 
 msgid "Loads calibration data from a file"
-msgstr "Carga datos de calibración d'un ficheru"
+msgstr "Carga datos de calibración d''un ficheru"
 
 msgid "Loading file failed: {0}"
 msgstr "Falló la carga´l ficheru: {0}"
@@ -28002,13 +28143,13 @@ msgid "Saving file failed: {0}"
 msgstr "Fallu al grabar ficheru: {0}"
 
 msgid "New picture layer from clipboard"
-msgstr "Nueva capa d'imaxes dende'l portapapeles"
+msgstr "Nueva capa d''imaxes dende''l portapapeles"
 
 msgid "Supported image files, *.zip, *.kml"
 msgstr "Arquivos de imaxe soportaos, *.zip, *.kml"
 
 msgid "New picture layer from file..."
-msgstr "Nueva capa d'imaxes dende un arquivu..."
+msgstr "Nueva capa d''imaxes dende un arquivu..."
 
 msgid ""
 "KML calibration is in beta stage and may produce incorrectly calibrated "
@@ -28021,7 +28162,7 @@ msgstr ""
 "incorrectamente."
 
 msgid "PicLayer move"
-msgstr "Mover Capa d'Imaxe(PicLayer)"
+msgstr "Mover Capa d''Imaxe(PicLayer)"
 
 msgid "Moved"
 msgstr "Movíu"
@@ -28030,7 +28171,7 @@ msgid "Drag to move the picture"
 msgstr "Abasnar pa mover la imaxe"
 
 msgid "PicLayer rotate"
-msgstr "Rotar capa d'imaxe"
+msgstr "Rotar capa d''imaxe"
 
 msgid "Rotated"
 msgstr "Xiráu"
@@ -28108,7 +28249,7 @@ msgid "Calibration Files"
 msgstr "Calibrar ficheros"
 
 msgid "Could not find the map object."
-msgstr "Nun s'atopó l'oxetu mapa."
+msgstr "Nun s''atopó l''oxetu mapa."
 
 msgid "PicLayer failed to load or import the image."
 msgstr "PicLayer falló al cargar o importar la imaxe."
@@ -28145,8 +28286,8 @@ msgstr "Va aplicase automáticamente."
 msgid ""
 "Also, from now on, calibration files will always be loaded automatically."
 msgstr ""
-"Amás, d'equí p'arriba, los arquivos de calibración van ser cargaos de forma "
-"automática."
+"Amás, d''equí p''arriba, los arquivos de calibración van ser cargaos de "
+"forma automática."
 
 msgid "Point info"
 msgstr "Información del puntu"
@@ -28182,7 +28323,7 @@ msgid "Error reading poly file: {0}"
 msgstr "Erru al lleer arquivu de polígonu: {0}"
 
 msgid "The file must begin with a polygon name"
-msgstr "L'arquivu tien de tener un nome de polígonu"
+msgstr "L''arquivu tien de tener un nome de polígonu"
 
 msgid "There are less than 2 points in an area"
 msgstr "Hai menos de 2 puntos nuna área"
@@ -28300,14 +28441,14 @@ msgid ""
 "There exists no dataset. Try to download data from the server or open an OSM "
 "file."
 msgstr ""
-"Nun esiste nengún conxuntu de datos. Intente descargar datos dende'l "
+"Nun esiste nengún conxuntu de datos. Intente descargar datos dende''l "
 "servidor o abra un arquivu OSM."
 
 msgid "No data found"
-msgstr "Non s'atoparon datos"
+msgstr "Non s''atoparon datos"
 
 msgid "The GTFS file was empty."
-msgstr "L'arquivu GRFS taba valeru."
+msgstr "L''arquivu GRFS taba valeru."
 
 msgid "Create Stops from GTFS"
 msgstr "Crear paraes dende GTFS"
@@ -28448,7 +28589,7 @@ msgid "left hand side"
 msgstr "llau de la manzorga"
 
 msgid "Maximum distance from route"
-msgstr "Distancia máxima dende l'itinerariu"
+msgstr "Distancia máxima dende l''itinerariu"
 
 msgid "Public Transport: Change stop type"
 msgstr "Tresporte públicu: camudar tipu de parada"
@@ -28460,16 +28601,16 @@ msgid "Create Stops from a GPX file"
 msgstr "Crear paraes dende un arquivu GPX"
 
 msgid "Select GPX file"
-msgstr "Escoyer l'arquivu GPX"
+msgstr "Escoyer l''arquivu GPX"
 
 msgid "The GPX file contained no tracks or waypoints."
-msgstr "L'arquivu GPX nun contenía traces nin puntos d'interés."
+msgstr "L''arquivu GPX nun contenía traces nin puntos d''interés."
 
 msgid "Create Stops from GPX"
 msgstr "Crear paraes dende GPX"
 
 msgid "Tracks in this GPX file:"
-msgstr "Traces n'esti arquivu GPX:"
+msgstr "Traces n''esti arquivu GPX:"
 
 msgid "Detach"
 msgstr "Dixebrar"
@@ -28481,7 +28622,7 @@ msgid ""
 "The GPX file doesn''t contain valid trackpoints. Please use a GPX file that "
 "has trackpoints."
 msgstr ""
-"L'arquivu GPX nun contien puntos de traza válidos. Por favor utilice un "
+"L''arquivu GPX nun contien puntos de traza válidos. Por favor utilice un "
 "arquivu GPX que contenga puntos de traza."
 
 msgid "GPX File Trouble"
@@ -28530,7 +28671,7 @@ msgid "Relation Toolbox"
 msgstr "Caja de ferramientes de rellaciones"
 
 msgid "Open relation/multipolygon editor panel"
-msgstr "Abrir el panel d'edición de rellaciones/multipolígonu"
+msgstr "Abrir el panel d''edición de rellaciones/multipolígonu"
 
 msgid "Specify role"
 msgstr "Especificar rol"
@@ -28547,7 +28688,7 @@ msgstr ""
 "rellación de llendes"
 
 msgid "Move area tags from contour to relation"
-msgstr "Mover les etiquetes d'área dende la contorna a la relación"
+msgstr "Mover les etiquetes d''área dende la contorna a la relación"
 
 msgid "When moving tags, consider even non-repeating ones"
 msgstr "Al mover etiquetes considere inclusive aquelles que nun se repiten"
@@ -28628,6 +28769,9 @@ msgstr ""
 msgid "Reconstruct polygons from relation {0}"
 msgstr "Reconstruyir polígonos a partir de la relación {0}"
 
+msgid "Reconstruct route"
+msgstr ""
+
 msgid "Open relation wiki page"
 msgstr "Abrir la páxina de la wiki rellacionada"
 
@@ -28667,6 +28811,12 @@ msgstr "Atopóse un nodo ensin el rol ''label'' o ''admin_centre''"
 msgid "Way without ''inner'' or ''outer'' role found"
 msgstr "Atopóse una vía ensin el rol ''inner'' o ''outer''"
 
+msgid "Node without ''stop'' or ''platform'' role found"
+msgstr ""
+
+msgid "Way platform without ''platform'' role found"
+msgstr ""
+
 msgid "Revert changeset fully"
 msgstr "Conxuntu de cambeos revertíu na so totalidá"
 
@@ -28683,7 +28833,7 @@ msgid "Revert"
 msgstr "Revertir"
 
 msgid "Enter the ID of the changeset that should be reverted"
-msgstr "Ingresar l'ID del conxuntu de cambeos que tendría de ser revertíu"
+msgstr "Ingresar l''ID del conxuntu de cambeos que tendría de ser revertíu"
 
 msgid "Reverted changeset"
 msgstr "Conxuntu de cambeos revertíu"
@@ -28695,13 +28845,13 @@ msgid "Missing merge target for {0} with id {1}"
 msgstr "Destín d´amiestu ausente pa {0} con id {1}"
 
 msgid "Objects history"
-msgstr "Historial d'oxetos"
+msgstr "Historial d''oxetos"
 
 msgid "History reverter"
-msgstr "Revertidor d'hestoria"
+msgstr "Revertidor d''hestoria"
 
 msgid "Preparing history data..."
-msgstr "Preparando datos d'hestoria..."
+msgstr "Preparando datos d''hestoria..."
 
 msgid "Remote Control has been asked to revert a changeset."
 msgstr "A Control Remotu solicitóse-y revertir un conxuntu de cambeos"
@@ -28715,7 +28865,7 @@ msgid ""
 msgstr ""
 "Esti conxuntu de cambeos tien oxetos que nun tán presentes nel conxuntu de "
 "datos actual.\n"
-"Precisa descargáselos antes d'empecipiar la reversión. ¿Deseya siguir?"
+"Precisa descargáselos antes d''empecipiar la reversión. ¿Deseya siguir?"
 
 msgid "Confirm"
 msgstr "Confirmar"
@@ -28807,7 +28957,7 @@ msgid "Edit relations"
 msgstr "Editar relaciones"
 
 msgid "No relation is selected"
-msgstr "Non s'escoyó nenguna relación"
+msgstr "Non s''escoyó nenguna relación"
 
 msgid "Remove node ''{0}'' at position {1} from relation ''{2}''"
 msgstr "Esaniciar nodo ''{0}'' na posición {1} de la relación ''{2}''"
@@ -28840,7 +28990,7 @@ msgid "Open a list of routing nodes"
 msgstr "Abrir una llista de nodos de enrutamientu"
 
 msgid "Add routing layer"
-msgstr "Añedir capa d'enrutáu"
+msgstr "Añedir capa d''enrutáu"
 
 msgid "Criteria"
 msgstr "Criteriu"
@@ -28896,7 +29046,7 @@ msgid "Enter credentials for Separate Data Store API"
 msgstr "Ingresar les credenciales pal API de Separate Data Store"
 
 msgid "Please enter the user name of your SDS account"
-msgstr "Por favor ingrese'l nome d'usuariu pa la so cuenta SDS"
+msgstr "Por favor ingrese''l nome d''usuariu pa la so cuenta SDS"
 
 msgid "Please enter the password of your SDS account"
 msgstr "Por favor ingrese la contraseña de la so cuenta SDS"
@@ -28915,7 +29065,7 @@ msgid "Load..."
 msgstr "Cargar..."
 
 msgid "Load separate data store data from a file."
-msgstr "Cargar datos d'almacenamientu separaos dende un arquivu."
+msgstr "Cargar datos d''almacenamientu separaos dende un arquivu."
 
 msgid "Loading files"
 msgstr "Lleendo arquivos"
@@ -28927,7 +29077,7 @@ msgid "Information about SDS."
 msgstr "Información sobre el SDS."
 
 msgid "About SDS..."
-msgstr "Sobre'l SDS..."
+msgstr "Sobre''l SDS..."
 
 msgid "Open a preferences dialog for SDS."
 msgstr "Abrir un cuadru de diálogu de preferencies pa SDS"
@@ -28948,28 +29098,28 @@ msgid ""
 "The user name at the SDS server. You need to create an account with the SDS "
 "admin first."
 msgstr ""
-"El nome d'usuariu nel servidor SDS. Precisa crear una cuenta col "
+"El nome d''usuariu nel servidor SDS. Precisa crear una cuenta col "
 "alministrador SDS primeru."
 
 msgid ""
 "The password at the SDS server. You need to create an account with the SDS "
 "admin first."
 msgstr ""
-"La contraseña nel servidor SDS. Precisa crear una cuenta com l'alministrador "
-"de SDS primeru."
+"La contraseña nel servidor SDS. Precisa crear una cuenta com "
+"l''alministrador de SDS primeru."
 
 msgid ""
 "Tags beginning with this prefix are never saved to OSM, but to the SDS "
 "server only."
 msgstr ""
-"Les etiquetes qu'empiecen con esti prefixu nun van ser guardaes en OSM, "
+"Les etiquetes qu''empiecen con esti prefixu nun van ser guardaes en OSM, "
 "sinón solamente al servidor SDS."
 
 msgid "SDS server URL"
 msgstr "URL del servidor SDS"
 
 msgid "SDS username"
-msgstr "Nome d'usuariu SDS"
+msgstr "Nome d''usuariu SDS"
 
 msgid "SDS password"
 msgstr "Contraseña SDS"
@@ -28978,7 +29128,7 @@ msgid "Test credentials now"
 msgstr "Prebar credenciales agora"
 
 msgid "SDS tag prefix"
-msgstr "Prefixu d'etiqueta SDS"
+msgstr "Prefixu d''etiqueta SDS"
 
 msgid "Connection successful."
 msgstr "Conexón correuta."
@@ -28991,7 +29141,7 @@ msgstr "Grabar..."
 
 msgid "Save the current separate data store information to a file."
 msgstr ""
-"Grabar la información de datos d'almacenamientu separáu como un arquivu"
+"Grabar la información de datos d''almacenamientu separáu como un arquivu"
 
 msgid "Save SDS file"
 msgstr "Grabar arquivu SDS"
@@ -29000,7 +29150,7 @@ msgid "Simplify Area"
 msgstr "Simplificar área"
 
 msgid "Delete unnecessary nodes from an area."
-msgstr "Esaniciar nodos innecesarios d'una área"
+msgstr "Esaniciar nodos innecesarios d''una área"
 
 msgid "Yes, delete nodes"
 msgstr "Sí, esaniciar nodos"
@@ -29034,32 +29184,32 @@ msgid ""
 "another step of the simplification that merges adjanced nodes that are "
 "closer than <u>Threshold</u> meters."
 msgstr ""
-"El nodo de la vía (área) ye esaniciáu si tolos <o>Pesos d'Ángulu</o>, "
-"<o>Pesos d'Área</o> y <o>Pesu de Distancia </o> son mayores que 1. El "
-"<o>Pesu</o calcúlase como un <o>Valor</o> / <o>Estragal</o>, onde'l "
-"<o>Valor</o> ye unu de <o>Ángulu</o>, <o>Área</o> y <o>Distancia</o> "
+"El nodo de la vía (área) ye esaniciáu si tolos <u>Pesos d''Ángulu</u>, "
+"<u>Pesos d''Área</u> y <u>Pesu de Distancia</u> son mayores que 1. El "
+"<u>Pesu</u> calcúlase como un <u>Valor</u> / <u>Estragal</u>, onde''l "
+"<u>Valor</u> ye unu de <u>Ángulu</u>, <u>Área</u> y <u>Distancia</u> "
 "calculáu de cada unu de los trés puntos adyancentes de la vía.<ul><li>El "
-"<o>Valor</o> de <o>Ángulu</o> ye l'ángulu en graos sobre'l segundu "
-"nodo</li><li>El <o>Valor</o> de <o>Área</o> ye formáu pol "
-"triángulu</li><li>El <o>Valor</o> de la <o>Distancia</o> ye la Distancia "
-"d'Erru de Pista Cruciada></li></ul>Los trés <o>Pesu</o>s multiplicaos polos "
-"sos <o>Factor</o>ye son sumaos y el nodo mínimu de la suma ye esaniciáu en "
+"<u>Valor</u> de <u>Ángulu</u> ye l''ángulu en graos sobre''l segundu "
+"nodo</li><li>El <u>Valor</u> de <u>Área</u> ye formáu pol "
+"triángulu</li><li>El <u>Valor</u> de la <u>Distancia</u> ye la Distancia "
+"d''Erru de Pista Cruciada></li></ul>Los trés <u>Pesu</u>s multiplicaos polos "
+"sos <u>Factor</u>ye son sumaos y el nodo mínimu de la suma ye esaniciáu en "
 "primer llugar. La eliminacióncontinúa hasta que nun hai nodos por esaniciar. "
 "La combinación de Nodos Cercanos ye otru pasu de la simplificación que "
 "combina los nodos axacentes que tán a una distancia inferior al "
-"<o>Estragal</o> en metros."
+"<u>Estragal</u> en metros."
 
 msgid "Angle Threshold"
-msgstr "Estragal d'ángulu"
+msgstr "Estragal d''ángulu"
 
 msgid "Angle Factor"
-msgstr "Factor d'ángulu"
+msgstr "Factor d''ángulu"
 
 msgid "Area Threshold"
-msgstr "Estragal d'área"
+msgstr "Estragal d''área"
 
 msgid "Area Factor"
-msgstr "Factor d'área"
+msgstr "Factor d''área"
 
 msgid "Distance Threshold"
 msgstr "Estragal de distancia"
@@ -29121,7 +29271,7 @@ msgid "Tag2Link Preferences"
 msgstr "Preferencies de Tag2Link"
 
 msgid "Launch browser with information about the selected object"
-msgstr "Llanzar navegador con información so l'oxetu escoyíu"
+msgstr "Llanzar navegador con información so l''oxetu escoyíu"
 
 msgid ""
 "Launch your default software for sending an email to the selected contact "
@@ -29134,13 +29284,13 @@ msgid "Edit tags"
 msgstr "Editar etiquetes"
 
 msgid "Launches the tag editor dialog"
-msgstr "Llanza la ventana de dialogo del editor d'etiquetes"
+msgstr "Llanza la ventana de dialogo del editor d''etiquetes"
 
 msgid "JOSM Tag Editor Plugin"
 msgstr "Componente JOSM Tag Editor"
 
 msgid "Abort tag editing and close dialog"
-msgstr "Dexar la edición d'etiquetes y pesllar el diálogu"
+msgstr "Dexar la edición d''etiquetes y pesllar el diálogu"
 
 msgid "Apply edited tags and close dialog"
 msgstr "Aplicar etiquetes editaes y pesllar diálogu"
@@ -29163,12 +29313,12 @@ msgstr "Test de etiquetes preestablecíes"
 msgid ""
 "Open the tagging preset test tool for previewing tagging preset dialogs."
 msgstr ""
-"Abrir la ferramienta de comprobación d'etiquetes preestablecidas pa "
-"previsualizar los diálogos d'etiquetes preestablecidas."
+"Abrir la ferramienta de comprobación d''etiquetes preestablecidas pa "
+"previsualizar los diálogos d''etiquetes preestablecidas."
 
 msgid "You have to specify tagging preset sources in the preferences first."
 msgstr ""
-"Enantes tien d'especificar les fontes de les etiquetes preestablecidas nes "
+"Enantes tien d''especificar les fontes de les etiquetes preestablecidas nes "
 "preferencies."
 
 msgid "Enter housenumbers or amount of segments"
@@ -29193,13 +29343,13 @@ msgid "List of Numbers"
 msgstr "Lista de Númberos"
 
 msgid "add to existing associatedStreet relation"
-msgstr "Amestar a una relación d'asociación de cai esistente"
+msgstr "Amestar a una relación d''asociación de cai esistente"
 
 msgid "create an associatedStreet relation"
-msgstr "crear una relación d'asociación de cai"
+msgstr "crear una relación d''asociación de cai"
 
-msgid "delete outline way"
-msgstr "Esaniciar vía resaltada"
+msgid "keep outline way"
+msgstr ""
 
 msgid "Street name: "
 msgstr "Nome de cai: "
@@ -29215,8 +29365,8 @@ msgstr "Mayor númberu"
 
 msgid "Lowest housenumber cannot be higher than highest housenumber"
 msgstr ""
-"El númberu de portal inferior non puede ser superior qu'el númberu de portal "
-"mayor"
+"El númberu de portal inferior non puede ser superior qu''el númberu de "
+"portal mayor"
 
 msgid "Housenumbers do not match odd/even setting"
 msgstr "Los númberos de portal nun coinciden cola configuración par/impar"
@@ -29234,7 +29384,7 @@ msgid "Reverse a terrace"
 msgstr "Invertir edificios adosaos"
 
 msgid "Reverses house numbers on a terrace."
-msgstr "Invertir los númberos de portal d'edificios adosaos"
+msgstr "Invertir los númberos de portal d''edificios adosaos"
 
 msgid "Reverse a Terrace"
 msgstr "Invertir edificios adosaos"
@@ -29249,7 +29399,7 @@ msgid "Terrace a building"
 msgstr "Adosar un edificiu"
 
 msgid "Creates individual buildings from a long building."
-msgstr "Crear edificios individuales a partir d'un gran edificiu."
+msgstr "Crear edificios individuales a partir d''un gran edificiu."
 
 msgid "Invalid selection"
 msgstr "Escoyeta non válida"
@@ -29261,7 +29411,7 @@ msgid ""
 msgstr ""
 "Escueya solamente una vía zarrada o siquier cuatro nodos, (Opcionalmente  "
 "puede escoyer una cai pola etiqueta addr:street y un nodo pa marcar "
-"l'empiezu de la numberación.)"
+"l''empiezu de la numberación.)"
 
 msgid "Terrace"
 msgstr "Terrace"
@@ -29273,7 +29423,7 @@ msgid "Browse map with left button"
 msgstr "Explorar el mapa col botón esquierdu"
 
 msgid "Merge objects nodes"
-msgstr "Entemecer nodos d'oxetos"
+msgstr "Entemecer nodos d''oxetos"
 
 msgid "Tracer"
 msgstr "Trazador"
@@ -29447,10 +29597,10 @@ msgid "Unknown"
 msgstr "Desconocíu"
 
 msgid "Object signatures"
-msgstr "Firmes d'oxetos"
+msgstr "Firmes d''oxetos"
 
 msgid "Open object signing window."
-msgstr "Abrir ventana de robladura d'oxetos"
+msgstr "Abrir ventana de robladura d''oxetos"
 
 msgid "Check"
 msgstr "Prebar"
@@ -29511,7 +29661,7 @@ msgid "Sorry, there are no Signatures for the selected Node."
 msgstr "Esculpe, nun hai firmes pal nodo escoyíu."
 
 msgid "No Signature found"
-msgstr "Non s'atopó firma"
+msgstr "Non s''atopó firma"
 
 msgid ""
 "Selected node was:\n"
@@ -29603,7 +29753,7 @@ msgid "Web Recherche"
 msgstr "Web Recherche"
 
 msgid "Trusted persons told me"
-msgstr "Dixéronmelo persones d'enfotu"
+msgstr "Dixéronmelo persones d''enfotu"
 
 msgid "Which source did you use?"
 msgstr "¿Qué fonte usó?"
@@ -29612,7 +29762,7 @@ msgid "never"
 msgstr "nunca"
 
 msgid "Primary user-ID: "
-msgstr "Id d'usuariu primariu: "
+msgstr "Id d''usuariu primariu: "
 
 msgid "Key-ID: "
 msgstr "Id de Llave: "
@@ -29624,7 +29774,7 @@ msgid "Algorithm: "
 msgstr "Algoritmu: "
 
 msgid "Strength in bit: "
-msgstr "Fuercia'n bit: "
+msgstr "Fuercia''n bit: "
 
 msgid "Creation date: "
 msgstr "Fecha de creación: "
@@ -29636,7 +29786,7 @@ msgid "PGP-Key details"
 msgstr "Detalles de la Llave PGP"
 
 msgid "User-ID:"
-msgstr "ID d'usuariu:"
+msgstr "ID d''usuariu:"
 
 msgid "Select algorithm:"
 msgstr "Escoyer algoritmu:"
@@ -29708,7 +29858,7 @@ msgid "{0} lanes are not referenced in any turn-relation."
 msgstr "{0} carriles nun son referencies por nenguna relación de xiru."
 
 msgid "Put the ways in order."
-msgstr "Asitia les víes n'orde."
+msgstr "Asitia les víes n''orde."
 
 msgid "Relation references non-existent (regular) lane {0}"
 msgstr "La relación referencia a un carril inesistente (regular) {0}"
@@ -29769,7 +29919,7 @@ msgstr "Llimpiar los roles escoyíos o borrar los miembros escoyíos"
 
 msgid "Insert new relation members from object in the clipboard"
 msgstr ""
-"Ensertar una nueva relación de miembros dende l'oxetu nel portapapeles"
+"Ensertar una nueva relación de miembros dende l''oxetu nel portapapeles"
 
 msgid "Move the selected relation members down by one position"
 msgstr "Mover los miembros de relación escoyíos una posición embaxo"
@@ -29778,10 +29928,10 @@ msgid "Move the selected relation members up by one position"
 msgstr "Mover los miembros de relación escoyíos una posición enriba"
 
 msgid "Edit basic attributes of a turn restriction"
-msgstr "Editar atributos básicos d'una restricción de xiru"
+msgstr "Editar atributos básicos d''una restricción de xiru"
 
 msgid "Edit the raw tags and members of this turn restriction"
-msgstr "Editar les etiquetes y los miembros d'esta restricción de xiru"
+msgstr "Editar les etiquetes y los miembros d''esta restricción de xiru"
 
 msgid "Errors/Warnings"
 msgstr "Erros/alvertencies"
@@ -29837,11 +29987,11 @@ msgid_plural ""
 "This turn restriction refers to {0} objects which were deleted outside of "
 "this turn restriction editor:"
 msgstr[0] ""
-"Esta restricción de xiru fai referenciaa un oxetu que borráu per fora d'esti "
-"editor de restricciones de xiru:"
+"Esta restricción de xiru fai referenciaa un oxetu que borráu per fora "
+"d''esti editor de restricciones de xiru:"
 msgstr[1] ""
 "Esta restricción de xiru fai referencia a {0} oxetos que fueron borraos fora "
-"d'esti editor de restricciones de xiru:"
+"d''esti editor de restricciones de xiru:"
 
 msgid ""
 "Updates to this turn restriction can''t be saved unless deleted members are "
@@ -29854,7 +30004,7 @@ msgid "Remove deleted members and save"
 msgstr "Quitar miembros esaniciaos y guardar"
 
 msgid "Cancel and return to editor"
-msgstr "Atayar y volver a l'editor"
+msgstr "Atayar y volver a l''editor"
 
 msgid "Deleted members in turn restriction"
 msgstr "Miembros esaniciaos en restricción de xiru"
@@ -29872,7 +30022,7 @@ msgid ""
 msgstr ""
 "<html>Esta restricción de xiru camudó fora del editor.<br>Nun puede aplicar "
 "los sos cambeos y siguir editando.<br><br>¿Deseya crear un conflictu y "
-"cerrar l'editor?</html>"
+"cerrar l''editor?</html>"
 
 msgid "Already participating in a conflict"
 msgstr "Participando yá nun conflictu"
@@ -29920,7 +30070,7 @@ msgstr "Crear nueva restricción de xiru"
 
 msgid "Launch the turn restriction editor to create a new turn restriction"
 msgstr ""
-"Llanzar l'editor de restricciones de xiru pa crear una nueva restricción."
+"Llanzar l''editor de restricciones de xiru pa crear una nueva restricción."
 
 msgid "No Right Turn"
 msgstr "Prohibíu xirar a la derecha"
@@ -29929,7 +30079,7 @@ msgid "No Left Turn"
 msgstr "Prohibíu xirar a la izquierda"
 
 msgid "No U-Turn"
-msgstr "Prohibíu xirar n'U"
+msgstr "Prohibíu xirar n''U"
 
 msgid "No Straight On"
 msgstr "Prohibíu siguir de frente"
@@ -29994,7 +30144,7 @@ msgid "Copy the selected vias to the clipboard"
 msgstr "Copiar les víes escoyíes al portapapeles"
 
 msgid "Insert ''via'' objects from the clipboard"
-msgstr "Ensertar objeto ''vía'' dende'l portapapeles"
+msgstr "Ensertar objeto ''vía'' dende''l portapapeles"
 
 msgid ""
 "Failed to retrieve OSM object with id {0} from dataset {1}. Cannot add it as "
@@ -30025,8 +30175,8 @@ msgid ""
 "selection only.<br>Deselect to display all turn restrictions in the current "
 "data set.</html>"
 msgstr ""
-"<html>Escoyer p'amosar les restricciones de xiru rellacionaos colos oxetos "
-"de la selección actual. <br> Deseleccionar p'amosar toles restricciones del "
+"<html>Escoyer p''amosar les restricciones de xiru rellacionaos colos oxetos "
+"de la selección actual. <br> Deseleccionar p''amosar toles restricciones del "
 "conxuntu de datos actual.</html>"
 
 msgid "Turn Restrictions"
@@ -30076,7 +30226,7 @@ msgid ""
 "restriction. If enabled, one can edit them in the Basic editor too. If "
 "disabled, editing of via-objects is possible in the Advanced Editor only."
 msgstr ""
-"L'Editor Básicu pue amosar de manera opcional un llistáu de víes con "
+"L''Editor Básicu pue amosar de manera opcional un llistáu de víes con "
 "restricciones de xiru. Si ta activáu estes restricciones puen editase tamién "
 "con esti editor básicu. Si tá desactiváu, la edición de víes ye solo posible "
 "col Editor Avanzáu."
@@ -30092,7 +30242,7 @@ msgstr "Señales de tráficu - Grupu B"
 
 msgid "Please select the set of road sign icons to be used in the plugin."
 msgstr ""
-"Por favor, escueya'l conxuntu d'iconos de señales de tráficu que van ser "
+"Por favor, escueya''l conxuntu d''iconos de señales de tráficu que van ser "
 "usaos nel complementu."
 
 msgid ""
@@ -30169,14 +30319,14 @@ msgid ""
 msgstr "Reemplaza el oxetu-via configuráu anguañu col nodo na intersección"
 
 msgid "Go to Basic Editor and manually fix the list of via-objects"
-msgstr "Dir al editor básicu ya iguar manualmente el llistáu d'oxetos-vía"
+msgstr "Dir al editor básicu ya iguar manualmente el llistáu d''oxetos-vía"
 
 msgid ""
 "A turn restriction must declare the type of restriction. Please select a "
 "type in the Basic Editor."
 msgstr ""
-"Nuna restricción de xiru tien de declarase'l tipu de restricción. Por favor, "
-"escueya una nel Editor Básicu."
+"Nuna restricción de xiru tien de declarase''l tipu de restricción. Por "
+"favor, escueya una nel Editor Básicu."
 
 msgid "A way with role <tt>from</tt> is required in a turn restriction."
 msgstr "Riquir una vía col rol <tt>dende</tt> nuna restricción de xiru."
@@ -30207,7 +30357,7 @@ msgid ""
 "Make sure you add one or more via objects (nodes or ways) to the turn "
 "restriction."
 msgstr ""
-"Asegúrese d'amestar un o más elementos (nodos o víes) a la restricción de "
+"Asegúrese d''amestar un o más elementos (nodos o víes) a la restricción de "
 "xiru."
 
 msgid "Go to the Advanced Editor and add via objects"
@@ -30295,7 +30445,7 @@ msgid "A way is required instead."
 msgstr "Riquir una víes nel so llugar"
 
 msgid "Delete the member from the turn restriction"
-msgstr "Borra'l miembru de la restricción de xiru"
+msgstr "Borra''l miembru de la restricción de xiru"
 
 msgid "Change to the Basic Editor and select a way"
 msgstr "Camude al Editor Básicu y escueya una vía"
@@ -30353,7 +30503,7 @@ msgid "Align Way Nodes"
 msgstr "Aliniar nodos de la vía"
 
 msgid "Align nodes in a way"
-msgstr "Alinia los nodos d'una vía"
+msgstr "Alinia los nodos d''una vía"
 
 msgid "The way with selected nodes can not be straightened."
 msgstr "El camín colos nodos escoyíos nun se pue endrechar."
@@ -30365,13 +30515,13 @@ msgid "Extract node"
 msgstr "Estrayer nodo"
 
 msgid "Extracts node from a way"
-msgstr "Extrayi nodo d'una vía"
+msgstr "Extrayi nodo d''una vía"
 
 msgid ""
 "This tool extracts node from its ways and requires single node to be "
 "selected."
 msgstr ""
-"Esta ferramienta estrayi un nodo de les sos víes y riquir que s'escoya un "
+"Esta ferramienta estrayi un nodo de les sos víes y riquir que s''escoya un "
 "únicu nodo."
 
 msgid "Extract node from line"
@@ -30440,7 +30590,7 @@ msgid "Copy tags from previous selection"
 msgstr "Copiar etiquetes de la escoyeta anterior"
 
 msgid "Pastes tags of previously selected object(s)"
-msgstr "Apega etiquetes d'oxetu(s) previamente escoyíu(s)"
+msgstr "Apega etiquetes d''oxetu(s) previamente escoyíu(s)"
 
 msgid "Add Source Tag"
 msgstr "Añedir etiqueta de fonte"
@@ -30472,7 +30622,7 @@ msgid "Create a circle arc"
 msgstr "Crear arcu de círculu"
 
 msgid "Select custom URL"
-msgstr "Escoyer l'URL personalizá"
+msgstr "Escoyer l''URL personalizá"
 
 msgid "Please select one of custom URLs (configured in Preferences)"
 msgstr ""
@@ -30488,7 +30638,7 @@ msgid "Open custom URL"
 msgstr "Abrir URL personalizá"
 
 msgid "Opens specified URL browser"
-msgstr "Abre l'URL especificá nel navegador"
+msgstr "Abre l''URL especificá nel navegador"
 
 msgid "Utilsplugin2 settings"
 msgstr "Configuración de Utilsplugin2"
@@ -30518,7 +30668,7 @@ msgstr ""
 "<br/> <b>&123;díi&125;</b> ye remplazado col ID del elementu <br/> "
 "<b>&123;type&125;</b> ye reemplazáu col \"nodo\", \"vía\" o \"relación\" "
 "<br/> <b>&123;lat&125; , &123;lon&125;</b> ye reemplazáu cola "
-"llatitú/llargor del centru del mapa <br/> Pue cargar manualmente l'arquivu "
+"llatitú/llargor del centru del mapa <br/> Pue cargar manualmente l''arquivu "
 "de configuración <b>customurl.txt</b> na carpeta de JOSM."
 
 msgid "Custom URL configuration"
@@ -30559,7 +30709,7 @@ msgstr ""
 "puntu y coma.<br/>Utilice númberos positivos, o bien los calteres N y E pa "
 "indicar la dirección cardinal Norte o Este.<br/>Pa les direcciones "
 "cardinales Sur y Oeste puede utilizar tanto númberos negativos como calteres "
-"S y W.<br/>El valor de la coordenada puede tar n'unu de los siguientes trés "
+"S y W.<br/>El valor de la coordenada puede tar n''unu de los siguientes trés "
 "formatos:<ul><li><i>grau</i><tt>°</tt></li><li><i>graos</i><tt>°</tt> "
 "<i>minutos</i><tt>&39;</tt></li><li><i>graos</i><tt>°</tt> "
 "<i>minutos</i><tt>&39;</tt> <i>segundos</i><tt>\"</tt></li>Los </ul>símbolos "
@@ -30577,7 +30727,7 @@ msgid "Tag multiple objects [alpha]"
 msgstr "Etiquetar múltiples oxetos [alfa]"
 
 msgid "Edit tags of object list in table"
-msgstr "Editar etiquetes de la llista d'oxetos na tabla"
+msgstr "Editar etiquetes de la llista d''oxetos na tabla"
 
 msgid "Tag multiple objects"
 msgstr "Etiquetar múltiples oxetos"
@@ -30598,7 +30748,7 @@ msgid "Duplicate tags from the first"
 msgstr "Doblar etiquetes a partir de la primera"
 
 msgid "Set tags for multiple objects"
-msgstr "Afitar valor d'etiquetes pa múltiples oxetos"
+msgstr "Afitar valor d''etiquetes pa múltiples oxetos"
 
 msgid "Delete from history"
 msgstr "Borrar del historial"
@@ -30619,8 +30769,8 @@ msgid ""
 "This tool replaces geometry of one object with another, and so requires "
 "exactly two objects to be selected."
 msgstr ""
-"Esta ferramienta reemplaza la xeometría d'un oxetu con otru, y rique que 2 y "
-"solo 2 oxetos sían escoyíos"
+"Esta ferramienta reemplaza la xeometría d''un oxetu con otru, y rique que 2 "
+"y solo 2 oxetos sían escoyíos."
 
 msgid ""
 "This tool can only replace a node, upgrade a node to a way or a "
@@ -30643,11 +30793,11 @@ msgid ""
 "Please select one way that exists in the database and one new way with "
 "correct geometry."
 msgstr ""
-"Por favor, escueya una vía qu'esista na base de datos y una vía nueva con "
+"Por favor, escueya una vía qu''esista na base de datos y una vía nueva con "
 "xeometría correcta."
 
 msgid "The ways must be entirely within the downloaded area."
-msgstr "Les víes tienen de tar dafechu dientro de l'área descargá."
+msgstr "Les víes tienen de tar dafechu dientro de l''área descargá."
 
 msgid ""
 "The way to be replaced cannot have any nodes with properties or relation "
@@ -30658,7 +30808,7 @@ msgstr ""
 
 msgid "Exceeded iteration limit for robust method, using simpler method."
 msgstr ""
-"Entepasóse la llende d'iteraciones pal métodu robustu, va procedese col "
+"Entepasóse la llende d''iteraciones pal métodu robustu, va procedese col "
 "métodu más simple."
 
 msgid "Replace geometry for way {0}"
@@ -30695,25 +30845,25 @@ msgid "Select all connected ways"
 msgstr "Escoyer toles víes conectaes"
 
 msgid "Intersecting ways"
-msgstr "Víes que s'interseccionen"
+msgstr "Víes que s''interseccionen"
 
 msgid "Select intersecting ways"
-msgstr "Escoyer víes que s'interseccionen"
+msgstr "Escoyer víes que s''interseccionen"
 
 msgid "Please select some ways to find connected and intersecting ways!"
 msgstr ""
-"¡Por favor, escueya delles víes p'atopar les que se conecten ya "
+"¡Por favor, escueya delles víes p''atopar les que se conecten ya "
 "interseccionen!"
 
 msgid "All intersecting ways"
-msgstr "Toles víes que s'interseccionen"
+msgstr "Toles víes que s''interseccionen"
 
 msgid "Select all intersecting ways"
-msgstr "Escoyer toles víes que s'interseccionen"
+msgstr "Escoyer toles víes que s''interseccionen"
 
 msgid "Please select some ways to find all connected and intersecting ways!"
 msgstr ""
-"¡Por favor, escueya delles víes p'atopar toles que se conecten ya "
+"¡Por favor, escueya delles víes p''atopar toles que se conecten ya "
 "interseccionen!"
 
 msgid "Middle nodes"
@@ -30738,20 +30888,20 @@ msgid ""
 "Nothing found. Please select some closed ways or multipolygons to find all "
 "primitives inside them!"
 msgstr ""
-"Nun s'atopó nada. Por favor escueya dalguna forma zarrada o multipolígonos "
-"p'atopar toles primitives dientro d'ellos."
+"Nun s''atopó nada. Por favor escueya dalguna forma zarrada o multipolígonos "
+"p''atopar toles primitives dientro d''ellos."
 
 msgid "Area boundary [testing]"
-msgstr "Llende de l'área [en prueba]"
+msgstr "Llende de l''área [en prueba]"
 
 msgid "Select relation or all ways that forms area boundary"
-msgstr "Escueye la relación o toles víes que configuren la llende de l'área"
+msgstr "Escueye la relación o toles víes que configuren la llende de l''área"
 
 msgid ""
 "Nothing found. Please select way that is a part of some polygon formed by "
 "connected ways"
 msgstr ""
-"Nun s'atopó nada. Por favor escueya una vía que sía parte d'un polígonu "
+"Nun s''atopó nada. Por favor escueya una vía que sía parte d''un polígonu "
 "formáu per víes conectaes"
 
 msgid "Select Highway"
@@ -30773,14 +30923,14 @@ msgid "Select Way Nodes"
 msgstr "Escoyer nodos de la vía"
 
 msgid "Select all nodes of a selected way."
-msgstr "Escueye tolos nodos d'una vía escoyida."
+msgstr "Escueye tolos nodos d''una vía escoyida."
 
 msgid "Undo selection"
 msgstr "Desfacer selección"
 
 msgid "Reselect last added object or selection form history"
 msgstr ""
-"Vuelve escoyer los caberos oxetos en ser añedíos o escoyer dende l'historial"
+"Vuelve escoyer los caberos oxetos en ser añedíos o escoyer dende l''historial"
 
 msgid "Unselect nodes"
 msgstr "Deseleccionar nodos"
@@ -30798,7 +30948,7 @@ msgid "Remove Video"
 msgstr "Desaniciar vídeu"
 
 msgid "removes current video from layer"
-msgstr "Desanicia'l vídeu actual de la capa"
+msgstr "Desanicia''l vídeu actual de la capa"
 
 msgid "Play/Pause"
 msgstr "Reproducir / Pausar"
@@ -30813,7 +30963,7 @@ msgid "Backward"
 msgstr "Escontra tras"
 
 msgid "jumps n sec back"
-msgstr "ir n segundos p'atrás"
+msgstr "ir n segundos p''atrás"
 
 msgid "Forward"
 msgstr "Alantre"
@@ -30849,7 +30999,7 @@ msgid "Keep centered"
 msgstr "Caltener centráu"
 
 msgid "follows the video icon automatically"
-msgstr "siguir l'iconu de vídeu de manera automática"
+msgstr "siguir l''iconu de vídeu de manera automática"
 
 msgid "Subtitles"
 msgstr "Subtítulos"
@@ -30870,7 +31020,7 @@ msgid "Loop length"
 msgstr "Llargor del ciclu"
 
 msgid "Set the length around a looppoint"
-msgstr "Axuste'l llargor d'alredor d'un puntu de bucle"
+msgstr "Axuste''l llargor d''alredor d''un puntu de bucle"
 
 msgid "no deinterlacing"
 msgstr "No desentrelazáu (deinterlacing)"
@@ -30903,10 +31053,10 @@ msgid "Sync"
 msgstr "Sincronizar"
 
 msgid "Unable to find JNA Java library!"
-msgstr "¡Nun s'atopó biblioteca JNA de Java!"
+msgstr "¡Nun s''atopó biblioteca JNA de Java!"
 
 msgid "Unable to find native libvlc library!"
-msgstr "¡Nun s'atopó la biblioteca nativa libvlc!"
+msgstr "¡Nun s''atopó la biblioteca nativa libvlc!"
 
 msgid "play"
 msgstr "reproducir"
@@ -30943,7 +31093,7 @@ msgid "Way Download"
 msgstr "Descargar vía"
 
 msgid "Download map data on the end of selected way"
-msgstr "Descargar elementos del mapa hasta'l final de la vía escoyida"
+msgstr "Descargar elementos del mapa hasta''l final de la vía escoyida"
 
 msgid ""
 "<html>Neither a node nor a way with an endpoint outside of the<br>current "
@@ -30951,7 +31101,7 @@ msgid ""
 "an entire way first.</html>"
 msgstr ""
 "<html>Nengún nodo, nin vía con un puntu final fora de la<br>actual área de "
-"descarga escoyida. <br> Escueya un nodo de principiu o fin d'una vía o una "
+"descarga escoyida. <br> Escueya un nodo de principiu o fin d''una vía o una "
 "vía completa primeru. </html>"
 
 msgid "<html>Could not find a unique node to start downloading from.</html>"
@@ -31012,7 +31162,7 @@ msgstr "Añedir nomes dende Wikipedia"
 msgid ""
 "Fetches interwiki links from Wikipedia in order to add several name tags"
 msgstr ""
-"Llogra los enllaces interwiki de Wikipedia p'amestar delles etiquetes de "
+"Llogra los enllaces interwiki de Wikipedia p''amestar delles etiquetes de "
 "denominación"
 
 msgid ""
@@ -31032,7 +31182,7 @@ msgid ""
 "Double click on item to search for object with article name (and center "
 "coordinate)"
 msgstr ""
-"Doble clic nun ítem pa buscar oxetos col mesmu nome d'artículu (y centru de "
+"Doble clic nun ítem pa buscar oxetos col mesmu nome d''artículu (y centru de "
 "coordenaes)"
 
 msgid "Available via WIWOSM server"
@@ -31060,7 +31210,7 @@ msgid "Category"
 msgstr "Estaya"
 
 msgid "Fetches a list of all Wikipedia articles of a category"
-msgstr "Llogra una llista de tolos artículos de Wikipedia d'una categoría"
+msgstr "Llogra una llista de tolos artículos de Wikipedia d''una categoría"
 
 msgid "Enter the Wikipedia category"
 msgstr "Introduza la categoría de Wikipedia"
@@ -31069,7 +31219,7 @@ msgid "Clipboard"
 msgstr "Cartafueyu"
 
 msgid "Pastes Wikipedia articles from the system clipboard"
-msgstr "Pegar artículos de la Wikipedia dende'l cartafueyu del sistema"
+msgstr "Pegar artículos de la Wikipedia dende''l cartafueyu del sistema"
 
 msgid "clipboard"
 msgstr "portapapeles"
@@ -31078,13 +31228,13 @@ msgid "Open Article"
 msgstr "Abrir artículu"
 
 msgid "Opens the Wikipedia article of the selected item in a browser"
-msgstr "Abre l'artículu de Wikipedia del elementu escoyíu nun navegador"
+msgstr "Abre l''artículu de Wikipedia del elementu escoyíu nun navegador"
 
 msgid "Sets the default language for the Wikipedia articles"
-msgstr "Establez l'idioma predetermináu pa los artículos de la Wikipedia"
+msgstr "Establez l''idioma predetermináu pa los artículos de la Wikipedia"
 
 msgid "Enter the Wikipedia language"
-msgstr "Ingrese'l llinguaxe de Wikipedia"
+msgstr "Ingrese''l llinguaxe de Wikipedia"
 
 msgid ""
 "Adds a ''wikipedia'' tag corresponding to this article to the selected "
diff --git a/i18n/po/az.po b/i18n/po/az.po
index cdd4b73..900955f 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: 2014-12-10 03:42+0100\n"
+"POT-Creation-Date: 2014-12-29 01:14+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: 2014-12-10 04:36+0000\n"
-"X-Generator: Launchpad (build 17283)\n"
+"X-Launchpad-Export-Date: 2014-12-29 04:37+0000\n"
+"X-Generator: Launchpad (build 17286)\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
 msgstr ""
@@ -3723,6 +3723,9 @@ msgstr ""
 msgid "Checks for errors in internet-related tags."
 msgstr ""
 
+msgid " URL cannot be converted to ASCII: {0}"
+msgstr ""
+
 msgid "''{0}'': {1}"
 msgstr ""
 
@@ -3929,19 +3932,20 @@ msgstr ""
 msgid "Relation is empty"
 msgstr ""
 
-msgid "<empty>"
+msgid "Role member does not match expression {0} in template {1}"
 msgstr ""
 
-msgid "Role {0} unknown"
+msgid ""
+"Role member type {0} does not match accepted list of {1} in template {2}"
 msgstr ""
 
-msgid "Empty role found"
+msgid "<empty>"
 msgstr ""
 
-msgid "Member for role ''{0}'' does not match ''{1}''"
+msgid "Role {0} unknown in templates {1}"
 msgstr ""
 
-msgid "Member for role {0} of wrong type"
+msgid "Empty role type found when expecting one of {0}"
 msgstr ""
 
 msgid "Role {0} missing"
@@ -4477,10 +4481,35 @@ msgstr ""
 msgid "options provided as Java system properties"
 msgstr ""
 
-msgid "/PATH/TO/JOSM/FOLDER/         "
+msgid "/PATH/TO/JOSM/PREF    "
+msgstr ""
+
+msgid "Set the preferences directory"
+msgstr ""
+
+msgid "/PATH/TO/JOSM/USERDATA"
+msgstr ""
+
+msgid "Set the user data directory"
+msgstr ""
+
+msgid "/PATH/TO/JOSM/CACHE   "
+msgstr ""
+
+msgid "Set the cache directory"
 msgstr ""
 
-msgid "Change the folder for all user settings"
+msgid "/PATH/TO/JOSM/HOMEDIR "
+msgstr ""
+
+msgid ""
+"Relocate all 3 directories to homedir. Cache directory will be in "
+"homedir/cache"
+msgstr ""
+
+msgid ""
+"-Djosm.home has lower precedence, i.e. the specific setting overrides the "
+"general one"
 msgstr ""
 
 msgid ""
@@ -4735,6 +4764,21 @@ msgstr ""
 msgid "Layer ''{0}'' must be in list of layers"
 msgstr ""
 
+msgid "Default (open, closed, new)"
+msgstr ""
+
+msgid "Username"
+msgstr ""
+
+msgid "Created date"
+msgstr ""
+
+msgid "Last change date"
+msgstr ""
+
+msgid "Select note sorting method"
+msgstr ""
+
 msgid "Click to cancel the current operation"
 msgstr ""
 
@@ -6075,6 +6119,12 @@ msgstr ""
 msgid "Reopen note with message:"
 msgstr ""
 
+msgid "Sort notes"
+msgstr ""
+
+msgid "Sort"
+msgstr ""
+
 msgid "Object type:"
 msgstr ""
 
@@ -7057,9 +7107,6 @@ msgstr ""
 msgid "Sort the relation members"
 msgstr ""
 
-msgid "Sort"
-msgstr ""
-
 msgid "Relation Editor: Sort"
 msgstr ""
 
@@ -7841,9 +7888,6 @@ msgstr ""
 msgid "Enter credentials for HTTP proxy"
 msgstr ""
 
-msgid "Username"
-msgstr ""
-
 msgid "Password"
 msgstr ""
 
@@ -8523,6 +8567,9 @@ msgstr ""
 msgid "Save Layer"
 msgstr ""
 
+msgid "Note"
+msgstr ""
+
 msgid "Notes layer"
 msgstr ""
 
@@ -8969,6 +9016,9 @@ msgstr ""
 msgid "Delete File from disk"
 msgstr ""
 
+msgid "Copy image path"
+msgstr ""
+
 msgid "Next"
 msgstr ""
 
@@ -12349,6 +12399,9 @@ msgstr ""
 msgid "Illegal long value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
+msgid "{0} bytes have been read"
+msgstr ""
+
 msgid "Prepare OSM data..."
 msgstr ""
 
@@ -12529,7 +12582,7 @@ msgstr ""
 msgid "Cannot start remotecontrol server on port {0}: {1}"
 msgstr ""
 
-msgid "RemoteControl::Accepting connections on port {0}"
+msgid "RemoteControl::Accepting connections on {0}:{1}"
 msgstr ""
 
 msgid "RemoteControl::Server stopped."
@@ -12541,7 +12594,7 @@ msgstr ""
 msgid "Unable to initialize Remote Control HTTPS Server"
 msgstr ""
 
-msgid "RemoteControl::Accepting secure connections on port {0}"
+msgid "RemoteControl::Accepting secure connections on {0}:{1}"
 msgstr ""
 
 msgid "RemoteControl::Server (https) stopped."
@@ -13501,9 +13554,6 @@ msgid ""
 "contain any JOSM object or suitable text. </p></html>"
 msgstr ""
 
-msgid "Invalid bz2 file."
-msgstr ""
-
 msgid "ms"
 msgstr ""
 
@@ -14739,6 +14789,10 @@ msgstr ""
 msgid "Coins"
 msgstr ""
 
+msgctxt "payment"
+msgid "Notes"
+msgstr ""
+
 msgid "Electronic purses and Charge cards"
 msgstr ""
 
@@ -15561,6 +15615,9 @@ msgstr ""
 msgid "Cross on horseback"
 msgstr ""
 
+msgid "Optional values for specific countries"
+msgstr ""
+
 msgid "Stop"
 msgstr ""
 
@@ -15618,6 +15675,18 @@ msgstr ""
 msgid "Speed Camera"
 msgstr ""
 
+msgid "Traffic Mirror"
+msgstr ""
+
+msgctxt "junction=yes"
+msgid "Named Junction"
+msgstr ""
+
+msgid ""
+"Used in some countries for a named road junction who’s name serves for local "
+"orientation."
+msgstr ""
+
 msgid "Elevator"
 msgstr ""
 
@@ -17062,6 +17131,9 @@ msgstr ""
 msgid "Fireplace"
 msgstr ""
 
+msgid "Picnic Table"
+msgstr ""
+
 msgid "Public Grill"
 msgstr ""
 
@@ -17667,6 +17739,12 @@ msgstr ""
 msgid "Count"
 msgstr ""
 
+msgid "Advertising Column"
+msgstr ""
+
+msgid "Billboard"
+msgstr ""
+
 msgid "Sports"
 msgstr ""
 
@@ -19537,9 +19615,6 @@ msgstr ""
 msgid "vouchers"
 msgstr ""
 
-msgid "Note"
-msgstr ""
-
 msgid "Geography"
 msgstr ""
 
@@ -19923,9 +19998,6 @@ msgstr ""
 msgid "House number"
 msgstr ""
 
-msgid "House name"
-msgstr ""
-
 msgid "Street name"
 msgstr ""
 
@@ -19938,7 +20010,7 @@ msgstr ""
 msgid "Country code"
 msgstr ""
 
-msgid "Optional values for specific countries"
+msgid "House name"
 msgstr ""
 
 msgid "Subdistrict"
@@ -20610,6 +20682,13 @@ msgstr ""
 msgid "VoGIS: DOM (Surface model)"
 msgstr ""
 
+msgid ""
+"AGIV(laanderen) aerial imagery (covers Brussels region as well) (2013)"
+msgstr ""
+
+msgid "Geoservices Wallonie aerial imagery (2009)"
+msgstr ""
+
 msgid "IBGE Mapa de Setores Urbanos"
 msgstr ""
 
@@ -20744,6 +20823,9 @@ msgstr ""
 msgid "Hamburg (40 cm)"
 msgstr ""
 
+msgid "Hamburg (20 cm)"
+msgstr ""
+
 msgid "Hamburg (DK5)"
 msgstr ""
 
@@ -20989,6 +21071,9 @@ msgstr ""
 msgid "Kanton Aargau 25cm (AGIS 2011)"
 msgstr ""
 
+msgid "Kanton Aargau 25cm (AGIS 2014)"
+msgstr ""
+
 msgid "Stadt Uster Orthophoto 2008 10cm"
 msgstr ""
 
@@ -21346,6 +21431,9 @@ msgstr ""
 msgid "{0} without {1}, {2} or {3}"
 msgstr ""
 
+msgid "{0} together with {1}"
+msgstr ""
+
 msgid "{0} on suspicious object"
 msgstr ""
 
@@ -21364,6 +21452,12 @@ 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 "{0}={1} is deprecated"
 msgstr ""
 
@@ -21400,6 +21494,9 @@ msgstr ""
 msgid "{0} should be replaced with {1}"
 msgstr ""
 
+msgid "{0} = {1}; remove {0}"
+msgstr ""
+
 msgid ""
 "{0}={1} is unspecific. Please replace ''{1}'' by ''left'', ''right'' or "
 "''both''."
@@ -21438,6 +21535,9 @@ msgstr ""
 msgid "Overlapping Identical Landuses"
 msgstr ""
 
+msgid "{0} must be connected to a way"
+msgstr ""
+
 msgid "abbreviated street name"
 msgstr ""
 
@@ -21459,9 +21559,17 @@ msgstr ""
 msgid "street name contains ss"
 msgstr ""
 
+msgid ""
+"Value of ''{0}'' should either be ''{1}'' or ''{2}''. For sidewalks use "
+"''{3}'' instead."
+msgstr ""
+
 msgid "{0} with multiple values"
 msgstr ""
 
+msgid "empty value in semicolon-separated ''{0}''"
+msgstr ""
+
 msgid "numerical key"
 msgstr ""
 
@@ -21496,6 +21604,9 @@ msgstr ""
 msgid "{0} must be a numeric value"
 msgstr ""
 
+msgid "{0} must be a positive integer number"
+msgstr ""
+
 msgid "relation without type"
 msgstr ""
 
@@ -22690,6 +22801,12 @@ msgstr ""
 msgid "merge nodes"
 msgstr ""
 
+msgid "How often thinning operation should be applied (Default {0})."
+msgstr ""
+
+msgid "Thinning Iterations"
+msgstr ""
+
 msgid "Street Name:"
 msgstr ""
 
@@ -25707,7 +25824,9 @@ msgstr ""
 msgid "Move and position photos"
 msgstr ""
 
-msgid "Click+drag photo or shift+click to position photo."
+msgid ""
+"Click+drag photo, shift+click to position photo, control+click to set "
+"direction."
 msgstr ""
 
 msgid "Please load some photos."
@@ -26368,6 +26487,9 @@ msgstr ""
 msgid "Reconstruct polygons from relation {0}"
 msgstr ""
 
+msgid "Reconstruct route"
+msgstr ""
+
 msgid "Open relation wiki page"
 msgstr ""
 
@@ -26407,6 +26529,12 @@ msgstr ""
 msgid "Way without ''inner'' or ''outer'' role found"
 msgstr ""
 
+msgid "Node without ''stop'' or ''platform'' role found"
+msgstr ""
+
+msgid "Way platform without ''platform'' role found"
+msgstr ""
+
 msgid "Revert changeset fully"
 msgstr ""
 
@@ -26897,7 +27025,7 @@ msgstr ""
 msgid "create an associatedStreet relation"
 msgstr ""
 
-msgid "delete outline way"
+msgid "keep outline way"
 msgstr ""
 
 msgid "Street name: "
diff --git a/i18n/po/be.po b/i18n/po/be.po
index d77b2cf..0f1a109 100644
--- a/i18n/po/be.po
+++ b/i18n/po/be.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-12-10 03:42+0100\n"
+"POT-Creation-Date: 2014-12-29 01:14+0100\n"
 "PO-Revision-Date: 2013-07-08 12:07+0000\n"
 "Last-Translator: Andrew West <2thewest at gmail.com>\n"
 "Language-Team: Belarusian <i18n at mova.org>\n"
@@ -19,8 +19,8 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
 "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-"X-Launchpad-Export-Date: 2014-12-10 04:37+0000\n"
-"X-Generator: Launchpad (build 17283)\n"
+"X-Launchpad-Export-Date: 2014-12-29 04:38+0000\n"
+"X-Generator: Launchpad (build 17286)\n"
 "Language: be\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -3897,6 +3897,9 @@ msgstr ""
 msgid "Checks for errors in internet-related tags."
 msgstr ""
 
+msgid " URL cannot be converted to ASCII: {0}"
+msgstr ""
+
 msgid "''{0}'': {1}"
 msgstr ""
 
@@ -4103,19 +4106,20 @@ msgstr ""
 msgid "Relation is empty"
 msgstr ""
 
-msgid "<empty>"
+msgid "Role member does not match expression {0} in template {1}"
 msgstr ""
 
-msgid "Role {0} unknown"
+msgid ""
+"Role member type {0} does not match accepted list of {1} in template {2}"
 msgstr ""
 
-msgid "Empty role found"
+msgid "<empty>"
 msgstr ""
 
-msgid "Member for role ''{0}'' does not match ''{1}''"
+msgid "Role {0} unknown in templates {1}"
 msgstr ""
 
-msgid "Member for role {0} of wrong type"
+msgid "Empty role type found when expecting one of {0}"
 msgstr ""
 
 msgid "Role {0} missing"
@@ -4652,10 +4656,35 @@ msgstr ""
 msgid "options provided as Java system properties"
 msgstr ""
 
-msgid "/PATH/TO/JOSM/FOLDER/         "
+msgid "/PATH/TO/JOSM/PREF    "
+msgstr ""
+
+msgid "Set the preferences directory"
+msgstr ""
+
+msgid "/PATH/TO/JOSM/USERDATA"
+msgstr ""
+
+msgid "Set the user data directory"
+msgstr ""
+
+msgid "/PATH/TO/JOSM/CACHE   "
+msgstr ""
+
+msgid "Set the cache directory"
 msgstr ""
 
-msgid "Change the folder for all user settings"
+msgid "/PATH/TO/JOSM/HOMEDIR "
+msgstr ""
+
+msgid ""
+"Relocate all 3 directories to homedir. Cache directory will be in "
+"homedir/cache"
+msgstr ""
+
+msgid ""
+"-Djosm.home has lower precedence, i.e. the specific setting overrides the "
+"general one"
 msgstr ""
 
 msgid ""
@@ -4910,6 +4939,21 @@ msgstr ""
 msgid "Layer ''{0}'' must be in list of layers"
 msgstr ""
 
+msgid "Default (open, closed, new)"
+msgstr ""
+
+msgid "Username"
+msgstr ""
+
+msgid "Created date"
+msgstr ""
+
+msgid "Last change date"
+msgstr ""
+
+msgid "Select note sorting method"
+msgstr ""
+
 msgid "Click to cancel the current operation"
 msgstr ""
 
@@ -6250,6 +6294,12 @@ msgstr ""
 msgid "Reopen note with message:"
 msgstr ""
 
+msgid "Sort notes"
+msgstr ""
+
+msgid "Sort"
+msgstr ""
+
 msgid "Object type:"
 msgstr "Тып аб'екта"
 
@@ -7232,9 +7282,6 @@ msgstr ""
 msgid "Sort the relation members"
 msgstr ""
 
-msgid "Sort"
-msgstr ""
-
 msgid "Relation Editor: Sort"
 msgstr ""
 
@@ -8018,9 +8065,6 @@ msgstr ""
 msgid "Enter credentials for HTTP proxy"
 msgstr ""
 
-msgid "Username"
-msgstr ""
-
 msgid "Password"
 msgstr ""
 
@@ -8705,6 +8749,9 @@ msgstr ""
 msgid "Save Layer"
 msgstr "Запісаць слой"
 
+msgid "Note"
+msgstr ""
+
 msgid "Notes layer"
 msgstr ""
 
@@ -9153,6 +9200,9 @@ msgstr ""
 msgid "Delete File from disk"
 msgstr ""
 
+msgid "Copy image path"
+msgstr ""
+
 msgid "Next"
 msgstr ""
 
@@ -12533,6 +12583,9 @@ msgstr ""
 msgid "Illegal long value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
+msgid "{0} bytes have been read"
+msgstr ""
+
 msgid "Prepare OSM data..."
 msgstr ""
 
@@ -12713,7 +12766,7 @@ msgstr ""
 msgid "Cannot start remotecontrol server on port {0}: {1}"
 msgstr ""
 
-msgid "RemoteControl::Accepting connections on port {0}"
+msgid "RemoteControl::Accepting connections on {0}:{1}"
 msgstr ""
 
 msgid "RemoteControl::Server stopped."
@@ -12725,7 +12778,7 @@ msgstr ""
 msgid "Unable to initialize Remote Control HTTPS Server"
 msgstr ""
 
-msgid "RemoteControl::Accepting secure connections on port {0}"
+msgid "RemoteControl::Accepting secure connections on {0}:{1}"
 msgstr ""
 
 msgid "RemoteControl::Server (https) stopped."
@@ -13685,9 +13738,6 @@ msgid ""
 "contain any JOSM object or suitable text. </p></html>"
 msgstr ""
 
-msgid "Invalid bz2 file."
-msgstr ""
-
 msgid "ms"
 msgstr ""
 
@@ -14923,6 +14973,10 @@ msgstr ""
 msgid "Coins"
 msgstr ""
 
+msgctxt "payment"
+msgid "Notes"
+msgstr ""
+
 msgid "Electronic purses and Charge cards"
 msgstr ""
 
@@ -15745,6 +15799,9 @@ msgstr ""
 msgid "Cross on horseback"
 msgstr ""
 
+msgid "Optional values for specific countries"
+msgstr ""
+
 msgid "Stop"
 msgstr ""
 
@@ -15802,6 +15859,18 @@ msgstr ""
 msgid "Speed Camera"
 msgstr ""
 
+msgid "Traffic Mirror"
+msgstr ""
+
+msgctxt "junction=yes"
+msgid "Named Junction"
+msgstr ""
+
+msgid ""
+"Used in some countries for a named road junction who’s name serves for local "
+"orientation."
+msgstr ""
+
 msgid "Elevator"
 msgstr ""
 
@@ -17246,6 +17315,9 @@ msgstr ""
 msgid "Fireplace"
 msgstr ""
 
+msgid "Picnic Table"
+msgstr ""
+
 msgid "Public Grill"
 msgstr ""
 
@@ -17851,6 +17923,12 @@ msgstr ""
 msgid "Count"
 msgstr ""
 
+msgid "Advertising Column"
+msgstr ""
+
+msgid "Billboard"
+msgstr ""
+
 msgid "Sports"
 msgstr ""
 
@@ -19721,9 +19799,6 @@ msgstr ""
 msgid "vouchers"
 msgstr ""
 
-msgid "Note"
-msgstr ""
-
 msgid "Geography"
 msgstr ""
 
@@ -20107,9 +20182,6 @@ msgstr ""
 msgid "House number"
 msgstr ""
 
-msgid "House name"
-msgstr ""
-
 msgid "Street name"
 msgstr ""
 
@@ -20122,7 +20194,7 @@ msgstr ""
 msgid "Country code"
 msgstr ""
 
-msgid "Optional values for specific countries"
+msgid "House name"
 msgstr ""
 
 msgid "Subdistrict"
@@ -20794,6 +20866,13 @@ msgstr ""
 msgid "VoGIS: DOM (Surface model)"
 msgstr ""
 
+msgid ""
+"AGIV(laanderen) aerial imagery (covers Brussels region as well) (2013)"
+msgstr ""
+
+msgid "Geoservices Wallonie aerial imagery (2009)"
+msgstr ""
+
 msgid "IBGE Mapa de Setores Urbanos"
 msgstr ""
 
@@ -20928,6 +21007,9 @@ msgstr ""
 msgid "Hamburg (40 cm)"
 msgstr ""
 
+msgid "Hamburg (20 cm)"
+msgstr ""
+
 msgid "Hamburg (DK5)"
 msgstr ""
 
@@ -21173,6 +21255,9 @@ msgstr ""
 msgid "Kanton Aargau 25cm (AGIS 2011)"
 msgstr ""
 
+msgid "Kanton Aargau 25cm (AGIS 2014)"
+msgstr ""
+
 msgid "Stadt Uster Orthophoto 2008 10cm"
 msgstr ""
 
@@ -21530,6 +21615,9 @@ msgstr ""
 msgid "{0} without {1}, {2} or {3}"
 msgstr ""
 
+msgid "{0} together with {1}"
+msgstr ""
+
 msgid "{0} on suspicious object"
 msgstr ""
 
@@ -21548,6 +21636,12 @@ 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 "{0}={1} is deprecated"
 msgstr ""
 
@@ -21584,6 +21678,9 @@ msgstr ""
 msgid "{0} should be replaced with {1}"
 msgstr ""
 
+msgid "{0} = {1}; remove {0}"
+msgstr ""
+
 msgid ""
 "{0}={1} is unspecific. Please replace ''{1}'' by ''left'', ''right'' or "
 "''both''."
@@ -21622,6 +21719,9 @@ msgstr ""
 msgid "Overlapping Identical Landuses"
 msgstr ""
 
+msgid "{0} must be connected to a way"
+msgstr ""
+
 msgid "abbreviated street name"
 msgstr ""
 
@@ -21643,9 +21743,17 @@ msgstr ""
 msgid "street name contains ss"
 msgstr ""
 
+msgid ""
+"Value of ''{0}'' should either be ''{1}'' or ''{2}''. For sidewalks use "
+"''{3}'' instead."
+msgstr ""
+
 msgid "{0} with multiple values"
 msgstr ""
 
+msgid "empty value in semicolon-separated ''{0}''"
+msgstr ""
+
 msgid "numerical key"
 msgstr ""
 
@@ -21680,6 +21788,9 @@ msgstr ""
 msgid "{0} must be a numeric value"
 msgstr ""
 
+msgid "{0} must be a positive integer number"
+msgstr ""
+
 msgid "relation without type"
 msgstr ""
 
@@ -22874,6 +22985,12 @@ msgstr ""
 msgid "merge nodes"
 msgstr ""
 
+msgid "How often thinning operation should be applied (Default {0})."
+msgstr ""
+
+msgid "Thinning Iterations"
+msgstr ""
+
 msgid "Street Name:"
 msgstr ""
 
@@ -25895,7 +26012,9 @@ msgstr ""
 msgid "Move and position photos"
 msgstr ""
 
-msgid "Click+drag photo or shift+click to position photo."
+msgid ""
+"Click+drag photo, shift+click to position photo, control+click to set "
+"direction."
 msgstr ""
 
 msgid "Please load some photos."
@@ -26556,6 +26675,9 @@ msgstr ""
 msgid "Reconstruct polygons from relation {0}"
 msgstr ""
 
+msgid "Reconstruct route"
+msgstr ""
+
 msgid "Open relation wiki page"
 msgstr ""
 
@@ -26595,6 +26717,12 @@ msgstr ""
 msgid "Way without ''inner'' or ''outer'' role found"
 msgstr ""
 
+msgid "Node without ''stop'' or ''platform'' role found"
+msgstr ""
+
+msgid "Way platform without ''platform'' role found"
+msgstr ""
+
 msgid "Revert changeset fully"
 msgstr ""
 
@@ -27085,7 +27213,7 @@ msgstr ""
 msgid "create an associatedStreet relation"
 msgstr ""
 
-msgid "delete outline way"
+msgid "keep outline way"
 msgstr ""
 
 msgid "Street name: "
diff --git a/i18n/po/bg.po b/i18n/po/bg.po
index 2d2abd9..109a07a 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: 2014-12-10 03:42+0100\n"
+"POT-Creation-Date: 2014-12-29 01:14+0100\n"
 "PO-Revision-Date: 2014-11-05 05:58+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: 2014-12-10 04:39+0000\n"
-"X-Generator: Launchpad (build 17283)\n"
+"X-Launchpad-Export-Date: 2014-12-29 04:42+0000\n"
+"X-Generator: Launchpad (build 17286)\n"
 "Language: bg\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -3844,6 +3844,9 @@ msgstr ""
 msgid "Checks for errors in internet-related tags."
 msgstr ""
 
+msgid " URL cannot be converted to ASCII: {0}"
+msgstr ""
+
 msgid "''{0}'': {1}"
 msgstr ""
 
@@ -4052,19 +4055,20 @@ msgstr ""
 msgid "Relation is empty"
 msgstr ""
 
-msgid "<empty>"
+msgid "Role member does not match expression {0} in template {1}"
 msgstr ""
 
-msgid "Role {0} unknown"
+msgid ""
+"Role member type {0} does not match accepted list of {1} in template {2}"
 msgstr ""
 
-msgid "Empty role found"
+msgid "<empty>"
 msgstr ""
 
-msgid "Member for role ''{0}'' does not match ''{1}''"
+msgid "Role {0} unknown in templates {1}"
 msgstr ""
 
-msgid "Member for role {0} of wrong type"
+msgid "Empty role type found when expecting one of {0}"
 msgstr ""
 
 msgid "Role {0} missing"
@@ -4608,10 +4612,35 @@ msgstr ""
 msgid "options provided as Java system properties"
 msgstr ""
 
-msgid "/PATH/TO/JOSM/FOLDER/         "
-msgstr "/път/към/папката/на/JOSM/         "
+msgid "/PATH/TO/JOSM/PREF    "
+msgstr ""
+
+msgid "Set the preferences directory"
+msgstr ""
+
+msgid "/PATH/TO/JOSM/USERDATA"
+msgstr ""
+
+msgid "Set the user data directory"
+msgstr ""
+
+msgid "/PATH/TO/JOSM/CACHE   "
+msgstr ""
+
+msgid "Set the cache directory"
+msgstr ""
+
+msgid "/PATH/TO/JOSM/HOMEDIR "
+msgstr ""
+
+msgid ""
+"Relocate all 3 directories to homedir. Cache directory will be in "
+"homedir/cache"
+msgstr ""
 
-msgid "Change the folder for all user settings"
+msgid ""
+"-Djosm.home has lower precedence, i.e. the specific setting overrides the "
+"general one"
 msgstr ""
 
 msgid ""
@@ -4866,6 +4895,21 @@ msgstr "слоя не е в списъка."
 msgid "Layer ''{0}'' must be in list of layers"
 msgstr "Слоя ''{0}'' трябва да бъде в списъка от слоеве"
 
+msgid "Default (open, closed, new)"
+msgstr ""
+
+msgid "Username"
+msgstr "Потребителско име"
+
+msgid "Created date"
+msgstr ""
+
+msgid "Last change date"
+msgstr ""
+
+msgid "Select note sorting method"
+msgstr ""
+
 msgid "Click to cancel the current operation"
 msgstr ""
 
@@ -6208,6 +6252,12 @@ msgstr ""
 msgid "Reopen note with message:"
 msgstr ""
 
+msgid "Sort notes"
+msgstr ""
+
+msgid "Sort"
+msgstr ""
+
 msgid "Object type:"
 msgstr "Тип на обекта:"
 
@@ -7192,9 +7242,6 @@ msgstr ""
 msgid "Sort the relation members"
 msgstr "Сортиране на членовете на релацията"
 
-msgid "Sort"
-msgstr ""
-
 msgid "Relation Editor: Sort"
 msgstr ""
 
@@ -7995,9 +8042,6 @@ msgstr ""
 msgid "Enter credentials for HTTP proxy"
 msgstr ""
 
-msgid "Username"
-msgstr "Потребителско име"
-
 msgid "Password"
 msgstr "Парола"
 
@@ -8691,6 +8735,9 @@ msgstr ""
 msgid "Save Layer"
 msgstr "Запис на слой"
 
+msgid "Note"
+msgstr "Забележка"
+
 msgid "Notes layer"
 msgstr ""
 
@@ -9150,6 +9197,9 @@ msgstr "Премахване на снимка от слой"
 msgid "Delete File from disk"
 msgstr ""
 
+msgid "Copy image path"
+msgstr ""
+
 msgid "Next"
 msgstr "Следващ"
 
@@ -12589,6 +12639,9 @@ msgstr ""
 msgid "Illegal long value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
+msgid "{0} bytes have been read"
+msgstr ""
+
 msgid "Prepare OSM data..."
 msgstr "Подготовка на OSM данните..."
 
@@ -12770,7 +12823,7 @@ msgstr ""
 msgid "Cannot start remotecontrol server on port {0}: {1}"
 msgstr ""
 
-msgid "RemoteControl::Accepting connections on port {0}"
+msgid "RemoteControl::Accepting connections on {0}:{1}"
 msgstr ""
 
 msgid "RemoteControl::Server stopped."
@@ -12782,7 +12835,7 @@ msgstr ""
 msgid "Unable to initialize Remote Control HTTPS Server"
 msgstr ""
 
-msgid "RemoteControl::Accepting secure connections on port {0}"
+msgid "RemoteControl::Accepting secure connections on {0}:{1}"
 msgstr ""
 
 msgid "RemoteControl::Server (https) stopped."
@@ -13752,9 +13805,6 @@ msgid ""
 "contain any JOSM object or suitable text. </p></html>"
 msgstr ""
 
-msgid "Invalid bz2 file."
-msgstr "Невалиден bz2 файл."
-
 msgid "ms"
 msgstr ""
 
@@ -15013,6 +15063,10 @@ msgstr ""
 msgid "Coins"
 msgstr "Монети"
 
+msgctxt "payment"
+msgid "Notes"
+msgstr ""
+
 msgid "Electronic purses and Charge cards"
 msgstr "Електрони средства за разплата"
 
@@ -15835,6 +15889,9 @@ msgstr "Пресичане с велосипед"
 msgid "Cross on horseback"
 msgstr "Пресичане върху кон"
 
+msgid "Optional values for specific countries"
+msgstr ""
+
 msgid "Stop"
 msgstr "Стоп"
 
@@ -15892,6 +15949,18 @@ msgstr "Второ име"
 msgid "Speed Camera"
 msgstr "Пътна камера"
 
+msgid "Traffic Mirror"
+msgstr ""
+
+msgctxt "junction=yes"
+msgid "Named Junction"
+msgstr ""
+
+msgid ""
+"Used in some countries for a named road junction who’s name serves for local "
+"orientation."
+msgstr ""
+
 msgid "Elevator"
 msgstr ""
 
@@ -17336,6 +17405,9 @@ msgstr "Място за пикник"
 msgid "Fireplace"
 msgstr "Огнище"
 
+msgid "Picnic Table"
+msgstr ""
+
 msgid "Public Grill"
 msgstr ""
 
@@ -17941,6 +18013,12 @@ msgstr ""
 msgid "Count"
 msgstr ""
 
+msgid "Advertising Column"
+msgstr ""
+
+msgid "Billboard"
+msgstr ""
+
 msgid "Sports"
 msgstr "Спорт"
 
@@ -19811,9 +19889,6 @@ msgstr "играчки"
 msgid "vouchers"
 msgstr "ваучери"
 
-msgid "Note"
-msgstr "Забележка"
-
 msgid "Geography"
 msgstr "География"
 
@@ -20197,9 +20272,6 @@ msgstr ""
 msgid "House number"
 msgstr "Номер"
 
-msgid "House name"
-msgstr "Име на дом"
-
 msgid "Street name"
 msgstr "Име на улица"
 
@@ -20212,8 +20284,8 @@ msgstr "Име на град"
 msgid "Country code"
 msgstr "Код на държава"
 
-msgid "Optional values for specific countries"
-msgstr ""
+msgid "House name"
+msgstr "Име на дом"
 
 msgid "Subdistrict"
 msgstr ""
@@ -20884,6 +20956,13 @@ msgstr ""
 msgid "VoGIS: DOM (Surface model)"
 msgstr ""
 
+msgid ""
+"AGIV(laanderen) aerial imagery (covers Brussels region as well) (2013)"
+msgstr ""
+
+msgid "Geoservices Wallonie aerial imagery (2009)"
+msgstr ""
+
 msgid "IBGE Mapa de Setores Urbanos"
 msgstr ""
 
@@ -21018,6 +21097,9 @@ msgstr ""
 msgid "Hamburg (40 cm)"
 msgstr ""
 
+msgid "Hamburg (20 cm)"
+msgstr ""
+
 msgid "Hamburg (DK5)"
 msgstr ""
 
@@ -21263,6 +21345,9 @@ msgstr ""
 msgid "Kanton Aargau 25cm (AGIS 2011)"
 msgstr ""
 
+msgid "Kanton Aargau 25cm (AGIS 2014)"
+msgstr ""
+
 msgid "Stadt Uster Orthophoto 2008 10cm"
 msgstr ""
 
@@ -21620,6 +21705,9 @@ msgstr ""
 msgid "{0} without {1}, {2} or {3}"
 msgstr ""
 
+msgid "{0} together with {1}"
+msgstr ""
+
 msgid "{0} on suspicious object"
 msgstr ""
 
@@ -21638,6 +21726,12 @@ 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 "{0}={1} is deprecated"
 msgstr ""
 
@@ -21674,6 +21768,9 @@ msgstr ""
 msgid "{0} should be replaced with {1}"
 msgstr ""
 
+msgid "{0} = {1}; remove {0}"
+msgstr ""
+
 msgid ""
 "{0}={1} is unspecific. Please replace ''{1}'' by ''left'', ''right'' or "
 "''both''."
@@ -21712,6 +21809,9 @@ msgstr ""
 msgid "Overlapping Identical Landuses"
 msgstr ""
 
+msgid "{0} must be connected to a way"
+msgstr ""
+
 msgid "abbreviated street name"
 msgstr ""
 
@@ -21733,9 +21833,17 @@ msgstr ""
 msgid "street name contains ss"
 msgstr ""
 
+msgid ""
+"Value of ''{0}'' should either be ''{1}'' or ''{2}''. For sidewalks use "
+"''{3}'' instead."
+msgstr ""
+
 msgid "{0} with multiple values"
 msgstr ""
 
+msgid "empty value in semicolon-separated ''{0}''"
+msgstr ""
+
 msgid "numerical key"
 msgstr ""
 
@@ -21770,6 +21878,9 @@ msgstr ""
 msgid "{0} must be a numeric value"
 msgstr ""
 
+msgid "{0} must be a positive integer number"
+msgstr ""
+
 msgid "relation without type"
 msgstr ""
 
@@ -22966,6 +23077,12 @@ msgstr ""
 msgid "merge nodes"
 msgstr ""
 
+msgid "How often thinning operation should be applied (Default {0})."
+msgstr ""
+
+msgid "Thinning Iterations"
+msgstr ""
+
 msgid "Street Name:"
 msgstr ""
 
@@ -26031,7 +26148,9 @@ msgstr ""
 msgid "Move and position photos"
 msgstr ""
 
-msgid "Click+drag photo or shift+click to position photo."
+msgid ""
+"Click+drag photo, shift+click to position photo, control+click to set "
+"direction."
 msgstr ""
 
 msgid "Please load some photos."
@@ -26692,6 +26811,9 @@ msgstr ""
 msgid "Reconstruct polygons from relation {0}"
 msgstr ""
 
+msgid "Reconstruct route"
+msgstr ""
+
 msgid "Open relation wiki page"
 msgstr ""
 
@@ -26731,6 +26853,12 @@ msgstr ""
 msgid "Way without ''inner'' or ''outer'' role found"
 msgstr ""
 
+msgid "Node without ''stop'' or ''platform'' role found"
+msgstr ""
+
+msgid "Way platform without ''platform'' role found"
+msgstr ""
+
 msgid "Revert changeset fully"
 msgstr ""
 
@@ -27226,7 +27354,7 @@ msgstr ""
 msgid "create an associatedStreet relation"
 msgstr ""
 
-msgid "delete outline way"
+msgid "keep outline way"
 msgstr ""
 
 msgid "Street name: "
diff --git a/i18n/po/bn.po b/i18n/po/bn.po
index 6c68e41..f6cf724 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: 2014-12-10 03:42+0100\n"
+"POT-Creation-Date: 2014-12-29 01:14+0100\n"
 "PO-Revision-Date: 2013-06-13 16:28+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: 2014-12-10 04:37+0000\n"
-"X-Generator: Launchpad (build 17283)\n"
+"X-Launchpad-Export-Date: 2014-12-29 04:39+0000\n"
+"X-Generator: Launchpad (build 17286)\n"
 "Language: bn\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -3727,6 +3727,9 @@ msgstr ""
 msgid "Checks for errors in internet-related tags."
 msgstr ""
 
+msgid " URL cannot be converted to ASCII: {0}"
+msgstr ""
+
 msgid "''{0}'': {1}"
 msgstr ""
 
@@ -3933,19 +3936,20 @@ msgstr ""
 msgid "Relation is empty"
 msgstr ""
 
-msgid "<empty>"
+msgid "Role member does not match expression {0} in template {1}"
 msgstr ""
 
-msgid "Role {0} unknown"
+msgid ""
+"Role member type {0} does not match accepted list of {1} in template {2}"
 msgstr ""
 
-msgid "Empty role found"
+msgid "<empty>"
 msgstr ""
 
-msgid "Member for role ''{0}'' does not match ''{1}''"
+msgid "Role {0} unknown in templates {1}"
 msgstr ""
 
-msgid "Member for role {0} of wrong type"
+msgid "Empty role type found when expecting one of {0}"
 msgstr ""
 
 msgid "Role {0} missing"
@@ -4481,10 +4485,35 @@ msgstr ""
 msgid "options provided as Java system properties"
 msgstr ""
 
-msgid "/PATH/TO/JOSM/FOLDER/         "
+msgid "/PATH/TO/JOSM/PREF    "
+msgstr ""
+
+msgid "Set the preferences directory"
+msgstr ""
+
+msgid "/PATH/TO/JOSM/USERDATA"
+msgstr ""
+
+msgid "Set the user data directory"
+msgstr ""
+
+msgid "/PATH/TO/JOSM/CACHE   "
+msgstr ""
+
+msgid "Set the cache directory"
 msgstr ""
 
-msgid "Change the folder for all user settings"
+msgid "/PATH/TO/JOSM/HOMEDIR "
+msgstr ""
+
+msgid ""
+"Relocate all 3 directories to homedir. Cache directory will be in "
+"homedir/cache"
+msgstr ""
+
+msgid ""
+"-Djosm.home has lower precedence, i.e. the specific setting overrides the "
+"general one"
 msgstr ""
 
 msgid ""
@@ -4739,6 +4768,21 @@ msgstr ""
 msgid "Layer ''{0}'' must be in list of layers"
 msgstr ""
 
+msgid "Default (open, closed, new)"
+msgstr ""
+
+msgid "Username"
+msgstr ""
+
+msgid "Created date"
+msgstr ""
+
+msgid "Last change date"
+msgstr ""
+
+msgid "Select note sorting method"
+msgstr ""
+
 msgid "Click to cancel the current operation"
 msgstr ""
 
@@ -6079,6 +6123,12 @@ msgstr ""
 msgid "Reopen note with message:"
 msgstr ""
 
+msgid "Sort notes"
+msgstr ""
+
+msgid "Sort"
+msgstr ""
+
 msgid "Object type:"
 msgstr ""
 
@@ -7061,9 +7111,6 @@ msgstr ""
 msgid "Sort the relation members"
 msgstr ""
 
-msgid "Sort"
-msgstr ""
-
 msgid "Relation Editor: Sort"
 msgstr ""
 
@@ -7845,9 +7892,6 @@ msgstr ""
 msgid "Enter credentials for HTTP proxy"
 msgstr ""
 
-msgid "Username"
-msgstr ""
-
 msgid "Password"
 msgstr ""
 
@@ -8527,6 +8571,9 @@ msgstr ""
 msgid "Save Layer"
 msgstr ""
 
+msgid "Note"
+msgstr ""
+
 msgid "Notes layer"
 msgstr ""
 
@@ -8973,6 +9020,9 @@ msgstr ""
 msgid "Delete File from disk"
 msgstr ""
 
+msgid "Copy image path"
+msgstr ""
+
 msgid "Next"
 msgstr ""
 
@@ -12353,6 +12403,9 @@ msgstr ""
 msgid "Illegal long value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
+msgid "{0} bytes have been read"
+msgstr ""
+
 msgid "Prepare OSM data..."
 msgstr ""
 
@@ -12533,7 +12586,7 @@ msgstr ""
 msgid "Cannot start remotecontrol server on port {0}: {1}"
 msgstr ""
 
-msgid "RemoteControl::Accepting connections on port {0}"
+msgid "RemoteControl::Accepting connections on {0}:{1}"
 msgstr ""
 
 msgid "RemoteControl::Server stopped."
@@ -12545,7 +12598,7 @@ msgstr ""
 msgid "Unable to initialize Remote Control HTTPS Server"
 msgstr ""
 
-msgid "RemoteControl::Accepting secure connections on port {0}"
+msgid "RemoteControl::Accepting secure connections on {0}:{1}"
 msgstr ""
 
 msgid "RemoteControl::Server (https) stopped."
@@ -13505,9 +13558,6 @@ msgid ""
 "contain any JOSM object or suitable text. </p></html>"
 msgstr ""
 
-msgid "Invalid bz2 file."
-msgstr ""
-
 msgid "ms"
 msgstr ""
 
@@ -14743,6 +14793,10 @@ msgstr ""
 msgid "Coins"
 msgstr ""
 
+msgctxt "payment"
+msgid "Notes"
+msgstr ""
+
 msgid "Electronic purses and Charge cards"
 msgstr ""
 
@@ -15565,6 +15619,9 @@ msgstr ""
 msgid "Cross on horseback"
 msgstr ""
 
+msgid "Optional values for specific countries"
+msgstr ""
+
 msgid "Stop"
 msgstr ""
 
@@ -15622,6 +15679,18 @@ msgstr ""
 msgid "Speed Camera"
 msgstr ""
 
+msgid "Traffic Mirror"
+msgstr ""
+
+msgctxt "junction=yes"
+msgid "Named Junction"
+msgstr ""
+
+msgid ""
+"Used in some countries for a named road junction who’s name serves for local "
+"orientation."
+msgstr ""
+
 msgid "Elevator"
 msgstr ""
 
@@ -17066,6 +17135,9 @@ msgstr ""
 msgid "Fireplace"
 msgstr ""
 
+msgid "Picnic Table"
+msgstr ""
+
 msgid "Public Grill"
 msgstr ""
 
@@ -17671,6 +17743,12 @@ msgstr ""
 msgid "Count"
 msgstr ""
 
+msgid "Advertising Column"
+msgstr ""
+
+msgid "Billboard"
+msgstr ""
+
 msgid "Sports"
 msgstr ""
 
@@ -19541,9 +19619,6 @@ msgstr ""
 msgid "vouchers"
 msgstr ""
 
-msgid "Note"
-msgstr ""
-
 msgid "Geography"
 msgstr ""
 
@@ -19927,9 +20002,6 @@ msgstr ""
 msgid "House number"
 msgstr ""
 
-msgid "House name"
-msgstr ""
-
 msgid "Street name"
 msgstr ""
 
@@ -19942,7 +20014,7 @@ msgstr ""
 msgid "Country code"
 msgstr ""
 
-msgid "Optional values for specific countries"
+msgid "House name"
 msgstr ""
 
 msgid "Subdistrict"
@@ -20614,6 +20686,13 @@ msgstr ""
 msgid "VoGIS: DOM (Surface model)"
 msgstr ""
 
+msgid ""
+"AGIV(laanderen) aerial imagery (covers Brussels region as well) (2013)"
+msgstr ""
+
+msgid "Geoservices Wallonie aerial imagery (2009)"
+msgstr ""
+
 msgid "IBGE Mapa de Setores Urbanos"
 msgstr ""
 
@@ -20748,6 +20827,9 @@ msgstr ""
 msgid "Hamburg (40 cm)"
 msgstr ""
 
+msgid "Hamburg (20 cm)"
+msgstr ""
+
 msgid "Hamburg (DK5)"
 msgstr ""
 
@@ -20993,6 +21075,9 @@ msgstr ""
 msgid "Kanton Aargau 25cm (AGIS 2011)"
 msgstr ""
 
+msgid "Kanton Aargau 25cm (AGIS 2014)"
+msgstr ""
+
 msgid "Stadt Uster Orthophoto 2008 10cm"
 msgstr ""
 
@@ -21350,6 +21435,9 @@ msgstr ""
 msgid "{0} without {1}, {2} or {3}"
 msgstr ""
 
+msgid "{0} together with {1}"
+msgstr ""
+
 msgid "{0} on suspicious object"
 msgstr ""
 
@@ -21368,6 +21456,12 @@ 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 "{0}={1} is deprecated"
 msgstr ""
 
@@ -21404,6 +21498,9 @@ msgstr ""
 msgid "{0} should be replaced with {1}"
 msgstr ""
 
+msgid "{0} = {1}; remove {0}"
+msgstr ""
+
 msgid ""
 "{0}={1} is unspecific. Please replace ''{1}'' by ''left'', ''right'' or "
 "''both''."
@@ -21442,6 +21539,9 @@ msgstr ""
 msgid "Overlapping Identical Landuses"
 msgstr ""
 
+msgid "{0} must be connected to a way"
+msgstr ""
+
 msgid "abbreviated street name"
 msgstr ""
 
@@ -21463,9 +21563,17 @@ msgstr ""
 msgid "street name contains ss"
 msgstr ""
 
+msgid ""
+"Value of ''{0}'' should either be ''{1}'' or ''{2}''. For sidewalks use "
+"''{3}'' instead."
+msgstr ""
+
 msgid "{0} with multiple values"
 msgstr ""
 
+msgid "empty value in semicolon-separated ''{0}''"
+msgstr ""
+
 msgid "numerical key"
 msgstr ""
 
@@ -21500,6 +21608,9 @@ msgstr ""
 msgid "{0} must be a numeric value"
 msgstr ""
 
+msgid "{0} must be a positive integer number"
+msgstr ""
+
 msgid "relation without type"
 msgstr ""
 
@@ -22694,6 +22805,12 @@ msgstr ""
 msgid "merge nodes"
 msgstr ""
 
+msgid "How often thinning operation should be applied (Default {0})."
+msgstr ""
+
+msgid "Thinning Iterations"
+msgstr ""
+
 msgid "Street Name:"
 msgstr ""
 
@@ -25711,7 +25828,9 @@ msgstr ""
 msgid "Move and position photos"
 msgstr ""
 
-msgid "Click+drag photo or shift+click to position photo."
+msgid ""
+"Click+drag photo, shift+click to position photo, control+click to set "
+"direction."
 msgstr ""
 
 msgid "Please load some photos."
@@ -26372,6 +26491,9 @@ msgstr ""
 msgid "Reconstruct polygons from relation {0}"
 msgstr ""
 
+msgid "Reconstruct route"
+msgstr ""
+
 msgid "Open relation wiki page"
 msgstr ""
 
@@ -26411,6 +26533,12 @@ msgstr ""
 msgid "Way without ''inner'' or ''outer'' role found"
 msgstr ""
 
+msgid "Node without ''stop'' or ''platform'' role found"
+msgstr ""
+
+msgid "Way platform without ''platform'' role found"
+msgstr ""
+
 msgid "Revert changeset fully"
 msgstr ""
 
@@ -26901,7 +27029,7 @@ msgstr ""
 msgid "create an associatedStreet relation"
 msgstr ""
 
-msgid "delete outline way"
+msgid "keep outline way"
 msgstr ""
 
 msgid "Street name: "
diff --git a/i18n/po/br.po b/i18n/po/br.po
index 9decd39..3210239 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: 2014-12-10 03:42+0100\n"
+"POT-Creation-Date: 2014-12-29 01:14+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: 2014-12-10 04:39+0000\n"
-"X-Generator: Launchpad (build 17283)\n"
+"X-Launchpad-Export-Date: 2014-12-29 04:41+0000\n"
+"X-Generator: Launchpad (build 17286)\n"
 "Language: br\n"
 
 msgid "License"
@@ -3724,6 +3724,9 @@ msgstr ""
 msgid "Checks for errors in internet-related tags."
 msgstr ""
 
+msgid " URL cannot be converted to ASCII: {0}"
+msgstr ""
+
 msgid "''{0}'': {1}"
 msgstr ""
 
@@ -3930,19 +3933,20 @@ msgstr ""
 msgid "Relation is empty"
 msgstr ""
 
-msgid "<empty>"
+msgid "Role member does not match expression {0} in template {1}"
 msgstr ""
 
-msgid "Role {0} unknown"
+msgid ""
+"Role member type {0} does not match accepted list of {1} in template {2}"
 msgstr ""
 
-msgid "Empty role found"
+msgid "<empty>"
 msgstr ""
 
-msgid "Member for role ''{0}'' does not match ''{1}''"
+msgid "Role {0} unknown in templates {1}"
 msgstr ""
 
-msgid "Member for role {0} of wrong type"
+msgid "Empty role type found when expecting one of {0}"
 msgstr ""
 
 msgid "Role {0} missing"
@@ -4478,10 +4482,35 @@ msgstr ""
 msgid "options provided as Java system properties"
 msgstr ""
 
-msgid "/PATH/TO/JOSM/FOLDER/         "
+msgid "/PATH/TO/JOSM/PREF    "
+msgstr ""
+
+msgid "Set the preferences directory"
+msgstr ""
+
+msgid "/PATH/TO/JOSM/USERDATA"
+msgstr ""
+
+msgid "Set the user data directory"
+msgstr ""
+
+msgid "/PATH/TO/JOSM/CACHE   "
+msgstr ""
+
+msgid "Set the cache directory"
 msgstr ""
 
-msgid "Change the folder for all user settings"
+msgid "/PATH/TO/JOSM/HOMEDIR "
+msgstr ""
+
+msgid ""
+"Relocate all 3 directories to homedir. Cache directory will be in "
+"homedir/cache"
+msgstr ""
+
+msgid ""
+"-Djosm.home has lower precedence, i.e. the specific setting overrides the "
+"general one"
 msgstr ""
 
 msgid ""
@@ -4736,6 +4765,21 @@ msgstr ""
 msgid "Layer ''{0}'' must be in list of layers"
 msgstr ""
 
+msgid "Default (open, closed, new)"
+msgstr ""
+
+msgid "Username"
+msgstr ""
+
+msgid "Created date"
+msgstr ""
+
+msgid "Last change date"
+msgstr ""
+
+msgid "Select note sorting method"
+msgstr ""
+
 msgid "Click to cancel the current operation"
 msgstr ""
 
@@ -6076,6 +6120,12 @@ msgstr ""
 msgid "Reopen note with message:"
 msgstr ""
 
+msgid "Sort notes"
+msgstr ""
+
+msgid "Sort"
+msgstr ""
+
 msgid "Object type:"
 msgstr ""
 
@@ -7058,9 +7108,6 @@ msgstr ""
 msgid "Sort the relation members"
 msgstr ""
 
-msgid "Sort"
-msgstr ""
-
 msgid "Relation Editor: Sort"
 msgstr ""
 
@@ -7842,9 +7889,6 @@ msgstr ""
 msgid "Enter credentials for HTTP proxy"
 msgstr ""
 
-msgid "Username"
-msgstr ""
-
 msgid "Password"
 msgstr ""
 
@@ -8524,6 +8568,9 @@ msgstr ""
 msgid "Save Layer"
 msgstr ""
 
+msgid "Note"
+msgstr ""
+
 msgid "Notes layer"
 msgstr ""
 
@@ -8970,6 +9017,9 @@ msgstr ""
 msgid "Delete File from disk"
 msgstr ""
 
+msgid "Copy image path"
+msgstr ""
+
 msgid "Next"
 msgstr ""
 
@@ -12350,6 +12400,9 @@ msgstr ""
 msgid "Illegal long value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
+msgid "{0} bytes have been read"
+msgstr ""
+
 msgid "Prepare OSM data..."
 msgstr ""
 
@@ -12530,7 +12583,7 @@ msgstr ""
 msgid "Cannot start remotecontrol server on port {0}: {1}"
 msgstr ""
 
-msgid "RemoteControl::Accepting connections on port {0}"
+msgid "RemoteControl::Accepting connections on {0}:{1}"
 msgstr ""
 
 msgid "RemoteControl::Server stopped."
@@ -12542,7 +12595,7 @@ msgstr ""
 msgid "Unable to initialize Remote Control HTTPS Server"
 msgstr ""
 
-msgid "RemoteControl::Accepting secure connections on port {0}"
+msgid "RemoteControl::Accepting secure connections on {0}:{1}"
 msgstr ""
 
 msgid "RemoteControl::Server (https) stopped."
@@ -13502,9 +13555,6 @@ msgid ""
 "contain any JOSM object or suitable text. </p></html>"
 msgstr ""
 
-msgid "Invalid bz2 file."
-msgstr ""
-
 msgid "ms"
 msgstr ""
 
@@ -14740,6 +14790,10 @@ msgstr ""
 msgid "Coins"
 msgstr ""
 
+msgctxt "payment"
+msgid "Notes"
+msgstr ""
+
 msgid "Electronic purses and Charge cards"
 msgstr ""
 
@@ -15562,6 +15616,9 @@ msgstr ""
 msgid "Cross on horseback"
 msgstr ""
 
+msgid "Optional values for specific countries"
+msgstr ""
+
 msgid "Stop"
 msgstr ""
 
@@ -15619,6 +15676,18 @@ msgstr ""
 msgid "Speed Camera"
 msgstr ""
 
+msgid "Traffic Mirror"
+msgstr ""
+
+msgctxt "junction=yes"
+msgid "Named Junction"
+msgstr ""
+
+msgid ""
+"Used in some countries for a named road junction who’s name serves for local "
+"orientation."
+msgstr ""
+
 msgid "Elevator"
 msgstr ""
 
@@ -17063,6 +17132,9 @@ msgstr ""
 msgid "Fireplace"
 msgstr ""
 
+msgid "Picnic Table"
+msgstr ""
+
 msgid "Public Grill"
 msgstr ""
 
@@ -17668,6 +17740,12 @@ msgstr ""
 msgid "Count"
 msgstr ""
 
+msgid "Advertising Column"
+msgstr ""
+
+msgid "Billboard"
+msgstr ""
+
 msgid "Sports"
 msgstr ""
 
@@ -19538,9 +19616,6 @@ msgstr ""
 msgid "vouchers"
 msgstr ""
 
-msgid "Note"
-msgstr ""
-
 msgid "Geography"
 msgstr ""
 
@@ -19924,9 +19999,6 @@ msgstr ""
 msgid "House number"
 msgstr ""
 
-msgid "House name"
-msgstr ""
-
 msgid "Street name"
 msgstr ""
 
@@ -19939,7 +20011,7 @@ msgstr ""
 msgid "Country code"
 msgstr ""
 
-msgid "Optional values for specific countries"
+msgid "House name"
 msgstr ""
 
 msgid "Subdistrict"
@@ -20611,6 +20683,13 @@ msgstr ""
 msgid "VoGIS: DOM (Surface model)"
 msgstr ""
 
+msgid ""
+"AGIV(laanderen) aerial imagery (covers Brussels region as well) (2013)"
+msgstr ""
+
+msgid "Geoservices Wallonie aerial imagery (2009)"
+msgstr ""
+
 msgid "IBGE Mapa de Setores Urbanos"
 msgstr ""
 
@@ -20745,6 +20824,9 @@ msgstr ""
 msgid "Hamburg (40 cm)"
 msgstr ""
 
+msgid "Hamburg (20 cm)"
+msgstr ""
+
 msgid "Hamburg (DK5)"
 msgstr ""
 
@@ -20990,6 +21072,9 @@ msgstr ""
 msgid "Kanton Aargau 25cm (AGIS 2011)"
 msgstr ""
 
+msgid "Kanton Aargau 25cm (AGIS 2014)"
+msgstr ""
+
 msgid "Stadt Uster Orthophoto 2008 10cm"
 msgstr ""
 
@@ -21347,6 +21432,9 @@ msgstr ""
 msgid "{0} without {1}, {2} or {3}"
 msgstr ""
 
+msgid "{0} together with {1}"
+msgstr ""
+
 msgid "{0} on suspicious object"
 msgstr ""
 
@@ -21365,6 +21453,12 @@ 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 "{0}={1} is deprecated"
 msgstr ""
 
@@ -21401,6 +21495,9 @@ msgstr ""
 msgid "{0} should be replaced with {1}"
 msgstr ""
 
+msgid "{0} = {1}; remove {0}"
+msgstr ""
+
 msgid ""
 "{0}={1} is unspecific. Please replace ''{1}'' by ''left'', ''right'' or "
 "''both''."
@@ -21439,6 +21536,9 @@ msgstr ""
 msgid "Overlapping Identical Landuses"
 msgstr ""
 
+msgid "{0} must be connected to a way"
+msgstr ""
+
 msgid "abbreviated street name"
 msgstr ""
 
@@ -21460,9 +21560,17 @@ msgstr ""
 msgid "street name contains ss"
 msgstr ""
 
+msgid ""
+"Value of ''{0}'' should either be ''{1}'' or ''{2}''. For sidewalks use "
+"''{3}'' instead."
+msgstr ""
+
 msgid "{0} with multiple values"
 msgstr ""
 
+msgid "empty value in semicolon-separated ''{0}''"
+msgstr ""
+
 msgid "numerical key"
 msgstr ""
 
@@ -21497,6 +21605,9 @@ msgstr ""
 msgid "{0} must be a numeric value"
 msgstr ""
 
+msgid "{0} must be a positive integer number"
+msgstr ""
+
 msgid "relation without type"
 msgstr ""
 
@@ -22691,6 +22802,12 @@ msgstr ""
 msgid "merge nodes"
 msgstr ""
 
+msgid "How often thinning operation should be applied (Default {0})."
+msgstr ""
+
+msgid "Thinning Iterations"
+msgstr ""
+
 msgid "Street Name:"
 msgstr ""
 
@@ -25708,7 +25825,9 @@ msgstr ""
 msgid "Move and position photos"
 msgstr ""
 
-msgid "Click+drag photo or shift+click to position photo."
+msgid ""
+"Click+drag photo, shift+click to position photo, control+click to set "
+"direction."
 msgstr ""
 
 msgid "Please load some photos."
@@ -26369,6 +26488,9 @@ msgstr ""
 msgid "Reconstruct polygons from relation {0}"
 msgstr ""
 
+msgid "Reconstruct route"
+msgstr ""
+
 msgid "Open relation wiki page"
 msgstr ""
 
@@ -26408,6 +26530,12 @@ msgstr ""
 msgid "Way without ''inner'' or ''outer'' role found"
 msgstr ""
 
+msgid "Node without ''stop'' or ''platform'' role found"
+msgstr ""
+
+msgid "Way platform without ''platform'' role found"
+msgstr ""
+
 msgid "Revert changeset fully"
 msgstr ""
 
@@ -26898,7 +27026,7 @@ msgstr ""
 msgid "create an associatedStreet relation"
 msgstr ""
 
-msgid "delete outline way"
+msgid "keep outline way"
 msgstr ""
 
 msgid "Street name: "
diff --git a/i18n/po/bs.po b/i18n/po/bs.po
index 768d2ca..bdf985a 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: 2014-12-10 03:42+0100\n"
+"POT-Creation-Date: 2014-12-29 01:14+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: 2014-12-10 04:38+0000\n"
-"X-Generator: Launchpad (build 17283)\n"
+"X-Launchpad-Export-Date: 2014-12-29 04:40+0000\n"
+"X-Generator: Launchpad (build 17286)\n"
 "Language: bs\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -3727,6 +3727,9 @@ msgstr ""
 msgid "Checks for errors in internet-related tags."
 msgstr ""
 
+msgid " URL cannot be converted to ASCII: {0}"
+msgstr ""
+
 msgid "''{0}'': {1}"
 msgstr ""
 
@@ -3933,19 +3936,20 @@ msgstr ""
 msgid "Relation is empty"
 msgstr ""
 
-msgid "<empty>"
+msgid "Role member does not match expression {0} in template {1}"
 msgstr ""
 
-msgid "Role {0} unknown"
+msgid ""
+"Role member type {0} does not match accepted list of {1} in template {2}"
 msgstr ""
 
-msgid "Empty role found"
+msgid "<empty>"
 msgstr ""
 
-msgid "Member for role ''{0}'' does not match ''{1}''"
+msgid "Role {0} unknown in templates {1}"
 msgstr ""
 
-msgid "Member for role {0} of wrong type"
+msgid "Empty role type found when expecting one of {0}"
 msgstr ""
 
 msgid "Role {0} missing"
@@ -4481,10 +4485,35 @@ msgstr ""
 msgid "options provided as Java system properties"
 msgstr ""
 
-msgid "/PATH/TO/JOSM/FOLDER/         "
+msgid "/PATH/TO/JOSM/PREF    "
+msgstr ""
+
+msgid "Set the preferences directory"
+msgstr ""
+
+msgid "/PATH/TO/JOSM/USERDATA"
+msgstr ""
+
+msgid "Set the user data directory"
+msgstr ""
+
+msgid "/PATH/TO/JOSM/CACHE   "
+msgstr ""
+
+msgid "Set the cache directory"
 msgstr ""
 
-msgid "Change the folder for all user settings"
+msgid "/PATH/TO/JOSM/HOMEDIR "
+msgstr ""
+
+msgid ""
+"Relocate all 3 directories to homedir. Cache directory will be in "
+"homedir/cache"
+msgstr ""
+
+msgid ""
+"-Djosm.home has lower precedence, i.e. the specific setting overrides the "
+"general one"
 msgstr ""
 
 msgid ""
@@ -4739,6 +4768,21 @@ msgstr ""
 msgid "Layer ''{0}'' must be in list of layers"
 msgstr ""
 
+msgid "Default (open, closed, new)"
+msgstr ""
+
+msgid "Username"
+msgstr ""
+
+msgid "Created date"
+msgstr ""
+
+msgid "Last change date"
+msgstr ""
+
+msgid "Select note sorting method"
+msgstr ""
+
 msgid "Click to cancel the current operation"
 msgstr ""
 
@@ -6079,6 +6123,12 @@ msgstr ""
 msgid "Reopen note with message:"
 msgstr ""
 
+msgid "Sort notes"
+msgstr ""
+
+msgid "Sort"
+msgstr ""
+
 msgid "Object type:"
 msgstr ""
 
@@ -7061,9 +7111,6 @@ msgstr ""
 msgid "Sort the relation members"
 msgstr ""
 
-msgid "Sort"
-msgstr ""
-
 msgid "Relation Editor: Sort"
 msgstr ""
 
@@ -7845,9 +7892,6 @@ msgstr ""
 msgid "Enter credentials for HTTP proxy"
 msgstr ""
 
-msgid "Username"
-msgstr ""
-
 msgid "Password"
 msgstr ""
 
@@ -8527,6 +8571,9 @@ msgstr ""
 msgid "Save Layer"
 msgstr ""
 
+msgid "Note"
+msgstr ""
+
 msgid "Notes layer"
 msgstr ""
 
@@ -8973,6 +9020,9 @@ msgstr ""
 msgid "Delete File from disk"
 msgstr ""
 
+msgid "Copy image path"
+msgstr ""
+
 msgid "Next"
 msgstr ""
 
@@ -12353,6 +12403,9 @@ msgstr ""
 msgid "Illegal long value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
+msgid "{0} bytes have been read"
+msgstr ""
+
 msgid "Prepare OSM data..."
 msgstr ""
 
@@ -12533,7 +12586,7 @@ msgstr ""
 msgid "Cannot start remotecontrol server on port {0}: {1}"
 msgstr ""
 
-msgid "RemoteControl::Accepting connections on port {0}"
+msgid "RemoteControl::Accepting connections on {0}:{1}"
 msgstr ""
 
 msgid "RemoteControl::Server stopped."
@@ -12545,7 +12598,7 @@ msgstr ""
 msgid "Unable to initialize Remote Control HTTPS Server"
 msgstr ""
 
-msgid "RemoteControl::Accepting secure connections on port {0}"
+msgid "RemoteControl::Accepting secure connections on {0}:{1}"
 msgstr ""
 
 msgid "RemoteControl::Server (https) stopped."
@@ -13505,9 +13558,6 @@ msgid ""
 "contain any JOSM object or suitable text. </p></html>"
 msgstr ""
 
-msgid "Invalid bz2 file."
-msgstr ""
-
 msgid "ms"
 msgstr ""
 
@@ -14743,6 +14793,10 @@ msgstr ""
 msgid "Coins"
 msgstr ""
 
+msgctxt "payment"
+msgid "Notes"
+msgstr ""
+
 msgid "Electronic purses and Charge cards"
 msgstr ""
 
@@ -15565,6 +15619,9 @@ msgstr ""
 msgid "Cross on horseback"
 msgstr ""
 
+msgid "Optional values for specific countries"
+msgstr ""
+
 msgid "Stop"
 msgstr ""
 
@@ -15622,6 +15679,18 @@ msgstr ""
 msgid "Speed Camera"
 msgstr ""
 
+msgid "Traffic Mirror"
+msgstr ""
+
+msgctxt "junction=yes"
+msgid "Named Junction"
+msgstr ""
+
+msgid ""
+"Used in some countries for a named road junction who’s name serves for local "
+"orientation."
+msgstr ""
+
 msgid "Elevator"
 msgstr ""
 
@@ -17066,6 +17135,9 @@ msgstr ""
 msgid "Fireplace"
 msgstr ""
 
+msgid "Picnic Table"
+msgstr ""
+
 msgid "Public Grill"
 msgstr ""
 
@@ -17671,6 +17743,12 @@ msgstr ""
 msgid "Count"
 msgstr ""
 
+msgid "Advertising Column"
+msgstr ""
+
+msgid "Billboard"
+msgstr ""
+
 msgid "Sports"
 msgstr ""
 
@@ -19541,9 +19619,6 @@ msgstr ""
 msgid "vouchers"
 msgstr ""
 
-msgid "Note"
-msgstr ""
-
 msgid "Geography"
 msgstr ""
 
@@ -19927,9 +20002,6 @@ msgstr ""
 msgid "House number"
 msgstr ""
 
-msgid "House name"
-msgstr ""
-
 msgid "Street name"
 msgstr ""
 
@@ -19942,7 +20014,7 @@ msgstr ""
 msgid "Country code"
 msgstr ""
 
-msgid "Optional values for specific countries"
+msgid "House name"
 msgstr ""
 
 msgid "Subdistrict"
@@ -20614,6 +20686,13 @@ msgstr ""
 msgid "VoGIS: DOM (Surface model)"
 msgstr ""
 
+msgid ""
+"AGIV(laanderen) aerial imagery (covers Brussels region as well) (2013)"
+msgstr ""
+
+msgid "Geoservices Wallonie aerial imagery (2009)"
+msgstr ""
+
 msgid "IBGE Mapa de Setores Urbanos"
 msgstr ""
 
@@ -20748,6 +20827,9 @@ msgstr ""
 msgid "Hamburg (40 cm)"
 msgstr ""
 
+msgid "Hamburg (20 cm)"
+msgstr ""
+
 msgid "Hamburg (DK5)"
 msgstr ""
 
@@ -20993,6 +21075,9 @@ msgstr ""
 msgid "Kanton Aargau 25cm (AGIS 2011)"
 msgstr ""
 
+msgid "Kanton Aargau 25cm (AGIS 2014)"
+msgstr ""
+
 msgid "Stadt Uster Orthophoto 2008 10cm"
 msgstr ""
 
@@ -21350,6 +21435,9 @@ msgstr ""
 msgid "{0} without {1}, {2} or {3}"
 msgstr ""
 
+msgid "{0} together with {1}"
+msgstr ""
+
 msgid "{0} on suspicious object"
 msgstr ""
 
@@ -21368,6 +21456,12 @@ 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 "{0}={1} is deprecated"
 msgstr ""
 
@@ -21404,6 +21498,9 @@ msgstr ""
 msgid "{0} should be replaced with {1}"
 msgstr ""
 
+msgid "{0} = {1}; remove {0}"
+msgstr ""
+
 msgid ""
 "{0}={1} is unspecific. Please replace ''{1}'' by ''left'', ''right'' or "
 "''both''."
@@ -21442,6 +21539,9 @@ msgstr ""
 msgid "Overlapping Identical Landuses"
 msgstr ""
 
+msgid "{0} must be connected to a way"
+msgstr ""
+
 msgid "abbreviated street name"
 msgstr ""
 
@@ -21463,9 +21563,17 @@ msgstr ""
 msgid "street name contains ss"
 msgstr ""
 
+msgid ""
+"Value of ''{0}'' should either be ''{1}'' or ''{2}''. For sidewalks use "
+"''{3}'' instead."
+msgstr ""
+
 msgid "{0} with multiple values"
 msgstr ""
 
+msgid "empty value in semicolon-separated ''{0}''"
+msgstr ""
+
 msgid "numerical key"
 msgstr ""
 
@@ -21500,6 +21608,9 @@ msgstr ""
 msgid "{0} must be a numeric value"
 msgstr ""
 
+msgid "{0} must be a positive integer number"
+msgstr ""
+
 msgid "relation without type"
 msgstr ""
 
@@ -22694,6 +22805,12 @@ msgstr ""
 msgid "merge nodes"
 msgstr ""
 
+msgid "How often thinning operation should be applied (Default {0})."
+msgstr ""
+
+msgid "Thinning Iterations"
+msgstr ""
+
 msgid "Street Name:"
 msgstr ""
 
@@ -25711,7 +25828,9 @@ msgstr ""
 msgid "Move and position photos"
 msgstr ""
 
-msgid "Click+drag photo or shift+click to position photo."
+msgid ""
+"Click+drag photo, shift+click to position photo, control+click to set "
+"direction."
 msgstr ""
 
 msgid "Please load some photos."
@@ -26372,6 +26491,9 @@ msgstr ""
 msgid "Reconstruct polygons from relation {0}"
 msgstr ""
 
+msgid "Reconstruct route"
+msgstr ""
+
 msgid "Open relation wiki page"
 msgstr ""
 
@@ -26411,6 +26533,12 @@ msgstr ""
 msgid "Way without ''inner'' or ''outer'' role found"
 msgstr ""
 
+msgid "Node without ''stop'' or ''platform'' role found"
+msgstr ""
+
+msgid "Way platform without ''platform'' role found"
+msgstr ""
+
 msgid "Revert changeset fully"
 msgstr ""
 
@@ -26901,7 +27029,7 @@ msgstr ""
 msgid "create an associatedStreet relation"
 msgstr ""
 
-msgid "delete outline way"
+msgid "keep outline way"
 msgstr ""
 
 msgid "Street name: "
diff --git a/i18n/po/ca.po b/i18n/po/ca.po
index 0b68f3b..0b1c0a6 100644
--- a/i18n/po/ca.po
+++ b/i18n/po/ca.po
@@ -7,16 +7,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-12-10 03:42+0100\n"
-"PO-Revision-Date: 2014-12-01 07:56+0000\n"
-"Last-Translator: pitort <pitort at eclipso.eu>\n"
+"POT-Creation-Date: 2014-12-29 01:14+0100\n"
+"PO-Revision-Date: 2014-12-26 23:17+0000\n"
+"Last-Translator: Don-vip <Unknown>\n"
 "Language-Team: el_libre - - www.catmidia.cat\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2014-12-10 04:40+0000\n"
-"X-Generator: Launchpad (build 17283)\n"
+"X-Launchpad-Export-Date: 2014-12-29 04:43+0000\n"
+"X-Generator: Launchpad (build 17286)\n"
 "Language: ca\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -4117,6 +4117,9 @@ msgstr "Etiquetes d''Internet"
 msgid "Checks for errors in internet-related tags."
 msgstr "Verifica si hi ha errors a les etiquetes relacionades amb Internet"
 
+msgid " URL cannot be converted to ASCII: {0}"
+msgstr " La URL no pot ser convertida a ASCII: {0}"
+
 msgid "''{0}'': {1}"
 msgstr "''{0}'': {1}"
 
@@ -4346,20 +4349,21 @@ msgstr "El tipus de relació no és conegut"
 msgid "Relation is empty"
 msgstr "La relació és buida"
 
-msgid "<empty>"
-msgstr "<buit>"
+msgid "Role member does not match expression {0} in template {1}"
+msgstr ""
 
-msgid "Role {0} unknown"
-msgstr "Rol {0} desconegut"
+msgid ""
+"Role member type {0} does not match accepted list of {1} in template {2}"
+msgstr ""
 
-msgid "Empty role found"
-msgstr "Trobat un rol buit"
+msgid "<empty>"
+msgstr "<buit>"
 
-msgid "Member for role ''{0}'' does not match ''{1}''"
-msgstr "El membre pel rol ''{0}'' no concorda amb ''{1}''"
+msgid "Role {0} unknown in templates {1}"
+msgstr ""
 
-msgid "Member for role {0} of wrong type"
-msgstr "Membre del rol {0} de tipus incorrecte"
+msgid "Empty role type found when expecting one of {0}"
+msgstr ""
 
 msgid "Role {0} missing"
 msgstr "Manca rol {0}"
@@ -4911,11 +4915,40 @@ msgstr "Deshabilita l''accés als recursos indicats, separats per coma"
 msgid "options provided as Java system properties"
 msgstr "opcions proporcionades com a propietats de sistema de Java"
 
-msgid "/PATH/TO/JOSM/FOLDER/         "
-msgstr "/RUTA/VERS/CARPETA/JOSM/         "
+msgid "/PATH/TO/JOSM/PREF    "
+msgstr "/CAMÍ/VERS/JOSM/PREF    "
+
+msgid "Set the preferences directory"
+msgstr "Estableix el directori de les preferències"
+
+msgid "/PATH/TO/JOSM/USERDATA"
+msgstr "/CAMÍ/VERS/JOSM/DADESUSUARI"
+
+msgid "Set the user data directory"
+msgstr "Estableix el directori de les dades d''usuari"
 
-msgid "Change the folder for all user settings"
-msgstr "Canviar la carpeta per tots els paràmetres d''usuari"
+msgid "/PATH/TO/JOSM/CACHE   "
+msgstr "/CAMÍ/VERS/JOSM/MEMÒRIACAU   "
+
+msgid "Set the cache directory"
+msgstr "Estableix el directori de la memòria cau"
+
+msgid "/PATH/TO/JOSM/HOMEDIR "
+msgstr "/CAMÍ/VERS/JOSM/DIRECTORIINICIAL "
+
+msgid ""
+"Relocate all 3 directories to homedir. Cache directory will be in "
+"homedir/cache"
+msgstr ""
+"Recol·loca els 3 directoris al directori inicial. El directori de la memòria "
+"cau serà a DirectoriInicial/cache"
+
+msgid ""
+"-Djosm.home has lower precedence, i.e. the specific setting overrides the "
+"general one"
+msgstr ""
+"-Djosm.home té una prioritat més baixa, és a dir, la configuració específica "
+"anul·la la general"
 
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -5196,6 +5229,21 @@ msgstr "La capa no és a la llista."
 msgid "Layer ''{0}'' must be in list of layers"
 msgstr "La capa ''{0}'' ha de ser a la llista de capes"
 
+msgid "Default (open, closed, new)"
+msgstr "Predefinit (obre, tanca, nou)"
+
+msgid "Username"
+msgstr "Nom d''usuari"
+
+msgid "Created date"
+msgstr "Data de creació"
+
+msgid "Last change date"
+msgstr "Data del darrer canvi"
+
+msgid "Select note sorting method"
+msgstr "Seleccioneu un mètode d''ordenació per les notes"
+
 msgid "Click to cancel the current operation"
 msgstr "Feu clic per anular l''operació actual"
 
@@ -6684,6 +6732,12 @@ msgstr "Torna a obrir"
 msgid "Reopen note with message:"
 msgstr "Tona a obrir la nota amb el missatge:"
 
+msgid "Sort notes"
+msgstr "Ordena les notes"
+
+msgid "Sort"
+msgstr "Ordenar"
+
 msgid "Object type:"
 msgstr "Tipus d''objecte:"
 
@@ -7783,9 +7837,6 @@ msgstr "Escull objectes pels membres de la relació seleccionats"
 msgid "Sort the relation members"
 msgstr "Ordenar els membres de la relació"
 
-msgid "Sort"
-msgstr "Ordenar"
-
 msgid "Relation Editor: Sort"
 msgstr "Editor de relacions: Ordenar"
 
@@ -8667,9 +8718,6 @@ msgstr "Indiqueu unes credencials pel servidor"
 msgid "Enter credentials for HTTP proxy"
 msgstr "Indiqueu unes credencials pel proxi HTTP"
 
-msgid "Username"
-msgstr "Nom d''usuari"
-
 msgid "Password"
 msgstr "Contrasenya"
 
@@ -9466,6 +9514,9 @@ msgstr ""
 msgid "Save Layer"
 msgstr "Desa la capa"
 
+msgid "Note"
+msgstr "Nota"
+
 msgid "Notes layer"
 msgstr "Capa de notes"
 
@@ -9945,6 +9996,9 @@ msgstr "Elimina foto de la capa"
 msgid "Delete File from disk"
 msgstr "Suprimir el fitxer al disc"
 
+msgid "Copy image path"
+msgstr "Copia el camí de la imatge"
+
 msgid "Next"
 msgstr "Següent"
 
@@ -13807,6 +13861,9 @@ msgid "Illegal long value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 "Valor incorrecte per l''atribut ''{0}'' (conjunt de canvis). El valor és {1}."
 
+msgid "{0} bytes have been read"
+msgstr "han estat llegits {0} bytes"
+
 msgid "Prepare OSM data..."
 msgstr "Preparació de dades..."
 
@@ -13996,8 +14053,8 @@ msgstr "Llegir la versió del protocol"
 msgid "Cannot start remotecontrol server on port {0}: {1}"
 msgstr "No es possible iniciar el servidor de control remot al port {0}: {1}"
 
-msgid "RemoteControl::Accepting connections on port {0}"
-msgstr "Control remot::Acceptant connexions a través del port {0}"
+msgid "RemoteControl::Accepting connections on {0}:{1}"
+msgstr "ControlRemot::Acceptant connexions a {0}:{1}"
 
 msgid "RemoteControl::Server stopped."
 msgstr "Control remot::Servidor aturat."
@@ -14009,8 +14066,8 @@ msgstr ""
 msgid "Unable to initialize Remote Control HTTPS Server"
 msgstr "No es pot iniciar el control remot del servidor HTTPS"
 
-msgid "RemoteControl::Accepting secure connections on port {0}"
-msgstr "Control Remot::Acceptant connexions segures al port {0}"
+msgid "RemoteControl::Accepting secure connections on {0}:{1}"
+msgstr "ControlRemot::Acceptant connexions segures a {0}:{1}"
 
 msgid "RemoteControl::Server (https) stopped."
 msgstr "Control Remot::Servidor (https) aturat."
@@ -15220,9 +15277,6 @@ msgstr ""
 "<html><p> Ho sentim, No és possible d''enganxar etiquetes de la memòria "
 "intermèdia perquè no conté cap objecte JOSM ni cap text apropiat. </p></html>"
 
-msgid "Invalid bz2 file."
-msgstr "Fitxer bz2 invàlid"
-
 msgid "ms"
 msgstr "ms"
 
@@ -16604,6 +16658,10 @@ msgstr "tennis"
 msgid "Coins"
 msgstr "Monedes"
 
+msgctxt "payment"
+msgid "Notes"
+msgstr "Notes"
+
 msgid "Electronic purses and Charge cards"
 msgstr "Moneders electrònics i targetes de dèbit"
 
@@ -17440,6 +17498,9 @@ msgstr "Cruïlla per bicicleta"
 msgid "Cross on horseback"
 msgstr "Cruïlla per cavalls"
 
+msgid "Optional values for specific countries"
+msgstr "Valors opcionals per estats específics"
+
 msgid "Stop"
 msgstr "Stop"
 
@@ -17497,6 +17558,20 @@ msgstr "Segon nom"
 msgid "Speed Camera"
 msgstr "Radar"
 
+msgid "Traffic Mirror"
+msgstr "Mirall (trànsit)"
+
+msgctxt "junction=yes"
+msgid "Named Junction"
+msgstr "Cruïlla amb nom"
+
+msgid ""
+"Used in some countries for a named road junction who’s name serves for local "
+"orientation."
+msgstr ""
+"Utilitzat en alguns països per a cruïlles de carreteres amb nom on el nom "
+"seveix com a element d''orientació local."
+
 msgid "Elevator"
 msgstr "Ascensor"
 
@@ -18953,6 +19028,9 @@ msgstr "Lloc de Pícnic"
 msgid "Fireplace"
 msgstr "Llar de foc"
 
+msgid "Picnic Table"
+msgstr "Taula de pícnic"
+
 msgid "Public Grill"
 msgstr "Barbacoes Públiques"
 
@@ -19558,6 +19636,12 @@ msgstr "succió"
 msgid "Count"
 msgstr "Compta"
 
+msgid "Advertising Column"
+msgstr "Columna publicitària"
+
+msgid "Billboard"
+msgstr "Cartellera"
+
 msgid "Sports"
 msgstr "Esports"
 
@@ -20179,7 +20263,7 @@ msgid "Tide Level"
 msgstr "NIvell de la marea"
 
 msgid "Groundwater"
-msgstr ""
+msgstr "Aigua subterrània"
 
 msgid "Traffic"
 msgstr "Trànsit"
@@ -21430,9 +21514,6 @@ msgstr "joguines"
 msgid "vouchers"
 msgstr "bons"
 
-msgid "Note"
-msgstr "Nota"
-
 msgid "Geography"
 msgstr "Geografia"
 
@@ -21829,9 +21910,6 @@ msgstr "Nom comú abreviat"
 msgid "House number"
 msgstr "Número de carrer"
 
-msgid "House name"
-msgstr "Nom de la Casa"
-
 msgid "Street name"
 msgstr "Nom del carrer"
 
@@ -21844,8 +21922,8 @@ msgstr "Nom de la ciutat"
 msgid "Country code"
 msgstr "Codi del país"
 
-msgid "Optional values for specific countries"
-msgstr "Valors opcionals per estats específics"
+msgid "House name"
+msgstr "Nom de la Casa"
 
 msgid "Subdistrict"
 msgstr "Sots districte"
@@ -22516,6 +22594,13 @@ msgstr "VoGIS: DGM (Model del terreny)"
 msgid "VoGIS: DOM (Surface model)"
 msgstr "VoGIS: DOM (Model de superfície)"
 
+msgid ""
+"AGIV(laanderen) aerial imagery (covers Brussels region as well) (2013)"
+msgstr ""
+
+msgid "Geoservices Wallonie aerial imagery (2009)"
+msgstr ""
+
 msgid "IBGE Mapa de Setores Urbanos"
 msgstr "IBGE Mapa de Sectors Urbans"
 
@@ -22565,13 +22650,13 @@ msgid "Estonia Ortho (Maaamet)"
 msgstr "Estònia Ortofoto (Maaamet)"
 
 msgid "Estonia Hillshade (Maaamet)"
-msgstr ""
+msgstr "Estònia Ombrejat (Maaamet)"
 
 msgid "Estonia Cadastre (Maaamet)"
-msgstr ""
+msgstr "Estònia Cadastre (Maaamet)"
 
 msgid "Estonia Forestry (Maaamet)"
-msgstr ""
+msgstr "Estònia Silvicultura (Maaamet)"
 
 msgid "Bordeaux - 2012"
 msgstr "Bordeus - 2012"
@@ -22652,6 +22737,9 @@ msgstr "OpenStreetMap (Llengua sòrab)"
 msgid "Hamburg (40 cm)"
 msgstr "Hamburg (40 cm)"
 
+msgid "Hamburg (20 cm)"
+msgstr ""
+
 msgid "Hamburg (DK5)"
 msgstr "Hamburg (DK5)"
 
@@ -22900,6 +22988,9 @@ msgstr "GRAFCAN Express - Illes Canàries"
 msgid "Kanton Aargau 25cm (AGIS 2011)"
 msgstr "Kanton Aargau 25cm (AGIS 2011)"
 
+msgid "Kanton Aargau 25cm (AGIS 2014)"
+msgstr "Cantó d''Aargau 25cm (AGIS 2014)"
+
 msgid "Stadt Uster Orthophoto 2008 10cm"
 msgstr "Stadt Uster Orthophoto 2008 10cm"
 
@@ -22970,7 +23061,7 @@ msgid "OSM US TIGER 2012 Roads Overlay"
 msgstr "OSM US TIGER 2012 Roads Overlay"
 
 msgid "New & Misaligned TIGER Roads (TIGER 2014)"
-msgstr ""
+msgstr "Carreteres TIGER noves i mal alineades"
 
 msgid "MassGIS L3 Parcels"
 msgstr "MassGIS L3 Parcels"
@@ -23257,6 +23348,9 @@ msgstr "{0} sense {1} o {2}"
 msgid "{0} without {1}, {2} or {3}"
 msgstr "{0} sense {1}, {2} o {3}"
 
+msgid "{0} together with {1}"
+msgstr "{0} junt amb {1}"
+
 msgid "{0} on suspicious object"
 msgstr "{0} a un objecte sospitòs"
 
@@ -23275,6 +23369,12 @@ 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 "{0}={1} is deprecated"
 msgstr "{0}={1} és obsolet"
 
@@ -23324,6 +23424,9 @@ msgstr ""
 msgid "{0} should be replaced with {1}"
 msgstr "{0} ha de ser substituït per {1}"
 
+msgid "{0} = {1}; remove {0}"
+msgstr "{0} = {1}; suprimeix {0}"
+
 msgid ""
 "{0}={1} is unspecific. Please replace ''{1}'' by ''left'', ''right'' or "
 "''both''."
@@ -23364,6 +23467,9 @@ 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 "abbreviated street name"
 msgstr "nom abreviat del carrer"
 
@@ -23385,9 +23491,19 @@ msgstr "via de tipus temporal"
 msgid "street name contains ss"
 msgstr "el nom del carrer conté ss"
 
+msgid ""
+"Value of ''{0}'' should either be ''{1}'' or ''{2}''. For sidewalks use "
+"''{3}'' instead."
+msgstr ""
+"El valor de ''{0}'' ha de ser ''{1}'' o ''{2}''. Per a voreres "
+"utilitzeu''{3}''."
+
 msgid "{0} with multiple values"
 msgstr "{0} amb valors múltiples"
 
+msgid "empty value in semicolon-separated ''{0}''"
+msgstr "valor buit en ''{0}'' separat per punt i coma"
+
 msgid "numerical key"
 msgstr "clau numèrica"
 
@@ -23424,6 +23540,9 @@ msgstr "pendent inusual; utilitzeu percentatges/graus o amunt/avall"
 msgid "{0} must be a numeric value"
 msgstr "{0} ha de ser un valor numèric"
 
+msgid "{0} must be a positive integer number"
+msgstr "{0} ha de ser un nombre sencer i positiu"
+
 msgid "relation without type"
 msgstr "relació sense tipus"
 
@@ -24775,6 +24894,12 @@ msgstr "Combina nodes amb veïns"
 msgid "merge nodes"
 msgstr "combina nodes"
 
+msgid "How often thinning operation should be applied (Default {0})."
+msgstr ""
+
+msgid "Thinning Iterations"
+msgstr ""
+
 msgid "Street Name:"
 msgstr "Nom del carrer:"
 
@@ -28084,9 +28209,10 @@ msgstr "Ajusta fotografies"
 msgid "Move and position photos"
 msgstr "Mou i posiciona fotografies"
 
-msgid "Click+drag photo or shift+click to position photo."
+msgid ""
+"Click+drag photo, shift+click to position photo, control+click to set "
+"direction."
 msgstr ""
-"Clic+arrossegar per moure la foto o majúscula+clic per posicionar la foto"
 
 msgid "Please load some photos."
 msgstr "Si us plau carregeu alguna foto"
@@ -28764,6 +28890,9 @@ msgstr "La reconstrucció de polígons només pot fer-se amb vies exteriors"
 msgid "Reconstruct polygons from relation {0}"
 msgstr "Reconstruir polígons a partir de la relació {0}"
 
+msgid "Reconstruct route"
+msgstr "Reconstrueix la ruta"
+
 msgid "Open relation wiki page"
 msgstr "Obre la pàgina wiki de la relació"
 
@@ -28804,6 +28933,12 @@ msgstr "Trobat un node sense els rols ''label'' o ''admin_centre''"
 msgid "Way without ''inner'' or ''outer'' role found"
 msgstr "Trobada una via sense els rols ''inner'' o ''outer''"
 
+msgid "Node without ''stop'' or ''platform'' role found"
+msgstr "Node sense rol de ''stop'' o ''platform''"
+
+msgid "Way platform without ''platform'' role found"
+msgstr "Andana sense rol ''platform''"
+
 msgid "Revert changeset fully"
 msgstr "Revertir el conjunt de canvis sencer"
 
@@ -29337,8 +29472,8 @@ msgstr "afegeix a la relació associatedStreet (carrer associat) existent"
 msgid "create an associatedStreet relation"
 msgstr "crea una relació associatedStreet (carrer associat)"
 
-msgid "delete outline way"
-msgstr "suprimir la via de contorn"
+msgid "keep outline way"
+msgstr "manté en mode esquema"
 
 msgid "Street name: "
 msgstr "Nom del carrer: "
diff --git a/i18n/po/ca at valencia.po b/i18n/po/ca at valencia.po
index 5181790..bb20aba 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: 2014-12-10 03:42+0100\n"
+"POT-Creation-Date: 2014-12-29 01:14+0100\n"
 "PO-Revision-Date: 2013-10-22 10:01+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: 2014-12-10 05:24+0000\n"
-"X-Generator: Launchpad (build 17283)\n"
+"X-Launchpad-Export-Date: 2014-12-29 05:41+0000\n"
+"X-Generator: Launchpad (build 17286)\n"
 "Language: ca at valencia\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -4081,6 +4081,9 @@ msgstr ""
 msgid "Checks for errors in internet-related tags."
 msgstr ""
 
+msgid " URL cannot be converted to ASCII: {0}"
+msgstr ""
+
 msgid "''{0}'': {1}"
 msgstr ""
 
@@ -4296,20 +4299,21 @@ msgstr "El tipus de relació no és conegut"
 msgid "Relation is empty"
 msgstr "La relació és buida"
 
-msgid "<empty>"
-msgstr "<buit>"
+msgid "Role member does not match expression {0} in template {1}"
+msgstr ""
 
-msgid "Role {0} unknown"
-msgstr "Rol {0} desconegut"
+msgid ""
+"Role member type {0} does not match accepted list of {1} in template {2}"
+msgstr ""
 
-msgid "Empty role found"
-msgstr "Trobat un rol buit"
+msgid "<empty>"
+msgstr "<buit>"
 
-msgid "Member for role ''{0}'' does not match ''{1}''"
+msgid "Role {0} unknown in templates {1}"
 msgstr ""
 
-msgid "Member for role {0} of wrong type"
-msgstr "Membre del rol {0} de tipus incorrecte"
+msgid "Empty role type found when expecting one of {0}"
+msgstr ""
 
 msgid "Role {0} missing"
 msgstr "Manca rol {0}"
@@ -4858,11 +4862,36 @@ msgstr ""
 msgid "options provided as Java system properties"
 msgstr "opcions proporcionades com a propietats de sistema de Java"
 
-msgid "/PATH/TO/JOSM/FOLDER/         "
-msgstr "/RUTA/VERS/CARPETA/JOSM/         "
+msgid "/PATH/TO/JOSM/PREF    "
+msgstr ""
+
+msgid "Set the preferences directory"
+msgstr ""
+
+msgid "/PATH/TO/JOSM/USERDATA"
+msgstr ""
+
+msgid "Set the user data directory"
+msgstr ""
+
+msgid "/PATH/TO/JOSM/CACHE   "
+msgstr ""
+
+msgid "Set the cache directory"
+msgstr ""
+
+msgid "/PATH/TO/JOSM/HOMEDIR "
+msgstr ""
+
+msgid ""
+"Relocate all 3 directories to homedir. Cache directory will be in "
+"homedir/cache"
+msgstr ""
 
-msgid "Change the folder for all user settings"
-msgstr "Canviar la carpeta per tots els paràmetres d''usuari"
+msgid ""
+"-Djosm.home has lower precedence, i.e. the specific setting overrides the "
+"general one"
+msgstr ""
 
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -5128,6 +5157,21 @@ msgstr "La capa no és a la llista."
 msgid "Layer ''{0}'' must be in list of layers"
 msgstr "La capa ''{0}'' ha de ser a la llista de capes"
 
+msgid "Default (open, closed, new)"
+msgstr ""
+
+msgid "Username"
+msgstr "Nom d''usuari"
+
+msgid "Created date"
+msgstr ""
+
+msgid "Last change date"
+msgstr ""
+
+msgid "Select note sorting method"
+msgstr ""
+
 msgid "Click to cancel the current operation"
 msgstr "Feu clic per anular l''operació actual"
 
@@ -6564,6 +6608,12 @@ msgstr ""
 msgid "Reopen note with message:"
 msgstr ""
 
+msgid "Sort notes"
+msgstr ""
+
+msgid "Sort"
+msgstr "Ordenar"
+
 msgid "Object type:"
 msgstr "Tipus d''objecte:"
 
@@ -7654,9 +7704,6 @@ msgstr "Trieu objectes pels membres de la relació seleccionats"
 msgid "Sort the relation members"
 msgstr "Ordenar els membres de la relació"
 
-msgid "Sort"
-msgstr "Ordenar"
-
 msgid "Relation Editor: Sort"
 msgstr "Editor de relacions: Ordenar"
 
@@ -8539,9 +8586,6 @@ msgstr "Indiqueu unes credencials pel servidor"
 msgid "Enter credentials for HTTP proxy"
 msgstr "Indiqueu unes credencials pel proxi HTTP"
 
-msgid "Username"
-msgstr "Nom d''usuari"
-
 msgid "Password"
 msgstr "Contrasenya"
 
@@ -9340,6 +9384,9 @@ msgstr ""
 msgid "Save Layer"
 msgstr "Guarda la capa"
 
+msgid "Note"
+msgstr "Nota"
+
 msgid "Notes layer"
 msgstr ""
 
@@ -9819,6 +9866,9 @@ msgstr "Elimina foto de la capa"
 msgid "Delete File from disk"
 msgstr "Suprimir el fitxer al disc"
 
+msgid "Copy image path"
+msgstr ""
+
 msgid "Next"
 msgstr "Següent"
 
@@ -13652,6 +13702,9 @@ msgid "Illegal long value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 "Valor incorrecte per l''atribut ''{0}'' (conjunt de canvis). El valor és {1}."
 
+msgid "{0} bytes have been read"
+msgstr ""
+
 msgid "Prepare OSM data..."
 msgstr "Preparació de dades..."
 
@@ -13840,8 +13893,8 @@ msgstr "Llegir la versió del protocol"
 msgid "Cannot start remotecontrol server on port {0}: {1}"
 msgstr "No es possible iniciar el servidor de control remot al port {0}: {1}"
 
-msgid "RemoteControl::Accepting connections on port {0}"
-msgstr "Control remot::Acceptant connexions a través del port {0}"
+msgid "RemoteControl::Accepting connections on {0}:{1}"
+msgstr ""
 
 msgid "RemoteControl::Server stopped."
 msgstr "Control remot::Servidor parat."
@@ -13852,7 +13905,7 @@ msgstr ""
 msgid "Unable to initialize Remote Control HTTPS Server"
 msgstr ""
 
-msgid "RemoteControl::Accepting secure connections on port {0}"
+msgid "RemoteControl::Accepting secure connections on {0}:{1}"
 msgstr ""
 
 msgid "RemoteControl::Server (https) stopped."
@@ -15046,9 +15099,6 @@ msgstr ""
 "<html><p> Ho sentim, No és possible d''apegar etiquetes de la memòria "
 "intermèdia perquè no conté cap objecte JOSM ni cap text apropiat. </p></html>"
 
-msgid "Invalid bz2 file."
-msgstr "Fitxer bz2 invàlid"
-
 msgid "ms"
 msgstr ""
 
@@ -16409,6 +16459,10 @@ msgstr "tennis"
 msgid "Coins"
 msgstr "Monedes"
 
+msgctxt "payment"
+msgid "Notes"
+msgstr ""
+
 msgid "Electronic purses and Charge cards"
 msgstr "Moneders electrònics i targetes de dèbit"
 
@@ -17245,6 +17299,9 @@ msgstr "Cruïlla amb bicicleta"
 msgid "Cross on horseback"
 msgstr "Cruïlla a cavall"
 
+msgid "Optional values for specific countries"
+msgstr ""
+
 msgid "Stop"
 msgstr "Stop"
 
@@ -17302,6 +17359,18 @@ msgstr "Segon nom"
 msgid "Speed Camera"
 msgstr "Radar"
 
+msgid "Traffic Mirror"
+msgstr ""
+
+msgctxt "junction=yes"
+msgid "Named Junction"
+msgstr ""
+
+msgid ""
+"Used in some countries for a named road junction who’s name serves for local "
+"orientation."
+msgstr ""
+
 msgid "Elevator"
 msgstr ""
 
@@ -18749,6 +18818,9 @@ msgstr "Lloc de Pícnic"
 msgid "Fireplace"
 msgstr "Llar de foc"
 
+msgid "Picnic Table"
+msgstr ""
+
 msgid "Public Grill"
 msgstr "Barbacoes Públiques"
 
@@ -19354,6 +19426,12 @@ msgstr "succió"
 msgid "Count"
 msgstr "Compta"
 
+msgid "Advertising Column"
+msgstr ""
+
+msgid "Billboard"
+msgstr ""
+
 msgid "Sports"
 msgstr "Esports"
 
@@ -21224,9 +21302,6 @@ msgstr "joguines"
 msgid "vouchers"
 msgstr "bons"
 
-msgid "Note"
-msgstr "Nota"
-
 msgid "Geography"
 msgstr "Geografia"
 
@@ -21610,9 +21685,6 @@ msgstr ""
 msgid "House number"
 msgstr "Número de carrer"
 
-msgid "House name"
-msgstr "Nom de la Casa"
-
 msgid "Street name"
 msgstr "Nom del carrer"
 
@@ -21625,8 +21697,8 @@ msgstr "Nom de la ciutat"
 msgid "Country code"
 msgstr "Codi del país"
 
-msgid "Optional values for specific countries"
-msgstr ""
+msgid "House name"
+msgstr "Nom de la Casa"
 
 msgid "Subdistrict"
 msgstr ""
@@ -22297,6 +22369,13 @@ msgstr ""
 msgid "VoGIS: DOM (Surface model)"
 msgstr ""
 
+msgid ""
+"AGIV(laanderen) aerial imagery (covers Brussels region as well) (2013)"
+msgstr ""
+
+msgid "Geoservices Wallonie aerial imagery (2009)"
+msgstr ""
+
 msgid "IBGE Mapa de Setores Urbanos"
 msgstr ""
 
@@ -22431,6 +22510,9 @@ msgstr ""
 msgid "Hamburg (40 cm)"
 msgstr ""
 
+msgid "Hamburg (20 cm)"
+msgstr ""
+
 msgid "Hamburg (DK5)"
 msgstr ""
 
@@ -22676,6 +22758,9 @@ msgstr ""
 msgid "Kanton Aargau 25cm (AGIS 2011)"
 msgstr ""
 
+msgid "Kanton Aargau 25cm (AGIS 2014)"
+msgstr ""
+
 msgid "Stadt Uster Orthophoto 2008 10cm"
 msgstr ""
 
@@ -23033,6 +23118,9 @@ msgstr ""
 msgid "{0} without {1}, {2} or {3}"
 msgstr ""
 
+msgid "{0} together with {1}"
+msgstr ""
+
 msgid "{0} on suspicious object"
 msgstr ""
 
@@ -23051,6 +23139,12 @@ 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 "{0}={1} is deprecated"
 msgstr ""
 
@@ -23087,6 +23181,9 @@ msgstr ""
 msgid "{0} should be replaced with {1}"
 msgstr ""
 
+msgid "{0} = {1}; remove {0}"
+msgstr ""
+
 msgid ""
 "{0}={1} is unspecific. Please replace ''{1}'' by ''left'', ''right'' or "
 "''both''."
@@ -23125,6 +23222,9 @@ msgstr ""
 msgid "Overlapping Identical Landuses"
 msgstr ""
 
+msgid "{0} must be connected to a way"
+msgstr ""
+
 msgid "abbreviated street name"
 msgstr "nom abreviat del carrer"
 
@@ -23146,9 +23246,17 @@ msgstr "via de tipus temporal"
 msgid "street name contains ss"
 msgstr "el nom del carrer conté ss"
 
+msgid ""
+"Value of ''{0}'' should either be ''{1}'' or ''{2}''. For sidewalks use "
+"''{3}'' instead."
+msgstr ""
+
 msgid "{0} with multiple values"
 msgstr ""
 
+msgid "empty value in semicolon-separated ''{0}''"
+msgstr ""
+
 msgid "numerical key"
 msgstr "clau numèrica"
 
@@ -23183,6 +23291,9 @@ msgstr "pendent inusual; utilitzeu percentatges/graus o amunt/avall"
 msgid "{0} must be a numeric value"
 msgstr ""
 
+msgid "{0} must be a positive integer number"
+msgstr ""
+
 msgid "relation without type"
 msgstr "relació sense tipus"
 
@@ -24519,6 +24630,12 @@ msgstr ""
 msgid "merge nodes"
 msgstr ""
 
+msgid "How often thinning operation should be applied (Default {0})."
+msgstr ""
+
+msgid "Thinning Iterations"
+msgstr ""
+
 msgid "Street Name:"
 msgstr "Nom del carrer:"
 
@@ -27825,7 +27942,9 @@ msgstr ""
 msgid "Move and position photos"
 msgstr ""
 
-msgid "Click+drag photo or shift+click to position photo."
+msgid ""
+"Click+drag photo, shift+click to position photo, control+click to set "
+"direction."
 msgstr ""
 
 msgid "Please load some photos."
@@ -28501,6 +28620,9 @@ msgstr "La reconstrucció de polígons només pot fer-se amb vies exteriors"
 msgid "Reconstruct polygons from relation {0}"
 msgstr "Reconstruir polígons a partir de la relació {0}"
 
+msgid "Reconstruct route"
+msgstr ""
+
 msgid "Open relation wiki page"
 msgstr "Obri la pàgina wiki de la relació"
 
@@ -28541,6 +28663,12 @@ msgstr "Trobat un node sense els rols ''label'' o ''admin_centre''"
 msgid "Way without ''inner'' or ''outer'' role found"
 msgstr "Trobada una via sense els rols ''inner'' o ''outer''"
 
+msgid "Node without ''stop'' or ''platform'' role found"
+msgstr ""
+
+msgid "Way platform without ''platform'' role found"
+msgstr ""
+
 msgid "Revert changeset fully"
 msgstr "Revertir el conjunt de canvis sencer"
 
@@ -29074,8 +29202,8 @@ msgstr "afig a la relació associatedStreet (carrer associat) existent"
 msgid "create an associatedStreet relation"
 msgstr "crea una relació associatedStreet (carrer associat)"
 
-msgid "delete outline way"
-msgstr "suprimir la via de contorn"
+msgid "keep outline way"
+msgstr ""
 
 msgid "Street name: "
 msgstr "Nom del carrer: "
diff --git a/i18n/po/cs.po b/i18n/po/cs.po
index 079ea32..9394094 100644
--- a/i18n/po/cs.po
+++ b/i18n/po/cs.po
@@ -7,16 +7,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-12-10 03:42+0100\n"
-"PO-Revision-Date: 2014-12-04 13:36+0000\n"
-"Last-Translator: Jan Martinec <Unknown>\n"
+"POT-Creation-Date: 2014-12-29 01:14+0100\n"
+"PO-Revision-Date: 2014-12-19 02:57+0000\n"
+"Last-Translator: Martin Petricek <singularita at gmail.com>\n"
 "Language-Team: Czech <cs at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2014-12-10 04:41+0000\n"
-"X-Generator: Launchpad (build 17283)\n"
+"X-Launchpad-Export-Date: 2014-12-29 04:44+0000\n"
+"X-Generator: Launchpad (build 17286)\n"
 "Language: cs\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -4088,6 +4088,9 @@ msgstr "Značky pro Internet"
 msgid "Checks for errors in internet-related tags."
 msgstr "Kontroluje chyby v značkách sovisejících s Internetem."
 
+msgid " URL cannot be converted to ASCII: {0}"
+msgstr ""
+
 msgid "''{0}'': {1}"
 msgstr "''{0}'': {1}"
 
@@ -4308,20 +4311,21 @@ msgstr "Neznámý typ relace"
 msgid "Relation is empty"
 msgstr "Relace je prázdná"
 
-msgid "<empty>"
-msgstr "<prázdné>"
+msgid "Role member does not match expression {0} in template {1}"
+msgstr ""
 
-msgid "Role {0} unknown"
-msgstr "Neznámá role {0}"
+msgid ""
+"Role member type {0} does not match accepted list of {1} in template {2}"
+msgstr ""
 
-msgid "Empty role found"
-msgstr "Nalezena prázdná role"
+msgid "<empty>"
+msgstr "<prázdné>"
 
-msgid "Member for role ''{0}'' does not match ''{1}''"
-msgstr "Člen s rolí ''{0}'' neodpovídá ''{1}''"
+msgid "Role {0} unknown in templates {1}"
+msgstr ""
 
-msgid "Member for role {0} of wrong type"
-msgstr "Člen pro roli {0} má špatný typ"
+msgid "Empty role type found when expecting one of {0}"
+msgstr ""
 
 msgid "Role {0} missing"
 msgstr "Role {0} chybí"
@@ -4872,11 +4876,36 @@ msgstr "Zakázat přístup k uvedeným zdrojům, odděleným čárkou"
 msgid "options provided as Java system properties"
 msgstr "Volby poskytované jako systémové vlastnosti Java"
 
-msgid "/PATH/TO/JOSM/FOLDER/         "
-msgstr "/CESTA/K/ADRESARI/JOSM/         "
+msgid "/PATH/TO/JOSM/PREF    "
+msgstr ""
 
-msgid "Change the folder for all user settings"
-msgstr "Změnit adresář pro všechna uživatelská nastavení"
+msgid "Set the preferences directory"
+msgstr ""
+
+msgid "/PATH/TO/JOSM/USERDATA"
+msgstr ""
+
+msgid "Set the user data directory"
+msgstr ""
+
+msgid "/PATH/TO/JOSM/CACHE   "
+msgstr ""
+
+msgid "Set the cache directory"
+msgstr ""
+
+msgid "/PATH/TO/JOSM/HOMEDIR "
+msgstr ""
+
+msgid ""
+"Relocate all 3 directories to homedir. Cache directory will be in "
+"homedir/cache"
+msgstr ""
+
+msgid ""
+"-Djosm.home has lower precedence, i.e. the specific setting overrides the "
+"general one"
+msgstr ""
 
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -5151,6 +5180,21 @@ msgstr "Vrstva není v seznamu."
 msgid "Layer ''{0}'' must be in list of layers"
 msgstr "Vrstva ''{0}'' musí být v  seznamu vrstev"
 
+msgid "Default (open, closed, new)"
+msgstr "Výchozí (otevřené, zavřené, nové)"
+
+msgid "Username"
+msgstr "Jméno uživatele"
+
+msgid "Created date"
+msgstr "Datum vytvoření"
+
+msgid "Last change date"
+msgstr "Datum poslední změny"
+
+msgid "Select note sorting method"
+msgstr "Zvolte způsob třídění poznámek"
+
 msgid "Click to cancel the current operation"
 msgstr "Klikněte pro zrušení aktuální operace"
 
@@ -6630,6 +6674,12 @@ msgstr "Znovu otevřít"
 msgid "Reopen note with message:"
 msgstr "Znovu otevřít poznámku se zprávou:"
 
+msgid "Sort notes"
+msgstr "Seřadit poznámky"
+
+msgid "Sort"
+msgstr "Řadit"
+
 msgid "Object type:"
 msgstr "Typ objektu:"
 
@@ -7692,9 +7742,6 @@ msgstr "Vybrat objekty vybraných členů relace"
 msgid "Sort the relation members"
 msgstr "Seřadit členy relace"
 
-msgid "Sort"
-msgstr "Řadit"
-
 msgid "Relation Editor: Sort"
 msgstr "Editor relací: Řazení"
 
@@ -8560,9 +8607,6 @@ msgstr "Zadajte přihlašovací údaje pro hostitele"
 msgid "Enter credentials for HTTP proxy"
 msgstr "Zadejte přihlašovací údaje pro HTTP proxy"
 
-msgid "Username"
-msgstr "Jméno uživatele"
-
 msgid "Password"
 msgstr "Heslo"
 
@@ -9373,6 +9417,9 @@ msgstr ""
 msgid "Save Layer"
 msgstr "Ulož vrstvu"
 
+msgid "Note"
+msgstr "Poznámka"
+
 msgid "Notes layer"
 msgstr "Vrstva poznámek"
 
@@ -9847,6 +9894,9 @@ msgstr "Odebrat fotografii z vrstvy"
 msgid "Delete File from disk"
 msgstr "Smazat soubor z disku"
 
+msgid "Copy image path"
+msgstr "Zkopírovat cestu k obrázku"
+
 msgid "Next"
 msgstr "Další"
 
@@ -13586,6 +13636,9 @@ msgid "Illegal long value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 "Neplatná dlhá hodnota pre vlastnosť \"{0}\". Prijatá hodnota je \"{1}\""
 
+msgid "{0} bytes have been read"
+msgstr ""
+
 msgid "Prepare OSM data..."
 msgstr "Připravuji OSM data..."
 
@@ -13774,8 +13827,8 @@ msgstr "Číst verzi protokolu"
 msgid "Cannot start remotecontrol server on port {0}: {1}"
 msgstr "Nemůžu spustit server vzdáleného ovládání na portu {0}: {1}"
 
-msgid "RemoteControl::Accepting connections on port {0}"
-msgstr "Vzdálené ovládání::Naslouchá spojením na portu {0}"
+msgid "RemoteControl::Accepting connections on {0}:{1}"
+msgstr "RemoteControl::Přijímá spojení na {0}:{1}"
 
 msgid "RemoteControl::Server stopped."
 msgstr "Vzdálené ovládání::Server zastaven."
@@ -13786,8 +13839,8 @@ msgstr "Nemohu spustit server https vzdáleného ovládání na portu {0}: {1}"
 msgid "Unable to initialize Remote Control HTTPS Server"
 msgstr "Nelze inicializovat server Vzdáleného ovládání HTTPS"
 
-msgid "RemoteControl::Accepting secure connections on port {0}"
-msgstr "Vzdálené ovládání::Naslouchá zabezpečeným spojením na portu {0}"
+msgid "RemoteControl::Accepting secure connections on {0}:{1}"
+msgstr "RemoteControl::Přijímá zabezpečená spojení na {0}:{1}"
 
 msgid "RemoteControl::Server (https) stopped."
 msgstr "Vzdálené ovládání::Server (https) zastaven."
@@ -15006,9 +15059,6 @@ msgstr ""
 "<html><p> Promiňte, ale nelze vložit značky ze schránky, protože neobsahuje "
 "objekty JOSM, ani žádný použitelný text.</p></html>"
 
-msgid "Invalid bz2 file."
-msgstr "poškozený bz2 soubor."
-
 msgid "ms"
 msgstr "ms"
 
@@ -15917,7 +15967,7 @@ msgid "paving_stones"
 msgstr "(zámková) dlažba"
 
 msgid "cobblestone"
-msgstr "kočičí hlavy"
+msgstr "dlažební kostky"
 
 msgid "gravel"
 msgstr "štěrk"
@@ -16376,6 +16426,10 @@ msgstr "tenis"
 msgid "Coins"
 msgstr "Mince"
 
+msgctxt "payment"
+msgid "Notes"
+msgstr "Bankovky"
+
 msgid "Electronic purses and Charge cards"
 msgstr "Elektronické peněženky nebo kreditní karty"
 
@@ -17212,6 +17266,9 @@ msgstr "Přechod na kole"
 msgid "Cross on horseback"
 msgstr "Přechod na koni"
 
+msgid "Optional values for specific countries"
+msgstr "Volitelné hodnoty pro některé země"
+
 msgid "Stop"
 msgstr "Stop"
 
@@ -17269,6 +17326,18 @@ msgstr "Druhé jméno"
 msgid "Speed Camera"
 msgstr "Rychlostní radar"
 
+msgid "Traffic Mirror"
+msgstr "Dopravní zrcadlo"
+
+msgctxt "junction=yes"
+msgid "Named Junction"
+msgstr ""
+
+msgid ""
+"Used in some countries for a named road junction who’s name serves for local "
+"orientation."
+msgstr ""
+
 msgid "Elevator"
 msgstr "Výtah"
 
@@ -18716,6 +18785,9 @@ msgstr "Místo na piknik"
 msgid "Fireplace"
 msgstr "Ohniště"
 
+msgid "Picnic Table"
+msgstr ""
+
 msgid "Public Grill"
 msgstr "Veřejný gril"
 
@@ -19321,6 +19393,12 @@ msgstr "sání"
 msgid "Count"
 msgstr "Počet"
 
+msgid "Advertising Column"
+msgstr "Reklamní sloup"
+
+msgid "Billboard"
+msgstr "Billboard"
+
 msgid "Sports"
 msgstr "Sport"
 
@@ -19942,7 +20020,7 @@ msgid "Tide Level"
 msgstr "Výšku přílivu"
 
 msgid "Groundwater"
-msgstr ""
+msgstr "Podzemní voda"
 
 msgid "Traffic"
 msgstr "Dopravu"
@@ -21193,9 +21271,6 @@ msgstr "hračky"
 msgid "vouchers"
 msgstr "poukazy"
 
-msgid "Note"
-msgstr "Poznámka"
-
 msgid "Geography"
 msgstr "Geografie"
 
@@ -21588,9 +21663,6 @@ msgstr "Obvyklý zkrácený název"
 msgid "House number"
 msgstr "Číslo domu"
 
-msgid "House name"
-msgstr "Jméno domu"
-
 msgid "Street name"
 msgstr "Jméno ulice"
 
@@ -21603,8 +21675,8 @@ msgstr "Jméno města"
 msgid "Country code"
 msgstr "Kód země"
 
-msgid "Optional values for specific countries"
-msgstr "Volitelné hodnoty pro některé země"
+msgid "House name"
+msgstr "Jméno domu"
 
 msgid "Subdistrict"
 msgstr "Podokres (subdistrict)"
@@ -22275,6 +22347,13 @@ msgstr "VoGIS: DGM (model terénu)"
 msgid "VoGIS: DOM (Surface model)"
 msgstr "VoGIS: DOM (model povrchu)"
 
+msgid ""
+"AGIV(laanderen) aerial imagery (covers Brussels region as well) (2013)"
+msgstr ""
+
+msgid "Geoservices Wallonie aerial imagery (2009)"
+msgstr ""
+
 msgid "IBGE Mapa de Setores Urbanos"
 msgstr "IBGE Mapa de Setores Urbanos"
 
@@ -22324,13 +22403,13 @@ msgid "Estonia Ortho (Maaamet)"
 msgstr "Estonsko ortho (Maaamet)"
 
 msgid "Estonia Hillshade (Maaamet)"
-msgstr ""
+msgstr "Estonia Hillshade (Maaamet)"
 
 msgid "Estonia Cadastre (Maaamet)"
-msgstr ""
+msgstr "Estonia Cadastre (Maaamet)"
 
 msgid "Estonia Forestry (Maaamet)"
-msgstr ""
+msgstr "Estonia Forestry (Maaamet)"
 
 msgid "Bordeaux - 2012"
 msgstr "Bordeaux - 2012"
@@ -22411,6 +22490,9 @@ msgstr "OpenStreetMap (Sorbian Language)"
 msgid "Hamburg (40 cm)"
 msgstr "Hamburg (40 cm)"
 
+msgid "Hamburg (20 cm)"
+msgstr ""
+
 msgid "Hamburg (DK5)"
 msgstr "Hamburg (DK5)"
 
@@ -22658,6 +22740,9 @@ msgstr "GRAFCAN Express - Kanárské ostrovy"
 msgid "Kanton Aargau 25cm (AGIS 2011)"
 msgstr "Kanton Aargau 25cm (AGIS 2011)"
 
+msgid "Kanton Aargau 25cm (AGIS 2014)"
+msgstr "Kanton Aargau 25cm (AGIS 2014)"
+
 msgid "Stadt Uster Orthophoto 2008 10cm"
 msgstr "Stadt Uster Orthophoto 2008 10cm"
 
@@ -22728,7 +22813,7 @@ msgid "OSM US TIGER 2012 Roads Overlay"
 msgstr "OSM US TIGER 2012 Roads Overlay"
 
 msgid "New & Misaligned TIGER Roads (TIGER 2014)"
-msgstr ""
+msgstr "New & Misaligned TIGER Roads (TIGER 2014)"
 
 msgid "MassGIS L3 Parcels"
 msgstr "MassGIS L3 Parcels"
@@ -23015,6 +23100,9 @@ msgstr "{0} bez {1} nebo {2}"
 msgid "{0} without {1}, {2} or {3}"
 msgstr "{0} bez {1}, {2} nebo {3}"
 
+msgid "{0} together with {1}"
+msgstr "{0} zároveň s {1}"
+
 msgid "{0} on suspicious object"
 msgstr "{0} u podezřelého objektu"
 
@@ -23033,6 +23121,12 @@ 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 "{0}={1} is deprecated"
 msgstr "{0}={1} je zastaralé"
 
@@ -23076,6 +23170,9 @@ msgstr "{0}={1} je neurčité. Nahraďte, prosím, ''{1}'' konkrétní hodnotou.
 msgid "{0} should be replaced with {1}"
 msgstr "{0} by mělo být nahrazeno {1}"
 
+msgid "{0} = {1}; remove {0}"
+msgstr "{0} = {1}; odstraňte {0}"
+
 msgid ""
 "{0}={1} is unspecific. Please replace ''{1}'' by ''left'', ''right'' or "
 "''both''."
@@ -23116,6 +23213,9 @@ 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 "abbreviated street name"
 msgstr "zkrácený název ulice"
 
@@ -23137,9 +23237,19 @@ msgstr "dočasný typ cesty"
 msgid "street name contains ss"
 msgstr "název ulice obsahuje ss"
 
+msgid ""
+"Value of ''{0}'' should either be ''{1}'' or ''{2}''. For sidewalks use "
+"''{3}'' instead."
+msgstr ""
+"Hodnota ''{0}'' by měla být buď ''{1}'' nebo ''{2}''. Pro chodník pak "
+"použijte ''{3}''."
+
 msgid "{0} with multiple values"
 msgstr "{0} s vícenásobnou hodnotou"
 
+msgid "empty value in semicolon-separated ''{0}''"
+msgstr ""
+
 msgid "numerical key"
 msgstr "číselný klíč"
 
@@ -23181,6 +23291,9 @@ msgstr ""
 msgid "{0} must be a numeric value"
 msgstr "{0} musí být číselná hodnota"
 
+msgid "{0} must be a positive integer number"
+msgstr ""
+
 msgid "relation without type"
 msgstr "relace bez \"type\""
 
@@ -24516,6 +24629,12 @@ msgstr "Sloučit uzly se sousedy"
 msgid "merge nodes"
 msgstr "sloučit uzly"
 
+msgid "How often thinning operation should be applied (Default {0})."
+msgstr ""
+
+msgid "Thinning Iterations"
+msgstr ""
+
 msgid "Street Name:"
 msgstr "Jméno ulice:"
 
@@ -27761,9 +27880,10 @@ msgstr "Upravit fotografie"
 msgid "Move and position photos"
 msgstr "Posunout a polohovat fotografie"
 
-msgid "Click+drag photo or shift+click to position photo."
+msgid ""
+"Click+drag photo, shift+click to position photo, control+click to set "
+"direction."
 msgstr ""
-"Klikněte+táhněte fotografii nebo Shift+kliknutím polohujte fotografii."
 
 msgid "Please load some photos."
 msgstr "Načtěte prosím nějaké fotografie."
@@ -28434,6 +28554,9 @@ msgstr "Rekonstrukce polygonů je možná pouze z vnějších cest"
 msgid "Reconstruct polygons from relation {0}"
 msgstr "Reconstruovat polygony z relace {0}"
 
+msgid "Reconstruct route"
+msgstr "Rekonstruovat trasu"
+
 msgid "Open relation wiki page"
 msgstr "Otevřít Wiki stránku o relaci"
 
@@ -28473,6 +28596,12 @@ msgstr "Nalezen uzel bez role ''label'' nebo ''admin_centre''"
 msgid "Way without ''inner'' or ''outer'' role found"
 msgstr "Nalezena cesta bez role ''inner'' nebo ''outer''"
 
+msgid "Node without ''stop'' or ''platform'' role found"
+msgstr "Nalezen uzel bez role ''stop'' nebo ''platform''"
+
+msgid "Way platform without ''platform'' role found"
+msgstr "Nalezeno cesta nástupiště bez role ''platform''"
+
 msgid "Revert changeset fully"
 msgstr "Vrátit zpět celou sadu změn"
 
@@ -28997,8 +29126,8 @@ msgstr "přidat do existující relace přiřazená alice (associatedStreet)"
 msgid "create an associatedStreet relation"
 msgstr "vytvořit relaci Přiřazená ulice (associatedStreet)"
 
-msgid "delete outline way"
-msgstr "smazat vnější obrys"
+msgid "keep outline way"
+msgstr ""
 
 msgid "Street name: "
 msgstr "Jméno ulice: "
diff --git a/i18n/po/cy.po b/i18n/po/cy.po
index 2e816ac..06da170 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: 2014-12-10 03:42+0100\n"
+"POT-Creation-Date: 2014-12-29 01:14+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: 2014-12-10 05:18+0000\n"
-"X-Generator: Launchpad (build 17283)\n"
+"X-Launchpad-Export-Date: 2014-12-29 05:34+0000\n"
+"X-Generator: Launchpad (build 17286)\n"
 "Language: cy\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -3725,6 +3725,9 @@ msgstr ""
 msgid "Checks for errors in internet-related tags."
 msgstr ""
 
+msgid " URL cannot be converted to ASCII: {0}"
+msgstr ""
+
 msgid "''{0}'': {1}"
 msgstr ""
 
@@ -3931,19 +3934,20 @@ msgstr ""
 msgid "Relation is empty"
 msgstr ""
 
-msgid "<empty>"
+msgid "Role member does not match expression {0} in template {1}"
 msgstr ""
 
-msgid "Role {0} unknown"
+msgid ""
+"Role member type {0} does not match accepted list of {1} in template {2}"
 msgstr ""
 
-msgid "Empty role found"
+msgid "<empty>"
 msgstr ""
 
-msgid "Member for role ''{0}'' does not match ''{1}''"
+msgid "Role {0} unknown in templates {1}"
 msgstr ""
 
-msgid "Member for role {0} of wrong type"
+msgid "Empty role type found when expecting one of {0}"
 msgstr ""
 
 msgid "Role {0} missing"
@@ -4479,10 +4483,35 @@ msgstr ""
 msgid "options provided as Java system properties"
 msgstr ""
 
-msgid "/PATH/TO/JOSM/FOLDER/         "
+msgid "/PATH/TO/JOSM/PREF    "
+msgstr ""
+
+msgid "Set the preferences directory"
+msgstr ""
+
+msgid "/PATH/TO/JOSM/USERDATA"
+msgstr ""
+
+msgid "Set the user data directory"
+msgstr ""
+
+msgid "/PATH/TO/JOSM/CACHE   "
+msgstr ""
+
+msgid "Set the cache directory"
 msgstr ""
 
-msgid "Change the folder for all user settings"
+msgid "/PATH/TO/JOSM/HOMEDIR "
+msgstr ""
+
+msgid ""
+"Relocate all 3 directories to homedir. Cache directory will be in "
+"homedir/cache"
+msgstr ""
+
+msgid ""
+"-Djosm.home has lower precedence, i.e. the specific setting overrides the "
+"general one"
 msgstr ""
 
 msgid ""
@@ -4737,6 +4766,21 @@ msgstr ""
 msgid "Layer ''{0}'' must be in list of layers"
 msgstr ""
 
+msgid "Default (open, closed, new)"
+msgstr ""
+
+msgid "Username"
+msgstr ""
+
+msgid "Created date"
+msgstr ""
+
+msgid "Last change date"
+msgstr ""
+
+msgid "Select note sorting method"
+msgstr ""
+
 msgid "Click to cancel the current operation"
 msgstr ""
 
@@ -6077,6 +6121,12 @@ msgstr ""
 msgid "Reopen note with message:"
 msgstr ""
 
+msgid "Sort notes"
+msgstr ""
+
+msgid "Sort"
+msgstr ""
+
 msgid "Object type:"
 msgstr ""
 
@@ -7059,9 +7109,6 @@ msgstr ""
 msgid "Sort the relation members"
 msgstr ""
 
-msgid "Sort"
-msgstr ""
-
 msgid "Relation Editor: Sort"
 msgstr ""
 
@@ -7843,9 +7890,6 @@ msgstr ""
 msgid "Enter credentials for HTTP proxy"
 msgstr ""
 
-msgid "Username"
-msgstr ""
-
 msgid "Password"
 msgstr ""
 
@@ -8525,6 +8569,9 @@ msgstr ""
 msgid "Save Layer"
 msgstr ""
 
+msgid "Note"
+msgstr ""
+
 msgid "Notes layer"
 msgstr ""
 
@@ -8971,6 +9018,9 @@ msgstr ""
 msgid "Delete File from disk"
 msgstr ""
 
+msgid "Copy image path"
+msgstr ""
+
 msgid "Next"
 msgstr ""
 
@@ -12351,6 +12401,9 @@ msgstr ""
 msgid "Illegal long value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
+msgid "{0} bytes have been read"
+msgstr ""
+
 msgid "Prepare OSM data..."
 msgstr ""
 
@@ -12531,7 +12584,7 @@ msgstr ""
 msgid "Cannot start remotecontrol server on port {0}: {1}"
 msgstr ""
 
-msgid "RemoteControl::Accepting connections on port {0}"
+msgid "RemoteControl::Accepting connections on {0}:{1}"
 msgstr ""
 
 msgid "RemoteControl::Server stopped."
@@ -12543,7 +12596,7 @@ msgstr ""
 msgid "Unable to initialize Remote Control HTTPS Server"
 msgstr ""
 
-msgid "RemoteControl::Accepting secure connections on port {0}"
+msgid "RemoteControl::Accepting secure connections on {0}:{1}"
 msgstr ""
 
 msgid "RemoteControl::Server (https) stopped."
@@ -13503,9 +13556,6 @@ msgid ""
 "contain any JOSM object or suitable text. </p></html>"
 msgstr ""
 
-msgid "Invalid bz2 file."
-msgstr ""
-
 msgid "ms"
 msgstr ""
 
@@ -14741,6 +14791,10 @@ msgstr ""
 msgid "Coins"
 msgstr ""
 
+msgctxt "payment"
+msgid "Notes"
+msgstr ""
+
 msgid "Electronic purses and Charge cards"
 msgstr ""
 
@@ -15563,6 +15617,9 @@ msgstr ""
 msgid "Cross on horseback"
 msgstr ""
 
+msgid "Optional values for specific countries"
+msgstr ""
+
 msgid "Stop"
 msgstr ""
 
@@ -15620,6 +15677,18 @@ msgstr ""
 msgid "Speed Camera"
 msgstr ""
 
+msgid "Traffic Mirror"
+msgstr ""
+
+msgctxt "junction=yes"
+msgid "Named Junction"
+msgstr ""
+
+msgid ""
+"Used in some countries for a named road junction who’s name serves for local "
+"orientation."
+msgstr ""
+
 msgid "Elevator"
 msgstr ""
 
@@ -17064,6 +17133,9 @@ msgstr ""
 msgid "Fireplace"
 msgstr ""
 
+msgid "Picnic Table"
+msgstr ""
+
 msgid "Public Grill"
 msgstr ""
 
@@ -17669,6 +17741,12 @@ msgstr ""
 msgid "Count"
 msgstr ""
 
+msgid "Advertising Column"
+msgstr ""
+
+msgid "Billboard"
+msgstr ""
+
 msgid "Sports"
 msgstr ""
 
@@ -19539,9 +19617,6 @@ msgstr ""
 msgid "vouchers"
 msgstr ""
 
-msgid "Note"
-msgstr ""
-
 msgid "Geography"
 msgstr ""
 
@@ -19925,9 +20000,6 @@ msgstr ""
 msgid "House number"
 msgstr ""
 
-msgid "House name"
-msgstr ""
-
 msgid "Street name"
 msgstr ""
 
@@ -19940,7 +20012,7 @@ msgstr ""
 msgid "Country code"
 msgstr ""
 
-msgid "Optional values for specific countries"
+msgid "House name"
 msgstr ""
 
 msgid "Subdistrict"
@@ -20612,6 +20684,13 @@ msgstr ""
 msgid "VoGIS: DOM (Surface model)"
 msgstr ""
 
+msgid ""
+"AGIV(laanderen) aerial imagery (covers Brussels region as well) (2013)"
+msgstr ""
+
+msgid "Geoservices Wallonie aerial imagery (2009)"
+msgstr ""
+
 msgid "IBGE Mapa de Setores Urbanos"
 msgstr ""
 
@@ -20746,6 +20825,9 @@ msgstr ""
 msgid "Hamburg (40 cm)"
 msgstr ""
 
+msgid "Hamburg (20 cm)"
+msgstr ""
+
 msgid "Hamburg (DK5)"
 msgstr ""
 
@@ -20991,6 +21073,9 @@ msgstr ""
 msgid "Kanton Aargau 25cm (AGIS 2011)"
 msgstr ""
 
+msgid "Kanton Aargau 25cm (AGIS 2014)"
+msgstr ""
+
 msgid "Stadt Uster Orthophoto 2008 10cm"
 msgstr ""
 
@@ -21348,6 +21433,9 @@ msgstr ""
 msgid "{0} without {1}, {2} or {3}"
 msgstr ""
 
+msgid "{0} together with {1}"
+msgstr ""
+
 msgid "{0} on suspicious object"
 msgstr ""
 
@@ -21366,6 +21454,12 @@ 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 "{0}={1} is deprecated"
 msgstr ""
 
@@ -21402,6 +21496,9 @@ msgstr ""
 msgid "{0} should be replaced with {1}"
 msgstr ""
 
+msgid "{0} = {1}; remove {0}"
+msgstr ""
+
 msgid ""
 "{0}={1} is unspecific. Please replace ''{1}'' by ''left'', ''right'' or "
 "''both''."
@@ -21440,6 +21537,9 @@ msgstr ""
 msgid "Overlapping Identical Landuses"
 msgstr ""
 
+msgid "{0} must be connected to a way"
+msgstr ""
+
 msgid "abbreviated street name"
 msgstr ""
 
@@ -21461,9 +21561,17 @@ msgstr ""
 msgid "street name contains ss"
 msgstr ""
 
+msgid ""
+"Value of ''{0}'' should either be ''{1}'' or ''{2}''. For sidewalks use "
+"''{3}'' instead."
+msgstr ""
+
 msgid "{0} with multiple values"
 msgstr ""
 
+msgid "empty value in semicolon-separated ''{0}''"
+msgstr ""
+
 msgid "numerical key"
 msgstr ""
 
@@ -21498,6 +21606,9 @@ msgstr ""
 msgid "{0} must be a numeric value"
 msgstr ""
 
+msgid "{0} must be a positive integer number"
+msgstr ""
+
 msgid "relation without type"
 msgstr ""
 
@@ -22692,6 +22803,12 @@ msgstr ""
 msgid "merge nodes"
 msgstr ""
 
+msgid "How often thinning operation should be applied (Default {0})."
+msgstr ""
+
+msgid "Thinning Iterations"
+msgstr ""
+
 msgid "Street Name:"
 msgstr ""
 
@@ -25709,7 +25826,9 @@ msgstr ""
 msgid "Move and position photos"
 msgstr ""
 
-msgid "Click+drag photo or shift+click to position photo."
+msgid ""
+"Click+drag photo, shift+click to position photo, control+click to set "
+"direction."
 msgstr ""
 
 msgid "Please load some photos."
@@ -26370,6 +26489,9 @@ msgstr ""
 msgid "Reconstruct polygons from relation {0}"
 msgstr ""
 
+msgid "Reconstruct route"
+msgstr ""
+
 msgid "Open relation wiki page"
 msgstr ""
 
@@ -26409,6 +26531,12 @@ msgstr ""
 msgid "Way without ''inner'' or ''outer'' role found"
 msgstr ""
 
+msgid "Node without ''stop'' or ''platform'' role found"
+msgstr ""
+
+msgid "Way platform without ''platform'' role found"
+msgstr ""
+
 msgid "Revert changeset fully"
 msgstr ""
 
@@ -26899,7 +27027,7 @@ msgstr ""
 msgid "create an associatedStreet relation"
 msgstr ""
 
-msgid "delete outline way"
+msgid "keep outline way"
 msgstr ""
 
 msgid "Street name: "
diff --git a/i18n/po/da.po b/i18n/po/da.po
index 3e43085..274343e 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: 2014-12-10 03:42+0100\n"
-"PO-Revision-Date: 2014-12-06 23:01+0000\n"
+"POT-Creation-Date: 2014-12-29 01:14+0100\n"
+"PO-Revision-Date: 2014-12-26 15:51+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: 2014-12-10 04:42+0000\n"
-"X-Generator: Launchpad (build 17283)\n"
+"X-Launchpad-Export-Date: 2014-12-29 04:45+0000\n"
+"X-Generator: Launchpad (build 17286)\n"
 "Language: da_DK\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
@@ -70,7 +70,7 @@ msgid "DEBUG: {0}"
 msgstr "DEBUG: {0}"
 
 msgid "Cause: "
-msgstr ""
+msgstr "Årsag: "
 
 msgid "Executing platform startup hook"
 msgstr "Afvikler platforms opstartskrog"
@@ -184,7 +184,15 @@ 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] ""
+"Du er ved at starte {0} browservindue. <br>Dette kan både fylde din skærm "
+"med et browservindue <br>og tage noget tid at \r\n"
+"\r\n"
+"afslutte."
 msgstr[1] ""
+"Du er ved at starte {0} browservinduer. <br>Dette kan både fylde din skærm "
+"med browservinduer <br>og tage noget tid at \r\n"
+"\r\n"
+"afslutte."
 
 msgid "Continue"
 msgstr "Fortsæt"
@@ -646,7 +654,7 @@ msgid "Move tags from ways to relations"
 msgstr "Flyt tags fra ways til relation"
 
 msgid "Reverting changes"
-msgstr "Tilbageruller ændringer"
+msgstr "Tilbagefører ændringer"
 
 msgid "Removed duplicate nodes"
 msgstr "Fjern duplikerede punkter"
@@ -2056,7 +2064,7 @@ msgid "Create areas"
 msgstr "Opret områder"
 
 msgid "Extrude Dual alignment"
-msgstr ""
+msgstr "Udvid dobbelt tilpasning"
 
 msgid ""
 "Drag a way segment to make a rectangle. Ctrl-drag to move a segment along "
@@ -2087,7 +2095,7 @@ msgid "Extrude: main line"
 msgstr "Udvid: primær linje"
 
 msgid "Extrude: helper line"
-msgstr "Extrude: hjælpelinje"
+msgstr "Udvid: hjælpelinje"
 
 msgid "Extrude Way"
 msgstr "Træk vej ud"
@@ -4028,6 +4036,9 @@ msgstr "Internet tags"
 msgid "Checks for errors in internet-related tags."
 msgstr "Kontrollerer for fejl i internet relaterede tags."
 
+msgid " URL cannot be converted to ASCII: {0}"
+msgstr ""
+
 msgid "''{0}'': {1}"
 msgstr "''{0}'': {1}"
 
@@ -4099,7 +4110,9 @@ msgid ""
 msgid_plural ""
 "Multipolygon relation should be tagged with area tags and not the outer ways"
 msgstr[0] ""
+"Multipolygon relation bør være tagget med område tags og ikke ydre vejen."
 msgstr[1] ""
+"Multipolygon relation bør være tagget med område tags og ikke ydre vejene."
 
 msgid "Style for inner way equals multipolygon"
 msgstr "Stilen for den indre veje er den samme som multipolygon"
@@ -4240,20 +4253,21 @@ msgstr "Relationstypen er ukendt"
 msgid "Relation is empty"
 msgstr "Relationen er tom"
 
-msgid "<empty>"
-msgstr "<tom>"
+msgid "Role member does not match expression {0} in template {1}"
+msgstr ""
 
-msgid "Role {0} unknown"
-msgstr "Rolle {0} ukendt"
+msgid ""
+"Role member type {0} does not match accepted list of {1} in template {2}"
+msgstr ""
 
-msgid "Empty role found"
-msgstr "Tom rolle fundet"
+msgid "<empty>"
+msgstr "<tom>"
 
-msgid "Member for role ''{0}'' does not match ''{1}''"
+msgid "Role {0} unknown in templates {1}"
 msgstr ""
 
-msgid "Member for role {0} of wrong type"
-msgstr "Medlem for rollen {0} er af forkert type"
+msgid "Empty role type found when expecting one of {0}"
+msgstr ""
 
 msgid "Role {0} missing"
 msgstr "Rolle {0} mangler"
@@ -4385,7 +4399,7 @@ msgid "Looks for nodes or ways with FIXME in any property value."
 msgstr "Søger efter punkter eller veje med FIXME i enhver egenskavsværdi"
 
 msgid "Fix tags"
-msgstr ""
+msgstr "Ret tags"
 
 msgid "Could not find element type"
 msgstr "Kunne ikke finde element-typen"
@@ -4800,11 +4814,36 @@ msgstr ""
 msgid "options provided as Java system properties"
 msgstr "options givet som Java systemegenskaber"
 
-msgid "/PATH/TO/JOSM/FOLDER/         "
-msgstr "/STI/TIL/JOSM/FOLDER/         "
+msgid "/PATH/TO/JOSM/PREF    "
+msgstr ""
+
+msgid "Set the preferences directory"
+msgstr ""
+
+msgid "/PATH/TO/JOSM/USERDATA"
+msgstr ""
+
+msgid "Set the user data directory"
+msgstr ""
+
+msgid "/PATH/TO/JOSM/CACHE   "
+msgstr ""
+
+msgid "Set the cache directory"
+msgstr ""
+
+msgid "/PATH/TO/JOSM/HOMEDIR "
+msgstr ""
+
+msgid ""
+"Relocate all 3 directories to homedir. Cache directory will be in "
+"homedir/cache"
+msgstr ""
 
-msgid "Change the folder for all user settings"
-msgstr "Ændr folderen for alle bruger indstillinger"
+msgid ""
+"-Djosm.home has lower precedence, i.e. the specific setting overrides the "
+"general one"
+msgstr ""
 
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -5069,6 +5108,21 @@ msgstr "lag er ikke i listen"
 msgid "Layer ''{0}'' must be in list of layers"
 msgstr "Lag \"{0}\" skal være i liste over lag"
 
+msgid "Default (open, closed, new)"
+msgstr ""
+
+msgid "Username"
+msgstr "Brugernavn"
+
+msgid "Created date"
+msgstr ""
+
+msgid "Last change date"
+msgstr ""
+
+msgid "Select note sorting method"
+msgstr ""
+
 msgid "Click to cancel the current operation"
 msgstr "Klik for at afbryde den aktuelle operation"
 
@@ -5684,7 +5738,17 @@ msgid_plural ""
 "are shown a dialog to decide how to adapt the relations.<br/><br/>Do you "
 "want to continue?"
 msgstr[0] ""
+"Du er ved at forbinde {1} objekt, som er den del af {0} "
+"relation:<br/>{2}Forbindes disse objekter kan det måske ødelægge denne "
+"relation. Hvis du er usikker, så afbryd denne handling.<br/>Hvis du ønsker "
+"at fortsætte, vises en dialog til at beslutte hvordan relationen "
+"tilpasses.<br/><br/>Ønsker du at fortsætte?"
 msgstr[1] ""
+"Du er ved at forbinde {1} objekter, som er den del af {0} "
+"relationer:<br/>{2}Forbindes disse objekter kan det måske ødelægge disse "
+"relationer. Hvis du er usikker, så afbryd denne handling.<br/>Hvis du ønsker "
+"at fortsætte, vises en dialog til at beslutte hvordan relatonerne "
+"tilpasses.<br/><br/>Ønsker du at fortsætte?"
 
 msgid "Combine confirmation"
 msgstr "Bekræft kombinering"
@@ -5706,7 +5770,15 @@ msgid_plural ""
 "may have unwanted tags.<br/>If you want to continue, you are shown a dialog "
 "to fix the conflicting tags.<br/><br/>Do you want to continue?"
 msgstr[0] ""
+"Du er ved at forbinde {0} objekter, men de følgende tags bliver brugt "
+"konfliktfyldt:<br/>{1}Hvis disse objekter forbindes, vil det resulterende "
+"objekt måske have uønskede tags.<br/>Hvis du ønsker at fortsætte, vises en "
+"dialog til at rette de modstridende tags.<br/><br/>Ønsker du at fortsætte?"
 msgstr[1] ""
+"Du er ved at forbinde {0} objekter, men de følgende tags bliver brugt "
+"konfliktfyldt:<br/>{1}Hvis disse objekter forbindes, vil det resulterende "
+"objekt måske have uønskede tags.<br/>Hvis du ønsker at fortsætte, vises en "
+"dialog til at rette de modstridende tags.<br/><br/>Ønsker du at fortsætte?"
 
 msgid "Choose a value"
 msgstr "Vælg en værdi"
@@ -6502,6 +6574,12 @@ msgstr ""
 msgid "Reopen note with message:"
 msgstr ""
 
+msgid "Sort notes"
+msgstr ""
+
+msgid "Sort"
+msgstr "Sortér"
+
 msgid "Object type:"
 msgstr "Objekttype:"
 
@@ -7561,9 +7639,6 @@ msgstr "Vælg objekter for valgte relationsmedlemmer"
 msgid "Sort the relation members"
 msgstr "Sortér relationsmedlemmerne"
 
-msgid "Sort"
-msgstr "Sortér"
-
 msgid "Relation Editor: Sort"
 msgstr "Relationseditor: Sortér"
 
@@ -8425,9 +8500,6 @@ msgstr "Indtast loginoplysninger for vært"
 msgid "Enter credentials for HTTP proxy"
 msgstr "Indtast brugerinfo for HTTP-proxy"
 
-msgid "Username"
-msgstr "Brugernavn"
-
 msgid "Password"
 msgstr "Adgangskode"
 
@@ -9197,6 +9269,9 @@ msgstr ""
 msgid "Save Layer"
 msgstr "Gem lag"
 
+msgid "Note"
+msgstr "Note"
+
 msgid "Notes layer"
 msgstr ""
 
@@ -9668,6 +9743,9 @@ msgstr "Fjern foto fra lag"
 msgid "Delete File from disk"
 msgstr "Slet fil fra disk"
 
+msgid "Copy image path"
+msgstr ""
+
 msgid "Next"
 msgstr "Næste"
 
@@ -12750,7 +12828,7 @@ msgstr ""
 "\"{1}\"."
 
 msgid "Deleted node {0} is part of way {1}"
-msgstr "Slette punkt {0} er en del af vejen {1}"
+msgstr "Slettet punkt {0} er en del af vej {1}"
 
 msgid ""
 "Way {0} with {1} nodes has incomplete nodes because at least one node was "
@@ -13075,7 +13153,7 @@ msgid "Note Files"
 msgstr ""
 
 msgid "OSM API"
-msgstr ""
+msgstr "OSM API"
 
 msgid "JOSM website"
 msgstr ""
@@ -13267,7 +13345,7 @@ msgid "No data found for layer ''{0}''."
 msgstr "Ingen data fundet for laget \"{0}\"."
 
 msgid "No data found in file ''{0}''."
-msgstr "Ingen data fundet u filen \"{0}\"."
+msgstr "Ingen data fundet i filen \"{0}\"."
 
 msgid "Open OSM file"
 msgstr "Åben OSM fil"
@@ -13354,6 +13432,9 @@ msgstr "Manglende påkrævet attribut \"{0}\"."
 msgid "Illegal long value for attribute ''{0}''. Got ''{1}''."
 msgstr "Ulovlig long værdi af attribut ''{0}''. Fik ''{1}''."
 
+msgid "{0} bytes have been read"
+msgstr ""
+
 msgid "Prepare OSM data..."
 msgstr "Forbereder OSM-data..."
 
@@ -13413,7 +13494,7 @@ msgstr ""
 "Kunne ikke forbinde til osm server. Tjek venligst din internetforbindelse."
 
 msgid "Reading error text failed."
-msgstr "Indkæsning af fejltekst mislykkedes."
+msgstr "Indlæsning af fejltekst mislykkedes."
 
 msgid "XML tag <user> is missing."
 msgstr "XML tag <user> mangler."
@@ -13475,7 +13556,7 @@ msgstr ""
 "Adgangskoden bliver gemt som simpel tekst i JOSMs indstillingsfil. Desuden "
 "bliver det overført <strong>ukrypteret</strong> ved hver eneste forespørgsel "
 "til OSM-serveren. <strong>Anvend ikke en værdifuld "
-"adgangskode..</strong></p></body></html>"
+"adgangskode.</strong></p></body></html>"
 
 msgid "Save user and password (unencrypted)"
 msgstr "Gem brugernavn og adgangskode (ukrypteret)"
@@ -13540,8 +13621,8 @@ msgstr "Læse protokolversionen"
 msgid "Cannot start remotecontrol server on port {0}: {1}"
 msgstr ""
 
-msgid "RemoteControl::Accepting connections on port {0}"
-msgstr "Fjernstyring::Accepterer forbindelser på port {0}"
+msgid "RemoteControl::Accepting connections on {0}:{1}"
+msgstr ""
 
 msgid "RemoteControl::Server stopped."
 msgstr "Fjernstyring::Server stoppet."
@@ -13552,7 +13633,7 @@ msgstr ""
 msgid "Unable to initialize Remote Control HTTPS Server"
 msgstr ""
 
-msgid "RemoteControl::Accepting secure connections on port {0}"
+msgid "RemoteControl::Accepting secure connections on {0}:{1}"
 msgstr ""
 
 msgid "RemoteControl::Server (https) stopped."
@@ -14579,50 +14660,54 @@ msgstr ""
 "platform."
 
 msgid "Opening URL: {0}"
-msgstr ""
+msgstr "Åbner URL: {0}"
 
 msgid "zoom"
-msgstr ""
+msgstr "zoom"
 
 msgid "latitude"
-msgstr ""
+msgstr "breddegrad"
 
 msgid "longitude"
-msgstr ""
+msgstr "længdegrad"
 
 msgid "URL does not contain {0}/{1}/{2}"
-msgstr ""
+msgstr "URL indeholder ikke {0}/{1}/{2}"
 
 msgid "URL does not contain valid {0}"
-msgstr ""
+msgstr "URL indeholder ikke gyldig {0}"
 
 msgid "reserved"
 msgstr "reserveret"
 
 msgid "Outdated Java version"
-msgstr ""
+msgstr "Forældet Java version"
 
 msgid "Update Java"
-msgstr ""
+msgstr "Opdater Java"
 
 msgid "You are running version {0} of Java."
-msgstr ""
+msgstr "Du bruger Java version {0}."
 
 msgid "April 2015"
-msgstr ""
+msgstr "April 2015"
 
 msgid ""
 "This version is no longer supported by {0} since {1} and is not recommended "
 "for use."
 msgstr ""
+"Denne version er ikke længere understøttet af {0} siden {1} og frarådes at "
+"bruge."
 
 msgid ""
 "JOSM will soon stop working with this version; we highly recommend you to "
 "update to Java {0}."
 msgstr ""
+"JOSM vil snart ikke virke med denne version; vi anbefaler dig meget at "
+"opdatere til Java {0}."
 
 msgid "Would you like to update now ?"
-msgstr ""
+msgstr "Vil du opdatere nu?"
 
 msgid ""
 "A previous version of JOSM has installed a custom certificate in order to "
@@ -14692,9 +14777,6 @@ msgstr ""
 "<html><p> Beklager, det er ikke muligt at indsætte tags fra udklipsholderen. "
 "Den indeholder ikke noget JOSM objekt, eller passende tekst. </p></html>"
 
-msgid "Invalid bz2 file."
-msgstr "Ugyldig bz2-fil."
-
 msgid "ms"
 msgstr "ms"
 
@@ -14817,7 +14899,7 @@ msgstr "skov"
 
 msgctxt "landuse"
 msgid "meadow"
-msgstr ""
+msgstr "eng"
 
 msgctxt "landuse"
 msgid "farmland"
@@ -14841,7 +14923,7 @@ msgstr "grænse"
 
 msgctxt "Relation type"
 msgid "bridge"
-msgstr ""
+msgstr "bro"
 
 msgctxt "Relation type"
 msgid "destination_sign"
@@ -14881,11 +14963,11 @@ msgstr "sted"
 
 msgctxt "Relation type"
 msgid "street"
-msgstr ""
+msgstr "gade"
 
 msgctxt "Relation type"
 msgid "tunnel"
-msgstr ""
+msgstr "tunnel"
 
 msgctxt "Relation type"
 msgid "waterway"
@@ -15304,6 +15386,8 @@ msgid ""
 "Disallow using JOSM forever (WARNING: this plugin prevents JOSM from loading "
 "and is hard to rid of)"
 msgstr ""
+"Forbyd at bruge JOSM for evigt (ADVARSEL: Dette plugin forhindrer JOSM "
+"starter og er svært at slippe af med)"
 
 msgid "Convert data from Open Data portals to OSM layer"
 msgstr "Konverter data fra Open Data portaler til OSM lag"
@@ -15329,7 +15413,7 @@ msgstr ""
 "boks"
 
 msgid "Import/export OSM data in PBF format"
-msgstr ""
+msgstr "Import/export OSM data i PBF format"
 
 msgid "Import PDF file and convert to ways."
 msgstr "Importér PDF fil og konverter til veje."
@@ -15378,7 +15462,7 @@ msgid "Relation and multipolygon creating and editing panel."
 msgstr "Panel til oprettelse og redigering af relationer og multipolygoner."
 
 msgid "Plugin for reverting changesets"
-msgstr "Plugin for tilbagerulning af rettesæt"
+msgstr "Plugin for tilbageførelse af rettesæt"
 
 msgid ""
 "Plugin for tagging of objects based on a selection of road signs. The dialog "
@@ -15409,7 +15493,7 @@ msgstr ""
 "også nærliggende punkter."
 
 msgid "Edit features for OpenSeaMap"
-msgstr ""
+msgstr "Rediger funktioner til OpenSeaMap"
 
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr ""
@@ -15444,13 +15528,14 @@ msgid ""
 "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
 "to be running."
 msgstr ""
-"Optegner bgninger fra Tjekkisk cadastral kort. Kræver at TracerServer (.Net "
+"Optegner bygninger fra Tjekkisk matrikelkort. Kræver at TracerServer (.Net "
 "eller Mono) kører."
 
 msgid ""
 "Traces buildings and other shapes from a map. Needs Tracer2Server to be "
 "running."
 msgstr ""
+"Optegner bygninger og andre former fra kort. Kræver at Tracer2Server kører."
 
 msgid "Plugin to digital sign OSM-Data"
 msgstr "Udvidelse til at signere OSM-data digitalt"
@@ -15540,10 +15625,10 @@ msgid "pebblestone"
 msgstr "småsten"
 
 msgid "compacted"
-msgstr "kompakteret"
+msgstr "komprimeret"
 
 msgid "grass_paver"
-msgstr "Græs_belægning"
+msgstr "græsarmeringssten"
 
 msgid "grass"
 msgstr "græs"
@@ -15555,7 +15640,7 @@ msgid "ground"
 msgstr "jord"
 
 msgid "sett"
-msgstr ""
+msgstr "chaussésten"
 
 msgctxt "riding"
 msgid "pitch"
@@ -15574,13 +15659,13 @@ msgid "track"
 msgstr "spor"
 
 msgid "clay"
-msgstr ""
+msgstr "ler"
 
 msgid "dirt"
-msgstr ""
+msgstr "snavs"
 
 msgid "fine_gravel"
-msgstr ""
+msgstr "fint grus"
 
 msgid "mud"
 msgstr "mudder"
@@ -15628,41 +15713,41 @@ msgid "Width (meters)"
 msgstr "Bredde (meter)"
 
 msgid "Sidewalk"
-msgstr ""
+msgstr "Fortov"
 
 msgctxt "sidewalk"
 msgid "both"
-msgstr ""
+msgstr "begge"
 
 msgctxt "sidewalk"
 msgid "left"
-msgstr ""
+msgstr "venstre"
 
 msgctxt "sidewalk"
 msgid "right"
-msgstr ""
+msgstr "højre"
 
 msgctxt "sidewalk"
 msgid "no"
-msgstr ""
+msgstr "nej"
 
 msgid "Service type"
-msgstr ""
+msgstr "Servicetype"
 
 msgid "yard"
-msgstr "Banegård"
+msgstr "banegård"
 
 msgid "siding"
 msgstr "sidespor"
 
 msgid "spur"
-msgstr "sidespor"
+msgstr "fabriksspor"
 
 msgid "Electrified"
 msgstr "Elektificeret"
 
 msgid "contact_line"
-msgstr ""
+msgstr "køreledning"
 
 msgid "no"
 msgstr "nej"
@@ -15671,16 +15756,16 @@ msgid "yes"
 msgstr "ja"
 
 msgid "rail"
-msgstr "bane"
+msgstr "strømskinne"
 
 msgid "Voltage in Volts (V)"
-msgstr ""
+msgstr "Spænding i volt (V)"
 
 msgid "Frequency in Hertz (Hz)"
-msgstr ""
+msgstr "Frekvens i hertz (Hz)"
 
 msgid "16.67"
-msgstr ""
+msgstr "16.67"
 
 msgid "16.7"
 msgstr "16.7"
@@ -15690,7 +15775,7 @@ msgid "Tracks"
 msgstr ""
 
 msgid "Gauge (mm)"
-msgstr ""
+msgstr "Sporvidde (mm)"
 
 msgid "Allowed traffic:"
 msgstr "Tilladt trafik:"
@@ -15726,7 +15811,7 @@ msgid "Service Times"
 msgstr "Servicetider"
 
 msgid "18:00"
-msgstr ""
+msgstr "18:00"
 
 msgid "sunset,sunrise"
 msgstr ""
@@ -15757,7 +15842,7 @@ msgid "24/7"
 msgstr "24/7"
 
 msgid "08:30-12:30,15:30-20:00"
-msgstr ""
+msgstr "08:30-12:30,15:30-20:00"
 
 msgid "Sa-Su 00:00-24:00"
 msgstr ""
@@ -15830,14 +15915,14 @@ msgid "stadium"
 msgstr "stadion"
 
 msgid "Select sport:"
-msgstr ""
+msgstr "Vælg sport:"
 
 msgid "Sport"
 msgstr "Sport"
 
 msgctxt "sport"
 msgid "multi"
-msgstr ""
+msgstr "multi"
 
 msgctxt "sport"
 msgid "archery"
@@ -15986,6 +16071,10 @@ msgstr ""
 msgid "Coins"
 msgstr "Mønter"
 
+msgctxt "payment"
+msgid "Notes"
+msgstr "Sedler"
+
 msgid "Electronic purses and Charge cards"
 msgstr "Elektroniske punge og betalingskort"
 
@@ -16002,7 +16091,7 @@ msgid "Fee"
 msgstr "Gebyr"
 
 msgid "06:00-20:00"
-msgstr ""
+msgstr "06:00-20:00"
 
 msgid "Mo-Fr 09:00-18:00,Sa 08:00-14:00"
 msgstr ""
@@ -16012,19 +16101,19 @@ msgstr ""
 
 msgctxt "parking"
 msgid "multi-storey"
-msgstr ""
+msgstr "flere etager"
 
 msgctxt "parking"
 msgid "surface"
-msgstr ""
+msgstr "overflade"
 
 msgctxt "parking"
 msgid "underground"
-msgstr ""
+msgstr "underjordisk"
 
 msgctxt "parking"
 msgid "rooftop"
-msgstr ""
+msgstr "hustag"
 
 msgid "Reference number"
 msgstr "Referensenummer"
@@ -16060,7 +16149,7 @@ msgid "agricultural"
 msgstr "landbrug"
 
 msgid "forestry"
-msgstr ""
+msgstr "skovbrug"
 
 msgid "Population"
 msgstr "Befolkning"
@@ -16072,13 +16161,13 @@ msgid "Distance (km)"
 msgstr "Distance (km)"
 
 msgid "Ascent (m)"
-msgstr ""
+msgstr "Opstigning (m)"
 
 msgid "Descent (m)"
-msgstr ""
+msgstr "Nedstigning (m)"
 
 msgid "Roundtrip"
-msgstr ""
+msgstr "Rundstrækning"
 
 msgid "Symbol description"
 msgstr "Symbol beskrivelse"
@@ -16207,10 +16296,10 @@ msgid "low"
 msgstr "lav"
 
 msgid "750000;200000"
-msgstr ""
+msgstr "750000;200000"
 
 msgid "110000;20000"
-msgstr ""
+msgstr "110000;20000"
 
 msgid "Branch operator"
 msgstr ""
@@ -16219,30 +16308,30 @@ msgid "Amount of Cables"
 msgstr "Antal kabler"
 
 msgid "Amount of circuits"
-msgstr ""
+msgstr "Antal kredsløb"
 
 msgid "Location"
 msgstr "Sted"
 
 msgctxt "power"
 msgid "outdoor"
-msgstr ""
+msgstr "udendørs"
 
 msgctxt "power"
 msgid "indoor"
-msgstr ""
+msgstr "indendørs"
 
 msgctxt "power"
 msgid "underground"
-msgstr ""
+msgstr "underjordisk"
 
 msgctxt "power"
 msgid "platform"
-msgstr ""
+msgstr "platform"
 
 msgctxt "power"
 msgid "kiosk"
-msgstr ""
+msgstr "kiosk"
 
 msgid "Start date"
 msgstr "Start dato"
@@ -16323,13 +16412,13 @@ msgid "Secondary"
 msgstr "Sekundær"
 
 msgid "Secondary Link"
-msgstr "Sekundær forbindelse"
+msgstr "Sekundærforbindelse"
 
 msgid "Tertiary"
 msgstr "Tertiær"
 
 msgid "Tertiary Link"
-msgstr "Tertiær forbindelse"
+msgstr "Tertiærforbindelse"
 
 msgid "Unclassified"
 msgstr "Uklassificeret"
@@ -16348,29 +16437,29 @@ msgstr "Vej-type"
 
 msgctxt "Highway"
 msgid "residential"
-msgstr ""
+msgstr "beboelse"
 
 msgctxt "Highway"
 msgid "service"
-msgstr ""
+msgstr "service"
 
 msgctxt "Highway"
 msgid "unclassified"
-msgstr ""
+msgstr "uklassificeret"
 
 msgctxt "Highway"
 msgid "path"
-msgstr ""
+msgstr "sti"
 
 msgctxt "Highway"
 msgid "cycleway"
 msgstr ""
 
 msgid "Vehicle access"
-msgstr ""
+msgstr "Køretøjsadgang"
 
 msgid "Oneway for bicycle"
-msgstr ""
+msgstr "Ensrettet for cykler"
 
 msgid "Living Street"
 msgstr "Legegade"
@@ -16385,7 +16474,7 @@ msgid "Service"
 msgstr "Service"
 
 msgid "Service way type"
-msgstr ""
+msgstr "Service vejtype"
 
 msgid "alley"
 msgstr "gyde"
@@ -16397,7 +16486,7 @@ msgid "parking_aisle"
 msgstr "Vej mellem parkeringsbåse"
 
 msgid "drive-through"
-msgstr ""
+msgstr "køre igennem"
 
 msgid "Parking Aisle"
 msgstr "Vej mellem parkeringsbåse"
@@ -16466,7 +16555,7 @@ msgid "Public Service Vehicles (psv)"
 msgstr "Offentlig transport"
 
 msgid "Tourist buses"
-msgstr ""
+msgstr "Turistbusser"
 
 msgid "Min. speed (km/h)"
 msgstr "Min. hastighed (km/t)"
@@ -16482,23 +16571,23 @@ msgstr "Overhaling"
 
 msgctxt "overtaking"
 msgid "yes"
-msgstr ""
+msgstr "ja"
 
 msgctxt "overtaking"
 msgid "both"
-msgstr ""
+msgstr "begge"
 
 msgctxt "overtaking"
 msgid "forward"
-msgstr ""
+msgstr "fremad"
 
 msgctxt "overtaking"
 msgid "backward"
-msgstr ""
+msgstr "tilbage"
 
 msgctxt "overtaking"
 msgid "no"
-msgstr ""
+msgstr "nej"
 
 msgid "Roundabout"
 msgstr "Rundkørsel"
@@ -16558,19 +16647,19 @@ msgid "Tracktype"
 msgstr "Sportype"
 
 msgid "grade1"
-msgstr ""
+msgstr "klasse1"
 
 msgid "grade2"
-msgstr ""
+msgstr "klasse2"
 
 msgid "grade3"
-msgstr ""
+msgstr "klasse3"
 
 msgid "grade4"
-msgstr ""
+msgstr "klasse4"
 
 msgid "grade5"
-msgstr ""
+msgstr "klasse5"
 
 msgid "MTB Scale"
 msgstr "MTB skala"
@@ -16653,7 +16742,7 @@ msgstr ""
 
 msgctxt "trail_visibility"
 msgid "no"
-msgstr ""
+msgstr "nej"
 
 msgid "Ski"
 msgstr "Ski"
@@ -16794,7 +16883,7 @@ msgid "tiger"
 msgstr "tiger"
 
 msgid "Button operated"
-msgstr ""
+msgstr "Knap betjent"
 
 msgid "Sound signals"
 msgstr "Lydsignaler"
@@ -16808,6 +16897,9 @@ msgstr "Overkørsel for cykler"
 msgid "Cross on horseback"
 msgstr "Overgangssted for ridende"
 
+msgid "Optional values for specific countries"
+msgstr ""
+
 msgid "Stop"
 msgstr "Stop"
 
@@ -16865,9 +16957,21 @@ msgstr "Andet navn"
 msgid "Speed Camera"
 msgstr "Fartkamera"
 
-msgid "Elevator"
+msgid "Traffic Mirror"
+msgstr ""
+
+msgctxt "junction=yes"
+msgid "Named Junction"
+msgstr ""
+
+msgid ""
+"Used in some countries for a named road junction who’s name serves for local "
+"orientation."
 msgstr ""
 
+msgid "Elevator"
+msgstr "Elevator"
+
 msgid "Grit Bin"
 msgstr "Vejkasse til salt/sand"
 
@@ -16926,7 +17030,7 @@ msgid "Hedge"
 msgstr "Hæk"
 
 msgid "Genus"
-msgstr ""
+msgstr "Slægt"
 
 msgid "Species"
 msgstr "Arter"
@@ -16941,7 +17045,7 @@ msgid "barbed_wire"
 msgstr "pigtråd"
 
 msgid "chain_link"
-msgstr ""
+msgstr "trådnet"
 
 msgid "electric"
 msgstr "elektrisk"
@@ -16950,7 +17054,7 @@ msgid "pole"
 msgstr "stang"
 
 msgid "split_rail"
-msgstr ""
+msgstr "zigzag hegn"
 
 msgid "wire"
 msgstr ""
@@ -16984,18 +17088,18 @@ msgid "Gate"
 msgstr "Låge/led"
 
 msgid "Lift Gate"
-msgstr "Bom"
+msgstr "Vippebom"
 
 msgid "Swing Gate"
 msgstr "Svingbom"
 
 msgctxt "swing_gate"
 msgid "single"
-msgstr ""
+msgstr "enkelt"
 
 msgctxt "swing_gate"
 msgid "double"
-msgstr ""
+msgstr "dobbelt"
 
 msgid "Hampshire Gate"
 msgstr "Trådled"
@@ -17178,13 +17282,13 @@ msgid "Mud"
 msgstr "Mudder"
 
 msgid "Large area covered with mud."
-msgstr ""
+msgstr "Stort område dækket med mudder."
 
 msgid "Beach"
 msgstr "Strand"
 
 msgid "A flat area of sand, gravel or pebble next to water."
-msgstr ""
+msgstr "Et fladt område med sand, grus eller småsten ved siden af vand."
 
 msgid "swimming"
 msgstr ""
@@ -17218,23 +17322,23 @@ msgstr "Fragt"
 
 msgctxt "cargo"
 msgid "passengers"
-msgstr ""
+msgstr "passagerer"
 
 msgctxt "cargo"
 msgid "vehicle"
-msgstr ""
+msgstr "køretøj"
 
 msgctxt "cargo"
 msgid "bicycle"
-msgstr ""
+msgstr "cykel"
 
 msgctxt "cargo"
 msgid "hgv"
-msgstr ""
+msgstr "lastbiler"
 
 msgctxt "cargo"
 msgid "passengers;vehicle"
-msgstr ""
+msgstr "passagerer;køretøj"
 
 msgid "Ferry Route"
 msgstr "Færgerute"
@@ -17325,23 +17429,23 @@ msgstr "Afgrænsning"
 
 msgctxt "crossing:barrier"
 msgid "yes"
-msgstr ""
+msgstr "ja"
 
 msgctxt "crossing:barrier"
 msgid "no"
-msgstr ""
+msgstr "nej"
 
 msgctxt "crossing:barrier"
 msgid "half"
-msgstr ""
+msgstr "halv"
 
 msgctxt "crossing:barrier"
 msgid "full"
-msgstr ""
+msgstr "fuld"
 
 msgctxt "crossing:barrier"
 msgid "double_half"
-msgstr ""
+msgstr "dobbelt halv"
 
 msgid "Crossing"
 msgstr "Fodgængerovergang (over jernbane)"
@@ -17353,7 +17457,7 @@ msgid "Turntable"
 msgstr "Drejeskive"
 
 msgid "Buffer Stop"
-msgstr ""
+msgstr "Sporstopper"
 
 msgid "Railway Switch"
 msgstr "Sporskifte"
@@ -17362,7 +17466,7 @@ msgid "Aerialway"
 msgstr "Luftvej"
 
 msgid "Chair Lift"
-msgstr "Skilift"
+msgstr "Stolelift"
 
 msgid "Number of people per hour"
 msgstr "Antal personer per time"
@@ -17383,28 +17487,28 @@ msgid "Drag Lift"
 msgstr "Træklift"
 
 msgid "Cable Car"
-msgstr "Tovbane"
+msgstr "Kabelbane"
 
 msgid "Number of people per car"
 msgstr "Antal personer per vogn"
 
 msgid "Gondola"
-msgstr "Gondol"
+msgstr "Gondollift"
 
 msgid "Number of people per gondola"
-msgstr "Antal personer per gondol"
+msgstr "Antal personer per gondollift"
 
 msgid "Mixed Lift"
 msgstr "Blandet lift"
 
 msgid "Number of people per gondola/chair"
-msgstr "Antal personer per gondol/stol"
+msgstr "Antal personer per gondollift/stol"
 
 msgid "T-bar Lift"
-msgstr ""
+msgstr "T-træklift"
 
 msgid "J-bar Lift"
-msgstr ""
+msgstr "J-træklift"
 
 msgid "Platter Lift"
 msgstr "Tallerkenlift"
@@ -17413,7 +17517,7 @@ msgid "Rope Tow"
 msgstr "Reblift"
 
 msgid "Magic Carpet"
-msgstr "Flyvende tæppe"
+msgstr "Tæppelift"
 
 msgid "Goods"
 msgstr "Varer"
@@ -17423,7 +17527,7 @@ msgid "Station"
 msgstr "Station"
 
 msgid "Pylon"
-msgstr ""
+msgstr "Mast"
 
 msgid "Parking"
 msgstr "Parkering"
@@ -17441,7 +17545,7 @@ msgid "tram"
 msgstr "sporvogn"
 
 msgid "metro"
-msgstr ""
+msgstr "metro"
 
 msgid "ferry"
 msgstr "færge"
@@ -17459,7 +17563,7 @@ msgid "Spaces for Parents"
 msgstr "Område for forældre"
 
 msgid "See the Wiki for other capacity:[types]=*."
-msgstr ""
+msgstr "Se Wiki for andre capacity:[typer]=*."
 
 msgid "Parking Space"
 msgstr "Parkeringsbås"
@@ -17630,7 +17734,7 @@ msgid "Rental"
 msgstr "Udlejning"
 
 msgid "Second hand"
-msgstr ""
+msgstr "Brugt"
 
 msgid "only"
 msgstr "kun"
@@ -17648,7 +17752,7 @@ msgid "Services:"
 msgstr "Services:"
 
 msgid "Sale"
-msgstr "Udsalg"
+msgstr "Salg"
 
 msgid "brand"
 msgstr "mærke"
@@ -17729,7 +17833,7 @@ msgid "Public Transport"
 msgstr "Offentlig transport"
 
 msgid "Public Transport Route"
-msgstr ""
+msgstr "Offentlig transportrute"
 
 msgid "Route type"
 msgstr "Rutetype"
@@ -17747,7 +17851,7 @@ msgid "trolleybus"
 msgstr "trolleybus"
 
 msgid "aerialway"
-msgstr ""
+msgstr "luftvej"
 
 msgid "From (initial stop)"
 msgstr "Fra (første stop)"
@@ -18105,7 +18209,7 @@ msgid "Fast Food"
 msgstr "Fastfood"
 
 msgid "fish_and_chips"
-msgstr ""
+msgstr "fiskefileter"
 
 msgid "chicken"
 msgstr "kylling"
@@ -18117,13 +18221,13 @@ msgid "Cafe"
 msgstr "Café"
 
 msgid "ice_cream"
-msgstr ""
+msgstr "is"
 
 msgid "Pub"
 msgstr "Pub"
 
 msgid "Beer Garden"
-msgstr ""
+msgstr "Ølhave"
 
 msgid "Bar"
 msgstr "Bar"
@@ -18150,19 +18254,19 @@ msgid "Information Office"
 msgstr "Informationskontor"
 
 msgid "An office where you can get information about a town or region."
-msgstr ""
+msgstr "Et kontor hvor du kan få information om en by eller region."
 
 msgid "Map"
 msgstr "Kort"
 
 msgid "A board with a map."
-msgstr ""
+msgstr "En tavle med et kort."
 
 msgid "Detail Grade"
-msgstr ""
+msgstr "Detaljeringsgrad"
 
 msgid "topo"
-msgstr ""
+msgstr "topografiske"
 
 msgid "street"
 msgstr "gade"
@@ -18171,7 +18275,7 @@ msgid "scheme"
 msgstr "skema"
 
 msgid "toposcope"
-msgstr ""
+msgstr "markør"
 
 msgid "Shown Area"
 msgstr "Vist område"
@@ -18213,10 +18317,10 @@ msgid "Information Board"
 msgstr "Informationstavle"
 
 msgid "A board with information."
-msgstr ""
+msgstr "En tavle med information."
 
 msgid "Board Content"
-msgstr ""
+msgstr "Tavle indhold"
 
 msgid "notice"
 msgstr "oplysning"
@@ -18234,7 +18338,7 @@ msgid "plants"
 msgstr "planter"
 
 msgid "geology"
-msgstr ""
+msgstr "geologi"
 
 msgid "Guidepost"
 msgstr "Guide post"
@@ -18249,7 +18353,7 @@ msgid "Information Terminal"
 msgstr "Informations terminal"
 
 msgid "Information access via electronic methods."
-msgstr ""
+msgstr "Informationsadgang via elektroniske metoder."
 
 msgid "Closer description"
 msgstr "Nærmere beskrivelse"
@@ -18311,6 +18415,9 @@ msgstr "Picnic sted"
 msgid "Fireplace"
 msgstr "Bålplads"
 
+msgid "Picnic Table"
+msgstr ""
+
 msgid "Public Grill"
 msgstr "Offentlig grill"
 
@@ -18328,7 +18435,7 @@ msgid "Fishing"
 msgstr "Fiskeri"
 
 msgid "Private Swimming Pool"
-msgstr "Privat svømmepøl"
+msgstr "Privat svømmebassin"
 
 msgid "Culture"
 msgstr "Kultur"
@@ -18349,16 +18456,16 @@ msgid "Artwork"
 msgstr "Kunstværk"
 
 msgid "mural"
-msgstr ""
+msgstr "vægmaleri"
 
 msgid "sculpture"
-msgstr ""
+msgstr "skulptur"
 
 msgid "statue"
-msgstr ""
+msgstr "statue"
 
 msgid "Artist Name"
-msgstr ""
+msgstr "Navn på kunstner"
 
 msgid "Recording Studio"
 msgstr "Lydstudie"
@@ -18376,7 +18483,7 @@ msgid "Church"
 msgstr "Kirke"
 
 msgid "Building type"
-msgstr ""
+msgstr "Bygningstype"
 
 msgid "basilica"
 msgstr ""
@@ -18617,16 +18724,16 @@ msgid "Baby Hatch/Safe Haven"
 msgstr "Babyluge"
 
 msgid "Emergency Access Point"
-msgstr ""
+msgstr "Alarmeringspunkt"
 
 msgid "Point Number"
-msgstr ""
+msgstr "Punktnummer"
 
 msgid "Point Name"
-msgstr ""
+msgstr "Punktnavn"
 
 msgid "(Use international code, like +12-345-67890)"
-msgstr "(brug forvalgskode, fx +12-345-67890)"
+msgstr "(Brug landekode, ligesom +12-345-67890)"
 
 msgid "Veterinary"
 msgstr "Dyrlæge"
@@ -18635,40 +18742,40 @@ msgid "Toilets/Restrooms"
 msgstr "Toiletter"
 
 msgid "Access rights"
-msgstr ""
+msgstr "Adgangsrettigheder"
 
 msgid "public"
 msgstr "offentlig"
 
 msgid "seasonal"
-msgstr ""
+msgstr "sæsonmæssige"
 
 msgid "flush"
-msgstr ""
+msgstr "skyl"
 
 msgid "pitlatrine"
-msgstr ""
+msgstr "hul"
 
 msgid "chemical"
-msgstr ""
+msgstr "kemisk"
 
 msgid "bucket"
-msgstr ""
+msgstr "spand"
 
 msgid "Usage Position"
-msgstr ""
+msgstr "Brugsposition"
 
 msgid "seated"
-msgstr ""
+msgstr "siddende"
 
 msgid "seated;urinal"
-msgstr ""
+msgstr "siddende;stående"
 
 msgid "squat"
-msgstr ""
+msgstr "på hug"
 
 msgid "urinal"
-msgstr ""
+msgstr "stående"
 
 msgid "Shower"
 msgstr "Bruser"
@@ -18801,10 +18908,10 @@ msgid "centre"
 msgstr "center"
 
 msgid "Waste Basket/Trash Can"
-msgstr ""
+msgstr "Affaldskurv/affaldsspand"
 
 msgid "Waste Disposal/Dumpster"
-msgstr ""
+msgstr "Skraldespand/container"
 
 msgid "Backrest"
 msgstr "Ryglæn"
@@ -18911,11 +19018,17 @@ msgid "Pressure (in bar)"
 msgstr "Tryk (i bar)"
 
 msgid "suction"
-msgstr ""
+msgstr "sugning"
 
 msgid "Count"
 msgstr "Antal"
 
+msgid "Advertising Column"
+msgstr "Reklamesøjle"
+
+msgid "Billboard"
+msgstr "Reklameskilt"
+
 msgid "Sports"
 msgstr "Sport"
 
@@ -18979,15 +19092,15 @@ msgstr "Kano/Kajak"
 
 msgctxt "racing"
 msgid "pitch"
-msgstr ""
+msgstr "bane"
 
 msgctxt "racing"
 msgid "sports_centre"
-msgstr ""
+msgstr "sportshal"
 
 msgctxt "racing"
 msgid "stadium"
-msgstr ""
+msgstr "stadion"
 
 msgctxt "racing"
 msgid "track"
@@ -19018,7 +19131,7 @@ msgid "Swimming"
 msgstr "Svømning"
 
 msgid "swimming_pool"
-msgstr ""
+msgstr "svømmebassin"
 
 msgid "water_park"
 msgstr "badeland"
@@ -19046,27 +19159,27 @@ msgstr "Sværhedsgrad"
 
 msgctxt "piste:difficulty"
 msgid "novice"
-msgstr ""
+msgstr "begynder"
 
 msgctxt "piste:difficulty"
 msgid "easy"
-msgstr ""
+msgstr "let"
 
 msgctxt "piste:difficulty"
 msgid "intermediate"
-msgstr ""
+msgstr "øvet"
 
 msgctxt "piste:difficulty"
 msgid "advanced"
-msgstr ""
+msgstr "avanceret"
 
 msgctxt "piste:difficulty"
 msgid "expert"
-msgstr ""
+msgstr "ekspert"
 
 msgctxt "piste:difficulty"
 msgid "freeride"
-msgstr ""
+msgstr "udenfor pisterne"
 
 msgid "Grooming"
 msgstr ""
@@ -19199,11 +19312,11 @@ msgstr "Model flyveplads"
 
 msgctxt "aerialway"
 msgid "pitch"
-msgstr ""
+msgstr "bane"
 
 msgctxt "aerialway"
 msgid "sports_centre"
-msgstr ""
+msgstr "sportshal"
 
 msgctxt "aerialway"
 msgid "track"
@@ -19220,7 +19333,7 @@ msgstr "Menneskeskabt"
 
 msgctxt "building"
 msgid "yes"
-msgstr ""
+msgstr "ja"
 
 msgctxt "building"
 msgid "roof"
@@ -19299,7 +19412,7 @@ msgstr ""
 
 msgctxt "building"
 msgid "residential"
-msgstr ""
+msgstr "beboelse"
 
 msgctxt "building"
 msgid "apartments"
@@ -19330,7 +19443,7 @@ msgstr "Indgang"
 
 msgctxt "entrance"
 msgid "yes"
-msgstr ""
+msgstr "ja"
 
 msgctxt "entrance"
 msgid "main"
@@ -19338,21 +19451,21 @@ msgstr ""
 
 msgctxt "entrance"
 msgid "service"
-msgstr ""
+msgstr "service"
 
 msgctxt "entrance"
 msgid "exit"
-msgstr ""
+msgstr "udgang"
 
 msgctxt "entrance"
 msgid "emergency"
-msgstr ""
+msgstr "nødudgang"
 
 msgid "Entrance number"
-msgstr ""
+msgstr "Indgangsnummer"
 
 msgid "Flat numbers"
-msgstr ""
+msgstr "Lejlighedsnummer"
 
 msgid "Tower"
 msgstr "Tårn"
@@ -19400,7 +19513,7 @@ msgid "oil"
 msgstr "olie"
 
 msgid "sewage"
-msgstr "Spildevand"
+msgstr "spildevand"
 
 msgctxt "pipeline"
 msgid "underwater"
@@ -19420,10 +19533,10 @@ msgid "Function"
 msgstr "Funktion"
 
 msgid "winding"
-msgstr ""
+msgstr "transportskaft"
 
 msgid "air"
-msgstr "luft"
+msgstr "luftskaft"
 
 msgid "Depth in meters"
 msgstr "Dybde i meter"
@@ -19486,7 +19599,7 @@ msgid "Visible Headframe"
 msgstr ""
 
 msgid "Disused"
-msgstr ""
+msgstr "Nedlagt"
 
 msgid "Adit"
 msgstr "Mineindgang"
@@ -19537,7 +19650,7 @@ msgid "Tide Level"
 msgstr "Tidevandsniveau"
 
 msgid "Groundwater"
-msgstr ""
+msgstr "Grundvand"
 
 msgid "Traffic"
 msgstr "Trafik"
@@ -19600,61 +19713,61 @@ msgid "outdoor"
 msgstr "udendørs"
 
 msgid "Zone"
-msgstr ""
+msgstr "Område"
 
 msgid "parking"
-msgstr ""
+msgstr "parkering"
 
 msgid "traffic"
-msgstr ""
+msgstr "trafik"
 
 msgid "shop"
 msgstr "butik"
 
 msgid "bank"
-msgstr ""
+msgstr "bank"
 
 msgid "Camera"
-msgstr ""
+msgstr "Kamera"
 
 msgctxt "camera:type"
 msgid "fixed"
-msgstr ""
+msgstr "fast"
 
 msgctxt "camera:type"
 msgid "panning"
-msgstr ""
+msgstr "panorering"
 
 msgctxt "camera:type"
 msgid "dome"
-msgstr ""
+msgstr "kuppel"
 
 msgid "Mounted on"
-msgstr ""
+msgstr "Montering"
 
 msgctxt "camera:mount"
 msgid "wall"
-msgstr ""
+msgstr "væg"
 
 msgctxt "camera:mount"
 msgid "pole"
-msgstr ""
+msgstr "stang"
 
 msgctxt "camera:mount"
 msgid "ceiling"
-msgstr ""
+msgstr "loft"
 
 msgid "Direction in degrees"
-msgstr ""
+msgstr "Retning i grader"
 
 msgid "Inclination in degrees"
-msgstr ""
+msgstr "Hældning i grader"
 
 msgid "Height in meter (m)"
-msgstr ""
+msgstr "Højde i meter (m)"
 
 msgid "Bridges"
-msgstr ""
+msgstr "Broer"
 
 msgid "aqueduct"
 msgstr "akvædukt"
@@ -19741,7 +19854,7 @@ msgid "pivot_pier"
 msgstr ""
 
 msgid "Bridge outline"
-msgstr ""
+msgstr "Bro omrids"
 
 msgid "Power Plant"
 msgstr ""
@@ -20035,19 +20148,19 @@ msgid "Power rating (kVA/MVA)"
 msgstr ""
 
 msgid "2700 kVA"
-msgstr ""
+msgstr "2700 kVA"
 
 msgid "12500 kVA"
-msgstr ""
+msgstr "12500 kVA"
 
 msgid "15 MVA"
-msgstr ""
+msgstr "15 MVA"
 
 msgid "50 MVA"
-msgstr ""
+msgstr "50 MVA"
 
 msgid "100 MVA"
-msgstr ""
+msgstr "100 MVA"
 
 msgid "Gas insulated"
 msgstr ""
@@ -20072,7 +20185,7 @@ msgstr ""
 
 msgctxt "power"
 msgid "yes"
-msgstr ""
+msgstr "ja"
 
 msgid "Phases"
 msgstr ""
@@ -20166,13 +20279,13 @@ msgid "Power rating (kvar/Mvar)"
 msgstr ""
 
 msgid "500 kvar"
-msgstr ""
+msgstr "500 kvar"
 
 msgid "1 Mvar"
-msgstr ""
+msgstr "1 Mvar"
 
 msgid "5 Mvar"
-msgstr ""
+msgstr "5 Mvar"
 
 msgid "Cable Distribution Cabinet"
 msgstr "Fordelerskab"
@@ -20410,15 +20523,15 @@ msgstr ""
 
 msgctxt "power cable"
 msgid "underground"
-msgstr ""
+msgstr "underjordisk"
 
 msgctxt "power cable"
 msgid "underwater"
-msgstr ""
+msgstr "undervands"
 
 msgctxt "power cable"
 msgid "overground"
-msgstr ""
+msgstr "overjordisk"
 
 msgid "Historic Places"
 msgstr "Historiske steder"
@@ -20446,30 +20559,30 @@ msgstr "Mindesmærke"
 
 msgctxt "memorial"
 msgid "statue"
-msgstr ""
+msgstr "statue"
 
 msgctxt "memorial"
 msgid "bust"
-msgstr ""
+msgstr "buste"
 
 msgctxt "memorial"
 msgid "plaque"
-msgstr ""
+msgstr "mindeplade"
 
 msgctxt "memorial"
 msgid "stele"
-msgstr ""
+msgstr "stele"
 
 msgctxt "memorial"
 msgid "stone"
-msgstr ""
+msgstr "sten"
 
 msgctxt "memorial"
 msgid "war_memorial"
-msgstr ""
+msgstr "krigsmindesmærke"
 
 msgid "Inscription"
-msgstr ""
+msgstr "Inskription"
 
 msgid "Wayside Cross"
 msgstr "Vejkantskors"
@@ -20529,7 +20642,7 @@ msgid "Farm Stand"
 msgstr "Gårdbutik"
 
 msgid "Organic/Bio"
-msgstr ""
+msgstr "Økologisk"
 
 msgid "Fair Trade"
 msgstr "Bæredygtig"
@@ -20544,7 +20657,7 @@ msgid "Wine"
 msgstr "Vinhandel"
 
 msgid "Boutique"
-msgstr ""
+msgstr "Boutique"
 
 msgid "Shoes"
 msgstr "Sko"
@@ -20733,7 +20846,7 @@ msgid "animal_food"
 msgstr "dyremad"
 
 msgid "bicycle_tube"
-msgstr ""
+msgstr "cykelslange"
 
 msgid "cigarettes"
 msgstr "cigaretter"
@@ -20786,9 +20899,6 @@ msgstr "legetøj"
 msgid "vouchers"
 msgstr ""
 
-msgid "Note"
-msgstr "Note"
-
 msgid "Geography"
 msgstr "Geografi"
 
@@ -20886,13 +20996,13 @@ msgid "Peak"
 msgstr "Tinde"
 
 msgid "The top (summit) of a mountain or hill."
-msgstr ""
+msgstr "Toppen (spidsen) af et bjerg eller en bakke."
 
 msgid "Saddle"
 msgstr "Saddel"
 
 msgid "A saddle point between mountains or hills."
-msgstr ""
+msgstr "Et saddelpunkt mellem bjerge eller bakker."
 
 msgid "Glacier"
 msgstr "Gletsjer"
@@ -20901,21 +21011,22 @@ msgid ""
 "A persistent body of dense ice that is constantly moving under its own "
 "weight."
 msgstr ""
+"En ismasse af tæt is der er i konstant bevægelse under sin egen vægt."
 
 msgid "Volcano"
 msgstr "Vulkan"
 
 msgid "A volcano, either dormant, extinct or active."
-msgstr ""
+msgstr "En vulkan, enten hvilende, uddød eller aktiv."
 
 msgid "Current Status"
-msgstr ""
+msgstr "Aktuel status"
 
 msgid "dormant"
-msgstr ""
+msgstr "hvilende"
 
 msgid "extinct"
-msgstr ""
+msgstr "uddød"
 
 msgid "stratovolcano"
 msgstr ""
@@ -20930,7 +21041,7 @@ msgid "Cave Entrance"
 msgstr "Huleindgang"
 
 msgid "The entrance to a cave."
-msgstr ""
+msgstr "Indgangen til en hule."
 
 msgid "Island"
 msgstr "Ø"
@@ -20951,7 +21062,7 @@ msgid "Tree"
 msgstr "Træ"
 
 msgid "A single tree."
-msgstr ""
+msgstr "Et enkeltstående træ."
 
 msgid "Botanical Name"
 msgstr "Botanisk navn"
@@ -20960,7 +21071,7 @@ msgid "Tree Row"
 msgstr "Trærække"
 
 msgid "A line of trees."
-msgstr ""
+msgstr "En linje af træer."
 
 msgid "Wood"
 msgstr "Naturskov"
@@ -21031,10 +21142,10 @@ msgid ""
 msgstr ""
 
 msgid "Sand"
-msgstr ""
+msgstr "Sand"
 
 msgid "Large area covered with sand."
-msgstr ""
+msgstr "Stort område dækket med sand."
 
 msgid "Bare Rock"
 msgstr "Klippe"
@@ -21043,6 +21154,8 @@ msgid ""
 "For areas of solid visible rock that is sparsely vegetated or not vegetated "
 "at all."
 msgstr ""
+"For områder med fast synlig klippe, der er tyndt bevoksede eller ikke "
+"bevoksede overhovedet."
 
 msgid "Stone"
 msgstr "Fritliggende sten"
@@ -21051,6 +21164,8 @@ msgid ""
 "A single notable free-standing rock, which may differ from the composition "
 "of the terrain it lies in."
 msgstr ""
+"En enkelt bemærkelsesværdig fritstående sten, som kan afvige fra "
+"sammensætningen af terrænet den ligger i."
 
 msgid "Land use"
 msgstr "Brug af land"
@@ -21107,7 +21222,7 @@ msgid "Cemetery"
 msgstr "Kirkegård"
 
 msgid "Religious"
-msgstr ""
+msgstr "Religiøs"
 
 msgid "Retail"
 msgstr "Detailhandel"
@@ -21122,13 +21237,13 @@ msgid "Garages"
 msgstr "Garager"
 
 msgid "Railway Land"
-msgstr ""
+msgstr "Baneterræn"
 
 msgid "Military"
 msgstr "Militært område"
 
 msgid "Construction Area"
-msgstr ""
+msgstr "Byggeplads"
 
 msgid "Brownfield"
 msgstr ""
@@ -21172,9 +21287,6 @@ msgstr ""
 msgid "House number"
 msgstr "Husnummer"
 
-msgid "House name"
-msgstr "Husnavn"
-
 msgid "Street name"
 msgstr "Vejnavn"
 
@@ -21187,8 +21299,8 @@ msgstr "Bynavn"
 msgid "Country code"
 msgstr "Landekode"
 
-msgid "Optional values for specific countries"
-msgstr ""
+msgid "House name"
+msgstr "Husnavn"
 
 msgid "Subdistrict"
 msgstr ""
@@ -21758,851 +21870,871 @@ msgid "Test"
 msgstr "Test"
 
 msgid "Landsat"
-msgstr ""
+msgstr "Landsat"
 
 msgid "Yahoo Sat"
-msgstr ""
+msgstr "Yahoo Sat"
 
 msgid "Bing Sat"
-msgstr ""
+msgstr "Bing Sat"
 
 msgid "HDM (Humanitarian OpenStreetMap Team)"
-msgstr ""
+msgstr "HDM (Humanitarian OpenStreetMap Team)"
 
 msgid "MapBox Satellite"
-msgstr ""
+msgstr "MapBox Satellite"
 
 msgid "MapQuest Open Aerial"
-msgstr ""
+msgstr "MapQuest Open Aerial"
 
 msgid "OpenStreetMap GPS Traces"
-msgstr ""
+msgstr "OpenStreetMap GPS Traces"
 
 msgid "OpenStreetMap (Mapnik)"
-msgstr ""
+msgstr "OpenStreetMap (Mapnik)"
 
 msgid "OpenStreetMap (Mapnik Black & White)"
-msgstr ""
+msgstr "OpenStreetMap (Mapnik Black & White)"
 
 msgid "OpenStreetMap (Mapnik, no labels)"
-msgstr ""
+msgstr "OpenStreetMap (Mapnik, no labels)"
 
 msgid "skobbler"
-msgstr ""
+msgstr "skobbler"
 
 msgid "skobbler heatmap"
-msgstr ""
+msgstr "skobbler heatmap"
 
 msgid "OpenCycleMap"
-msgstr ""
+msgstr "OpenCycleMap"
 
 msgid "MapQuest OSM"
-msgstr ""
+msgstr "MapQuest OSM"
 
 msgid "Public Transport (ÖPNV)"
-msgstr ""
+msgstr "Public Transport (ÖPNV)"
 
 msgid "OpenStreetMap (German Style)"
-msgstr ""
+msgstr "OpenStreetMap (German Style)"
 
 msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
-msgstr ""
+msgstr "Cambodia, Laos, Thailand, Vietnam bilingual"
 
 msgid "osmfr"
-msgstr ""
+msgstr "osmfr"
 
 msgid "OpenPT Map (overlay)"
-msgstr ""
+msgstr "OpenPT Map (overlay)"
 
 msgid "Strava cycling heatmap"
-msgstr ""
+msgstr "Strava cycling heatmap"
 
 msgid "Strava running heatmap"
-msgstr ""
+msgstr "Strava running heatmap"
 
 msgid "AGRI black-and-white 2.5m"
-msgstr ""
+msgstr "AGRI black-and-white 2.5m"
 
 msgid "Geoimage.at MaxRes"
-msgstr ""
+msgstr "Geoimage.at MaxRes"
 
 msgid "basemap.at"
-msgstr ""
+msgstr "basemap.at"
 
 msgid "Graz: Basiskarte (base map)"
-msgstr ""
+msgstr "Graz: Basiskarte (base map)"
 
 msgid "Tiris: DGM (Terrain model)"
-msgstr ""
+msgstr "Tiris: DGM (Terrain model)"
 
 msgid "Tiris: DOM (Surface model)"
-msgstr ""
+msgstr "Tiris: DOM (Surface model)"
 
 msgid "Vienna: Mehrzweckkarte (general purpose)"
-msgstr ""
+msgstr "Vienna: Mehrzweckkarte (general purpose)"
 
 msgid "Vienna: Beschriftungen (annotations)"
-msgstr ""
+msgstr "Vienna: Beschriftungen (annotations)"
 
 msgid "Vienna: Orthofoto (aerial image)"
-msgstr ""
+msgstr "Vienna: Orthofoto (aerial image)"
 
 msgid "VoGIS: Echtfarbenbild 2012 (12cm)"
-msgstr ""
+msgstr "VoGIS: Echtfarbenbild 2012 (12cm)"
 
 msgid "VoGIS: Flächenwidmungsplan"
-msgstr ""
+msgstr "VoGIS: Flächenwidmungsplan"
 
 msgid "VoGIS: DGM (Terrain model)"
-msgstr ""
+msgstr "VoGIS: DGM (Terrain model)"
 
 msgid "VoGIS: DOM (Surface model)"
+msgstr "VoGIS: DOM (Surface model)"
+
+msgid ""
+"AGIV(laanderen) aerial imagery (covers Brussels region as well) (2013)"
 msgstr ""
 
-msgid "IBGE Mapa de Setores Urbanos"
+msgid "Geoservices Wallonie aerial imagery (2009)"
 msgstr ""
 
+msgid "IBGE Mapa de Setores Urbanos"
+msgstr "IBGE Mapa de Setores Urbanos"
+
 msgid "IBGE Mapa de Setores Rurais"
-msgstr ""
+msgstr "IBGE Mapa de Setores Rurais"
 
 msgid "Geobase Hydrography"
-msgstr ""
+msgstr "Geobase Hydrography"
 
 msgid "Geobase Roads"
-msgstr ""
+msgstr "Geobase Roads"
 
 msgid "Canvec"
-msgstr ""
+msgstr "Canvec"
 
 msgid "British Columbia Mosaic"
-msgstr ""
+msgstr "British Columbia Mosaic"
 
 msgid "Czech CUZK:KM"
-msgstr ""
+msgstr "Czech CUZK:KM"
 
 msgid "Czech RUIAN budovy"
-msgstr ""
+msgstr "Czech RUIAN budovy"
 
 msgid "Czech RUIAN parcely"
-msgstr ""
+msgstr "Czech RUIAN parcely"
 
 msgid "Czech pLPIS"
-msgstr ""
+msgstr "Czech pLPIS"
 
 msgid "Fugro (Denmark)"
-msgstr ""
+msgstr "Fugro (Denmark)"
 
 msgid "Geodatastyrelsen (Denmark)"
-msgstr ""
+msgstr "Geodatastyrelsen (Denmark)"
 
 msgid "Stevns (Denmark)"
-msgstr ""
+msgstr "Stevns (Denmark)"
 
 msgid "Vejmidte (Denmark)"
-msgstr ""
+msgstr "Vejmidte (Denmark)"
 
 msgid "Estonia Basemap (Maaamet)"
-msgstr ""
+msgstr "Estonia Basemap (Maaamet)"
 
 msgid "Estonia Ortho (Maaamet)"
-msgstr ""
+msgstr "Estonia Ortho (Maaamet)"
 
 msgid "Estonia Hillshade (Maaamet)"
-msgstr ""
+msgstr "Estonia Hillshade (Maaamet)"
 
 msgid "Estonia Cadastre (Maaamet)"
-msgstr ""
+msgstr "Estonia Cadastre (Maaamet)"
 
 msgid "Estonia Forestry (Maaamet)"
-msgstr ""
+msgstr "Estonia Forestry (Maaamet)"
 
 msgid "Bordeaux - 2012"
-msgstr ""
+msgstr "Bordeaux - 2012"
 
 msgid "CRAIG - Auvergne 2009/2010 - 30 cm"
-msgstr ""
+msgstr "CRAIG - Auvergne 2009/2010 - 30 cm"
 
 msgid "CRAIG - Moulins 2009 - 15 cm"
-msgstr ""
+msgstr "CRAIG - Moulins 2009 - 15 cm"
 
 msgid "CRAIG - Montluçon 2009 - 15 cm"
-msgstr ""
+msgstr "CRAIG - Montluçon 2009 - 15 cm"
 
 msgid "CRAIG - Vichy 2009 - 15 cm"
-msgstr ""
+msgstr "CRAIG - Vichy 2009 - 15 cm"
 
 msgid "CRAIG - Le Puy 2010 - 15 cm"
-msgstr ""
+msgstr "CRAIG - Le Puy 2010 - 15 cm"
 
 msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
-msgstr ""
+msgstr "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
 
 msgid "GrandNancy Orthophotographie 2012"
-msgstr ""
+msgstr "GrandNancy Orthophotographie 2012"
 
 msgid "Géobretagne - Brest 2010 - 10 cm"
-msgstr ""
+msgstr "Géobretagne - Brest 2010 - 10 cm"
 
 msgid "Géobretagne - Morbihan 2010"
-msgstr ""
+msgstr "Géobretagne - Morbihan 2010"
 
 msgid "Géolittoral - Orthophotos 2000"
-msgstr ""
+msgstr "Géolittoral - Orthophotos 2000"
 
 msgid "Géolittoral V2 - Orthophotos 2010-2012"
-msgstr ""
+msgstr "Géolittoral V2 - Orthophotos 2010-2012"
 
 msgid "Géolittoral - Sentiers"
-msgstr ""
+msgstr "Géolittoral - Sentiers"
 
 msgid "Grand Lyon - Orthophotographie 2012 - 10cm"
-msgstr ""
+msgstr "Grand Lyon - Orthophotographie 2012 - 10cm"
 
 msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
-msgstr ""
+msgstr "Loire-Atlantique - Orthophotos 2012 - 20 cm"
 
 msgid "Toulouse - Orthophotoplan 2013"
-msgstr ""
+msgstr "Toulouse - Orthophotoplan 2013"
 
 msgid "Toulouse - Orthophotoplan 2011"
-msgstr ""
+msgstr "Toulouse - Orthophotoplan 2011"
 
 msgid "Toulouse - Orthophotoplan 2007"
-msgstr ""
+msgstr "Toulouse - Orthophotoplan 2007"
 
 msgid "Tours - Orthophotos 2013"
-msgstr ""
+msgstr "Tours - Orthophotos 2013"
 
 msgid "Tours - Orthophotos 2008-2010"
-msgstr ""
+msgstr "Tours - Orthophotos 2008-2010"
 
 msgid "Tours - Orthophotos 2008"
-msgstr ""
+msgstr "Tours - Orthophotos 2008"
 
 msgid ""
 "Vercors - Réserve naturelle des Hauts-Plateaux du Vercors - Orthophotos 1999 "
 "- 1 m"
 msgstr ""
+"Vercors - Réserve naturelle des Hauts-Plateaux du Vercors - Orthophotos 1999 "
+"- 1 m"
 
 msgid "Hike & Bike"
-msgstr ""
+msgstr "Hike & Bike"
 
 msgid "OpenStreetMap (Sorbian Language)"
-msgstr ""
+msgstr "OpenStreetMap (Sorbian Language)"
 
 msgid "Hamburg (40 cm)"
+msgstr "Hamburg (40 cm)"
+
+msgid "Hamburg (20 cm)"
 msgstr ""
 
 msgid "Hamburg (DK5)"
-msgstr ""
+msgstr "Hamburg (DK5)"
 
 msgid "Bavaria (2 m)"
-msgstr ""
+msgstr "Bavaria (2 m)"
 
 msgid "Stuttgart (Luftbild)"
-msgstr ""
+msgstr "Stuttgart (Luftbild)"
 
 msgid "Erlangen 2013 Luftbild (6,25 cm)"
-msgstr ""
+msgstr "Erlangen 2013 Luftbild (6,25 cm)"
 
 msgid "Erlangen 2011 Luftbild (5,0 cm)"
-msgstr ""
+msgstr "Erlangen 2011 Luftbild (5,0 cm)"
 
 msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
-msgstr ""
+msgstr "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
 
 msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
-msgstr ""
+msgstr "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
 
 msgid "Physical DE - Physische Karte (Naturräume)"
-msgstr ""
+msgstr "Physical DE - Physische Karte (Naturräume)"
 
 msgid "Physical DE:Harz - Physische Karte (Naturräume)"
-msgstr ""
+msgstr "Physical DE:Harz - Physische Karte (Naturräume)"
 
 msgid ""
 "Physical DE:Harz - Overlay für Bing (z.B. Deckkraft zw. 20 und 50 Prozent "
 "nutzen)"
 msgstr ""
+"Physical DE:Harz - Overlay für Bing (z.B. Deckkraft zw. 20 und 50 Prozent "
+"nutzen)"
 
 msgid "Maps4BW (LGL-BW, www.lgl-bw.de)"
-msgstr ""
+msgstr "Maps4BW (LGL-BW, www.lgl-bw.de)"
 
 msgid "NRW-Atlas: Automatisierte Liegenschaftskarte (Vektor)"
-msgstr ""
+msgstr "NRW-Atlas: Automatisierte Liegenschaftskarte (Vektor)"
 
 msgid "NRW-Atlas: Automatisierte Liegenschaftskarte (Raster)"
-msgstr ""
+msgstr "NRW-Atlas: Automatisierte Liegenschaftskarte (Raster)"
 
 msgid "NRW-Atlas: Digitale GrundKarte 1:5000"
-msgstr ""
+msgstr "NRW-Atlas: Digitale GrundKarte 1:5000"
 
 msgid "NRW-Atlas: Luftbilder"
-msgstr ""
+msgstr "NRW-Atlas: Luftbilder"
 
 msgid "NRW-Atlas: Topographische Karte 1:10000"
-msgstr ""
+msgstr "NRW-Atlas: Topographische Karte 1:10000"
 
 msgid "Metropole Ruhr: Luftbilder (10 cm)"
-msgstr ""
+msgstr "Metropole Ruhr: Luftbilder (10 cm)"
 
 msgid "Drone Imagery (Haiti)"
-msgstr ""
+msgstr "Drone Imagery (Haiti)"
 
 msgid "Drone Imagery 2014 (Haiti)"
-msgstr ""
+msgstr "Drone Imagery 2014 (Haiti)"
 
 msgid "Ireland British War Office 1:25k GSGS 3906"
-msgstr ""
+msgstr "Ireland British War Office 1:25k GSGS 3906"
 
 msgid "Ireland British War Office One-Inch 1941-43 GSGS 4136"
-msgstr ""
+msgstr "Ireland British War Office One-Inch 1941-43 GSGS 4136"
 
 msgid "Ireland Bartholomew Quarter-Inch 1940"
-msgstr ""
+msgstr "Ireland Bartholomew Quarter-Inch 1940"
 
 msgid "Ireland EEA GMES Urban Atlas"
-msgstr ""
+msgstr "Ireland EEA GMES Urban Atlas"
 
 msgid "Ireland EEA CORINE 2006"
-msgstr ""
+msgstr "Ireland EEA CORINE 2006"
 
 msgid "Lodi - Italy"
-msgstr ""
+msgstr "Lodi - Italy"
 
 msgid "Lombardia - Italy (CTR)"
-msgstr ""
+msgstr "Lombardia - Italy (CTR)"
 
 msgid "Sicily - Italy"
-msgstr ""
+msgstr "Sicily - Italy"
 
 msgid "PCN 2006 - Italy"
-msgstr ""
+msgstr "PCN 2006 - Italy"
 
 msgid "PCN 2008 - IT Lazio+Umbria"
-msgstr ""
+msgstr "PCN 2008 - IT Lazio+Umbria"
 
 msgid "PCN 2012 - Italy"
-msgstr ""
+msgstr "PCN 2012 - Italy"
 
 msgid "USSR - Latvia"
-msgstr ""
+msgstr "USSR - Latvia"
 
 msgid "50cm ortho - Latvia"
-msgstr ""
+msgstr "50cm ortho - Latvia"
 
 msgid "20cm ortho - Latvia - Coastline"
-msgstr ""
+msgstr "20cm ortho - Latvia - Coastline"
 
 msgid "ORT10LT (Lithuania)"
-msgstr ""
+msgstr "ORT10LT (Lithuania)"
 
 msgid "Luxembourg Inspire Ortho 2010"
-msgstr ""
+msgstr "Luxembourg Inspire Ortho 2010"
 
 msgid "Luxembourg Inspire Ortho 2013"
-msgstr ""
+msgstr "Luxembourg Inspire Ortho 2013"
 
 msgid "Luxembourg Inspire Railway"
-msgstr ""
+msgstr "Luxembourg Inspire Railway"
 
 msgid "Luxembourg Inspire Roads"
-msgstr ""
+msgstr "Luxembourg Inspire Roads"
 
 msgid "Niger Delta Oct 2012 Landsat"
-msgstr ""
+msgstr "Niger Delta Oct 2012 Landsat"
 
 msgid "Gaza Strip - Pléiades - 2014/07/06"
-msgstr ""
+msgstr "Gaza Strip - Pléiades - 2014/07/06"
 
 msgid "Gaza Strip - Pléiades - 2014/07/06 (NIR)"
-msgstr ""
+msgstr "Gaza Strip - Pléiades - 2014/07/06 (NIR)"
 
 msgid "Pangasinán/Bulacan (Phillipines HiRes)"
-msgstr ""
+msgstr "Pangasinán/Bulacan (Phillipines HiRes)"
 
 msgid "Geoportal 2: Ortofotomapa (aerial image)"
-msgstr ""
+msgstr "Geoportal 2: Ortofotomapa (aerial image)"
 
 msgid "Geoportal 2: PRNG (geo names)"
-msgstr ""
+msgstr "Geoportal 2: PRNG (geo names)"
 
 msgid "Będzin: Ortofotomapa 2013 (aerial image)"
-msgstr ""
+msgstr "Będzin: Ortofotomapa 2013 (aerial image)"
 
 msgid "Będzin: Budynki (buildings)"
-msgstr ""
+msgstr "Będzin: Budynki (buildings)"
 
 msgid "Bytom: Ortofotomapa 2012 (aerial image)"
-msgstr ""
+msgstr "Bytom: Ortofotomapa 2012 (aerial image)"
 
 msgid "Bytom: Budynki (buildings)"
-msgstr ""
+msgstr "Bytom: Budynki (buildings)"
 
 msgid "Chorzów: Budynki (buildings)"
-msgstr ""
+msgstr "Chorzów: Budynki (buildings)"
 
 msgid "Częstochowa: Ortofotomapa 2011 (aerial image)"
-msgstr ""
+msgstr "Częstochowa: Ortofotomapa 2011 (aerial image)"
 
 msgid "Gliwice: Ortofotomapa 2013 (aerial image)"
-msgstr ""
+msgstr "Gliwice: Ortofotomapa 2013 (aerial image)"
 
 msgid "Gliwice: Budynki (buildings)"
-msgstr ""
+msgstr "Gliwice: Budynki (buildings)"
 
 msgid "Katowice: Ortofotomapa (aerial image)"
-msgstr ""
+msgstr "Katowice: Ortofotomapa (aerial image)"
 
 msgid "Łódź: Ortofotomapa (aerial image)"
-msgstr ""
+msgstr "Łódź: Ortofotomapa (aerial image)"
 
 msgid "Ruda Śląska: Ortofotomapa (aerial image)"
-msgstr ""
+msgstr "Ruda Śląska: Ortofotomapa (aerial image)"
 
 msgid "Rzeszów: Ortofotomapa (aerial image)"
-msgstr ""
+msgstr "Rzeszów: Ortofotomapa (aerial image)"
 
 msgid "Rzeszów: Budynki (buildings)"
-msgstr ""
+msgstr "Rzeszów: Budynki (buildings)"
 
 msgid "Siemianowice Śląskie: Ortofotomapa (aerial image)"
-msgstr ""
+msgstr "Siemianowice Śląskie: Ortofotomapa (aerial image)"
 
 msgid "Świętochłowice: Ortofotomapa 2009 (aerial image)"
-msgstr ""
+msgstr "Świętochłowice: Ortofotomapa 2009 (aerial image)"
 
 msgid "Zabrze: Ortofotomapa 2011 (aerial image)"
-msgstr ""
+msgstr "Zabrze: Ortofotomapa 2011 (aerial image)"
 
 msgid "trail.pl: Szlaki (paths)"
-msgstr ""
+msgstr "trail.pl: Szlaki (paths)"
 
 msgid "ScanEx IRS"
-msgstr ""
+msgstr "ScanEx IRS"
 
 msgid "ScanEx SPOT"
-msgstr ""
+msgstr "ScanEx SPOT"
 
 msgid "Freemap.sk Car"
-msgstr ""
+msgstr "Freemap.sk Car"
 
 msgid "Freemap.sk Hiking"
-msgstr ""
+msgstr "Freemap.sk Hiking"
 
 msgid "Freemap.sk Cyclo"
-msgstr ""
+msgstr "Freemap.sk Cyclo"
 
 msgid "Freemap.sk Ski"
-msgstr ""
+msgstr "Freemap.sk Ski"
 
 msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
-msgstr ""
+msgstr "Katastrálna mapa Slovenska (KaPor, 2010-04)"
 
 msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
-msgstr ""
+msgstr "Katastrálna mapa Slovenska (KaPor, 2011-05)"
 
 msgid "Slovakia EEA GMES Urban Atlas"
-msgstr ""
+msgstr "Slovakia EEA GMES Urban Atlas"
 
 msgid "Slovakia EEA CORINE 2006"
-msgstr ""
+msgstr "Slovakia EEA CORINE 2006"
 
 msgid "Slovakia Historic Maps"
-msgstr ""
+msgstr "Slovakia Historic Maps"
 
 msgid "South Africa CD:NGI Aerial"
-msgstr ""
+msgstr "South Africa CD:NGI Aerial"
 
 msgid "Catastro Spain"
-msgstr ""
+msgstr "Catastro Spain"
 
 msgid "PNOA Spain"
-msgstr ""
+msgstr "PNOA Spain"
 
 msgid "SIGPAC Spain"
-msgstr ""
+msgstr "SIGPAC Spain"
 
 msgid "GRAFCAN - Canary Islands"
-msgstr ""
+msgstr "GRAFCAN - Canary Islands"
 
 msgid "ITACyL - Castile and León"
-msgstr ""
+msgstr "ITACyL - Castile and León"
 
 msgid "IDEIB - Balearic Islands"
-msgstr ""
+msgstr "IDEIB - Balearic Islands"
 
 msgid "GRAFCAN Express - Canary Islands"
-msgstr ""
+msgstr "GRAFCAN Express - Canary Islands"
 
 msgid "Kanton Aargau 25cm (AGIS 2011)"
-msgstr ""
+msgstr "Kanton Aargau 25cm (AGIS 2011)"
+
+msgid "Kanton Aargau 25cm (AGIS 2014)"
+msgstr "Kanton Aargau 25cm (AGIS 2014)"
 
 msgid "Stadt Uster Orthophoto 2008 10cm"
-msgstr ""
+msgstr "Stadt Uster Orthophoto 2008 10cm"
 
 msgid "Stadtplan Zürich"
-msgstr ""
+msgstr "Stadtplan Zürich"
 
 msgid "Stadt Zürich Übersichtsplan (Strassen, Gebäude, Hausnummer)"
-msgstr ""
+msgstr "Stadt Zürich Übersichtsplan (Strassen, Gebäude, Hausnummer)"
 
 msgid "Stadt Zürich Luftbild 2011"
-msgstr ""
+msgstr "Stadt Zürich Luftbild 2011"
 
 msgid "Orthofoto Kanton Solothurn RGB (SOGIS 2011/2012/2013)"
-msgstr ""
+msgstr "Orthofoto Kanton Solothurn RGB (SOGIS 2011/2012/2013)"
 
 msgid "Orthofoto Kanton Solothurn Infrarot (SOGIS 2011/2012/2013)"
-msgstr ""
+msgstr "Orthofoto Kanton Solothurn Infrarot (SOGIS 2011/2012/2013)"
 
 msgid "Canton de Génève 5cm (SITG 2011)"
-msgstr ""
+msgstr "Canton de Génève 5cm (SITG 2011)"
 
 msgid "Canton de Neuchâtel 50cm (SITN 2006)"
-msgstr ""
+msgstr "Canton de Neuchâtel 50cm (SITN 2006)"
 
 msgid "Canton du Jura 50cm (RCJU 1998)"
-msgstr ""
+msgstr "Canton du Jura 50cm (RCJU 1998)"
 
 msgid "Canton de Fribourg 50cm (2005)"
-msgstr ""
+msgstr "Canton de Fribourg 50cm (2005)"
 
 msgid "Stadt Bern 10cm/25cm (2012)"
-msgstr ""
+msgstr "Stadt Bern 10cm/25cm (2012)"
 
 msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
-msgstr ""
+msgstr "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
 
 msgid "Ville de Nyon - Orthophoto 2010 HD 5cm/pi"
-msgstr ""
+msgstr "Ville de Nyon - Orthophoto 2010 HD 5cm/pi"
 
 msgid "Cartoriviera - Orthophoto 2012"
-msgstr ""
+msgstr "Cartoriviera - Orthophoto 2012"
 
 msgid "SIGIP - Orthophoto 2012"
-msgstr ""
+msgstr "SIGIP - Orthophoto 2012"
 
 msgid "Lausanne - Orthophoto technique 2012"
-msgstr ""
+msgstr "Lausanne - Orthophoto technique 2012"
 
 msgid "Bonvillars Orthophoto 2013"
-msgstr ""
+msgstr "Bonvillars Orthophoto 2013"
 
 msgid "Fiez Orthophoto 2013"
-msgstr ""
+msgstr "Fiez Orthophoto 2013"
 
 msgid "MSR Maps Topo"
-msgstr ""
+msgstr "MSR Maps Topo"
 
 msgid "MSR Maps Urban"
-msgstr ""
+msgstr "MSR Maps Urban"
 
 msgid "USGS Scanned Topographic Maps"
-msgstr ""
+msgstr "USGS Scanned Topographic Maps"
 
 msgid "USGS Large Scale Imagery"
-msgstr ""
+msgstr "USGS Large Scale Imagery"
 
 msgid "OSM US TIGER 2012 Roads Overlay"
-msgstr ""
+msgstr "OSM US TIGER 2012 Roads Overlay"
 
 msgid "New & Misaligned TIGER Roads (TIGER 2014)"
-msgstr ""
+msgstr "New & Misaligned TIGER Roads (TIGER 2014)"
 
 msgid "MassGIS L3 Parcels"
-msgstr ""
+msgstr "MassGIS L3 Parcels"
 
 msgid "NC Latest Orthoimagery"
-msgstr ""
+msgstr "NC Latest Orthoimagery"
 
 msgid "Ukraine - Orthophotomaps 2012"
-msgstr ""
+msgstr "Ukraine - Orthophotomaps 2012"
 
 msgid "7th Series (OS7)"
-msgstr ""
+msgstr "7th Series (OS7)"
 
 msgid "OS New Popular Edition historic"
-msgstr ""
+msgstr "OS New Popular Edition historic"
 
 msgid "OS OpenData StreetView"
-msgstr ""
+msgstr "OS OpenData StreetView"
 
 msgid "OS OpenData Locator"
-msgstr ""
+msgstr "OS OpenData Locator"
 
 msgid "Surrey Air Survey"
-msgstr ""
+msgstr "Surrey Air Survey"
 
 msgid "NLS - OS 6-inch Scotland 1842-82"
-msgstr ""
+msgstr "NLS - OS 6-inch Scotland 1842-82"
 
 msgid "NLS - OS 1:25k 1st Series 1937-61"
-msgstr ""
+msgstr "NLS - OS 1:25k 1st Series 1937-61"
 
 msgid "NLS - OS 1-inch 7th Series 1955-61"
-msgstr ""
+msgstr "NLS - OS 1-inch 7th Series 1955-61"
 
 msgid "OS 1:25k historic (OSM-Best)"
-msgstr ""
+msgstr "OS 1:25k historic (OSM-Best)"
 
 msgid "OS 1:25k historic (OSM-Limited)"
-msgstr ""
+msgstr "OS 1:25k historic (OSM-Limited)"
 
 msgid "OS Scottish Popular historic"
-msgstr ""
+msgstr "OS Scottish Popular historic"
 
 msgid "NLS - Bartholomew Half Inch, 1897-1907"
-msgstr ""
+msgstr "NLS - Bartholomew Half Inch, 1897-1907"
 
 msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
-msgstr ""
+msgstr "OS Town Plans, Aberdeen 1866-1867 (NLS)"
 
 msgid "OS Town Plans, Airdrie 1858 (NLS)"
-msgstr ""
+msgstr "OS Town Plans, Airdrie 1858 (NLS)"
 
 msgid "OS Town Plans, Alexandria 1859 (NLS)"
-msgstr ""
+msgstr "OS Town Plans, Alexandria 1859 (NLS)"
 
 msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
-msgstr ""
+msgstr "OS Town Plans, Alloa 1861-1862 (NLS)"
 
 msgid "OS Town Plans, Annan 1859 (NLS)"
-msgstr ""
+msgstr "OS Town Plans, Annan 1859 (NLS)"
 
 msgid "OS Town Plans, Arbroath 1858 (NLS)"
-msgstr ""
+msgstr "OS Town Plans, Arbroath 1858 (NLS)"
 
 msgid "OS Town Plans, Ayr 1855 (NLS)"
-msgstr ""
+msgstr "OS Town Plans, Ayr 1855 (NLS)"
 
 msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
-msgstr ""
+msgstr "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
 
 msgid "OS Town Plans, Brechin 1862 (NLS)"
-msgstr ""
+msgstr "OS Town Plans, Brechin 1862 (NLS)"
 
 msgid "OS Town Plans, Burntisland 1894 (NLS)"
-msgstr ""
+msgstr "OS Town Plans, Burntisland 1894 (NLS)"
 
 msgid "OS Town Plans, Campbelton 1865 (NLS)"
-msgstr ""
+msgstr "OS Town Plans, Campbelton 1865 (NLS)"
 
 msgid "OS Town Plans, Coatbridge 1858 (NLS)"
-msgstr ""
+msgstr "OS Town Plans, Coatbridge 1858 (NLS)"
 
 msgid "OS Town Plans, Cupar 1854 (NLS)"
-msgstr ""
+msgstr "OS Town Plans, Cupar 1854 (NLS)"
 
 msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
-msgstr ""
+msgstr "OS Town Plans, Cupar 1893-1894 (NLS)"
 
 msgid "OS Town Plans, Dalkeith 1852 (NLS)"
-msgstr ""
+msgstr "OS Town Plans, Dalkeith 1852 (NLS)"
 
 msgid "OS Town Plans, Dalkeith 1893 (NLS)"
-msgstr ""
+msgstr "OS Town Plans, Dalkeith 1893 (NLS)"
 
 msgid "OS Town Plans, Dumbarton 1859 (NLS)"
-msgstr ""
+msgstr "OS Town Plans, Dumbarton 1859 (NLS)"
 
 msgid "OS Town Plans, Dumfries 1850 (NLS)"
-msgstr ""
+msgstr "OS Town Plans, Dumfries 1850 (NLS)"
 
 msgid "OS Town Plans, Dumfries 1893 (NLS)"
-msgstr ""
+msgstr "OS Town Plans, Dumfries 1893 (NLS)"
 
 msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
-msgstr ""
+msgstr "OS Town Plans, Dundee 1857-1858 (NLS)"
 
 msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
-msgstr ""
+msgstr "OS Town Plans, Dundee 1870-1872 (NLS)"
 
 msgid "OS Town Plans, Dunfermline 1854 (NLS)"
-msgstr ""
+msgstr "OS Town Plans, Dunfermline 1854 (NLS)"
 
 msgid "OS Town Plans, Dunfermline 1894 (NLS)"
-msgstr ""
+msgstr "OS Town Plans, Dunfermline 1894 (NLS)"
 
 msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
-msgstr ""
+msgstr "OS Town Plans, Edinburgh 1849-1851 (NLS)"
 
 msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
-msgstr ""
+msgstr "OS Town Plans, Edinburgh 1876-1877 (NLS)"
 
 msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
-msgstr ""
+msgstr "OS Town Plans, Edinburgh 1893-1894 (NLS)"
 
 msgid "OS Town Plans, Elgin 1868 (NLS)"
-msgstr ""
+msgstr "OS Town Plans, Elgin 1868 (NLS)"
 
 msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
-msgstr ""
+msgstr "OS Town Plans, Falkirk 1858-1859 (NLS)"
 
 msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
-msgstr ""
+msgstr "OS Town Plans, Forfar 1860-1861 (NLS)"
 
 msgid "OS Town Plans, Forres 1868 (NLS)"
-msgstr ""
+msgstr "OS Town Plans, Forres 1868 (NLS)"
 
 msgid "OS Town Plans, Galashiels 1858 (NLS)"
-msgstr ""
+msgstr "OS Town Plans, Galashiels 1858 (NLS)"
 
 msgid "OS Town Plans, Girvan 1857 (NLS)"
-msgstr ""
+msgstr "OS Town Plans, Girvan 1857 (NLS)"
 
 msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
-msgstr ""
+msgstr "OS Town Plans, Glasgow 1857-1858 (NLS)"
 
 msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
-msgstr ""
+msgstr "OS Town Plans, Glasgow 1892-1894 (NLS)"
 
 msgid "OS Town Plans, Greenock 1857 (NLS)"
-msgstr ""
+msgstr "OS Town Plans, Greenock 1857 (NLS)"
 
 msgid "OS Town Plans, Haddington 1853 (NLS)"
-msgstr ""
+msgstr "OS Town Plans, Haddington 1853 (NLS)"
 
 msgid "OS Town Plans, Haddington 1893 (NLS)"
-msgstr ""
+msgstr "OS Town Plans, Haddington 1893 (NLS)"
 
 msgid "OS Town Plans, Hamilton 1858 (NLS)"
-msgstr ""
+msgstr "OS Town Plans, Hamilton 1858 (NLS)"
 
 msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
-msgstr ""
+msgstr "OS Town Plans, Hawick 1857-1858 (NLS)"
 
 msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
-msgstr ""
+msgstr "OS Town Plans, Inverness 1867-1868 (NLS)"
 
 msgid "OS Town Plans, Irvine 1859 (NLS)"
-msgstr ""
+msgstr "OS Town Plans, Irvine 1859 (NLS)"
 
 msgid "OS Town Plans, Jedburgh 1858 (NLS)"
-msgstr ""
+msgstr "OS Town Plans, Jedburgh 1858 (NLS)"
 
 msgid "OS Town Plans, Kelso 1857 (NLS)"
-msgstr ""
+msgstr "OS Town Plans, Kelso 1857 (NLS)"
 
 msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
-msgstr ""
+msgstr "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
 
 msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
-msgstr ""
+msgstr "OS Town Plans, Kirkcaldy 1855 (NLS)"
 
 msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
-msgstr ""
+msgstr "OS Town Plans, Kirkcaldy 1894 (NLS)"
 
 msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
-msgstr ""
+msgstr "OS Town Plans, Kirkcudbright 1850 (NLS)"
 
 msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
-msgstr ""
+msgstr "OS Town Plans, Kirkcudbright 1893 (NLS)"
 
 msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
-msgstr ""
+msgstr "OS Town Plans, Kirkintilloch 1859 (NLS)"
 
 msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
-msgstr ""
+msgstr "OS Town Plans, Kirriemuir 1861 (NLS)"
 
 msgid "OS Town Plans, Lanark 1858 (NLS)"
-msgstr ""
+msgstr "OS Town Plans, Lanark 1858 (NLS)"
 
 msgid "OS Town Plans, Linlithgow 1856 (NLS)"
-msgstr ""
+msgstr "OS Town Plans, Linlithgow 1856 (NLS)"
 
 msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
-msgstr ""
+msgstr "OS Town Plans, Mayole 1856-1857 (NLS)"
 
 msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
-msgstr ""
+msgstr "OS Town Plans, Montrose 1861-1862 (NLS)"
 
 msgid "OS Town Plans, Musselburgh 1853 (NLS)"
-msgstr ""
+msgstr "OS Town Plans, Musselburgh 1853 (NLS)"
 
 msgid "OS Town Plans, Musselburgh 1893 (NLS)"
-msgstr ""
+msgstr "OS Town Plans, Musselburgh 1893 (NLS)"
 
 msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
-msgstr ""
+msgstr "OS Town Plans, Nairn 1867-1868 (NLS)"
 
 msgid "OS Town Plans, Oban 1867-1868 (NLS)"
-msgstr ""
+msgstr "OS Town Plans, Oban 1867-1868 (NLS)"
 
 msgid "OS Town Plans, Peebles 1856 (NLS)"
-msgstr ""
+msgstr "OS Town Plans, Peebles 1856 (NLS)"
 
 msgid "OS Town Plans, Perth 1860 (NLS)"
-msgstr ""
+msgstr "OS Town Plans, Perth 1860 (NLS)"
 
 msgid "OS Town Plans, Peterhead 1868 (NLS)"
-msgstr ""
+msgstr "OS Town Plans, Peterhead 1868 (NLS)"
 
 msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
-msgstr ""
+msgstr "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
 
 msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
-msgstr ""
+msgstr "OS Town Plans, Portobello 1893-1894 (NLS)"
 
 msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
-msgstr ""
+msgstr "OS Town Plans, Rothesay 1862-1863 (NLS)"
 
 msgid "OS Town Plans, Selkirk 1865 (NLS)"
-msgstr ""
+msgstr "OS Town Plans, Selkirk 1865 (NLS)"
 
 msgid "OS Town Plans, St Andrews 1854 (NLS)"
-msgstr ""
+msgstr "OS Town Plans, St Andrews 1854 (NLS)"
 
 msgid "OS Town Plans, St Andrews 1893 (NLS)"
-msgstr ""
+msgstr "OS Town Plans, St Andrews 1893 (NLS)"
 
 msgid "OS Town Plans, Stirling 1858 (NLS)"
-msgstr ""
+msgstr "OS Town Plans, Stirling 1858 (NLS)"
 
 msgid "OS Town Plans, Stonehaven 1864 (NLS)"
-msgstr ""
+msgstr "OS Town Plans, Stonehaven 1864 (NLS)"
 
 msgid "OS Town Plans, Stranraer 1847 (NLS)"
-msgstr ""
+msgstr "OS Town Plans, Stranraer 1847 (NLS)"
 
 msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
-msgstr ""
+msgstr "OS Town Plans, Stranraer 1863-1877 (NLS)"
 
 msgid "OS Town Plans, Stranraer 1893 (NLS)"
-msgstr ""
+msgstr "OS Town Plans, Stranraer 1893 (NLS)"
 
 msgid "OS Town Plans, Strathaven 1858 (NLS)"
-msgstr ""
+msgstr "OS Town Plans, Strathaven 1858 (NLS)"
 
 msgid "OS Town Plans, Wick 1872 (NLS)"
-msgstr ""
+msgstr "OS Town Plans, Wick 1872 (NLS)"
 
 msgid "OS Town Plans, Wigtown 1848 (NLS)"
-msgstr ""
+msgstr "OS Town Plans, Wigtown 1848 (NLS)"
 
 msgid "OS Town Plans, Wigtown 1894 (NLS)"
-msgstr ""
+msgstr "OS Town Plans, Wigtown 1894 (NLS)"
 
 msgid "Decreasing house numbers in addresses interpolation"
 msgstr ""
 
 msgid "{0} without {1}"
-msgstr ""
+msgstr "{0} uden {1}"
 
 msgid "{0} without {1} or {2}"
-msgstr ""
+msgstr "{0} uden {1} eller {2}"
 
 msgid "{0} without {1}, {2} or {3}"
-msgstr ""
+msgstr "{0} uden {1}, {2} eller {3}"
+
+msgid "{0} together with {1}"
+msgstr "{0} sammen med {1}"
 
 msgid "{0} on suspicious object"
-msgstr ""
+msgstr "{0} på mistænkeligt objekt"
 
 msgid "restaurant without name"
 msgstr "restaurant uden navn"
 
 msgid "{0} used with {1}"
-msgstr ""
+msgstr "{0} bruges med {1}"
 
 msgid "natural water used for swimming pool"
 msgstr "natural water brugt til swimming pool"
@@ -22611,16 +22743,22 @@ msgid "sport without physical feature"
 msgstr ""
 
 msgid "{0} should be on the node where {1} and {2} intersect"
-msgstr ""
+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 "{0}={1} is deprecated"
-msgstr ""
+msgstr "{0}={1} er forældet"
 
 msgid "{0} is deprecated"
 msgstr "{0} er forældet"
 
 msgid "''{0}'' is meaningless, use more specific tags, e.g. ''{1}''"
-msgstr ""
+msgstr "''{0}'' er meningsløst, brug mere specifikke tags, f.eks. ''{1}''"
 
 msgid ""
 "''{0}'' does not specify the official mode of transportation, use ''{1}'' "
@@ -22633,11 +22771,11 @@ msgid ""
 msgstr ""
 
 msgid "{0}={1} is deprecated. Please use instead a multipolygon."
-msgstr ""
+msgstr "{0}={1} er forældet. Brug i stedet en multipolygon."
 
 msgid ""
 "{0} is deprecated. Please specify interval by using opening_hours syntax"
-msgstr ""
+msgstr "{0} er forældet. Angiv interval ved brug af opening_hours syntaks"
 
 msgid ""
 "{0} is deprecated. Please delete this object and use a private layer instead"
@@ -22647,27 +22785,32 @@ msgid "{0}={1} is unspecific. Please replace ''{1}'' by a specific value."
 msgstr ""
 
 msgid "{0} should be replaced with {1}"
-msgstr ""
+msgstr "{0} bør erstattes med {1}"
+
+msgid "{0} = {1}; remove {0}"
+msgstr "{0} = {1}; fjern {0}"
 
 msgid ""
 "{0}={1} is unspecific. Please replace ''{1}'' by ''left'', ''right'' or "
 "''both''."
 msgstr ""
+"{0}={1}  er uspecifik. Udskift ''{1}'' med ''left'', ''right'' eller "
+"''both''."
 
 msgid "{0} on a node. Should be used on a way."
-msgstr ""
+msgstr "{0} på et punkt. Bør bruges på en vej."
 
 msgid "{0} on a node. Should be drawn as an area."
-msgstr ""
+msgstr "{0} på et punkt. Bør tegnes som et område."
 
 msgid "{0}=* on a node. Should be used in a relation"
-msgstr ""
+msgstr "{0}=* på et punkt. Bør bruges i en relation"
 
 msgid "{0} on a way. Should be used in a relation"
-msgstr ""
+msgstr "{0} på en vej. Bør bruges i en relation"
 
 msgid "{0} on a node"
-msgstr ""
+msgstr "{0} på et punkt"
 
 msgid "Building inside building"
 msgstr "Bygning inden i bygning"
@@ -22679,13 +22822,16 @@ msgid "Overlapping Areas"
 msgstr "Overlappende områder"
 
 msgid "{0} inside {1}"
-msgstr ""
+msgstr "{0} inden i {1}"
 
 msgid "Overlapping Identical Natural Areas"
-msgstr ""
+msgstr "Overlappende identiske naturområder"
 
 msgid "Overlapping Identical Landuses"
-msgstr ""
+msgstr "Overlappende identiske landområder"
+
+msgid "{0} must be connected to a way"
+msgstr "{0} skal være forbundet til en vej"
 
 msgid "abbreviated street name"
 msgstr "forkortet vejnavn"
@@ -22694,7 +22840,7 @@ msgid "wrong highway tag on a node"
 msgstr "forkert highway tag på et punkt"
 
 msgid "wrong crossing tag on a way"
-msgstr ""
+msgstr "forkert krydsnings tag på en vej"
 
 msgid "Unnamed unclassified highway"
 msgstr "Unavngivet uklassificeret highway"
@@ -22708,48 +22854,63 @@ msgstr "midlertidig highway type"
 msgid "street name contains ss"
 msgstr "vejnavn indeholder ss"
 
+msgid ""
+"Value of ''{0}'' should either be ''{1}'' or ''{2}''. For sidewalks use "
+"''{3}'' instead."
+msgstr ""
+"Værdien af ''{0}'' bør være enten ''{1}'' eller ''{2}''. For fortove brug "
+"''{3}'' i stedet."
+
 msgid "{0} with multiple values"
+msgstr "{0} med flere værdier"
+
+msgid "empty value in semicolon-separated ''{0}''"
 msgstr ""
 
 msgid "numerical key"
-msgstr ""
+msgstr "numerisk nøgle"
 
 msgid "layer tag with + sign"
 msgstr "layer tag med + tegn"
 
 msgid "layer should be between -5 and 5"
-msgstr ""
+msgstr "lag bør være mellem -5 og 5"
 
 msgid "level should be numbers with optional .5 increments"
-msgstr ""
+msgstr "niveau bør være tal med mulighed for .5 intervaller"
 
 msgid ""
 "{0}: meters is default; period is separator; if units, put space then unit"
 msgstr ""
+"{0}: meter er standard; punktum er  separator; hvis enheder, brug mellemrum "
+"så enhed"
 
 msgid "unusual {0} format"
-msgstr ""
+msgstr "usædvanligt {0} format"
 
 msgid "voltage should be in volts with no units/delimiter/spaces"
-msgstr ""
+msgstr "spænding bør være i volt uden enheder/skilletegn/mellemrum"
 
 msgid "unusual {0} specification"
-msgstr ""
+msgstr "usædvanlig {0} specifikation"
 
 msgid "unusual train track gauge; use mm with no separator"
-msgstr ""
+msgstr "usædvanlig tog sporvidde; bruge mm uden separator"
 
 msgid "unusual incline; use percentages/degrees or up/down"
-msgstr ""
+msgstr "usædvanlig hældning; bruge procenter/grader eller op/ned"
 
 msgid "{0} must be a numeric value"
-msgstr ""
+msgstr "{0} skal være en numerisk værdi"
+
+msgid "{0} must be a positive integer number"
+msgstr "{0} skal være et positivt heltal"
 
 msgid "relation without type"
 msgstr "relation uden type"
 
 msgid "{0} relation without {0} tag"
-msgstr ""
+msgstr "{0} relation uden {0} tag"
 
 msgid "religion without denomination"
 msgstr "religion uden trosretning"
@@ -22764,13 +22925,13 @@ msgid "unknown jewish denomination"
 msgstr "ukendt jødisk trosretning"
 
 msgid "{0} is unnecessary"
-msgstr ""
+msgstr "{0} er unødvendig"
 
 msgid "{0} is unnecessary for {1}"
-msgstr ""
+msgstr "{0} er unødvendig for {1}"
 
 msgid "{0}={1} makes no sense"
-msgstr ""
+msgstr "{0}={1} giver ingen mening"
 
 msgid "Nodes duplicating parent way tags"
 msgstr "Punkter der duplikerer \"forældre\"-vej tags"
@@ -22781,31 +22942,31 @@ msgstr ""
 "intet wikipedia-sprog angivet, brug \"wikipedia\"=\"sprog:sidetitel\""
 
 msgid "unknown language prefix in wikipedia tag"
-msgstr ""
+msgstr "ukendt sprog præfiks i wikipedia tag"
 
 msgid "deprecated format for wikipedia tag"
-msgstr ""
+msgstr "forældet format for wikipedia tag"
 
 msgid "''wikipedia''=''language:page title''"
-msgstr ""
+msgstr "''wikipedia''=''sprog:sidetitel''"
 
 msgid "Hide icons at low zoom"
-msgstr ""
+msgstr "Skjul ikoner ved lav zoom"
 
 msgid "Less obtrusive node symbols at low zoom"
 msgstr ""
 
 msgid "Display street labels (at high zoom)"
-msgstr ""
+msgstr "Vis gadenavne (ved høj zoom)"
 
 msgid "OSM Export"
-msgstr ""
+msgstr "OSM eksport"
 
 msgid "Export traffic data to SUMO network file."
 msgstr ""
 
 msgid "SUMO Export"
-msgstr ""
+msgstr "SUMO eksport"
 
 msgid "Export"
 msgstr "Eksporter"
@@ -22835,7 +22996,7 @@ msgid "Importing CSV file ''%s''..."
 msgstr "Importerer CSV filen ''%s''..."
 
 msgid "Markers of "
-msgstr ""
+msgstr "Markører for "
 
 msgid "Show summary after import"
 msgstr "Vis opsummering efter import"
@@ -22844,7 +23005,7 @@ msgid "Do not zoom after import"
 msgstr "Zoom ikke efter import"
 
 msgid "Ignore hdop/vdop/pdop entries"
-msgstr ""
+msgstr "Ignorer hdop/vdop/pdop poster"
 
 msgid "Warn on missing audio files"
 msgstr "Advarsel ved manglende lydfiler"
@@ -22865,18 +23026,23 @@ msgid ""
 "No command has been found. Would you like to download and install default "
 "commands now?"
 msgstr ""
+"Ingen kommando er blevet fundet. Vil du hente og installere standard "
+"kommandoer nu?"
 
 msgid "No command found"
-msgstr ""
+msgstr "Ingen kommando fundet"
 
 msgid "Default commands have been successfully installed"
-msgstr ""
+msgstr "Standard kommandoer er blevet installeret"
 
 msgid ""
 "Failed to download and install default commands.\n"
 "\n"
 "Error: {0}"
 msgstr ""
+"Kunne ikke hente og installere standard kommandoer.\n"
+"\n"
+"Fejl: {0}"
 
 msgid "Processing..."
 msgstr "Behandler..."
@@ -23047,10 +23213,10 @@ msgid "Uploads traces to openstreetmap.org"
 msgstr "Uploader GPX-spor til openstreetmap.org"
 
 msgid "Shows elevation profile"
-msgstr ""
+msgstr "Viser højdeprofil"
 
 msgid "Elevation Profile"
-msgstr ""
+msgstr "Højdeprofil"
 
 msgid "Elevation Grid Layer (experimental!)"
 msgstr ""
@@ -23062,10 +23228,10 @@ msgid "Elevation Grid"
 msgstr ""
 
 msgid "No SRTM data"
-msgstr ""
+msgstr "Ingen SRTM data"
 
 msgid "Open the elevation profile window."
-msgstr ""
+msgstr "Åben højdeprofilvindue."
 
 msgid "Min"
 msgstr "Min."
@@ -23086,16 +23252,16 @@ msgid "Tracks"
 msgstr "Spor"
 
 msgid "Elevation profile for track ''{0}''."
-msgstr ""
+msgstr "Højdeprofil for spor ''{0}''."
 
 msgid "Elevation profile"
-msgstr ""
+msgstr "Højdeprofil"
 
 msgid "(No elevation data)"
-msgstr ""
+msgstr "(Ingen højde data)"
 
 msgid "Can not save preferences"
-msgstr ""
+msgstr "Kan ikke gemme indstillinger"
 
 msgid "Epsilon multiplier"
 msgstr ""
@@ -23143,7 +23309,7 @@ msgid "Save settings"
 msgstr "Gem indstillinger"
 
 msgid "Can not read settings"
-msgstr ""
+msgstr "Kan ikke læse indstillingerne"
 
 msgid "Q=Options, Enter=save, Ctrl-Enter=save with tags, Up/Down=tune"
 msgstr ""
@@ -23154,10 +23320,10 @@ msgid ""
 msgstr ""
 
 msgid "FastDrawing"
-msgstr ""
+msgstr "Hurtig tegning"
 
 msgid "Fast drawing mode"
-msgstr ""
+msgstr "Hurtig tegning tilstand"
 
 msgid "Please move the mouse to draw new way"
 msgstr ""
@@ -23173,13 +23339,13 @@ msgid ""
 msgstr ""
 
 msgid "Line information"
-msgstr ""
+msgstr "Linje information"
 
 msgid "Cannot place node outside of the world."
 msgstr "Kan ikke placere et punkt uden for verdenen."
 
 msgid "Draw the way by mouse"
-msgstr ""
+msgstr "Tegn vej med mus"
 
 msgid "min distance={0} px ({1} m)"
 msgstr ""
@@ -23191,10 +23357,10 @@ msgid "Eps={0}, {1} points, {2} p/km"
 msgstr ""
 
 msgid "Fix addresses"
-msgstr ""
+msgstr "Ret adresser"
 
 msgid "Show dialog with incomplete addresses"
-msgstr ""
+msgstr "Vis dialog med ufuldstændige adresser"
 
 msgid "Include objects used for guesses"
 msgstr ""
@@ -23239,19 +23405,19 @@ msgid "No name"
 msgstr "Intet navn"
 
 msgid "Unresolved Addresses"
-msgstr "Uopløste adresser"
+msgstr "Uløste adresser"
 
 msgid "Select and close"
 msgstr "Vælg og luk"
 
 msgid "Fix unresolved addresses"
-msgstr "Ret uopløste adresser"
+msgstr "Ret uløste adresser"
 
 msgid "Complete Addresses"
 msgstr "Færdige adresser"
 
 msgid "Incomplete Addresses"
-msgstr "Ej-færdige adresser"
+msgstr "Ufuldstændige adresser"
 
 msgid "Selected Addresses"
 msgstr "Valgte adresser"
@@ -23266,7 +23432,7 @@ msgid "Segments"
 msgstr "Segmenter"
 
 msgid "Show incomplete addresses"
-msgstr ""
+msgstr "Vis ufuldstændige adresser"
 
 msgid "items"
 msgstr "emner"
@@ -23282,7 +23448,7 @@ msgid "Postcode"
 msgstr "Postnummer"
 
 msgid "Turns all guesses into the corresponding tag values."
-msgstr ""
+msgstr "Lav alle gæt om til de tilsvarende tag værdier."
 
 msgid "Applied guessed values"
 msgstr ""
@@ -23308,7 +23474,7 @@ msgid ""
 msgstr ""
 
 msgid "Convert to relation."
-msgstr ""
+msgstr "Konverter til relation."
 
 msgid "Create relation between street and related addresses."
 msgstr ""
@@ -23317,7 +23483,7 @@ msgid "Create address relation for "
 msgstr ""
 
 msgid "Guess"
-msgstr ""
+msgstr "Gæt"
 
 msgid ""
 "Tries to guess address data by picking the name of the closest object with "
@@ -23325,25 +23491,25 @@ msgid ""
 msgstr ""
 
 msgid "Guessing address values"
-msgstr ""
+msgstr "Gætter adresseværdier"
 
 msgid "Removes address related tags from the object."
-msgstr ""
+msgstr "Fjerner adresse relaterede tags fra objektet."
 
 msgid "Remove address tags"
-msgstr ""
+msgstr "Fjern adresse tags"
 
 msgid "Marks selected addresses in the map"
-msgstr ""
+msgstr "Marker valgte adresser på kortet"
 
 msgid "Select incomplete addresses"
-msgstr ""
+msgstr "Vælg ufuldstændige adresser"
 
 msgid "Selects all addresses with incomplete data."
-msgstr ""
+msgstr "Vælger alle adresser med ufuldstændige data."
 
 msgid "Use tag ''addr:street'' or ''addr:place''"
-msgstr ""
+msgstr "Brug tag ''addr:street'' eller ''addr:place''"
 
 msgid "House Number Editor"
 msgstr ""
@@ -23403,19 +23569,19 @@ msgid "Correlate entries with GPS trace"
 msgstr ""
 
 msgid "Save layer..."
-msgstr ""
+msgstr "Gem lag..."
 
 msgid "Save NanoLog layer"
-msgstr ""
+msgstr "Gem NanoLog lag"
 
 msgid "Open NanoLog panel"
 msgstr ""
 
 msgid "Open NanoLog file..."
-msgstr ""
+msgstr "Åben NanoLog fil..."
 
 msgid "Could not read NanoLog file:"
-msgstr ""
+msgstr "Kunne ikke læse NanoLog fil:"
 
 msgid "Edit opening hours"
 msgstr "Rediger åbningstider"
@@ -23457,10 +23623,10 @@ msgid "Import Osm Inspector Bugs..."
 msgstr ""
 
 msgid "OsmInspector"
-msgstr ""
+msgstr "OsmInspector"
 
 msgid "Open OsmInspector"
-msgstr ""
+msgstr "Åben OsmInspector"
 
 msgid "OsmBugInfo"
 msgstr ""
@@ -23472,16 +23638,16 @@ msgid "Current Selected Bug Info"
 msgstr ""
 
 msgid "Prev OSMI bug"
-msgstr ""
+msgstr "Forrige OSMI fejl"
 
 msgid "Next OSMI bug"
-msgstr ""
+msgstr "Næste OSMI fejl"
 
 msgid "Osm Inspector Bugs"
-msgstr ""
+msgstr "Osm Inspector fejl"
 
 msgid "OSM Inspector Bugs"
-msgstr ""
+msgstr "OSM Inspector fejl"
 
 msgid "Selected Bug Info"
 msgstr ""
@@ -23599,10 +23765,10 @@ msgid "Starting address number must be less than ending address number"
 msgstr "Første adressenummer skal være lavere end sidste adressenummer"
 
 msgid "Align Way Segments"
-msgstr ""
+msgstr "Tilpas vejsegmenter"
 
 msgid "Align Ways"
-msgstr ""
+msgstr "Tilpas veje"
 
 msgid ""
 "Please select two segments that don''t share any nodes.\n"
@@ -23613,6 +23779,8 @@ msgid ""
 "Aligning would result nodes ''outside the world''.\n"
 "Alignment not possible.\n"
 msgstr ""
+"Tilpasning vil resultere i punkter ''uden for verden''.\n"
+"Tilpasning ikke mulig.\n"
 
 msgid ""
 "There is at least a non-pivot endpoint of the alignee that joins more than "
@@ -23632,13 +23800,13 @@ msgid ""
 msgstr ""
 
 msgid "Undocumented problem occured.\n"
-msgstr ""
+msgstr "Udokumenteret problem opstået.\n"
 
 msgid "AlignWayS: Alignment not possible"
 msgstr ""
 
 msgid "Align way segment"
-msgstr ""
+msgstr "Tilpas vejsegment"
 
 msgid ""
 "Please select two segments that don''t share any nodes\n"
@@ -23646,10 +23814,10 @@ msgid ""
 msgstr ""
 
 msgid "Align Way Segments: Modes"
-msgstr ""
+msgstr "Tilpas vejsegmenter: Tilstande"
 
 msgid "Align Ways control panel"
-msgstr ""
+msgstr "Tilpas veje kontrolpanel"
 
 msgid "This panel activates in Align Ways mode:"
 msgstr ""
@@ -23661,30 +23829,34 @@ msgid "Angle preserved"
 msgstr "Vinkel bevaret"
 
 msgid "Align with:"
-msgstr ""
+msgstr "Tilpas med:"
 
 msgid ""
 "<html>Aligns the way segment to the reference so that its length is "
 "preserved.</html>"
 msgstr ""
+"<html>Tilpas vejsegment til reference så dens længde er bevaret.</html>"
 
 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 ""
+"<html>Tilpas vejsegment til reference så vinklerne for de tilstødende "
+"segmenter er bevaret. <br/> Længden af det tilpasset segment vil "
+"sandsynligvis ændre sig som resultat.</html>"
 
 msgid "I''m ready!"
 msgstr "Jeg er klar!"
 
 msgid "AlignWays Tips"
-msgstr ""
+msgstr "Tilpas veje tips"
 
 msgid "AlignWays: What''s New..."
-msgstr ""
+msgstr "Tilpas veje: Hvad er nyt..."
 
 msgid "Align Ways mode"
-msgstr ""
+msgstr "Tilpas veje tilstand"
 
 msgid "Parameter ''{0}'' must not be null"
 msgstr "Parameter ''{0}'' må ikke være nul"
@@ -23703,23 +23875,27 @@ msgid ""
 msgstr ""
 
 msgid "Ctrl-Click: select reference way segment; Alt-click: Clear selection"
-msgstr ""
+msgstr "Ctrl-Click: vælg reference vejsegment; Alt-click: Nulstil valg"
 
 msgid ": Align segments; Alt-click: Clear selection"
-msgstr ""
+msgstr ": Tilpas segmenter; Alt-click: Nulstil valg"
 
 msgid ""
 "Ctrl-click: select reference way segment; Click: select way segment to be "
 "aligned"
 msgstr ""
+"Ctrl-click: vælg reference vejsegment; Click: vælg vejsegment der skal "
+"tilpasses"
 
 msgid "Click: select way segment to be aligned; Alt-click: Clear selection"
-msgstr ""
+msgstr "Click: vælg vejsegment der skal tilpasses; Alt-click: Nulstil valg"
 
 msgid ""
 "Ctrl-Click: select reference way segment; Click: select way segment to be "
 "aligned"
 msgstr ""
+"Ctrl-Click: vælg reference vejsegment; Click: vælg vejsegment der skal "
+"tilpasses"
 
 msgid ""
 "Welcome to the</span><br>\n"
@@ -23828,7 +24004,7 @@ msgid "Various improvements and bugfixes"
 msgstr "Diverse forbedringer og fejlrettelser"
 
 msgid "Errr..."
-msgstr ""
+msgstr "Fejl..."
 
 msgid "Browser not supported."
 msgstr "Browser ikke understøttet."
@@ -23837,72 +24013,74 @@ msgid "Building address"
 msgstr "Bygningsadresse"
 
 msgid "empty"
-msgstr ""
+msgstr "tom"
 
 msgid "skip"
-msgstr ""
+msgstr "spring over"
 
 msgid "House number:"
 msgstr "Husnummer:"
 
 msgid "Street:"
-msgstr ""
+msgstr "Gade:"
 
 msgid "Post code:"
-msgstr ""
+msgstr "Postnummer:"
 
 msgid "Building:"
-msgstr ""
+msgstr "Bygning:"
 
 msgid "Tags:"
-msgstr ""
+msgstr "Tags:"
 
 msgid "Name:"
 msgstr "Navn:"
 
 msgid "updated building info"
-msgstr ""
+msgstr "opdateret bygningsinfo"
 
 msgid "Tag Element"
-msgstr ""
+msgstr "Tag element"
 
 msgid "Select an item to tag."
-msgstr ""
+msgstr "Vælg et emne at tag."
 
 msgid "Tag Building"
-msgstr ""
+msgstr "Tag bygning"
 
 msgid "Tools: {0}"
-msgstr ""
+msgstr "Værktøj: {0}"
 
 msgid "Area Selection"
-msgstr ""
+msgstr "Område valg"
 
 msgid "Select an area (e.g. building) from an underlying image."
-msgstr ""
+msgstr "Vælg et område (f.eks. bygning) fra et underliggende billede."
 
 msgid "Area Selector"
-msgstr ""
+msgstr "Område vælger"
 
 msgid "Created area"
-msgstr ""
+msgstr "Oprettet område"
 
 msgid "Unable to detect a polygon where you clicked."
 msgstr ""
 
 msgid "Error Report"
-msgstr ""
+msgstr "Fejlrapport"
 
 msgid "Something went wrong!"
-msgstr ""
+msgstr "Noget gik galt!"
 
 msgid "Please file a bug report on the github project page under"
-msgstr ""
+msgstr "Vær venlig at indsende en fejlrapport på GitHub projektside under"
 
 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 ""
+"Lad os vide hvad du gjorde og hvad der skete tilføj den følgende tekst til "
+"fejlrapporten, så vi kan finde kilden til problemet."
 
 msgid "Area detection algorithm settings."
 msgstr ""
@@ -23947,6 +24125,12 @@ msgstr ""
 msgid "merge nodes"
 msgstr ""
 
+msgid "How often thinning operation should be applied (Default {0})."
+msgstr ""
+
+msgid "Thinning Iterations"
+msgstr ""
+
 msgid "Street Name:"
 msgstr "Vejnavn:"
 
@@ -24211,13 +24395,13 @@ msgid "Image resolution:"
 msgstr ""
 
 msgid "High resolution (1000x800)"
-msgstr ""
+msgstr "Høj opløsning (1000x800)"
 
 msgid "Medium resolution (800x600)"
-msgstr ""
+msgstr "Mellem opløsning (800x600)"
 
 msgid "Low resolution (600x400)"
-msgstr ""
+msgstr "Lav opløsning (600x400)"
 
 msgid "Image filter interpolation:"
 msgstr ""
@@ -24456,13 +24640,13 @@ msgid "Get a new cookie (session timeout)"
 msgstr ""
 
 msgid "Save image as..."
-msgstr ""
+msgstr "Gem billede som..."
 
 msgid "PNG files (*.png)"
 msgstr "PNG filer (*.png)"
 
 msgid "GeoTiff files (*.tif)"
-msgstr ""
+msgstr "GeoTiff filer (*.tif)"
 
 msgid "Export image (only raster images)"
 msgstr ""
@@ -24742,10 +24926,10 @@ msgid "Format errors: "
 msgstr "Formatfejl: "
 
 msgid "TangoGPS import success"
-msgstr ""
+msgstr "TangoGPS import succes"
 
 msgid "TangoGPS import failure!"
-msgstr ""
+msgstr "TangoGPS import fejl!"
 
 msgid "TCX Files (*.tcx)"
 msgstr "TCX Filer (*.tcx)"
@@ -24772,16 +24956,16 @@ msgid "between {0} {1} and {2} {3}"
 msgstr "mellem {0} {1} og {2} {3}"
 
 msgid "  adding {0} {1}"
-msgstr ""
+msgstr "  tilføjer {0} {1}"
 
 msgid "Layer for editing GPX tracks"
 msgstr "Lag til redigering af GPX spor"
 
 msgid "Convert to GPX layer with anonymised time"
-msgstr ""
+msgstr "Konverter til GPX lag med anonymiseret tid"
 
 msgid "EditGpx"
-msgstr "RedigérGpx"
+msgstr "RedigerGpx"
 
 msgid "edit gpx tracks"
 msgstr "Ret gpx-spor"
@@ -24796,7 +24980,7 @@ msgid "No GPX data layer found."
 msgstr "Intet GPX-datalag blev fundet"
 
 msgid "External tool error"
-msgstr ""
+msgstr "Ekstern værktøjsfejl"
 
 msgid "Error executing the script:"
 msgstr "Fejl ved udførelse af script:"
@@ -25576,7 +25760,7 @@ msgid "Rotate right"
 msgstr "Roter med uret"
 
 msgid "Rotate image right"
-msgstr "Rotér billedet med uret"
+msgstr "Roter billedet med uret"
 
 msgid "WayPoint Image"
 msgstr "WayPoint billede"
@@ -25597,7 +25781,7 @@ msgid "Scale:"
 msgstr "Skala:"
 
 msgid "unit(s) = "
-msgstr ""
+msgstr "enhed(er) = "
 
 msgid "Importing..."
 msgstr ""
@@ -26397,25 +26581,25 @@ msgid "Downloading data..."
 msgstr "Downloader data..."
 
 msgid "OpenData XML files"
-msgstr ""
+msgstr "OpenData XML filer"
 
 msgid "File to load"
 msgstr ""
 
 msgid "7Zip Files"
-msgstr ""
+msgstr "7Zip filer"
 
 msgid "Reading 7Zip file..."
-msgstr ""
+msgstr "Læser 7Zip fil..."
 
 msgid "Zip Files"
-msgstr ""
+msgstr "Zip filer"
 
 msgid "Reading Zip file..."
-msgstr ""
+msgstr "Læser Zip fil..."
 
 msgid "Cannot transform to WGS84"
-msgstr ""
+msgstr "Kan ikke omdanne til WGS84"
 
 msgid ""
 "JOSM was unable to find a strict mathematical transformation between ''{0}'' "
@@ -26428,16 +26612,16 @@ msgid "Try lenient method"
 msgstr ""
 
 msgid "GML files"
-msgstr ""
+msgstr "GML filer"
 
 msgid "KML/KMZ files"
-msgstr ""
+msgstr "KML/KMZ filer"
 
 msgid "MapInfo files"
-msgstr ""
+msgstr "MapInfo filer"
 
 msgid "Shapefiles"
-msgstr ""
+msgstr "Shapefiler"
 
 msgid ""
 "Unable to detect Coordinate Reference System.\n"
@@ -26445,10 +26629,10 @@ msgid ""
 msgstr ""
 
 msgid "Warning: CRS not found"
-msgstr ""
+msgstr "Advarsel: CRS ikke fundet"
 
 msgid "Unable to detect CRS !"
-msgstr ""
+msgstr "Kan ikke finde CRS !"
 
 msgid "Unable to find a data store for file {0}"
 msgstr ""
@@ -26457,10 +26641,10 @@ msgid "Loading shapefile ({0} features)"
 msgstr ""
 
 msgid "CSV files"
-msgstr ""
+msgstr "CSV filer"
 
 msgid "ODS files"
-msgstr ""
+msgstr "ODS filer"
 
 msgid "No valid coordinates have been found."
 msgstr ""
@@ -26469,10 +26653,10 @@ msgid "Invalid file. Bad length on line {0}. Expected {1} columns, got {2}."
 msgstr ""
 
 msgid "XLS files"
-msgstr ""
+msgstr "XLS filer"
 
 msgid "View OSM Wiki page"
-msgstr ""
+msgstr "Vis OSM Wiki side"
 
 msgid "Launch browser to the OSM Wiki page of the selected data set"
 msgstr ""
@@ -26863,7 +27047,7 @@ msgid "Joining nodes"
 msgstr "Sammenlægger punkter"
 
 msgid "Joining adjacent segments"
-msgstr ""
+msgstr "Sammenlægger tilstødende segmenter"
 
 msgid "Removing small objects"
 msgstr ""
@@ -26995,8 +27179,10 @@ msgstr "Juster billeder"
 msgid "Move and position photos"
 msgstr "Flyt og placerer billeder"
 
-msgid "Click+drag photo or shift+click to position photo."
-msgstr "Klik+træk billede eller shift+klik for at placerer billede."
+msgid ""
+"Click+drag photo, shift+click to position photo, control+click to set "
+"direction."
+msgstr ""
 
 msgid "Please load some photos."
 msgstr ""
@@ -27294,7 +27480,7 @@ msgid "Printing has failed."
 msgstr "Udskrivning mislykkedes."
 
 msgid "Proj4J: {0} selected"
-msgstr ""
+msgstr "Proj4J: {0} valgt"
 
 msgid "Selected: {0}"
 msgstr "Valgte: {0}"
@@ -27650,7 +27836,7 @@ msgid "Open relation editor for the chosen relation"
 msgstr ""
 
 msgid "Find a relation"
-msgstr ""
+msgstr "Find en relation"
 
 msgid "Reconstruct polygon"
 msgstr ""
@@ -27664,9 +27850,12 @@ msgstr ""
 msgid "Reconstruct polygons from relation {0}"
 msgstr ""
 
-msgid "Open relation wiki page"
+msgid "Reconstruct route"
 msgstr ""
 
+msgid "Open relation wiki page"
+msgstr "Åben relation wiki side"
+
 msgid "Select relation in main selection."
 msgstr "Vælg relation i hovedmarkering."
 
@@ -27677,55 +27866,61 @@ msgid "Complete multipolygon for way {0}"
 msgstr ""
 
 msgid "Node without ''house'' role found"
-msgstr ""
+msgstr "Punkt uden ''house'' rolle fundet"
 
 msgid "Way without ''house'' or ''street'' role found"
-msgstr ""
+msgstr "Vej uden ''house'' eller ''street'' rolle fundet"
 
 msgid "Relation without ''house'' role found"
-msgstr ""
+msgstr "Relation uden ''house'' rolle fundet"
 
 msgid "Relation does not have name"
-msgstr ""
+msgstr "Relation har intet navn"
 
 msgid "Relation has streets with different names"
-msgstr ""
+msgstr "Relation har gader med forskellige navne"
 
 msgid "fix associatedStreet relation"
 msgstr ""
 
 msgid "Relation without ''subarea'' role found"
-msgstr ""
+msgstr "Relation uden ''subarea'' rolle fundet"
 
 msgid "Node without ''label'' or ''admin_centre'' role found"
-msgstr ""
+msgstr "Punkt uden ''label'' eller ''admin_centre'' rolle fundet"
 
 msgid "Way without ''inner'' or ''outer'' role found"
-msgstr ""
+msgstr "Vej uden ''inner'' eller ''outer'' rolle fundet"
+
+msgid "Node without ''stop'' or ''platform'' role found"
+msgstr "Punkt uden ''stop'' eller ''platform'' rolle fundet"
+
+msgid "Way platform without ''platform'' role found"
+msgstr "Vej platform uden ''platform'' rolle fundet"
 
 msgid "Revert changeset fully"
-msgstr ""
+msgstr "Tilbagefør rettesæt fuldstændigt"
 
 msgid "Revert selection only"
-msgstr ""
+msgstr "Tilbagefør kun valgte"
 
 msgid "Revert selection and restore deleted objects"
-msgstr ""
+msgstr "Tilbagefør valgte og genskab slettede objekter"
 
 msgid "Revert changeset"
-msgstr ""
+msgstr "Tilbagefør rettesæt"
 
 msgid "Revert"
 msgstr "Tilbagefør"
 
 msgid "Enter the ID of the changeset that should be reverted"
-msgstr ""
+msgstr "Indtast ID på rettesæt som bør tilbageføres"
 
 msgid "Reverted changeset"
-msgstr ""
+msgstr "Tilbageført rettesæt"
 
 msgid "It is not allowed to revert changeset from {0}"
-msgstr ""
+msgstr "Det er ikke tilladt at tilbageføre rettesæt fra {0}"
 
 msgid "Missing merge target for {0} with id {1}"
 msgstr ""
@@ -27734,23 +27929,23 @@ msgid "Objects history"
 msgstr "Objekts historik"
 
 msgid "History reverter"
-msgstr ""
+msgstr "Historie tilbagefører"
 
 msgid "Preparing history data..."
-msgstr ""
+msgstr "Forbereder historie data..."
 
 msgid "Remote Control has been asked to revert a changeset."
-msgstr ""
+msgstr "Fjernbetjening er blevet bedt om at tilbageføre et rettesæt."
 
 msgid "Reverting..."
-msgstr "Tilbageruller..."
+msgstr "Tilbagefører..."
 
 msgid ""
 "This changeset has objects that are not present in current dataset.\n"
 "It is needed to download them before reverting. Do you want to continue?"
 msgstr ""
 "Dette rettesæt har objekter som ikke findes i det eksisterende datasæt.\n"
-"Det er nødvendigt at downloade dem før tilbagerulning. Ønsker du at "
+"Det er nødvendigt at downloade dem før tilbageførelsen. Ønsker du at "
 "fortsætte?"
 
 msgid "Confirm"
@@ -27766,7 +27961,7 @@ msgid "See {0}"
 msgstr ""
 
 msgid "Revert changeset #{0}"
-msgstr ""
+msgstr "Tilbagefør rettesæt #{0}"
 
 msgid ""
 "Warning: unsupported start element ''{0}'' in changeset content at position "
@@ -27801,7 +27996,7 @@ msgid "Show a selection of the most useful signs"
 msgstr "Vis et udvalg af de mest brugte skilte"
 
 msgid "Spain"
-msgstr ""
+msgstr "Spanien"
 
 msgid "Germany"
 msgstr "Tyskland"
@@ -27888,7 +28083,7 @@ msgid "Fastest"
 msgstr "Hurtigste"
 
 msgid "Ignore oneways"
-msgstr ""
+msgstr "Ignorer ensrettet"
 
 msgid "Reverse route"
 msgstr "Vend ruten om"
@@ -27940,7 +28135,7 @@ msgid ""
 msgstr ""
 
 msgid "SDS data file"
-msgstr ""
+msgstr "SDS data fil"
 
 msgid "Load..."
 msgstr "Indlæs..."
@@ -27949,16 +28144,16 @@ msgid "Load separate data store data from a file."
 msgstr ""
 
 msgid "Loading files"
-msgstr ""
+msgstr "Henter filer"
 
 msgid "SDS"
-msgstr ""
+msgstr "SDS"
 
 msgid "Information about SDS."
-msgstr ""
+msgstr "Information om SDS."
 
 msgid "About SDS..."
-msgstr ""
+msgstr "Om SDS..."
 
 msgid "Open a preferences dialog for SDS."
 msgstr ""
@@ -28206,7 +28401,7 @@ msgstr ""
 msgid "create an associatedStreet relation"
 msgstr ""
 
-msgid "delete outline way"
+msgid "keep outline way"
 msgstr ""
 
 msgid "Street name: "
@@ -28294,7 +28489,7 @@ msgid "Tracer2."
 msgstr ""
 
 msgid "Change tag {0} to {1}"
-msgstr ""
+msgstr "Ret tag {0} til {1}"
 
 msgid ""
 "The Tracer2Server version isn''t compatible with this plugin. Please "
@@ -28311,7 +28506,7 @@ msgid "No set of parameter is active!"
 msgstr ""
 
 msgid "Select parameter"
-msgstr ""
+msgstr "Vælg parameter"
 
 msgid "Tracer2: add a way with {0} points"
 msgstr ""
@@ -28320,7 +28515,7 @@ msgid "Tracer2: modify way to {0} points"
 msgstr ""
 
 msgid "Tracer2 error"
-msgstr ""
+msgstr "Tracer2 fejl"
 
 msgid "Parameter for server request"
 msgstr ""
@@ -28329,10 +28524,10 @@ msgid "Tile size:"
 msgstr ""
 
 msgid "Resolution:"
-msgstr ""
+msgstr "Opløsning:"
 
 msgid "Mode:"
-msgstr ""
+msgstr "Tilstand:"
 
 msgid "Threshold:"
 msgstr ""
@@ -28341,7 +28536,7 @@ msgid "Points per circle:"
 msgstr ""
 
 msgid "Tag:"
-msgstr ""
+msgstr "Tag:"
 
 msgid "Preferred values:"
 msgstr ""
@@ -28362,7 +28557,7 @@ msgid "Modify list of parameter for server request."
 msgstr ""
 
 msgid "Parameter:"
-msgstr ""
+msgstr "Parameter:"
 
 msgid ""
 "Tracer2Server isn''t running. Please start the Server.\n"
@@ -28377,7 +28572,7 @@ msgid "Tracer2Server has detected an error."
 msgstr ""
 
 msgid "GPG"
-msgstr ""
+msgstr "GPG"
 
 msgid "Export sigs..."
 msgstr ""
@@ -28502,6 +28697,8 @@ msgid ""
 "Selected node was:\n"
 "{0}"
 msgstr ""
+"Valgt punkt var:\n"
+"{0}"
 
 msgid "Sorry, there are no Signatures for the selected Attribute."
 msgstr "Beklager, der er ikke nogen signaturer for den valgte attribut."
@@ -28679,7 +28876,7 @@ msgid "Add turn"
 msgstr "Tilføj sving"
 
 msgid "Delete lane."
-msgstr "Slet spor."
+msgstr "Slet sving."
 
 msgid "Delete turn."
 msgstr "Slet sving."
@@ -28933,7 +29130,7 @@ msgid "Bicycles"
 msgstr "Cykler"
 
 msgid "Mopeds"
-msgstr ""
+msgstr "Knallerter"
 
 msgid "Use standard exceptions"
 msgstr ""
@@ -29053,16 +29250,16 @@ msgid ""
 msgstr ""
 
 msgid "Delete ''from''"
-msgstr ""
+msgstr "Slet ''from''"
 
 msgid "Removes the member with role ''from''"
-msgstr ""
+msgstr "Fjern medlemmer med rolle ''from''"
 
 msgid "Delete ''to''"
 msgstr "Slet \"til\""
 
 msgid "Removes the member with role ''to''"
-msgstr ""
+msgstr "Fjern medlemmer med rolle ''to''"
 
 msgid "Fix in editor"
 msgstr "Ret i editor"
@@ -29117,10 +29314,10 @@ msgid "Add in editor"
 msgstr "Tilføj i editor"
 
 msgid "Add a way with role ''from''"
-msgstr ""
+msgstr "Tilføj en vej med rolle ''from''"
 
 msgid "Add a way with role ''to''"
-msgstr ""
+msgstr "Tilføj en vej med rolle ''to''"
 
 msgid ""
 "The two ways participating in the turn restriction <strong>aren''t "
@@ -29248,10 +29445,10 @@ msgid "Please select one or more ways with intersections of segments."
 msgstr ""
 
 msgid "Align Way Nodes"
-msgstr ""
+msgstr "Tilpas vejpunkter"
 
 msgid "Align nodes in a way"
-msgstr ""
+msgstr "Tilpas punkter i en vej"
 
 msgid "The way with selected nodes can not be straightened."
 msgstr ""
@@ -29306,10 +29503,10 @@ msgid "The selected nodes can not be consecutive nodes in the object."
 msgstr ""
 
 msgid "Split adjacent ways"
-msgstr ""
+msgstr "Opdel tilstødende veje"
 
 msgid "Split adjacent ways on T-intersections"
-msgstr ""
+msgstr "Opdel tilstødende veje ved T-kryds"
 
 msgid ""
 "There are several ways containing one of the splitting nodes. Select ways "
@@ -29325,16 +29522,16 @@ msgid ""
 msgstr ""
 
 msgid "Copy tags from previous selection"
-msgstr ""
+msgstr "Kopier tags fra forrige valg"
 
 msgid "Pastes tags of previously selected object(s)"
-msgstr ""
+msgstr "Indsæt tags fra forrige valgt objekt(er)"
 
 msgid "Add Source Tag"
 msgstr "Tilføj kilde tag"
 
 msgid "Add remembered source tag"
-msgstr ""
+msgstr "Tilføj husket kilde tag"
 
 msgid "UnGlue Relation"
 msgstr "Adskil relation"
@@ -29350,13 +29547,13 @@ msgid "Unglued Relations"
 msgstr "Adskilte relationer"
 
 msgid "Change relation member for {0} {1}"
-msgstr ""
+msgstr "Ret relationsmedlem for {0} {1}"
 
 msgid "Circle arc"
-msgstr ""
+msgstr "Cirkelbue"
 
 msgid "Create a circle arc"
-msgstr ""
+msgstr "Opret en cirkelbue"
 
 msgid "Select custom URL"
 msgstr ""
@@ -29365,7 +29562,7 @@ msgid "Please select one of custom URLs (configured in Preferences)"
 msgstr ""
 
 msgid "Ask every time"
-msgstr ""
+msgstr "Spørg hver gang"
 
 msgid "Configure custom URL"
 msgstr ""
@@ -29444,10 +29641,10 @@ msgid "Sync with JOSM selection"
 msgstr ""
 
 msgid "Zoom to objects"
-msgstr ""
+msgstr "Zoom til objekter"
 
 msgid "Remove tag"
-msgstr ""
+msgstr "Fjern tag"
 
 msgid "Delete tags from multiple objects"
 msgstr ""
@@ -29524,16 +29721,16 @@ msgid "Range of attached ways count"
 msgstr ""
 
 msgid "Adjacent nodes"
-msgstr ""
+msgstr "Tilstødende punkter"
 
 msgid "Select adjacent nodes"
-msgstr ""
+msgstr "Vælg tilstødende punkter"
 
 msgid "Adjacent ways"
-msgstr ""
+msgstr "Tilstødende veje"
 
 msgid "Adjacent ways will be selected. Nodes will be deselected."
-msgstr ""
+msgstr "Tilstødende veje vil blive valgt. Punkter vil blive fravalgt."
 
 msgid "All connected ways"
 msgstr "Alle forbundne veje"
@@ -29563,7 +29760,7 @@ msgid "Middle nodes"
 msgstr "Midterpunkter"
 
 msgid "Select middle nodes"
-msgstr "Vælgt midterpunkter"
+msgstr "Vælg midterpunkter"
 
 msgid "Please select two nodes connected by way!"
 msgstr ""
@@ -29621,7 +29818,7 @@ msgid "Reselect last added object or selection form history"
 msgstr "Genmarkerer sidste tilføjede objekt eller markering fra historikken"
 
 msgid "Unselect nodes"
-msgstr ""
+msgstr "Fravælg punkter"
 
 msgid "Removes all nodes from selection"
 msgstr "Fjern alle punkter fra markeringen"
@@ -29672,7 +29869,7 @@ msgid "slower playback"
 msgstr "langsommere afspilning"
 
 msgid "Jump To"
-msgstr "Sprin til"
+msgstr "Spring til"
 
 msgid "jumps to the entered gps time"
 msgstr "springer til den angivne gps-tid"
diff --git a/i18n/po/de.po b/i18n/po/de.po
index d01391b..d56ffe3 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: 2014-12-10 03:42+0100\n"
-"PO-Revision-Date: 2014-12-09 17:32+0000\n"
-"Last-Translator: Klumbumbus <Unknown>\n"
+"POT-Creation-Date: 2014-12-29 01:14+0100\n"
+"PO-Revision-Date: 2014-12-28 14:30+0000\n"
+"Last-Translator: holgermappt <Unknown>\n"
 "Language-Team: JOSM\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2014-12-10 04:48+0000\n"
-"X-Generator: Launchpad (build 17283)\n"
+"X-Launchpad-Export-Date: 2014-12-29 04:53+0000\n"
+"X-Generator: Launchpad (build 17286)\n"
 "Language: de\n"
 "X-Poedit-SearchPath-0: .\n"
 "X-Poedit-Basepath: /home/simon/src/josm.all/i18n\n"
@@ -1475,7 +1475,7 @@ msgid "Toggles the global setting ''{0}''."
 msgstr "Globale Einstellung \"{0}\" umschalten."
 
 msgid "Encourage/discourage upload"
-msgstr "Hochladen vorantreiben/verhindern"
+msgstr "Hochladen erlauben/verhindern"
 
 msgid "UnGlue Ways"
 msgstr "Linien trennen"
@@ -4150,6 +4150,9 @@ msgstr "Internetschlagwörter"
 msgid "Checks for errors in internet-related tags."
 msgstr "Prüft auf Fehler in Internet-bezogenen Tags."
 
+msgid " URL cannot be converted to ASCII: {0}"
+msgstr " URL kann nicht in ASCII umgewandelt werden: {0}"
+
 msgid "''{0}'': {1}"
 msgstr "''{0}'': {1}"
 
@@ -4369,20 +4372,24 @@ msgstr "Relationstyp unbekannt"
 msgid "Relation is empty"
 msgstr "Relation ist leer"
 
-msgid "<empty>"
-msgstr "<leer>"
+msgid "Role member does not match expression {0} in template {1}"
+msgstr ""
+"Rollenmitglied stimmt nicht mit dem Ausdruck {0} in Vorlage {1} überein"
 
-msgid "Role {0} unknown"
-msgstr "Rolle {0} unbekannt"
+msgid ""
+"Role member type {0} does not match accepted list of {1} in template {2}"
+msgstr ""
+"Rollen Elementtyp {0} stimmt nicht mit der akzeptierten Liste von {1} in "
+"Template {2} überein"
 
-msgid "Empty role found"
-msgstr "Leere Rolle gefunden"
+msgid "<empty>"
+msgstr "<leer>"
 
-msgid "Member for role ''{0}'' does not match ''{1}''"
-msgstr "Element für Rolle ''{0}'' entspricht nicht ''{1}''"
+msgid "Role {0} unknown in templates {1}"
+msgstr "Rolle {0} in Vorlagen {1} unbekannt"
 
-msgid "Member for role {0} of wrong type"
-msgstr "Element für Rolle {0} hat falschen Typ"
+msgid "Empty role type found when expecting one of {0}"
+msgstr "Leerer Rollentyp gefunden, erwartet wird einer von {0}"
 
 msgid "Role {0} missing"
 msgstr "Rolle {0} fehlt"
@@ -4934,11 +4941,40 @@ msgstr "Zugriff zu folgende/n Ressource/n verweigern (kommagetrennt)"
 msgid "options provided as Java system properties"
 msgstr "Optionen über die Java-Systemeinstellungen"
 
-msgid "/PATH/TO/JOSM/FOLDER/         "
-msgstr "/PFAD/ZU/JOSM/ORDNER/         "
+msgid "/PATH/TO/JOSM/PREF    "
+msgstr "/PFAD/ZU/JOSM/EINST.    "
+
+msgid "Set the preferences directory"
+msgstr "Legen Sie das Einstellungsverzeichnis fest"
+
+msgid "/PATH/TO/JOSM/USERDATA"
+msgstr "/PFAD/ZU/JOSM/BENUTZERDATEN"
+
+msgid "Set the user data directory"
+msgstr "Legen Sie das Benutzerdatenverzeichnis fest"
+
+msgid "/PATH/TO/JOSM/CACHE   "
+msgstr "/PFAD/ZUM/JOSM/CACHE   "
+
+msgid "Set the cache directory"
+msgstr "Legen Sie das Cache-Verzeichnis fest"
 
-msgid "Change the folder for all user settings"
-msgstr "Verzeichnis für alle Benutzereinstellungen ändern"
+msgid "/PATH/TO/JOSM/HOMEDIR "
+msgstr "/PFAD/ZU/JOSM/HOME-VERZEICHNIS "
+
+msgid ""
+"Relocate all 3 directories to homedir. Cache directory will be in "
+"homedir/cache"
+msgstr ""
+"Verschiebe alle 3 Verzeichnisse in das home-Verzeichnis. Das "
+"Zwischenspeicherverzeichnis ist dann home-Verzeichnis/cache"
+
+msgid ""
+"-Djosm.home has lower precedence, i.e. the specific setting overrides the "
+"general one"
+msgstr ""
+"-Djosm.home hat niedrigere Priorität, d.h. die spezifische Einstellung hat "
+"Vorrang vor der allgemeinen"
 
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -5216,6 +5252,21 @@ msgstr "Ebene nicht in der Liste."
 msgid "Layer ''{0}'' must be in list of layers"
 msgstr "Ebene ''{0}'' muss in der Liste der Ebenen sein"
 
+msgid "Default (open, closed, new)"
+msgstr "Standard (offen, geschlossen, neu)"
+
+msgid "Username"
+msgstr "Benutzername"
+
+msgid "Created date"
+msgstr "Erstellungsdatum"
+
+msgid "Last change date"
+msgstr "Letztes Erstellungsdatum"
+
+msgid "Select note sorting method"
+msgstr "Anmerkungssortierverfahren auswählen"
+
 msgid "Click to cancel the current operation"
 msgstr "Klicken Sie, um die aktuelle Aufgabe abzubrechen"
 
@@ -6698,6 +6749,12 @@ msgstr "Erneut öffnen"
 msgid "Reopen note with message:"
 msgstr "Hinweis mit Nachricht erneut öffnen:"
 
+msgid "Sort notes"
+msgstr "Anmerkungen sortieren"
+
+msgid "Sort"
+msgstr "Sortieren"
+
 msgid "Object type:"
 msgstr "Objekttyp:"
 
@@ -7789,9 +7846,6 @@ msgstr "Wählen Sie Objekte für die ausgewählten Relationsmitglieder"
 msgid "Sort the relation members"
 msgstr "Relationselemente sortieren"
 
-msgid "Sort"
-msgstr "Sortieren"
-
 msgid "Relation Editor: Sort"
 msgstr "Relationseditor: Sortieren"
 
@@ -8121,7 +8175,7 @@ msgid "Select to download GPS traces in the selected download area."
 msgstr "Auswählen, um GPS-Spuren im ausgewählten Ladebereich zu laden."
 
 msgid "Notes"
-msgstr "Scheine"
+msgstr "Anmerkungen"
 
 msgid "Select to download notes in the selected download area."
 msgstr ""
@@ -8688,9 +8742,6 @@ msgstr "Geben Sie Ihre Anmeldeinformationen für den Server ein"
 msgid "Enter credentials for HTTP proxy"
 msgstr "Geben Sie Ihre Anmeldeinformationen für den HTTP-Proxy ein"
 
-msgid "Username"
-msgstr "Benutzername"
-
 msgid "Password"
 msgstr "Passwort"
 
@@ -9496,6 +9547,9 @@ msgstr ""
 msgid "Save Layer"
 msgstr "Ebene speichern"
 
+msgid "Note"
+msgstr "Kommentar"
+
 msgid "Notes layer"
 msgstr "Anmerkungsebene"
 
@@ -9970,6 +10024,9 @@ msgstr "Photo aus Ebene entfernen"
 msgid "Delete File from disk"
 msgstr "Dateien von Platte löschen"
 
+msgid "Copy image path"
+msgstr "Bildpfad kopieren"
+
 msgid "Next"
 msgstr "Nächstes"
 
@@ -13820,6 +13877,9 @@ msgstr "Fehlendes erforderliches Attribut \"{0}\"."
 msgid "Illegal long value for attribute ''{0}''. Got ''{1}''."
 msgstr "Ungültiger langer Wert \"{1}\" für das Attribut ''{0}''."
 
+msgid "{0} bytes have been read"
+msgstr "{0} Bytes wurden gelesen"
+
 msgid "Prepare OSM data..."
 msgstr "OSM-Daten werden vorbereitet...."
 
@@ -14010,9 +14070,8 @@ msgid "Cannot start remotecontrol server on port {0}: {1}"
 msgstr ""
 "Der Fernsteuerungsserver auf Port {0} konnte nicht gestartet werden: {1}"
 
-msgid "RemoteControl::Accepting connections on port {0}"
-msgstr ""
-"RemoteControl::Eingehende Verbindungen auf Port {0} werden akzeptiert"
+msgid "RemoteControl::Accepting connections on {0}:{1}"
+msgstr "RemoteControl::Eingehende Verbindungen auf {0}:{1} werden akzeptiert"
 
 msgid "RemoteControl::Server stopped."
 msgstr "RemoteControl::Server angehalten."
@@ -14024,8 +14083,9 @@ msgstr ""
 msgid "Unable to initialize Remote Control HTTPS Server"
 msgstr "Fernsteuerungs HTTPS Server konnte nicht intialisiert werden"
 
-msgid "RemoteControl::Accepting secure connections on port {0}"
-msgstr "Fernsteuerung: Erwarte sichere Verbindungen auf Port {0}"
+msgid "RemoteControl::Accepting secure connections on {0}:{1}"
+msgstr ""
+"RemoteControl::Eingehende sichere Verbindungen auf {0}:{1} werden akzeptiert"
 
 msgid "RemoteControl::Server (https) stopped."
 msgstr "Fernsteuerung: Server (HTTPS) gestoppt."
@@ -15240,9 +15300,6 @@ msgstr ""
 "werden, da diese keine JOSM-Objekte und keinen passenden Text enthält. "
 "</p></html>"
 
-msgid "Invalid bz2 file."
-msgstr "Ungültige bz2-Datei."
-
 msgid "ms"
 msgstr "ms"
 
@@ -16626,6 +16683,10 @@ msgstr "Tennis"
 msgid "Coins"
 msgstr "Münzen"
 
+msgctxt "payment"
+msgid "Notes"
+msgstr "Geldscheine"
+
 msgid "Electronic purses and Charge cards"
 msgstr "Geld- oder Prepaidkarten"
 
@@ -17462,6 +17523,9 @@ msgstr "Mit Fahrrad"
 msgid "Cross on horseback"
 msgstr "Zu Pferd"
 
+msgid "Optional values for specific countries"
+msgstr "Optionale Werte für bestimmte Länder"
+
 msgid "Stop"
 msgstr "Stopp-Schild"
 
@@ -17519,6 +17583,20 @@ msgstr "Zweiter Name"
 msgid "Speed Camera"
 msgstr "Geschwindigkeitsüberwachung"
 
+msgid "Traffic Mirror"
+msgstr "Verkehrsspiegel"
+
+msgctxt "junction=yes"
+msgid "Named Junction"
+msgstr "Benannter Straßenknotenpunkt"
+
+msgid ""
+"Used in some countries for a named road junction who’s name serves for local "
+"orientation."
+msgstr ""
+"Wird in einigen Ländern für Straßenknotenpunkte verwendet, die einen Namen "
+"haben, der der Orientierung im Nahbereich dient."
+
 msgid "Elevator"
 msgstr "Aufzug"
 
@@ -18973,6 +19051,9 @@ msgstr "Picknickplatz"
 msgid "Fireplace"
 msgstr "Feuerstelle"
 
+msgid "Picnic Table"
+msgstr "Picknicktisch"
+
 msgid "Public Grill"
 msgstr "Grillplatz"
 
@@ -19578,6 +19659,12 @@ msgstr "Saugwirkung"
 msgid "Count"
 msgstr "Anzahl"
 
+msgid "Advertising Column"
+msgstr "Litfaßsäule"
+
+msgid "Billboard"
+msgstr "Plakatwand"
+
 msgid "Sports"
 msgstr "Sport"
 
@@ -21450,9 +21537,6 @@ msgstr "Spielzeug"
 msgid "vouchers"
 msgstr "Karten/Belege"
 
-msgid "Note"
-msgstr "Kommentar"
-
 msgid "Geography"
 msgstr "Geografie"
 
@@ -21853,9 +21937,6 @@ msgstr "Übliche Namensabkürzung"
 msgid "House number"
 msgstr "Hausnummer"
 
-msgid "House name"
-msgstr "Hausname (v.a. UK)"
-
 msgid "Street name"
 msgstr "Straße"
 
@@ -21868,8 +21949,8 @@ msgstr "Ort"
 msgid "Country code"
 msgstr "Ländercode"
 
-msgid "Optional values for specific countries"
-msgstr "Optionale Werte für bestimmte Länder"
+msgid "House name"
+msgstr "Hausname (v.a. UK)"
 
 msgid "Subdistrict"
 msgstr "Unterbezirk"
@@ -22540,6 +22621,13 @@ msgstr "VoGIS: DGM (Geländemodell)"
 msgid "VoGIS: DOM (Surface model)"
 msgstr "VoGIS: DOM (Oberflächenmodell)"
 
+msgid ""
+"AGIV(laanderen) aerial imagery (covers Brussels region as well) (2013)"
+msgstr ""
+
+msgid "Geoservices Wallonie aerial imagery (2009)"
+msgstr ""
+
 msgid "IBGE Mapa de Setores Urbanos"
 msgstr "IBGE Mapa de Setores Urbanos"
 
@@ -22589,13 +22677,13 @@ msgid "Estonia Ortho (Maaamet)"
 msgstr "Estland Orthofoto (Maaamet)"
 
 msgid "Estonia Hillshade (Maaamet)"
-msgstr ""
+msgstr "Estland Schummerung (Maaamet)"
 
 msgid "Estonia Cadastre (Maaamet)"
-msgstr ""
+msgstr "Estland Kataster (Maaamet)"
 
 msgid "Estonia Forestry (Maaamet)"
-msgstr ""
+msgstr "Estland Forstwirtschaft (Maaamet)"
 
 msgid "Bordeaux - 2012"
 msgstr "Bordeaux - 2012"
@@ -22676,6 +22764,9 @@ msgstr "OpenStreetMap (Sorbische Sprache)"
 msgid "Hamburg (40 cm)"
 msgstr "Hamburg (40 cm)"
 
+msgid "Hamburg (20 cm)"
+msgstr ""
+
 msgid "Hamburg (DK5)"
 msgstr "Hamburg (DK5)"
 
@@ -22923,6 +23014,9 @@ msgstr "GRAFCAN Express - Kanarische Inseln"
 msgid "Kanton Aargau 25cm (AGIS 2011)"
 msgstr "Kanton Aargau 25cm (AGIS 2011)"
 
+msgid "Kanton Aargau 25cm (AGIS 2014)"
+msgstr "Kanton Aargau 25cm (AGIS 2014)"
+
 msgid "Stadt Uster Orthophoto 2008 10cm"
 msgstr "Stadt Uster Orthophoto 2008 10cm"
 
@@ -23280,6 +23374,9 @@ msgstr "{0} ohne {1} oder {2}"
 msgid "{0} without {1}, {2} or {3}"
 msgstr "{0} ohne {1}, {2} oder {3}"
 
+msgid "{0} together with {1}"
+msgstr "{0} zusammen mit {1}"
+
 msgid "{0} on suspicious object"
 msgstr "{0} auf einem verdächtigen Objekt"
 
@@ -23298,6 +23395,12 @@ msgstr "Sport ohne physische Merkmale"
 msgid "{0} should be on the node where {1} and {2} intersect"
 msgstr "{0} sollte auf einem Knoten 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 "{0}={1} is deprecated"
 msgstr "{0}={1} ist veraltet"
 
@@ -23344,6 +23447,9 @@ msgstr ""
 msgid "{0} should be replaced with {1}"
 msgstr "{0} sollte mit {1} ersetzt werden"
 
+msgid "{0} = {1}; remove {0}"
+msgstr "{0} = {1}; entferne {0}"
+
 msgid ""
 "{0}={1} is unspecific. Please replace ''{1}'' by ''left'', ''right'' or "
 "''both''."
@@ -23384,6 +23490,9 @@ 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} müssen mit einem Weg verbunden sein"
+
 msgid "abbreviated street name"
 msgstr "Abgekürzter Straßenname"
 
@@ -23405,9 +23514,19 @@ msgstr "Temporärer Straßentyp"
 msgid "street name contains ss"
 msgstr "Straßenname enthält ss"
 
+msgid ""
+"Value of ''{0}'' should either be ''{1}'' or ''{2}''. For sidewalks use "
+"''{3}'' instead."
+msgstr ""
+"Der Wert von ''{0}'' sollte entweder ''{1}'' oder ''{2}'' sein. Für Fußwege "
+"nutze stattdessen ''{3}''."
+
 msgid "{0} with multiple values"
 msgstr "{0} mit mehreren Werten"
 
+msgid "empty value in semicolon-separated ''{0}''"
+msgstr "Leerer Wert in Semikolon-getrenntem ''{0}''"
+
 msgid "numerical key"
 msgstr "Numerischer Schlüssel"
 
@@ -23447,6 +23566,9 @@ msgstr "Ungewöhnliche Steigung; Bitte Angaben in Prozent/Grad oder up/down"
 msgid "{0} must be a numeric value"
 msgstr "{0} muss eine Zahl sein"
 
+msgid "{0} must be a positive integer number"
+msgstr "{0} muss eine positive Ganzzahl sein"
+
 msgid "relation without type"
 msgstr "Relation ohne Typ"
 
@@ -24794,6 +24916,13 @@ msgstr "Knotenpunkte mit Nachbarn zusammenführen"
 msgid "merge nodes"
 msgstr "Knotenpunkte zusammenführen"
 
+msgid "How often thinning operation should be applied (Default {0})."
+msgstr ""
+"Wie oft die Ausdünnungs-Operation angewendet werden soll (Standard ist {0})."
+
+msgid "Thinning Iterations"
+msgstr "Ausdünnungs-Iterationen"
+
 msgid "Street Name:"
 msgstr "Straße:"
 
@@ -28067,10 +28196,12 @@ msgstr "Fotos ausrichten"
 msgid "Move and position photos"
 msgstr "Fotos verschieben und positionieren"
 
-msgid "Click+drag photo or shift+click to position photo."
+msgid ""
+"Click+drag photo, shift+click to position photo, control+click to set "
+"direction."
 msgstr ""
-"Fotos mit gedrückter Maustaste verschieben oder mit Shift+Mausklick "
-"positionieren."
+"Fotos mit gedrückter Maustaste verschieben, mit Shift+Mausklick "
+"positionieren oder Aufnahmerichtung mit Steuerung+Mausklick setzen."
 
 msgid "Please load some photos."
 msgstr "Bitte einige Fotos laden."
@@ -28745,6 +28876,9 @@ msgstr "Rekonstruktion von Polygonen kann nur mit Außenlinien geschehen"
 msgid "Reconstruct polygons from relation {0}"
 msgstr "Polygone aus Relation {0} rekonstruieren"
 
+msgid "Reconstruct route"
+msgstr "Route rekonstruieren"
+
 msgid "Open relation wiki page"
 msgstr "Wikiseite zu Relationen öffnen"
 
@@ -28784,6 +28918,12 @@ msgstr "Punkt ohne Rolle ''label'' oder ''admin_centre'' gefunden"
 msgid "Way without ''inner'' or ''outer'' role found"
 msgstr "Linie ohne Rolle ''inner'' oder ''outer'' gefunden"
 
+msgid "Node without ''stop'' or ''platform'' role found"
+msgstr "Knoten ohne ''stop'' oder ''platform''-Rolle gefunden"
+
+msgid "Way platform without ''platform'' role found"
+msgstr "Plattform-Linie ohne Rolle ''platform'' gefunden"
+
 msgid "Revert changeset fully"
 msgstr "Änderungssatz vollständig umkehren"
 
@@ -29317,8 +29457,8 @@ msgstr "Zu Straßenzugehörigkeitsrelation hinzufügen"
 msgid "create an associatedStreet relation"
 msgstr "Eine Straßenzugehörigkeitsrelation erzeugen"
 
-msgid "delete outline way"
-msgstr "Umringslinie löschen"
+msgid "keep outline way"
+msgstr "Umrisslinie behalten"
 
 msgid "Street name: "
 msgstr "Straßenname: "
diff --git a/i18n/po/de_DE.po b/i18n/po/de_DE.po
index c0a97b2..19a142f 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: 2014-12-10 03:42+0100\n"
+"POT-Creation-Date: 2014-12-29 01:14+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: 2014-12-10 05:22+0000\n"
-"X-Generator: Launchpad (build 17283)\n"
+"X-Launchpad-Export-Date: 2014-12-29 05:39+0000\n"
+"X-Generator: Launchpad (build 17286)\n"
 "Language: \n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -3733,6 +3733,9 @@ msgstr ""
 msgid "Checks for errors in internet-related tags."
 msgstr ""
 
+msgid " URL cannot be converted to ASCII: {0}"
+msgstr ""
+
 msgid "''{0}'': {1}"
 msgstr ""
 
@@ -3939,19 +3942,20 @@ msgstr ""
 msgid "Relation is empty"
 msgstr ""
 
-msgid "<empty>"
+msgid "Role member does not match expression {0} in template {1}"
 msgstr ""
 
-msgid "Role {0} unknown"
+msgid ""
+"Role member type {0} does not match accepted list of {1} in template {2}"
 msgstr ""
 
-msgid "Empty role found"
+msgid "<empty>"
 msgstr ""
 
-msgid "Member for role ''{0}'' does not match ''{1}''"
+msgid "Role {0} unknown in templates {1}"
 msgstr ""
 
-msgid "Member for role {0} of wrong type"
+msgid "Empty role type found when expecting one of {0}"
 msgstr ""
 
 msgid "Role {0} missing"
@@ -4487,10 +4491,35 @@ msgstr ""
 msgid "options provided as Java system properties"
 msgstr ""
 
-msgid "/PATH/TO/JOSM/FOLDER/         "
+msgid "/PATH/TO/JOSM/PREF    "
+msgstr ""
+
+msgid "Set the preferences directory"
+msgstr ""
+
+msgid "/PATH/TO/JOSM/USERDATA"
+msgstr ""
+
+msgid "Set the user data directory"
+msgstr ""
+
+msgid "/PATH/TO/JOSM/CACHE   "
+msgstr ""
+
+msgid "Set the cache directory"
 msgstr ""
 
-msgid "Change the folder for all user settings"
+msgid "/PATH/TO/JOSM/HOMEDIR "
+msgstr ""
+
+msgid ""
+"Relocate all 3 directories to homedir. Cache directory will be in "
+"homedir/cache"
+msgstr ""
+
+msgid ""
+"-Djosm.home has lower precedence, i.e. the specific setting overrides the "
+"general one"
 msgstr ""
 
 msgid ""
@@ -4745,6 +4774,21 @@ msgstr ""
 msgid "Layer ''{0}'' must be in list of layers"
 msgstr ""
 
+msgid "Default (open, closed, new)"
+msgstr ""
+
+msgid "Username"
+msgstr ""
+
+msgid "Created date"
+msgstr ""
+
+msgid "Last change date"
+msgstr ""
+
+msgid "Select note sorting method"
+msgstr ""
+
 msgid "Click to cancel the current operation"
 msgstr ""
 
@@ -6085,6 +6129,12 @@ msgstr ""
 msgid "Reopen note with message:"
 msgstr ""
 
+msgid "Sort notes"
+msgstr ""
+
+msgid "Sort"
+msgstr ""
+
 msgid "Object type:"
 msgstr "Objekttyp:"
 
@@ -7067,9 +7117,6 @@ msgstr ""
 msgid "Sort the relation members"
 msgstr ""
 
-msgid "Sort"
-msgstr ""
-
 msgid "Relation Editor: Sort"
 msgstr ""
 
@@ -7851,9 +7898,6 @@ msgstr ""
 msgid "Enter credentials for HTTP proxy"
 msgstr ""
 
-msgid "Username"
-msgstr ""
-
 msgid "Password"
 msgstr ""
 
@@ -8533,6 +8577,9 @@ msgstr ""
 msgid "Save Layer"
 msgstr ""
 
+msgid "Note"
+msgstr ""
+
 msgid "Notes layer"
 msgstr ""
 
@@ -8979,6 +9026,9 @@ msgstr ""
 msgid "Delete File from disk"
 msgstr ""
 
+msgid "Copy image path"
+msgstr ""
+
 msgid "Next"
 msgstr ""
 
@@ -12359,6 +12409,9 @@ msgstr ""
 msgid "Illegal long value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
+msgid "{0} bytes have been read"
+msgstr ""
+
 msgid "Prepare OSM data..."
 msgstr ""
 
@@ -12539,7 +12592,7 @@ msgstr ""
 msgid "Cannot start remotecontrol server on port {0}: {1}"
 msgstr ""
 
-msgid "RemoteControl::Accepting connections on port {0}"
+msgid "RemoteControl::Accepting connections on {0}:{1}"
 msgstr ""
 
 msgid "RemoteControl::Server stopped."
@@ -12551,7 +12604,7 @@ msgstr ""
 msgid "Unable to initialize Remote Control HTTPS Server"
 msgstr ""
 
-msgid "RemoteControl::Accepting secure connections on port {0}"
+msgid "RemoteControl::Accepting secure connections on {0}:{1}"
 msgstr ""
 
 msgid "RemoteControl::Server (https) stopped."
@@ -13511,9 +13564,6 @@ msgid ""
 "contain any JOSM object or suitable text. </p></html>"
 msgstr ""
 
-msgid "Invalid bz2 file."
-msgstr ""
-
 msgid "ms"
 msgstr ""
 
@@ -14752,6 +14802,10 @@ msgstr ""
 msgid "Coins"
 msgstr ""
 
+msgctxt "payment"
+msgid "Notes"
+msgstr ""
+
 msgid "Electronic purses and Charge cards"
 msgstr ""
 
@@ -15574,6 +15628,9 @@ msgstr ""
 msgid "Cross on horseback"
 msgstr ""
 
+msgid "Optional values for specific countries"
+msgstr ""
+
 msgid "Stop"
 msgstr ""
 
@@ -15631,6 +15688,18 @@ msgstr ""
 msgid "Speed Camera"
 msgstr ""
 
+msgid "Traffic Mirror"
+msgstr ""
+
+msgctxt "junction=yes"
+msgid "Named Junction"
+msgstr ""
+
+msgid ""
+"Used in some countries for a named road junction who’s name serves for local "
+"orientation."
+msgstr ""
+
 msgid "Elevator"
 msgstr ""
 
@@ -17075,6 +17144,9 @@ msgstr ""
 msgid "Fireplace"
 msgstr ""
 
+msgid "Picnic Table"
+msgstr ""
+
 msgid "Public Grill"
 msgstr ""
 
@@ -17680,6 +17752,12 @@ msgstr ""
 msgid "Count"
 msgstr ""
 
+msgid "Advertising Column"
+msgstr ""
+
+msgid "Billboard"
+msgstr ""
+
 msgid "Sports"
 msgstr ""
 
@@ -19550,9 +19628,6 @@ msgstr ""
 msgid "vouchers"
 msgstr ""
 
-msgid "Note"
-msgstr ""
-
 msgid "Geography"
 msgstr ""
 
@@ -19936,9 +20011,6 @@ msgstr ""
 msgid "House number"
 msgstr ""
 
-msgid "House name"
-msgstr ""
-
 msgid "Street name"
 msgstr ""
 
@@ -19951,7 +20023,7 @@ msgstr ""
 msgid "Country code"
 msgstr "Ländercode"
 
-msgid "Optional values for specific countries"
+msgid "House name"
 msgstr ""
 
 msgid "Subdistrict"
@@ -20623,6 +20695,13 @@ msgstr ""
 msgid "VoGIS: DOM (Surface model)"
 msgstr ""
 
+msgid ""
+"AGIV(laanderen) aerial imagery (covers Brussels region as well) (2013)"
+msgstr ""
+
+msgid "Geoservices Wallonie aerial imagery (2009)"
+msgstr ""
+
 msgid "IBGE Mapa de Setores Urbanos"
 msgstr ""
 
@@ -20757,6 +20836,9 @@ msgstr ""
 msgid "Hamburg (40 cm)"
 msgstr ""
 
+msgid "Hamburg (20 cm)"
+msgstr ""
+
 msgid "Hamburg (DK5)"
 msgstr ""
 
@@ -21002,6 +21084,9 @@ msgstr ""
 msgid "Kanton Aargau 25cm (AGIS 2011)"
 msgstr ""
 
+msgid "Kanton Aargau 25cm (AGIS 2014)"
+msgstr ""
+
 msgid "Stadt Uster Orthophoto 2008 10cm"
 msgstr ""
 
@@ -21359,6 +21444,9 @@ msgstr ""
 msgid "{0} without {1}, {2} or {3}"
 msgstr ""
 
+msgid "{0} together with {1}"
+msgstr ""
+
 msgid "{0} on suspicious object"
 msgstr ""
 
@@ -21377,6 +21465,12 @@ 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 "{0}={1} is deprecated"
 msgstr ""
 
@@ -21413,6 +21507,9 @@ msgstr ""
 msgid "{0} should be replaced with {1}"
 msgstr ""
 
+msgid "{0} = {1}; remove {0}"
+msgstr ""
+
 msgid ""
 "{0}={1} is unspecific. Please replace ''{1}'' by ''left'', ''right'' or "
 "''both''."
@@ -21451,6 +21548,9 @@ msgstr ""
 msgid "Overlapping Identical Landuses"
 msgstr ""
 
+msgid "{0} must be connected to a way"
+msgstr ""
+
 msgid "abbreviated street name"
 msgstr ""
 
@@ -21472,9 +21572,17 @@ msgstr ""
 msgid "street name contains ss"
 msgstr ""
 
+msgid ""
+"Value of ''{0}'' should either be ''{1}'' or ''{2}''. For sidewalks use "
+"''{3}'' instead."
+msgstr ""
+
 msgid "{0} with multiple values"
 msgstr ""
 
+msgid "empty value in semicolon-separated ''{0}''"
+msgstr ""
+
 msgid "numerical key"
 msgstr ""
 
@@ -21509,6 +21617,9 @@ msgstr ""
 msgid "{0} must be a numeric value"
 msgstr ""
 
+msgid "{0} must be a positive integer number"
+msgstr ""
+
 msgid "relation without type"
 msgstr ""
 
@@ -22703,6 +22814,12 @@ msgstr ""
 msgid "merge nodes"
 msgstr ""
 
+msgid "How often thinning operation should be applied (Default {0})."
+msgstr ""
+
+msgid "Thinning Iterations"
+msgstr ""
+
 msgid "Street Name:"
 msgstr ""
 
@@ -25724,7 +25841,9 @@ msgstr ""
 msgid "Move and position photos"
 msgstr ""
 
-msgid "Click+drag photo or shift+click to position photo."
+msgid ""
+"Click+drag photo, shift+click to position photo, control+click to set "
+"direction."
 msgstr ""
 
 msgid "Please load some photos."
@@ -26385,6 +26504,9 @@ msgstr ""
 msgid "Reconstruct polygons from relation {0}"
 msgstr ""
 
+msgid "Reconstruct route"
+msgstr ""
+
 msgid "Open relation wiki page"
 msgstr ""
 
@@ -26424,6 +26546,12 @@ msgstr ""
 msgid "Way without ''inner'' or ''outer'' role found"
 msgstr ""
 
+msgid "Node without ''stop'' or ''platform'' role found"
+msgstr ""
+
+msgid "Way platform without ''platform'' role found"
+msgstr ""
+
 msgid "Revert changeset fully"
 msgstr ""
 
@@ -26914,7 +27042,7 @@ msgstr ""
 msgid "create an associatedStreet relation"
 msgstr ""
 
-msgid "delete outline way"
+msgid "keep outline way"
 msgstr ""
 
 msgid "Street name: "
diff --git a/i18n/po/el.po b/i18n/po/el.po
index 54d19b0..5e9d1ea 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: 2014-12-10 03:42+0100\n"
+"POT-Creation-Date: 2014-12-29 01:14+0100\n"
 "PO-Revision-Date: 2014-10-28 23:48+0000\n"
 "Last-Translator: aitolos <Unknown>\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: 2014-12-10 04:49+0000\n"
-"X-Generator: Launchpad (build 17283)\n"
+"X-Launchpad-Export-Date: 2014-12-29 04:55+0000\n"
+"X-Generator: Launchpad (build 17286)\n"
 "Language: el\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -3918,6 +3918,9 @@ msgstr ""
 msgid "Checks for errors in internet-related tags."
 msgstr ""
 
+msgid " URL cannot be converted to ASCII: {0}"
+msgstr ""
+
 msgid "''{0}'': {1}"
 msgstr ""
 
@@ -4124,19 +4127,20 @@ msgstr "Ο τύπος της σχέσης είναι αγνωστος"
 msgid "Relation is empty"
 msgstr "Η σχέση είναι άδεια"
 
-msgid "<empty>"
-msgstr "<κενό>"
+msgid "Role member does not match expression {0} in template {1}"
+msgstr ""
 
-msgid "Role {0} unknown"
-msgstr "Ο ρόλος {0} είναι άγνωστος"
+msgid ""
+"Role member type {0} does not match accepted list of {1} in template {2}"
+msgstr ""
 
-msgid "Empty role found"
-msgstr "Βρέθηκε άδειος ρόλος"
+msgid "<empty>"
+msgstr "<κενό>"
 
-msgid "Member for role ''{0}'' does not match ''{1}''"
+msgid "Role {0} unknown in templates {1}"
 msgstr ""
 
-msgid "Member for role {0} of wrong type"
+msgid "Empty role type found when expecting one of {0}"
 msgstr ""
 
 msgid "Role {0} missing"
@@ -4690,10 +4694,35 @@ msgstr ""
 msgid "options provided as Java system properties"
 msgstr ""
 
-msgid "/PATH/TO/JOSM/FOLDER/         "
+msgid "/PATH/TO/JOSM/PREF    "
+msgstr ""
+
+msgid "Set the preferences directory"
+msgstr ""
+
+msgid "/PATH/TO/JOSM/USERDATA"
+msgstr ""
+
+msgid "Set the user data directory"
 msgstr ""
 
-msgid "Change the folder for all user settings"
+msgid "/PATH/TO/JOSM/CACHE   "
+msgstr ""
+
+msgid "Set the cache directory"
+msgstr ""
+
+msgid "/PATH/TO/JOSM/HOMEDIR "
+msgstr ""
+
+msgid ""
+"Relocate all 3 directories to homedir. Cache directory will be in "
+"homedir/cache"
+msgstr ""
+
+msgid ""
+"-Djosm.home has lower precedence, i.e. the specific setting overrides the "
+"general one"
 msgstr ""
 
 msgid ""
@@ -4956,6 +4985,21 @@ msgstr "το επίπεδο δεν είναι στη λίστα."
 msgid "Layer ''{0}'' must be in list of layers"
 msgstr "Το επίπεδο ''{0}'' πρέπει να είναι στη λίστα των επιπέδων"
 
+msgid "Default (open, closed, new)"
+msgstr ""
+
+msgid "Username"
+msgstr "Όνομα χρήστη"
+
+msgid "Created date"
+msgstr ""
+
+msgid "Last change date"
+msgstr ""
+
+msgid "Select note sorting method"
+msgstr ""
+
 msgid "Click to cancel the current operation"
 msgstr "Κλικ για ακύρωση της τρέχουσας λειτουργίας"
 
@@ -6319,6 +6363,12 @@ msgstr ""
 msgid "Reopen note with message:"
 msgstr ""
 
+msgid "Sort notes"
+msgstr ""
+
+msgid "Sort"
+msgstr "Ταξινόμηση"
+
 msgid "Object type:"
 msgstr "Τύπος αντικειμένου:"
 
@@ -7321,9 +7371,6 @@ msgstr ""
 msgid "Sort the relation members"
 msgstr "Ταξινόμηση των μελών της σχέσης"
 
-msgid "Sort"
-msgstr "Ταξινόμηση"
-
 msgid "Relation Editor: Sort"
 msgstr ""
 
@@ -8128,9 +8175,6 @@ msgstr ""
 msgid "Enter credentials for HTTP proxy"
 msgstr ""
 
-msgid "Username"
-msgstr "Όνομα χρήστη"
-
 msgid "Password"
 msgstr "Κωδικός"
 
@@ -8848,6 +8892,9 @@ msgstr ""
 msgid "Save Layer"
 msgstr "Αποθήκευση Επιπέδου"
 
+msgid "Note"
+msgstr "Σημείωση"
+
 msgid "Notes layer"
 msgstr ""
 
@@ -9295,6 +9342,9 @@ msgstr "Αφαίρεση φωτογραφίας από επίπεδο"
 msgid "Delete File from disk"
 msgstr "Διαγραφή αρχείου από τον δίσκο"
 
+msgid "Copy image path"
+msgstr ""
+
 msgid "Next"
 msgstr "Επόμενο"
 
@@ -12722,6 +12772,9 @@ msgstr ""
 msgid "Illegal long value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
+msgid "{0} bytes have been read"
+msgstr ""
+
 msgid "Prepare OSM data..."
 msgstr "Προετοιμασία δεδομένων OSM..."
 
@@ -12904,7 +12957,7 @@ msgstr ""
 msgid "Cannot start remotecontrol server on port {0}: {1}"
 msgstr ""
 
-msgid "RemoteControl::Accepting connections on port {0}"
+msgid "RemoteControl::Accepting connections on {0}:{1}"
 msgstr ""
 
 msgid "RemoteControl::Server stopped."
@@ -12916,7 +12969,7 @@ msgstr ""
 msgid "Unable to initialize Remote Control HTTPS Server"
 msgstr ""
 
-msgid "RemoteControl::Accepting secure connections on port {0}"
+msgid "RemoteControl::Accepting secure connections on {0}:{1}"
 msgstr ""
 
 msgid "RemoteControl::Server (https) stopped."
@@ -13902,9 +13955,6 @@ msgid ""
 "contain any JOSM object or suitable text. </p></html>"
 msgstr ""
 
-msgid "Invalid bz2 file."
-msgstr ""
-
 msgid "ms"
 msgstr ""
 
@@ -15146,6 +15196,10 @@ msgstr ""
 msgid "Coins"
 msgstr "Κέρματα"
 
+msgctxt "payment"
+msgid "Notes"
+msgstr ""
+
 msgid "Electronic purses and Charge cards"
 msgstr ""
 
@@ -15968,6 +16022,9 @@ msgstr ""
 msgid "Cross on horseback"
 msgstr ""
 
+msgid "Optional values for specific countries"
+msgstr ""
+
 msgid "Stop"
 msgstr "Stop"
 
@@ -16025,6 +16082,18 @@ msgstr "Δεύτερο Όνομα"
 msgid "Speed Camera"
 msgstr "Κάμερα ελέγχου ταχύτητας"
 
+msgid "Traffic Mirror"
+msgstr ""
+
+msgctxt "junction=yes"
+msgid "Named Junction"
+msgstr ""
+
+msgid ""
+"Used in some countries for a named road junction who’s name serves for local "
+"orientation."
+msgstr ""
+
 msgid "Elevator"
 msgstr ""
 
@@ -17469,6 +17538,9 @@ msgstr ""
 msgid "Fireplace"
 msgstr "Τζάκι"
 
+msgid "Picnic Table"
+msgstr ""
+
 msgid "Public Grill"
 msgstr ""
 
@@ -18074,6 +18146,12 @@ msgstr ""
 msgid "Count"
 msgstr ""
 
+msgid "Advertising Column"
+msgstr ""
+
+msgid "Billboard"
+msgstr ""
+
 msgid "Sports"
 msgstr "Αθλητικά"
 
@@ -19944,9 +20022,6 @@ msgstr "Παιχνίδια"
 msgid "vouchers"
 msgstr "κουπόνια"
 
-msgid "Note"
-msgstr "Σημείωση"
-
 msgid "Geography"
 msgstr "Γεωγραφία"
 
@@ -20330,9 +20405,6 @@ msgstr ""
 msgid "House number"
 msgstr "Αριθμός σπιτιού"
 
-msgid "House name"
-msgstr "Όνομα Σπιτιού"
-
 msgid "Street name"
 msgstr "Όνομα οδού"
 
@@ -20345,8 +20417,8 @@ msgstr "Όνομα πόλης"
 msgid "Country code"
 msgstr "Κωδικός χώρας"
 
-msgid "Optional values for specific countries"
-msgstr ""
+msgid "House name"
+msgstr "Όνομα Σπιτιού"
 
 msgid "Subdistrict"
 msgstr ""
@@ -21017,6 +21089,13 @@ msgstr ""
 msgid "VoGIS: DOM (Surface model)"
 msgstr ""
 
+msgid ""
+"AGIV(laanderen) aerial imagery (covers Brussels region as well) (2013)"
+msgstr ""
+
+msgid "Geoservices Wallonie aerial imagery (2009)"
+msgstr ""
+
 msgid "IBGE Mapa de Setores Urbanos"
 msgstr ""
 
@@ -21151,6 +21230,9 @@ msgstr ""
 msgid "Hamburg (40 cm)"
 msgstr ""
 
+msgid "Hamburg (20 cm)"
+msgstr ""
+
 msgid "Hamburg (DK5)"
 msgstr ""
 
@@ -21396,6 +21478,9 @@ msgstr ""
 msgid "Kanton Aargau 25cm (AGIS 2011)"
 msgstr ""
 
+msgid "Kanton Aargau 25cm (AGIS 2014)"
+msgstr ""
+
 msgid "Stadt Uster Orthophoto 2008 10cm"
 msgstr ""
 
@@ -21753,6 +21838,9 @@ msgstr ""
 msgid "{0} without {1}, {2} or {3}"
 msgstr ""
 
+msgid "{0} together with {1}"
+msgstr ""
+
 msgid "{0} on suspicious object"
 msgstr ""
 
@@ -21771,6 +21859,12 @@ 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 "{0}={1} is deprecated"
 msgstr ""
 
@@ -21807,6 +21901,9 @@ msgstr ""
 msgid "{0} should be replaced with {1}"
 msgstr ""
 
+msgid "{0} = {1}; remove {0}"
+msgstr ""
+
 msgid ""
 "{0}={1} is unspecific. Please replace ''{1}'' by ''left'', ''right'' or "
 "''both''."
@@ -21845,6 +21942,9 @@ msgstr ""
 msgid "Overlapping Identical Landuses"
 msgstr ""
 
+msgid "{0} must be connected to a way"
+msgstr ""
+
 msgid "abbreviated street name"
 msgstr ""
 
@@ -21866,9 +21966,17 @@ msgstr ""
 msgid "street name contains ss"
 msgstr ""
 
+msgid ""
+"Value of ''{0}'' should either be ''{1}'' or ''{2}''. For sidewalks use "
+"''{3}'' instead."
+msgstr ""
+
 msgid "{0} with multiple values"
 msgstr ""
 
+msgid "empty value in semicolon-separated ''{0}''"
+msgstr ""
+
 msgid "numerical key"
 msgstr ""
 
@@ -21903,6 +22011,9 @@ msgstr ""
 msgid "{0} must be a numeric value"
 msgstr ""
 
+msgid "{0} must be a positive integer number"
+msgstr ""
+
 msgid "relation without type"
 msgstr ""
 
@@ -23101,6 +23212,12 @@ msgstr ""
 msgid "merge nodes"
 msgstr ""
 
+msgid "How often thinning operation should be applied (Default {0})."
+msgstr ""
+
+msgid "Thinning Iterations"
+msgstr ""
+
 msgid "Street Name:"
 msgstr "Όνομα Οδού:"
 
@@ -26145,7 +26262,9 @@ msgstr ""
 msgid "Move and position photos"
 msgstr ""
 
-msgid "Click+drag photo or shift+click to position photo."
+msgid ""
+"Click+drag photo, shift+click to position photo, control+click to set "
+"direction."
 msgstr ""
 
 msgid "Please load some photos."
@@ -26808,6 +26927,9 @@ msgstr ""
 msgid "Reconstruct polygons from relation {0}"
 msgstr ""
 
+msgid "Reconstruct route"
+msgstr ""
+
 msgid "Open relation wiki page"
 msgstr ""
 
@@ -26847,6 +26969,12 @@ msgstr ""
 msgid "Way without ''inner'' or ''outer'' role found"
 msgstr ""
 
+msgid "Node without ''stop'' or ''platform'' role found"
+msgstr ""
+
+msgid "Way platform without ''platform'' role found"
+msgstr ""
+
 msgid "Revert changeset fully"
 msgstr "Ολοκληρωτική επαναφορά"
 
@@ -27338,7 +27466,7 @@ msgstr ""
 msgid "create an associatedStreet relation"
 msgstr ""
 
-msgid "delete outline way"
+msgid "keep outline way"
 msgstr ""
 
 msgid "Street name: "
diff --git a/i18n/po/en_AU.po b/i18n/po/en_AU.po
index 959fb32..0b89311 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: 2014-12-10 03:42+0100\n"
+"POT-Creation-Date: 2014-12-29 01:14+0100\n"
 "PO-Revision-Date: 2013-03-30 14:03+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad at dstoecker.de>\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: 2014-12-10 05:19+0000\n"
-"X-Generator: Launchpad (build 17283)\n"
+"X-Launchpad-Export-Date: 2014-12-29 05:36+0000\n"
+"X-Generator: Launchpad (build 17286)\n"
 "Language: \n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -3810,6 +3810,9 @@ msgstr ""
 msgid "Checks for errors in internet-related tags."
 msgstr ""
 
+msgid " URL cannot be converted to ASCII: {0}"
+msgstr ""
+
 msgid "''{0}'': {1}"
 msgstr ""
 
@@ -4018,19 +4021,20 @@ msgstr ""
 msgid "Relation is empty"
 msgstr ""
 
-msgid "<empty>"
+msgid "Role member does not match expression {0} in template {1}"
 msgstr ""
 
-msgid "Role {0} unknown"
+msgid ""
+"Role member type {0} does not match accepted list of {1} in template {2}"
 msgstr ""
 
-msgid "Empty role found"
+msgid "<empty>"
 msgstr ""
 
-msgid "Member for role ''{0}'' does not match ''{1}''"
+msgid "Role {0} unknown in templates {1}"
 msgstr ""
 
-msgid "Member for role {0} of wrong type"
+msgid "Empty role type found when expecting one of {0}"
 msgstr ""
 
 msgid "Role {0} missing"
@@ -4571,11 +4575,36 @@ msgstr ""
 msgid "options provided as Java system properties"
 msgstr "options provided as Java system properties"
 
-msgid "/PATH/TO/JOSM/FOLDER/         "
-msgstr "/PATH/TO/JOSM/FOLDER/         "
+msgid "/PATH/TO/JOSM/PREF    "
+msgstr ""
+
+msgid "Set the preferences directory"
+msgstr ""
+
+msgid "/PATH/TO/JOSM/USERDATA"
+msgstr ""
+
+msgid "Set the user data directory"
+msgstr ""
+
+msgid "/PATH/TO/JOSM/CACHE   "
+msgstr ""
+
+msgid "Set the cache directory"
+msgstr ""
+
+msgid "/PATH/TO/JOSM/HOMEDIR "
+msgstr ""
+
+msgid ""
+"Relocate all 3 directories to homedir. Cache directory will be in "
+"homedir/cache"
+msgstr ""
 
-msgid "Change the folder for all user settings"
-msgstr "Change the folder for all user settings"
+msgid ""
+"-Djosm.home has lower precedence, i.e. the specific setting overrides the "
+"general one"
+msgstr ""
 
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4837,6 +4866,21 @@ msgstr "layer not in list."
 msgid "Layer ''{0}'' must be in list of layers"
 msgstr "Layer ''{0}'' must be in list of layers"
 
+msgid "Default (open, closed, new)"
+msgstr ""
+
+msgid "Username"
+msgstr "Username"
+
+msgid "Created date"
+msgstr ""
+
+msgid "Last change date"
+msgstr ""
+
+msgid "Select note sorting method"
+msgstr ""
+
 msgid "Click to cancel the current operation"
 msgstr "Click to cancel the current operation"
 
@@ -6217,6 +6261,12 @@ msgstr ""
 msgid "Reopen note with message:"
 msgstr ""
 
+msgid "Sort notes"
+msgstr ""
+
+msgid "Sort"
+msgstr "Sort"
+
 msgid "Object type:"
 msgstr "Object type:"
 
@@ -7244,9 +7294,6 @@ msgstr ""
 msgid "Sort the relation members"
 msgstr "Sort the relation members"
 
-msgid "Sort"
-msgstr "Sort"
-
 msgid "Relation Editor: Sort"
 msgstr ""
 
@@ -8075,9 +8122,6 @@ msgstr ""
 msgid "Enter credentials for HTTP proxy"
 msgstr "Enter credentials for HTTP proxy"
 
-msgid "Username"
-msgstr "Username"
-
 msgid "Password"
 msgstr "Password"
 
@@ -8817,6 +8861,9 @@ msgstr ""
 msgid "Save Layer"
 msgstr "Save Layer"
 
+msgid "Note"
+msgstr "Note"
+
 msgid "Notes layer"
 msgstr ""
 
@@ -9283,6 +9330,9 @@ msgstr "Remove photo from layer"
 msgid "Delete File from disk"
 msgstr "Delete File from disk"
 
+msgid "Copy image path"
+msgstr ""
+
 msgid "Next"
 msgstr "Next"
 
@@ -12857,6 +12907,9 @@ msgstr "Missing required attribute ''{0}''."
 msgid "Illegal long value for attribute ''{0}''. Got ''{1}''."
 msgstr "Illegal long value for attribute ''{0}''. Got ''{1}''."
 
+msgid "{0} bytes have been read"
+msgstr ""
+
 msgid "Prepare OSM data..."
 msgstr "Prepare OSM data..."
 
@@ -13042,7 +13095,7 @@ msgstr ""
 msgid "Cannot start remotecontrol server on port {0}: {1}"
 msgstr ""
 
-msgid "RemoteControl::Accepting connections on port {0}"
+msgid "RemoteControl::Accepting connections on {0}:{1}"
 msgstr ""
 
 msgid "RemoteControl::Server stopped."
@@ -13054,7 +13107,7 @@ msgstr ""
 msgid "Unable to initialize Remote Control HTTPS Server"
 msgstr ""
 
-msgid "RemoteControl::Accepting secure connections on port {0}"
+msgid "RemoteControl::Accepting secure connections on {0}:{1}"
 msgstr ""
 
 msgid "RemoteControl::Server (https) stopped."
@@ -14094,9 +14147,6 @@ msgid ""
 "contain any JOSM object or suitable text. </p></html>"
 msgstr ""
 
-msgid "Invalid bz2 file."
-msgstr "Invalid bz2 file."
-
 msgid "ms"
 msgstr ""
 
@@ -15377,6 +15427,10 @@ msgstr ""
 msgid "Coins"
 msgstr "Coins"
 
+msgctxt "payment"
+msgid "Notes"
+msgstr ""
+
 msgid "Electronic purses and Charge cards"
 msgstr "Electronic purses and Charge cards"
 
@@ -16199,6 +16253,9 @@ msgstr "Cross by bicycle"
 msgid "Cross on horseback"
 msgstr "Cross on horseback"
 
+msgid "Optional values for specific countries"
+msgstr ""
+
 msgid "Stop"
 msgstr "Stop"
 
@@ -16256,6 +16313,18 @@ msgstr "Second Name"
 msgid "Speed Camera"
 msgstr "Speed Camera"
 
+msgid "Traffic Mirror"
+msgstr ""
+
+msgctxt "junction=yes"
+msgid "Named Junction"
+msgstr ""
+
+msgid ""
+"Used in some countries for a named road junction who’s name serves for local "
+"orientation."
+msgstr ""
+
 msgid "Elevator"
 msgstr ""
 
@@ -17700,6 +17769,9 @@ msgstr "Picnic Site"
 msgid "Fireplace"
 msgstr "Fireplace"
 
+msgid "Picnic Table"
+msgstr ""
+
 msgid "Public Grill"
 msgstr ""
 
@@ -18305,6 +18377,12 @@ msgstr ""
 msgid "Count"
 msgstr ""
 
+msgid "Advertising Column"
+msgstr ""
+
+msgid "Billboard"
+msgstr ""
+
 msgid "Sports"
 msgstr "Sports"
 
@@ -20175,9 +20253,6 @@ msgstr "toys"
 msgid "vouchers"
 msgstr "vouchers"
 
-msgid "Note"
-msgstr "Note"
-
 msgid "Geography"
 msgstr "Geography"
 
@@ -20561,9 +20636,6 @@ msgstr ""
 msgid "House number"
 msgstr "House number"
 
-msgid "House name"
-msgstr "House name"
-
 msgid "Street name"
 msgstr "Street name"
 
@@ -20576,8 +20648,8 @@ msgstr "City name"
 msgid "Country code"
 msgstr "Country code"
 
-msgid "Optional values for specific countries"
-msgstr ""
+msgid "House name"
+msgstr "House name"
 
 msgid "Subdistrict"
 msgstr ""
@@ -21248,6 +21320,13 @@ msgstr ""
 msgid "VoGIS: DOM (Surface model)"
 msgstr ""
 
+msgid ""
+"AGIV(laanderen) aerial imagery (covers Brussels region as well) (2013)"
+msgstr ""
+
+msgid "Geoservices Wallonie aerial imagery (2009)"
+msgstr ""
+
 msgid "IBGE Mapa de Setores Urbanos"
 msgstr ""
 
@@ -21382,6 +21461,9 @@ msgstr ""
 msgid "Hamburg (40 cm)"
 msgstr ""
 
+msgid "Hamburg (20 cm)"
+msgstr ""
+
 msgid "Hamburg (DK5)"
 msgstr ""
 
@@ -21627,6 +21709,9 @@ msgstr ""
 msgid "Kanton Aargau 25cm (AGIS 2011)"
 msgstr ""
 
+msgid "Kanton Aargau 25cm (AGIS 2014)"
+msgstr ""
+
 msgid "Stadt Uster Orthophoto 2008 10cm"
 msgstr ""
 
@@ -21984,6 +22069,9 @@ msgstr ""
 msgid "{0} without {1}, {2} or {3}"
 msgstr ""
 
+msgid "{0} together with {1}"
+msgstr ""
+
 msgid "{0} on suspicious object"
 msgstr ""
 
@@ -22002,6 +22090,12 @@ 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 "{0}={1} is deprecated"
 msgstr ""
 
@@ -22038,6 +22132,9 @@ msgstr ""
 msgid "{0} should be replaced with {1}"
 msgstr ""
 
+msgid "{0} = {1}; remove {0}"
+msgstr ""
+
 msgid ""
 "{0}={1} is unspecific. Please replace ''{1}'' by ''left'', ''right'' or "
 "''both''."
@@ -22076,6 +22173,9 @@ msgstr ""
 msgid "Overlapping Identical Landuses"
 msgstr ""
 
+msgid "{0} must be connected to a way"
+msgstr ""
+
 msgid "abbreviated street name"
 msgstr ""
 
@@ -22097,9 +22197,17 @@ msgstr ""
 msgid "street name contains ss"
 msgstr ""
 
+msgid ""
+"Value of ''{0}'' should either be ''{1}'' or ''{2}''. For sidewalks use "
+"''{3}'' instead."
+msgstr ""
+
 msgid "{0} with multiple values"
 msgstr ""
 
+msgid "empty value in semicolon-separated ''{0}''"
+msgstr ""
+
 msgid "numerical key"
 msgstr ""
 
@@ -22134,6 +22242,9 @@ msgstr ""
 msgid "{0} must be a numeric value"
 msgstr ""
 
+msgid "{0} must be a positive integer number"
+msgstr ""
+
 msgid "relation without type"
 msgstr ""
 
@@ -23333,6 +23444,12 @@ msgstr ""
 msgid "merge nodes"
 msgstr ""
 
+msgid "How often thinning operation should be applied (Default {0})."
+msgstr ""
+
+msgid "Thinning Iterations"
+msgstr ""
+
 msgid "Street Name:"
 msgstr "Street Name:"
 
@@ -26416,7 +26533,9 @@ msgstr ""
 msgid "Move and position photos"
 msgstr ""
 
-msgid "Click+drag photo or shift+click to position photo."
+msgid ""
+"Click+drag photo, shift+click to position photo, control+click to set "
+"direction."
 msgstr ""
 
 msgid "Please load some photos."
@@ -27077,6 +27196,9 @@ msgstr ""
 msgid "Reconstruct polygons from relation {0}"
 msgstr ""
 
+msgid "Reconstruct route"
+msgstr ""
+
 msgid "Open relation wiki page"
 msgstr ""
 
@@ -27116,6 +27238,12 @@ msgstr ""
 msgid "Way without ''inner'' or ''outer'' role found"
 msgstr ""
 
+msgid "Node without ''stop'' or ''platform'' role found"
+msgstr ""
+
+msgid "Way platform without ''platform'' role found"
+msgstr ""
+
 msgid "Revert changeset fully"
 msgstr ""
 
@@ -27611,8 +27739,8 @@ msgstr "add to existing associatedStreet relation"
 msgid "create an associatedStreet relation"
 msgstr "create an associatedStreet relation"
 
-msgid "delete outline way"
-msgstr "delete outline way"
+msgid "keep outline way"
+msgstr ""
 
 msgid "Street name: "
 msgstr "Street name: "
diff --git a/i18n/po/en_CA.po b/i18n/po/en_CA.po
index 13012c2..fb3ac39 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: 2014-12-10 03:42+0100\n"
+"POT-Creation-Date: 2014-12-29 01:14+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: 2014-12-10 05:22+0000\n"
-"X-Generator: Launchpad (build 17283)\n"
+"X-Launchpad-Export-Date: 2014-12-29 05:39+0000\n"
+"X-Generator: Launchpad (build 17286)\n"
 "Language: \n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -3730,6 +3730,9 @@ msgstr ""
 msgid "Checks for errors in internet-related tags."
 msgstr ""
 
+msgid " URL cannot be converted to ASCII: {0}"
+msgstr ""
+
 msgid "''{0}'': {1}"
 msgstr ""
 
@@ -3936,19 +3939,20 @@ msgstr ""
 msgid "Relation is empty"
 msgstr ""
 
-msgid "<empty>"
+msgid "Role member does not match expression {0} in template {1}"
 msgstr ""
 
-msgid "Role {0} unknown"
+msgid ""
+"Role member type {0} does not match accepted list of {1} in template {2}"
 msgstr ""
 
-msgid "Empty role found"
+msgid "<empty>"
 msgstr ""
 
-msgid "Member for role ''{0}'' does not match ''{1}''"
+msgid "Role {0} unknown in templates {1}"
 msgstr ""
 
-msgid "Member for role {0} of wrong type"
+msgid "Empty role type found when expecting one of {0}"
 msgstr ""
 
 msgid "Role {0} missing"
@@ -4484,10 +4488,35 @@ msgstr ""
 msgid "options provided as Java system properties"
 msgstr ""
 
-msgid "/PATH/TO/JOSM/FOLDER/         "
+msgid "/PATH/TO/JOSM/PREF    "
+msgstr ""
+
+msgid "Set the preferences directory"
+msgstr ""
+
+msgid "/PATH/TO/JOSM/USERDATA"
+msgstr ""
+
+msgid "Set the user data directory"
+msgstr ""
+
+msgid "/PATH/TO/JOSM/CACHE   "
+msgstr ""
+
+msgid "Set the cache directory"
 msgstr ""
 
-msgid "Change the folder for all user settings"
+msgid "/PATH/TO/JOSM/HOMEDIR "
+msgstr ""
+
+msgid ""
+"Relocate all 3 directories to homedir. Cache directory will be in "
+"homedir/cache"
+msgstr ""
+
+msgid ""
+"-Djosm.home has lower precedence, i.e. the specific setting overrides the "
+"general one"
 msgstr ""
 
 msgid ""
@@ -4742,6 +4771,21 @@ msgstr ""
 msgid "Layer ''{0}'' must be in list of layers"
 msgstr ""
 
+msgid "Default (open, closed, new)"
+msgstr ""
+
+msgid "Username"
+msgstr ""
+
+msgid "Created date"
+msgstr ""
+
+msgid "Last change date"
+msgstr ""
+
+msgid "Select note sorting method"
+msgstr ""
+
 msgid "Click to cancel the current operation"
 msgstr ""
 
@@ -6082,6 +6126,12 @@ msgstr ""
 msgid "Reopen note with message:"
 msgstr ""
 
+msgid "Sort notes"
+msgstr ""
+
+msgid "Sort"
+msgstr ""
+
 msgid "Object type:"
 msgstr "Object type:"
 
@@ -7064,9 +7114,6 @@ msgstr ""
 msgid "Sort the relation members"
 msgstr ""
 
-msgid "Sort"
-msgstr ""
-
 msgid "Relation Editor: Sort"
 msgstr ""
 
@@ -7848,9 +7895,6 @@ msgstr ""
 msgid "Enter credentials for HTTP proxy"
 msgstr ""
 
-msgid "Username"
-msgstr ""
-
 msgid "Password"
 msgstr ""
 
@@ -8530,6 +8574,9 @@ msgstr ""
 msgid "Save Layer"
 msgstr ""
 
+msgid "Note"
+msgstr ""
+
 msgid "Notes layer"
 msgstr ""
 
@@ -8976,6 +9023,9 @@ msgstr ""
 msgid "Delete File from disk"
 msgstr ""
 
+msgid "Copy image path"
+msgstr ""
+
 msgid "Next"
 msgstr ""
 
@@ -12356,6 +12406,9 @@ msgstr ""
 msgid "Illegal long value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
+msgid "{0} bytes have been read"
+msgstr ""
+
 msgid "Prepare OSM data..."
 msgstr ""
 
@@ -12536,7 +12589,7 @@ msgstr ""
 msgid "Cannot start remotecontrol server on port {0}: {1}"
 msgstr ""
 
-msgid "RemoteControl::Accepting connections on port {0}"
+msgid "RemoteControl::Accepting connections on {0}:{1}"
 msgstr ""
 
 msgid "RemoteControl::Server stopped."
@@ -12548,7 +12601,7 @@ msgstr ""
 msgid "Unable to initialize Remote Control HTTPS Server"
 msgstr ""
 
-msgid "RemoteControl::Accepting secure connections on port {0}"
+msgid "RemoteControl::Accepting secure connections on {0}:{1}"
 msgstr ""
 
 msgid "RemoteControl::Server (https) stopped."
@@ -13508,9 +13561,6 @@ msgid ""
 "contain any JOSM object or suitable text. </p></html>"
 msgstr ""
 
-msgid "Invalid bz2 file."
-msgstr ""
-
 msgid "ms"
 msgstr ""
 
@@ -14746,6 +14796,10 @@ msgstr ""
 msgid "Coins"
 msgstr ""
 
+msgctxt "payment"
+msgid "Notes"
+msgstr ""
+
 msgid "Electronic purses and Charge cards"
 msgstr ""
 
@@ -15568,6 +15622,9 @@ msgstr ""
 msgid "Cross on horseback"
 msgstr ""
 
+msgid "Optional values for specific countries"
+msgstr ""
+
 msgid "Stop"
 msgstr ""
 
@@ -15625,6 +15682,18 @@ msgstr ""
 msgid "Speed Camera"
 msgstr ""
 
+msgid "Traffic Mirror"
+msgstr ""
+
+msgctxt "junction=yes"
+msgid "Named Junction"
+msgstr ""
+
+msgid ""
+"Used in some countries for a named road junction who’s name serves for local "
+"orientation."
+msgstr ""
+
 msgid "Elevator"
 msgstr ""
 
@@ -17069,6 +17138,9 @@ msgstr ""
 msgid "Fireplace"
 msgstr ""
 
+msgid "Picnic Table"
+msgstr ""
+
 msgid "Public Grill"
 msgstr ""
 
@@ -17674,6 +17746,12 @@ msgstr ""
 msgid "Count"
 msgstr ""
 
+msgid "Advertising Column"
+msgstr ""
+
+msgid "Billboard"
+msgstr ""
+
 msgid "Sports"
 msgstr ""
 
@@ -19544,9 +19622,6 @@ msgstr ""
 msgid "vouchers"
 msgstr ""
 
-msgid "Note"
-msgstr ""
-
 msgid "Geography"
 msgstr ""
 
@@ -19930,9 +20005,6 @@ msgstr ""
 msgid "House number"
 msgstr ""
 
-msgid "House name"
-msgstr ""
-
 msgid "Street name"
 msgstr ""
 
@@ -19945,7 +20017,7 @@ msgstr ""
 msgid "Country code"
 msgstr ""
 
-msgid "Optional values for specific countries"
+msgid "House name"
 msgstr ""
 
 msgid "Subdistrict"
@@ -20617,6 +20689,13 @@ msgstr ""
 msgid "VoGIS: DOM (Surface model)"
 msgstr ""
 
+msgid ""
+"AGIV(laanderen) aerial imagery (covers Brussels region as well) (2013)"
+msgstr ""
+
+msgid "Geoservices Wallonie aerial imagery (2009)"
+msgstr ""
+
 msgid "IBGE Mapa de Setores Urbanos"
 msgstr ""
 
@@ -20751,6 +20830,9 @@ msgstr ""
 msgid "Hamburg (40 cm)"
 msgstr ""
 
+msgid "Hamburg (20 cm)"
+msgstr ""
+
 msgid "Hamburg (DK5)"
 msgstr ""
 
@@ -20996,6 +21078,9 @@ msgstr ""
 msgid "Kanton Aargau 25cm (AGIS 2011)"
 msgstr ""
 
+msgid "Kanton Aargau 25cm (AGIS 2014)"
+msgstr ""
+
 msgid "Stadt Uster Orthophoto 2008 10cm"
 msgstr ""
 
@@ -21353,6 +21438,9 @@ msgstr ""
 msgid "{0} without {1}, {2} or {3}"
 msgstr ""
 
+msgid "{0} together with {1}"
+msgstr ""
+
 msgid "{0} on suspicious object"
 msgstr ""
 
@@ -21371,6 +21459,12 @@ 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 "{0}={1} is deprecated"
 msgstr ""
 
@@ -21407,6 +21501,9 @@ msgstr ""
 msgid "{0} should be replaced with {1}"
 msgstr ""
 
+msgid "{0} = {1}; remove {0}"
+msgstr ""
+
 msgid ""
 "{0}={1} is unspecific. Please replace ''{1}'' by ''left'', ''right'' or "
 "''both''."
@@ -21445,6 +21542,9 @@ msgstr ""
 msgid "Overlapping Identical Landuses"
 msgstr ""
 
+msgid "{0} must be connected to a way"
+msgstr ""
+
 msgid "abbreviated street name"
 msgstr ""
 
@@ -21466,9 +21566,17 @@ msgstr ""
 msgid "street name contains ss"
 msgstr ""
 
+msgid ""
+"Value of ''{0}'' should either be ''{1}'' or ''{2}''. For sidewalks use "
+"''{3}'' instead."
+msgstr ""
+
 msgid "{0} with multiple values"
 msgstr ""
 
+msgid "empty value in semicolon-separated ''{0}''"
+msgstr ""
+
 msgid "numerical key"
 msgstr ""
 
@@ -21503,6 +21611,9 @@ msgstr ""
 msgid "{0} must be a numeric value"
 msgstr ""
 
+msgid "{0} must be a positive integer number"
+msgstr ""
+
 msgid "relation without type"
 msgstr ""
 
@@ -22697,6 +22808,12 @@ msgstr ""
 msgid "merge nodes"
 msgstr ""
 
+msgid "How often thinning operation should be applied (Default {0})."
+msgstr ""
+
+msgid "Thinning Iterations"
+msgstr ""
+
 msgid "Street Name:"
 msgstr ""
 
@@ -25714,7 +25831,9 @@ msgstr ""
 msgid "Move and position photos"
 msgstr ""
 
-msgid "Click+drag photo or shift+click to position photo."
+msgid ""
+"Click+drag photo, shift+click to position photo, control+click to set "
+"direction."
 msgstr ""
 
 msgid "Please load some photos."
@@ -26375,6 +26494,9 @@ msgstr ""
 msgid "Reconstruct polygons from relation {0}"
 msgstr ""
 
+msgid "Reconstruct route"
+msgstr ""
+
 msgid "Open relation wiki page"
 msgstr ""
 
@@ -26414,6 +26536,12 @@ msgstr ""
 msgid "Way without ''inner'' or ''outer'' role found"
 msgstr ""
 
+msgid "Node without ''stop'' or ''platform'' role found"
+msgstr ""
+
+msgid "Way platform without ''platform'' role found"
+msgstr ""
+
 msgid "Revert changeset fully"
 msgstr ""
 
@@ -26904,7 +27032,7 @@ msgstr ""
 msgid "create an associatedStreet relation"
 msgstr ""
 
-msgid "delete outline way"
+msgid "keep outline way"
 msgstr ""
 
 msgid "Street name: "
diff --git a/i18n/po/en_GB.po b/i18n/po/en_GB.po
index 1397e3a..8e6f91e 100644
--- a/i18n/po/en_GB.po
+++ b/i18n/po/en_GB.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: JOSM\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-12-10 03:42+0100\n"
+"POT-Creation-Date: 2014-12-29 01:14+0100\n"
 "PO-Revision-Date: 2014-09-20 20:07+0000\n"
 "Last-Translator: Andi Chandler <Unknown>\n"
 "Language-Team: German <josm-dev at openstreetmap.org>\n"
@@ -18,8 +18,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2014-12-10 05:19+0000\n"
-"X-Generator: Launchpad (build 17283)\n"
+"X-Launchpad-Export-Date: 2014-12-29 05:36+0000\n"
+"X-Generator: Launchpad (build 17286)\n"
 "Language: de\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -4011,6 +4011,9 @@ msgstr "Internet tags"
 msgid "Checks for errors in internet-related tags."
 msgstr "Checks for errors in Internet-related tags."
 
+msgid " URL cannot be converted to ASCII: {0}"
+msgstr ""
+
 msgid "''{0}'': {1}"
 msgstr "''{0}'': {1}"
 
@@ -4224,20 +4227,21 @@ msgstr "Relation type is unknown"
 msgid "Relation is empty"
 msgstr "Relation is empty"
 
-msgid "<empty>"
-msgstr "<empty>"
+msgid "Role member does not match expression {0} in template {1}"
+msgstr ""
 
-msgid "Role {0} unknown"
-msgstr "Role {0} unknown"
+msgid ""
+"Role member type {0} does not match accepted list of {1} in template {2}"
+msgstr ""
 
-msgid "Empty role found"
-msgstr "Empty role found"
+msgid "<empty>"
+msgstr "<empty>"
 
-msgid "Member for role ''{0}'' does not match ''{1}''"
-msgstr "Member for role ''{0}'' does not match ''{1}''"
+msgid "Role {0} unknown in templates {1}"
+msgstr ""
 
-msgid "Member for role {0} of wrong type"
-msgstr "Member for role {0} of wrong type"
+msgid "Empty role type found when expecting one of {0}"
+msgstr ""
 
 msgid "Role {0} missing"
 msgstr "Role {0} missing"
@@ -4778,11 +4782,36 @@ msgstr "Disable access to the given resource(s), separated by comma"
 msgid "options provided as Java system properties"
 msgstr "options provided as Java system properties"
 
-msgid "/PATH/TO/JOSM/FOLDER/         "
-msgstr "/PATH/TO/JOSM/FOLDER/         "
+msgid "/PATH/TO/JOSM/PREF    "
+msgstr ""
+
+msgid "Set the preferences directory"
+msgstr ""
+
+msgid "/PATH/TO/JOSM/USERDATA"
+msgstr ""
+
+msgid "Set the user data directory"
+msgstr ""
+
+msgid "/PATH/TO/JOSM/CACHE   "
+msgstr ""
+
+msgid "Set the cache directory"
+msgstr ""
+
+msgid "/PATH/TO/JOSM/HOMEDIR "
+msgstr ""
+
+msgid ""
+"Relocate all 3 directories to homedir. Cache directory will be in "
+"homedir/cache"
+msgstr ""
 
-msgid "Change the folder for all user settings"
-msgstr "Change the folder for all user settings"
+msgid ""
+"-Djosm.home has lower precedence, i.e. the specific setting overrides the "
+"general one"
+msgstr ""
 
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -5056,6 +5085,21 @@ msgstr "layer not in list."
 msgid "Layer ''{0}'' must be in list of layers"
 msgstr "Layer ''{0}'' must be in list of layers"
 
+msgid "Default (open, closed, new)"
+msgstr ""
+
+msgid "Username"
+msgstr "Username"
+
+msgid "Created date"
+msgstr ""
+
+msgid "Last change date"
+msgstr ""
+
+msgid "Select note sorting method"
+msgstr ""
+
 msgid "Click to cancel the current operation"
 msgstr "Click to cancel the current operation"
 
@@ -6502,6 +6546,12 @@ msgstr ""
 msgid "Reopen note with message:"
 msgstr ""
 
+msgid "Sort notes"
+msgstr ""
+
+msgid "Sort"
+msgstr "Sort"
+
 msgid "Object type:"
 msgstr "Object type:"
 
@@ -7563,9 +7613,6 @@ msgstr "Select objects for selected relation members"
 msgid "Sort the relation members"
 msgstr "Sort the relation members"
 
-msgid "Sort"
-msgstr "Sort"
-
 msgid "Relation Editor: Sort"
 msgstr "Relation Editor: Sort"
 
@@ -8423,9 +8470,6 @@ msgstr "Enter credentials for host"
 msgid "Enter credentials for HTTP proxy"
 msgstr "Enter credentials for HTTP proxy"
 
-msgid "Username"
-msgstr "Username"
-
 msgid "Password"
 msgstr "Password"
 
@@ -9197,6 +9241,9 @@ msgstr ""
 msgid "Save Layer"
 msgstr "Save Layer"
 
+msgid "Note"
+msgstr "Note"
+
 msgid "Notes layer"
 msgstr "Notes layer"
 
@@ -9668,6 +9715,9 @@ msgstr "Remove photo from layer"
 msgid "Delete File from disk"
 msgstr "Delete File from disk"
 
+msgid "Copy image path"
+msgstr ""
+
 msgid "Next"
 msgstr "Next"
 
@@ -13366,6 +13416,9 @@ msgstr "Missing required attribute ''{0}''."
 msgid "Illegal long value for attribute ''{0}''. Got ''{1}''."
 msgstr "Illegal long value for attribute ''{0}''. Got ''{1}''."
 
+msgid "{0} bytes have been read"
+msgstr ""
+
 msgid "Prepare OSM data..."
 msgstr "Prepare OSM data..."
 
@@ -13551,8 +13604,8 @@ msgstr "Read protocol version"
 msgid "Cannot start remotecontrol server on port {0}: {1}"
 msgstr "Cannot start remotecontrol server on port {0}: {1}"
 
-msgid "RemoteControl::Accepting connections on port {0}"
-msgstr "RemoteControl::Accepting connections on port {0}"
+msgid "RemoteControl::Accepting connections on {0}:{1}"
+msgstr ""
 
 msgid "RemoteControl::Server stopped."
 msgstr "RemoteControl::Server stopped."
@@ -13563,8 +13616,8 @@ msgstr "Cannot start remotecontrol https server on port {0}: {1}"
 msgid "Unable to initialize Remote Control HTTPS Server"
 msgstr "Unable to initialise Remote Control HTTPS Server"
 
-msgid "RemoteControl::Accepting secure connections on port {0}"
-msgstr "RemoteControl::Accepting secure connections on port {0}"
+msgid "RemoteControl::Accepting secure connections on {0}:{1}"
+msgstr ""
 
 msgid "RemoteControl::Server (https) stopped."
 msgstr "RemoteControl::Server (https) stopped."
@@ -14742,9 +14795,6 @@ msgstr ""
 "<html><p> Sorry, it is impossible to paste tags from buffer. It does not "
 "contain any JOSM object or suitable text. </p></html>"
 
-msgid "Invalid bz2 file."
-msgstr "Invalid bz2 file."
-
 msgid "ms"
 msgstr "ms"
 
@@ -16099,6 +16149,10 @@ msgstr "tennis"
 msgid "Coins"
 msgstr "Coins"
 
+msgctxt "payment"
+msgid "Notes"
+msgstr ""
+
 msgid "Electronic purses and Charge cards"
 msgstr "Electronic purses and Charge cards"
 
@@ -16932,6 +16986,9 @@ msgstr "Cross by bicycle"
 msgid "Cross on horseback"
 msgstr "Cross on horseback"
 
+msgid "Optional values for specific countries"
+msgstr ""
+
 msgid "Stop"
 msgstr "Stop"
 
@@ -16989,6 +17046,18 @@ msgstr "Second Name"
 msgid "Speed Camera"
 msgstr "Speed Camera"
 
+msgid "Traffic Mirror"
+msgstr ""
+
+msgctxt "junction=yes"
+msgid "Named Junction"
+msgstr ""
+
+msgid ""
+"Used in some countries for a named road junction who’s name serves for local "
+"orientation."
+msgstr ""
+
 msgid "Elevator"
 msgstr "Elevator"
 
@@ -18440,6 +18509,9 @@ msgstr "Picnic Site"
 msgid "Fireplace"
 msgstr "Fireplace"
 
+msgid "Picnic Table"
+msgstr ""
+
 msgid "Public Grill"
 msgstr "Public grill"
 
@@ -19045,6 +19117,12 @@ msgstr "suction"
 msgid "Count"
 msgstr "Count"
 
+msgid "Advertising Column"
+msgstr ""
+
+msgid "Billboard"
+msgstr ""
+
 msgid "Sports"
 msgstr "Sports"
 
@@ -20915,9 +20993,6 @@ msgstr "toys"
 msgid "vouchers"
 msgstr "vouchers"
 
-msgid "Note"
-msgstr "Note"
-
 msgid "Geography"
 msgstr "Geography"
 
@@ -21303,9 +21378,6 @@ msgstr ""
 msgid "House number"
 msgstr "House number"
 
-msgid "House name"
-msgstr "House name"
-
 msgid "Street name"
 msgstr "Street name"
 
@@ -21318,8 +21390,8 @@ msgstr "City name"
 msgid "Country code"
 msgstr "Country code"
 
-msgid "Optional values for specific countries"
-msgstr ""
+msgid "House name"
+msgstr "House name"
 
 msgid "Subdistrict"
 msgstr ""
@@ -21990,6 +22062,13 @@ msgstr ""
 msgid "VoGIS: DOM (Surface model)"
 msgstr ""
 
+msgid ""
+"AGIV(laanderen) aerial imagery (covers Brussels region as well) (2013)"
+msgstr ""
+
+msgid "Geoservices Wallonie aerial imagery (2009)"
+msgstr ""
+
 msgid "IBGE Mapa de Setores Urbanos"
 msgstr ""
 
@@ -22124,6 +22203,9 @@ msgstr ""
 msgid "Hamburg (40 cm)"
 msgstr ""
 
+msgid "Hamburg (20 cm)"
+msgstr ""
+
 msgid "Hamburg (DK5)"
 msgstr ""
 
@@ -22369,6 +22451,9 @@ msgstr ""
 msgid "Kanton Aargau 25cm (AGIS 2011)"
 msgstr ""
 
+msgid "Kanton Aargau 25cm (AGIS 2014)"
+msgstr ""
+
 msgid "Stadt Uster Orthophoto 2008 10cm"
 msgstr ""
 
@@ -22726,6 +22811,9 @@ msgstr "{0} without {1} or {2}"
 msgid "{0} without {1}, {2} or {3}"
 msgstr "{0} without {1}, {2} or {3}"
 
+msgid "{0} together with {1}"
+msgstr ""
+
 msgid "{0} on suspicious object"
 msgstr "{0} on suspicious object"
 
@@ -22744,6 +22832,12 @@ msgstr "sport without physical feature"
 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 "{0}={1} is deprecated"
 msgstr "{0}={1} is deprecated"
 
@@ -22784,6 +22878,9 @@ msgstr ""
 msgid "{0} should be replaced with {1}"
 msgstr ""
 
+msgid "{0} = {1}; remove {0}"
+msgstr ""
+
 msgid ""
 "{0}={1} is unspecific. Please replace ''{1}'' by ''left'', ''right'' or "
 "''both''."
@@ -22822,6 +22919,9 @@ msgstr "Overlapping identical natural areas"
 msgid "Overlapping Identical Landuses"
 msgstr "Overlapping identical landuses"
 
+msgid "{0} must be connected to a way"
+msgstr ""
+
 msgid "abbreviated street name"
 msgstr "abbreviated street name"
 
@@ -22843,9 +22943,17 @@ msgstr "temporary highway type"
 msgid "street name contains ss"
 msgstr "street name contains ss"
 
+msgid ""
+"Value of ''{0}'' should either be ''{1}'' or ''{2}''. For sidewalks use "
+"''{3}'' instead."
+msgstr ""
+
 msgid "{0} with multiple values"
 msgstr "{0} with multiple values"
 
+msgid "empty value in semicolon-separated ''{0}''"
+msgstr ""
+
 msgid "numerical key"
 msgstr "numerical key"
 
@@ -22881,6 +22989,9 @@ msgstr "unusual incline; use percentages/degrees or up/down"
 msgid "{0} must be a numeric value"
 msgstr "{0} must be a numeric value"
 
+msgid "{0} must be a positive integer number"
+msgstr ""
+
 msgid "relation without type"
 msgstr "relation without type"
 
@@ -24172,6 +24283,12 @@ msgstr ""
 msgid "merge nodes"
 msgstr ""
 
+msgid "How often thinning operation should be applied (Default {0})."
+msgstr ""
+
+msgid "Thinning Iterations"
+msgstr ""
+
 msgid "Street Name:"
 msgstr "Street Name:"
 
@@ -27259,7 +27376,9 @@ msgstr ""
 msgid "Move and position photos"
 msgstr ""
 
-msgid "Click+drag photo or shift+click to position photo."
+msgid ""
+"Click+drag photo, shift+click to position photo, control+click to set "
+"direction."
 msgstr ""
 
 msgid "Please load some photos."
@@ -27920,6 +28039,9 @@ msgstr ""
 msgid "Reconstruct polygons from relation {0}"
 msgstr ""
 
+msgid "Reconstruct route"
+msgstr ""
+
 msgid "Open relation wiki page"
 msgstr ""
 
@@ -27959,6 +28081,12 @@ msgstr ""
 msgid "Way without ''inner'' or ''outer'' role found"
 msgstr ""
 
+msgid "Node without ''stop'' or ''platform'' role found"
+msgstr ""
+
+msgid "Way platform without ''platform'' role found"
+msgstr ""
+
 msgid "Revert changeset fully"
 msgstr ""
 
@@ -28454,8 +28582,8 @@ msgstr "add to existing associatedStreet relation"
 msgid "create an associatedStreet relation"
 msgstr "create an associatedStreet relation"
 
-msgid "delete outline way"
-msgstr "delete outline way"
+msgid "keep outline way"
+msgstr ""
 
 msgid "Street name: "
 msgstr "Street name: "
diff --git a/i18n/po/eo.po b/i18n/po/eo.po
index c20a50a..62751a3 100644
--- a/i18n/po/eo.po
+++ b/i18n/po/eo.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-12-10 03:42+0100\n"
+"POT-Creation-Date: 2014-12-29 01:14+0100\n"
 "PO-Revision-Date: 2012-10-03 21:33+0000\n"
 "Last-Translator: Michael Moroni <michael.moroni at openmailbox.org>\n"
 "Language-Team: Esperanto <eo at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2014-12-10 04:44+0000\n"
-"X-Generator: Launchpad (build 17283)\n"
+"X-Launchpad-Export-Date: 2014-12-29 04:47+0000\n"
+"X-Generator: Launchpad (build 17286)\n"
 "Language: eo\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -3726,6 +3726,9 @@ msgstr ""
 msgid "Checks for errors in internet-related tags."
 msgstr ""
 
+msgid " URL cannot be converted to ASCII: {0}"
+msgstr ""
+
 msgid "''{0}'': {1}"
 msgstr ""
 
@@ -3932,19 +3935,20 @@ msgstr ""
 msgid "Relation is empty"
 msgstr ""
 
-msgid "<empty>"
+msgid "Role member does not match expression {0} in template {1}"
 msgstr ""
 
-msgid "Role {0} unknown"
+msgid ""
+"Role member type {0} does not match accepted list of {1} in template {2}"
 msgstr ""
 
-msgid "Empty role found"
+msgid "<empty>"
 msgstr ""
 
-msgid "Member for role ''{0}'' does not match ''{1}''"
+msgid "Role {0} unknown in templates {1}"
 msgstr ""
 
-msgid "Member for role {0} of wrong type"
+msgid "Empty role type found when expecting one of {0}"
 msgstr ""
 
 msgid "Role {0} missing"
@@ -4480,10 +4484,35 @@ msgstr ""
 msgid "options provided as Java system properties"
 msgstr ""
 
-msgid "/PATH/TO/JOSM/FOLDER/         "
+msgid "/PATH/TO/JOSM/PREF    "
+msgstr ""
+
+msgid "Set the preferences directory"
+msgstr ""
+
+msgid "/PATH/TO/JOSM/USERDATA"
+msgstr ""
+
+msgid "Set the user data directory"
+msgstr ""
+
+msgid "/PATH/TO/JOSM/CACHE   "
+msgstr ""
+
+msgid "Set the cache directory"
 msgstr ""
 
-msgid "Change the folder for all user settings"
+msgid "/PATH/TO/JOSM/HOMEDIR "
+msgstr ""
+
+msgid ""
+"Relocate all 3 directories to homedir. Cache directory will be in "
+"homedir/cache"
+msgstr ""
+
+msgid ""
+"-Djosm.home has lower precedence, i.e. the specific setting overrides the "
+"general one"
 msgstr ""
 
 msgid ""
@@ -4738,6 +4767,21 @@ msgstr ""
 msgid "Layer ''{0}'' must be in list of layers"
 msgstr ""
 
+msgid "Default (open, closed, new)"
+msgstr ""
+
+msgid "Username"
+msgstr ""
+
+msgid "Created date"
+msgstr ""
+
+msgid "Last change date"
+msgstr ""
+
+msgid "Select note sorting method"
+msgstr ""
+
 msgid "Click to cancel the current operation"
 msgstr ""
 
@@ -6078,6 +6122,12 @@ msgstr ""
 msgid "Reopen note with message:"
 msgstr ""
 
+msgid "Sort notes"
+msgstr ""
+
+msgid "Sort"
+msgstr ""
+
 msgid "Object type:"
 msgstr ""
 
@@ -7060,9 +7110,6 @@ msgstr ""
 msgid "Sort the relation members"
 msgstr ""
 
-msgid "Sort"
-msgstr ""
-
 msgid "Relation Editor: Sort"
 msgstr ""
 
@@ -7844,9 +7891,6 @@ msgstr ""
 msgid "Enter credentials for HTTP proxy"
 msgstr ""
 
-msgid "Username"
-msgstr ""
-
 msgid "Password"
 msgstr ""
 
@@ -8526,6 +8570,9 @@ msgstr ""
 msgid "Save Layer"
 msgstr ""
 
+msgid "Note"
+msgstr ""
+
 msgid "Notes layer"
 msgstr ""
 
@@ -8972,6 +9019,9 @@ msgstr ""
 msgid "Delete File from disk"
 msgstr ""
 
+msgid "Copy image path"
+msgstr ""
+
 msgid "Next"
 msgstr ""
 
@@ -12356,6 +12406,9 @@ msgstr ""
 msgid "Illegal long value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
+msgid "{0} bytes have been read"
+msgstr ""
+
 msgid "Prepare OSM data..."
 msgstr ""
 
@@ -12536,7 +12589,7 @@ msgstr ""
 msgid "Cannot start remotecontrol server on port {0}: {1}"
 msgstr ""
 
-msgid "RemoteControl::Accepting connections on port {0}"
+msgid "RemoteControl::Accepting connections on {0}:{1}"
 msgstr ""
 
 msgid "RemoteControl::Server stopped."
@@ -12548,7 +12601,7 @@ msgstr ""
 msgid "Unable to initialize Remote Control HTTPS Server"
 msgstr ""
 
-msgid "RemoteControl::Accepting secure connections on port {0}"
+msgid "RemoteControl::Accepting secure connections on {0}:{1}"
 msgstr ""
 
 msgid "RemoteControl::Server (https) stopped."
@@ -13508,9 +13561,6 @@ msgid ""
 "contain any JOSM object or suitable text. </p></html>"
 msgstr ""
 
-msgid "Invalid bz2 file."
-msgstr ""
-
 msgid "ms"
 msgstr ""
 
@@ -14746,6 +14796,10 @@ msgstr ""
 msgid "Coins"
 msgstr "Moneroj"
 
+msgctxt "payment"
+msgid "Notes"
+msgstr ""
+
 msgid "Electronic purses and Charge cards"
 msgstr ""
 
@@ -15568,6 +15622,9 @@ msgstr ""
 msgid "Cross on horseback"
 msgstr ""
 
+msgid "Optional values for specific countries"
+msgstr ""
+
 msgid "Stop"
 msgstr ""
 
@@ -15625,6 +15682,18 @@ msgstr ""
 msgid "Speed Camera"
 msgstr ""
 
+msgid "Traffic Mirror"
+msgstr ""
+
+msgctxt "junction=yes"
+msgid "Named Junction"
+msgstr ""
+
+msgid ""
+"Used in some countries for a named road junction who’s name serves for local "
+"orientation."
+msgstr ""
+
 msgid "Elevator"
 msgstr ""
 
@@ -17069,6 +17138,9 @@ msgstr ""
 msgid "Fireplace"
 msgstr ""
 
+msgid "Picnic Table"
+msgstr ""
+
 msgid "Public Grill"
 msgstr ""
 
@@ -17674,6 +17746,12 @@ msgstr ""
 msgid "Count"
 msgstr ""
 
+msgid "Advertising Column"
+msgstr ""
+
+msgid "Billboard"
+msgstr ""
+
 msgid "Sports"
 msgstr "Sportoj"
 
@@ -19544,9 +19622,6 @@ msgstr ""
 msgid "vouchers"
 msgstr ""
 
-msgid "Note"
-msgstr ""
-
 msgid "Geography"
 msgstr ""
 
@@ -19930,9 +20005,6 @@ msgstr ""
 msgid "House number"
 msgstr "Domo numero"
 
-msgid "House name"
-msgstr "Domo nomo"
-
 msgid "Street name"
 msgstr ""
 
@@ -19945,8 +20017,8 @@ msgstr "Urbo nomo"
 msgid "Country code"
 msgstr ""
 
-msgid "Optional values for specific countries"
-msgstr ""
+msgid "House name"
+msgstr "Domo nomo"
 
 msgid "Subdistrict"
 msgstr ""
@@ -20617,6 +20689,13 @@ msgstr ""
 msgid "VoGIS: DOM (Surface model)"
 msgstr ""
 
+msgid ""
+"AGIV(laanderen) aerial imagery (covers Brussels region as well) (2013)"
+msgstr ""
+
+msgid "Geoservices Wallonie aerial imagery (2009)"
+msgstr ""
+
 msgid "IBGE Mapa de Setores Urbanos"
 msgstr ""
 
@@ -20751,6 +20830,9 @@ msgstr ""
 msgid "Hamburg (40 cm)"
 msgstr ""
 
+msgid "Hamburg (20 cm)"
+msgstr ""
+
 msgid "Hamburg (DK5)"
 msgstr ""
 
@@ -20996,6 +21078,9 @@ msgstr ""
 msgid "Kanton Aargau 25cm (AGIS 2011)"
 msgstr ""
 
+msgid "Kanton Aargau 25cm (AGIS 2014)"
+msgstr ""
+
 msgid "Stadt Uster Orthophoto 2008 10cm"
 msgstr ""
 
@@ -21353,6 +21438,9 @@ msgstr ""
 msgid "{0} without {1}, {2} or {3}"
 msgstr ""
 
+msgid "{0} together with {1}"
+msgstr ""
+
 msgid "{0} on suspicious object"
 msgstr ""
 
@@ -21371,6 +21459,12 @@ 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 "{0}={1} is deprecated"
 msgstr ""
 
@@ -21407,6 +21501,9 @@ msgstr ""
 msgid "{0} should be replaced with {1}"
 msgstr ""
 
+msgid "{0} = {1}; remove {0}"
+msgstr ""
+
 msgid ""
 "{0}={1} is unspecific. Please replace ''{1}'' by ''left'', ''right'' or "
 "''both''."
@@ -21445,6 +21542,9 @@ msgstr ""
 msgid "Overlapping Identical Landuses"
 msgstr ""
 
+msgid "{0} must be connected to a way"
+msgstr ""
+
 msgid "abbreviated street name"
 msgstr ""
 
@@ -21466,9 +21566,17 @@ msgstr ""
 msgid "street name contains ss"
 msgstr ""
 
+msgid ""
+"Value of ''{0}'' should either be ''{1}'' or ''{2}''. For sidewalks use "
+"''{3}'' instead."
+msgstr ""
+
 msgid "{0} with multiple values"
 msgstr ""
 
+msgid "empty value in semicolon-separated ''{0}''"
+msgstr ""
+
 msgid "numerical key"
 msgstr ""
 
@@ -21503,6 +21611,9 @@ msgstr ""
 msgid "{0} must be a numeric value"
 msgstr ""
 
+msgid "{0} must be a positive integer number"
+msgstr ""
+
 msgid "relation without type"
 msgstr ""
 
@@ -22697,6 +22808,12 @@ msgstr ""
 msgid "merge nodes"
 msgstr ""
 
+msgid "How often thinning operation should be applied (Default {0})."
+msgstr ""
+
+msgid "Thinning Iterations"
+msgstr ""
+
 msgid "Street Name:"
 msgstr ""
 
@@ -25714,7 +25831,9 @@ msgstr ""
 msgid "Move and position photos"
 msgstr ""
 
-msgid "Click+drag photo or shift+click to position photo."
+msgid ""
+"Click+drag photo, shift+click to position photo, control+click to set "
+"direction."
 msgstr ""
 
 msgid "Please load some photos."
@@ -26375,6 +26494,9 @@ msgstr ""
 msgid "Reconstruct polygons from relation {0}"
 msgstr ""
 
+msgid "Reconstruct route"
+msgstr ""
+
 msgid "Open relation wiki page"
 msgstr ""
 
@@ -26414,6 +26536,12 @@ msgstr ""
 msgid "Way without ''inner'' or ''outer'' role found"
 msgstr ""
 
+msgid "Node without ''stop'' or ''platform'' role found"
+msgstr ""
+
+msgid "Way platform without ''platform'' role found"
+msgstr ""
+
 msgid "Revert changeset fully"
 msgstr ""
 
@@ -26904,7 +27032,7 @@ msgstr ""
 msgid "create an associatedStreet relation"
 msgstr ""
 
-msgid "delete outline way"
+msgid "keep outline way"
 msgstr ""
 
 msgid "Street name: "
diff --git a/i18n/po/es.po b/i18n/po/es.po
index a64a3f6..3ec520c 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: 2014-12-10 03:42+0100\n"
-"PO-Revision-Date: 2014-11-05 14:16+0000\n"
-"Last-Translator: Oscar Fabian Prieto Gonzalez <Unknown>\n"
+"POT-Creation-Date: 2014-12-29 01:14+0100\n"
+"PO-Revision-Date: 2014-12-11 08:31+0000\n"
+"Last-Translator: Omar Vega <ovruni at gnu.org.pe>\n"
 "Language-Team: Spanish <es at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2014-12-10 05:12+0000\n"
-"X-Generator: Launchpad (build 17283)\n"
+"X-Launchpad-Export-Date: 2014-12-29 05:25+0000\n"
+"X-Generator: Launchpad (build 17286)\n"
 "Language: es\n"
 "X-Language: es_ES\n"
 "X-Source-Language: C\n"
@@ -1970,13 +1970,13 @@ msgid "Create new note"
 msgstr "Crear nueva nota"
 
 msgid "Create note"
-msgstr ""
+msgstr "Crear nota"
 
 msgid "Enter a detailed comment to create a note"
-msgstr ""
+msgstr "Introduzca un comentario detallado para crear una nota"
 
 msgid "You must enter a comment to create a new note"
-msgstr ""
+msgstr "Debe introducir un comentario para crear una nueva nota"
 
 msgid "Delete Mode"
 msgstr "Modo de borrado"
@@ -4119,6 +4119,9 @@ msgstr "Etiquetas de Internet"
 msgid "Checks for errors in internet-related tags."
 msgstr "Busca errores en etiquetas relacionadas a Internet."
 
+msgid " URL cannot be converted to ASCII: {0}"
+msgstr ""
+
 msgid "''{0}'': {1}"
 msgstr "''{0}'': {1}"
 
@@ -4344,20 +4347,21 @@ msgstr "Tipo de relación desconocida"
 msgid "Relation is empty"
 msgstr "La relación está vacía"
 
-msgid "<empty>"
-msgstr "<vacío>"
+msgid "Role member does not match expression {0} in template {1}"
+msgstr ""
 
-msgid "Role {0} unknown"
-msgstr "Rol {0} desconocido"
+msgid ""
+"Role member type {0} does not match accepted list of {1} in template {2}"
+msgstr ""
 
-msgid "Empty role found"
-msgstr "Se encontró un rol vacío"
+msgid "<empty>"
+msgstr "<vacío>"
 
-msgid "Member for role ''{0}'' does not match ''{1}''"
-msgstr "El miembro para el rol ''{0}'' no concuerda con ''{1}''"
+msgid "Role {0} unknown in templates {1}"
+msgstr ""
 
-msgid "Member for role {0} of wrong type"
-msgstr "Miembro de rol {0} con tipo erróneo"
+msgid "Empty role type found when expecting one of {0}"
+msgstr ""
 
 msgid "Role {0} missing"
 msgstr "Falta el rol {0}"
@@ -4915,11 +4919,36 @@ msgstr "Deshabilitar el acceso al recurso(s) dado(s), separados por comas"
 msgid "options provided as Java system properties"
 msgstr "opciones proporcionadas como propiedades de sistema Java"
 
-msgid "/PATH/TO/JOSM/FOLDER/         "
-msgstr "/PATH/TO/JOSM/FOLDER/         "
+msgid "/PATH/TO/JOSM/PREF    "
+msgstr ""
+
+msgid "Set the preferences directory"
+msgstr ""
 
-msgid "Change the folder for all user settings"
-msgstr "Cambiar la carpeta para todas las configuraciones de usuario"
+msgid "/PATH/TO/JOSM/USERDATA"
+msgstr ""
+
+msgid "Set the user data directory"
+msgstr ""
+
+msgid "/PATH/TO/JOSM/CACHE   "
+msgstr ""
+
+msgid "Set the cache directory"
+msgstr ""
+
+msgid "/PATH/TO/JOSM/HOMEDIR "
+msgstr ""
+
+msgid ""
+"Relocate all 3 directories to homedir. Cache directory will be in "
+"homedir/cache"
+msgstr ""
+
+msgid ""
+"-Djosm.home has lower precedence, i.e. the specific setting overrides the "
+"general one"
+msgstr ""
 
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -5202,6 +5231,21 @@ msgstr "capa no listada"
 msgid "Layer ''{0}'' must be in list of layers"
 msgstr "La capa ''{0}'' debe estar en la lista de capas"
 
+msgid "Default (open, closed, new)"
+msgstr ""
+
+msgid "Username"
+msgstr "Nombre de usuario"
+
+msgid "Created date"
+msgstr "Fecha de creación"
+
+msgid "Last change date"
+msgstr "Última fecha de modificación"
+
+msgid "Select note sorting method"
+msgstr ""
+
 msgid "Click to cancel the current operation"
 msgstr "Haga clic para cancelar la operación actual"
 
@@ -6672,7 +6716,7 @@ msgid "Comment"
 msgstr "Comentario"
 
 msgid "Comment on note"
-msgstr ""
+msgstr "Comentar sobre la nota"
 
 msgid "Add comment to note:"
 msgstr "Añadir comentario a la nota:"
@@ -6698,6 +6742,12 @@ msgstr "Reabrir"
 msgid "Reopen note with message:"
 msgstr "Reabrir nota con el mensaje;"
 
+msgid "Sort notes"
+msgstr "Ordenar notas"
+
+msgid "Sort"
+msgstr "Ordenar"
+
 msgid "Object type:"
 msgstr "Tipo de objeto:"
 
@@ -7805,9 +7855,6 @@ msgstr "Seleccionar los objetos para los miembros de la relación indicados"
 msgid "Sort the relation members"
 msgstr "Ordenar los miembros de la relación"
 
-msgid "Sort"
-msgstr "Ordenar"
-
 msgid "Relation Editor: Sort"
 msgstr "Editor de relaciones: ordenar"
 
@@ -8137,6 +8184,8 @@ msgstr "Billetes"
 
 msgid "Select to download notes in the selected download area."
 msgstr ""
+"Seleccione esta opción para descargar notas en el área de descarga "
+"seleccionada."
 
 msgid "Download as new layer"
 msgstr "Descargar como nueva capa"
@@ -8698,9 +8747,6 @@ msgstr "Introduzca las credenciales para el servidor"
 msgid "Enter credentials for HTTP proxy"
 msgstr "Introducir las credenciales para el proxy HTTP"
 
-msgid "Username"
-msgstr "Nombre de usuario"
-
 msgid "Password"
 msgstr "Contraseña"
 
@@ -9501,6 +9547,9 @@ msgstr ""
 msgid "Save Layer"
 msgstr "Guardar capa"
 
+msgid "Note"
+msgstr "Nota"
+
 msgid "Notes layer"
 msgstr "Capa de notas"
 
@@ -9979,6 +10028,9 @@ msgstr "Eliminar foto de la capa"
 msgid "Delete File from disk"
 msgstr "Borrar archivo del disco"
 
+msgid "Copy image path"
+msgstr ""
+
 msgid "Next"
 msgstr "Siguiente"
 
@@ -13835,6 +13887,9 @@ msgid "Illegal long value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 "Hay un valor ilegal número(long) para el atributo \"{0}\". Se obtuvo \"{1}\"."
 
+msgid "{0} bytes have been read"
+msgstr ""
+
 msgid "Prepare OSM data..."
 msgstr "Preparando datos OSM..."
 
@@ -14025,8 +14080,8 @@ msgid "Cannot start remotecontrol server on port {0}: {1}"
 msgstr ""
 "No se puede iniciar el servidor de control remoto en el puerto {0}: {1}"
 
-msgid "RemoteControl::Accepting connections on port {0}"
-msgstr "ControlRemoto::Aceptando conexiones en el puerto {0}"
+msgid "RemoteControl::Accepting connections on {0}:{1}"
+msgstr ""
 
 msgid "RemoteControl::Server stopped."
 msgstr "ControlRemoto::El servidor fue detenido"
@@ -14037,8 +14092,8 @@ msgstr "No se puede iniciar el servidor https en el puerto {0}: {1}"
 msgid "Unable to initialize Remote Control HTTPS Server"
 msgstr "No se puede inicializar Control Remoto sobre Servidor HTTPS"
 
-msgid "RemoteControl::Accepting secure connections on port {0}"
-msgstr "ControlRemoto::Aceptando conexiones seguras en el puerto {0}"
+msgid "RemoteControl::Accepting secure connections on {0}:{1}"
+msgstr ""
 
 msgid "RemoteControl::Server (https) stopped."
 msgstr "ControlRemoto:::Servidor (https) se detuvo."
@@ -15250,9 +15305,6 @@ msgstr ""
 "<html><p> Lo sentimos, es imposible pegar etiquetas desde la memoria. No "
 "contiene ningún objeto de JOSM o un texto adecuado. </p></html>"
 
-msgid "Invalid bz2 file."
-msgstr "Archivo bz2 inválido"
-
 msgid "ms"
 msgstr "ms"
 
@@ -15725,6 +15777,8 @@ msgid ""
 "Allows to import various file formats into JOSM directly. Currently "
 "supported: TangoGPS, Garmin Trainings Center TCX."
 msgstr ""
+"Permite importar varios formatos de archivo en JOSM directamente. "
+"Actualmente los formatos soportados: TangoGPS, Garmin Trainings Center TCX."
 
 msgid "Download your GPX tracks from openstreetmap.org"
 msgstr "Descarga tus trazas GPX desde openstreetmap.org"
@@ -15852,6 +15906,9 @@ msgid ""
 "Provides Java Native Access (JNA) library. Not meant to be installed "
 "directly by users, but rather as a dependency for other plugins."
 msgstr ""
+"Proporciona la biblioteca Java Native Access (JNA). No pretende ser "
+"instalado directamente por los usuarios, sino más bien como una dependencia "
+"de otros complementos."
 
 msgid ""
 "Provides Java Topology Suite (JTS) library and related utilities. Not meant "
@@ -16297,19 +16354,19 @@ msgstr "anden"
 
 msgctxt "sidewalk"
 msgid "both"
-msgstr ""
+msgstr "ambos"
 
 msgctxt "sidewalk"
 msgid "left"
-msgstr ""
+msgstr "izquierda"
 
 msgctxt "sidewalk"
 msgid "right"
-msgstr ""
+msgstr "derecha"
 
 msgctxt "sidewalk"
 msgid "no"
-msgstr ""
+msgstr "no"
 
 msgid "Service type"
 msgstr "Tipo de servicio"
@@ -16654,6 +16711,10 @@ msgstr "tenis"
 msgid "Coins"
 msgstr "Monedas"
 
+msgctxt "payment"
+msgid "Notes"
+msgstr "Notas"
+
 msgid "Electronic purses and Charge cards"
 msgstr "Tarjetas de recarga y monederos electrónicos"
 
@@ -16680,19 +16741,19 @@ msgstr "May-Sep 09:30-12:30,14:15-19:30"
 
 msgctxt "parking"
 msgid "multi-storey"
-msgstr ""
+msgstr "de varios pisos"
 
 msgctxt "parking"
 msgid "surface"
-msgstr ""
+msgstr "superficie"
 
 msgctxt "parking"
 msgid "underground"
-msgstr ""
+msgstr "subterráneo"
 
 msgctxt "parking"
 msgid "rooftop"
-msgstr ""
+msgstr "azotea"
 
 msgid "Reference number"
 msgstr "Número de referencia"
@@ -17152,23 +17213,23 @@ msgstr "sobrepaso"
 
 msgctxt "overtaking"
 msgid "yes"
-msgstr ""
+msgstr "sí"
 
 msgctxt "overtaking"
 msgid "both"
-msgstr ""
+msgstr "ambos"
 
 msgctxt "overtaking"
 msgid "forward"
-msgstr ""
+msgstr "adelante"
 
 msgctxt "overtaking"
 msgid "backward"
-msgstr ""
+msgstr "retroceder"
 
 msgctxt "overtaking"
 msgid "no"
-msgstr ""
+msgstr "no"
 
 msgid "Roundabout"
 msgstr "Rotonda"
@@ -17492,6 +17553,9 @@ msgstr "Cruce de bicicletas"
 msgid "Cross on horseback"
 msgstr "Cruce de caballos"
 
+msgid "Optional values for specific countries"
+msgstr "Valores opcionales para países específicos"
+
 msgid "Stop"
 msgstr "Stop"
 
@@ -17549,6 +17613,18 @@ msgstr "Nombre alternativo"
 msgid "Speed Camera"
 msgstr "Rádar de tráfico"
 
+msgid "Traffic Mirror"
+msgstr ""
+
+msgctxt "junction=yes"
+msgid "Named Junction"
+msgstr ""
+
+msgid ""
+"Used in some countries for a named road junction who’s name serves for local "
+"orientation."
+msgstr ""
+
 msgid "Elevator"
 msgstr "Ascensor"
 
@@ -19006,6 +19082,9 @@ msgstr "Zona de picnic"
 msgid "Fireplace"
 msgstr "Barbacoa"
 
+msgid "Picnic Table"
+msgstr ""
+
 msgid "Public Grill"
 msgstr "Barbacoa pública"
 
@@ -19613,6 +19692,12 @@ msgstr "succión"
 msgid "Count"
 msgstr "Cuenta"
 
+msgid "Advertising Column"
+msgstr ""
+
+msgid "Billboard"
+msgstr ""
+
 msgid "Sports"
 msgstr "Deportes"
 
@@ -21145,7 +21230,7 @@ msgstr "Monumento conmemorativo"
 
 msgctxt "memorial"
 msgid "statue"
-msgstr ""
+msgstr "estatua"
 
 msgctxt "memorial"
 msgid "bust"
@@ -21157,11 +21242,11 @@ msgstr "Placa"
 
 msgctxt "memorial"
 msgid "stele"
-msgstr ""
+msgstr "estela"
 
 msgctxt "memorial"
 msgid "stone"
-msgstr ""
+msgstr "piedra"
 
 msgctxt "memorial"
 msgid "war_memorial"
@@ -21485,9 +21570,6 @@ msgstr "juguetes"
 msgid "vouchers"
 msgstr "Bonos"
 
-msgid "Note"
-msgstr "Nota"
-
 msgid "Geography"
 msgstr "Geografía"
 
@@ -21522,13 +21604,13 @@ msgid "National Park"
 msgstr "Parque Nacional"
 
 msgid "Protected Area"
-msgstr ""
+msgstr "Área Protegida"
 
 msgid "Protected Class"
-msgstr ""
+msgstr "Clase protegida"
 
 msgid "Title or type of protection"
-msgstr ""
+msgstr "Título o tipo de protección"
 
 msgid "Places"
 msgstr "Lugares"
@@ -21894,9 +21976,6 @@ msgstr "Abreviatura común del nombre"
 msgid "House number"
 msgstr "Número de portal"
 
-msgid "House name"
-msgstr "Nombre del edificio"
-
 msgid "Street name"
 msgstr "Nombre de la calle"
 
@@ -21909,8 +21988,8 @@ msgstr "Nombre de la ciudad"
 msgid "Country code"
 msgstr "Código del país"
 
-msgid "Optional values for specific countries"
-msgstr "Valores opcionales para países específicos"
+msgid "House name"
+msgstr "Nombre del edificio"
 
 msgid "Subdistrict"
 msgstr "Subdistrito"
@@ -22581,6 +22660,13 @@ msgstr "VoGIS: DGM (modelo de terreno)"
 msgid "VoGIS: DOM (Surface model)"
 msgstr "VoGIS: DOM (modelo de superficie)"
 
+msgid ""
+"AGIV(laanderen) aerial imagery (covers Brussels region as well) (2013)"
+msgstr ""
+
+msgid "Geoservices Wallonie aerial imagery (2009)"
+msgstr ""
+
 msgid "IBGE Mapa de Setores Urbanos"
 msgstr "IBGE Mapa de Sectores Urbanos"
 
@@ -22716,6 +22802,9 @@ msgstr "OpenStreetMap (idioma sorabo)"
 msgid "Hamburg (40 cm)"
 msgstr "Hamburgo (40 cm)"
 
+msgid "Hamburg (20 cm)"
+msgstr ""
+
 msgid "Hamburg (DK5)"
 msgstr "Hamburgo (DK5)"
 
@@ -22965,6 +23054,9 @@ msgstr "GRAFCAN Expresa - Islas Canarias"
 msgid "Kanton Aargau 25cm (AGIS 2011)"
 msgstr "Cantón Aargau 25cm (AGIS 2011)"
 
+msgid "Kanton Aargau 25cm (AGIS 2014)"
+msgstr ""
+
 msgid "Stadt Uster Orthophoto 2008 10cm"
 msgstr "Stadt Uster Ortofoto 2008 10cm"
 
@@ -23322,6 +23414,9 @@ msgstr "{0} sin {1} o {2}"
 msgid "{0} without {1}, {2} or {3}"
 msgstr "{0} sin {1}, {2} o {3}"
 
+msgid "{0} together with {1}"
+msgstr ""
+
 msgid "{0} on suspicious object"
 msgstr "{0} en objeto sospechoso"
 
@@ -23340,6 +23435,12 @@ 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 ""
+
+msgid "incomplete usage of {0} on a way without {1}"
+msgstr ""
+
 msgid "{0}={1} is deprecated"
 msgstr "{0}={1} está obsoleto"
 
@@ -23383,6 +23484,9 @@ msgstr ""
 msgid "{0} should be replaced with {1}"
 msgstr ""
 
+msgid "{0} = {1}; remove {0}"
+msgstr ""
+
 msgid ""
 "{0}={1} is unspecific. Please replace ''{1}'' by ''left'', ''right'' or "
 "''both''."
@@ -23421,6 +23525,9 @@ 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 ""
+
 msgid "abbreviated street name"
 msgstr "nombre de calle abreviado"
 
@@ -23442,9 +23549,17 @@ msgstr "tipo de carretera de uso temporal"
 msgid "street name contains ss"
 msgstr "nombre de calle contiene ss"
 
+msgid ""
+"Value of ''{0}'' should either be ''{1}'' or ''{2}''. For sidewalks use "
+"''{3}'' instead."
+msgstr ""
+
 msgid "{0} with multiple values"
 msgstr "{0} con múltiples valores"
 
+msgid "empty value in semicolon-separated ''{0}''"
+msgstr ""
+
 msgid "numerical key"
 msgstr "tecla numérica"
 
@@ -23482,6 +23597,9 @@ msgstr "inclinación inusual; usar porcentajes/grados o arriba/abajo"
 msgid "{0} must be a numeric value"
 msgstr "{0} debe ser un valor numérico"
 
+msgid "{0} must be a positive integer number"
+msgstr ""
+
 msgid "relation without type"
 msgstr "relation sin type"
 
@@ -24841,6 +24959,12 @@ msgstr "Combinar nodos con sus vecinos"
 msgid "merge nodes"
 msgstr "combinar nodos"
 
+msgid "How often thinning operation should be applied (Default {0})."
+msgstr ""
+
+msgid "Thinning Iterations"
+msgstr ""
+
 msgid "Street Name:"
 msgstr "Nombre de Calle:"
 
@@ -28135,8 +28259,10 @@ msgstr "Adjuntar fotos"
 msgid "Move and position photos"
 msgstr "Mover y colocar fotos"
 
-msgid "Click+drag photo or shift+click to position photo."
-msgstr "Haga clic y arrastre la foto o Mayús+clic para posicionar la foto"
+msgid ""
+"Click+drag photo, shift+click to position photo, control+click to set "
+"direction."
+msgstr ""
 
 msgid "Please load some photos."
 msgstr "Por favor cargue algunas fotos."
@@ -28815,6 +28941,9 @@ msgstr ""
 msgid "Reconstruct polygons from relation {0}"
 msgstr "Reconstruir polígonos a partir de la relación {0}"
 
+msgid "Reconstruct route"
+msgstr ""
+
 msgid "Open relation wiki page"
 msgstr "Abrir la página de la wiki relacionada"
 
@@ -28854,6 +28983,12 @@ msgstr "Se encontró un nodo sin el rol ''label'' o ''admin_centre''"
 msgid "Way without ''inner'' or ''outer'' role found"
 msgstr "Se encontró una vía sin e lrol ''iner'' o ''outer''"
 
+msgid "Node without ''stop'' or ''platform'' role found"
+msgstr ""
+
+msgid "Way platform without ''platform'' role found"
+msgstr ""
+
 msgid "Revert changeset fully"
 msgstr "Conjunto de cambios revertido en su totalidad"
 
@@ -29386,8 +29521,8 @@ msgstr "Agregar a una relación de asociación de calle existente"
 msgid "create an associatedStreet relation"
 msgstr "crear una relación de asociación de calle"
 
-msgid "delete outline way"
-msgstr "Eliminar vía resaltada"
+msgid "keep outline way"
+msgstr ""
 
 msgid "Street name: "
 msgstr "Nombre de calle: "
diff --git a/i18n/po/et.po b/i18n/po/et.po
index d6d9654..8ea1b07 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: 2014-12-10 03:42+0100\n"
+"POT-Creation-Date: 2014-12-29 01:14+0100\n"
 "PO-Revision-Date: 2014-11-24 22:08+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: 2014-12-10 04:44+0000\n"
-"X-Generator: Launchpad (build 17283)\n"
+"X-Launchpad-Export-Date: 2014-12-29 04:48+0000\n"
+"X-Generator: Launchpad (build 17286)\n"
 "Language: et\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -3806,6 +3806,9 @@ msgstr ""
 msgid "Checks for errors in internet-related tags."
 msgstr ""
 
+msgid " URL cannot be converted to ASCII: {0}"
+msgstr ""
+
 msgid "''{0}'': {1}"
 msgstr ""
 
@@ -4012,19 +4015,20 @@ msgstr ""
 msgid "Relation is empty"
 msgstr ""
 
-msgid "<empty>"
+msgid "Role member does not match expression {0} in template {1}"
 msgstr ""
 
-msgid "Role {0} unknown"
+msgid ""
+"Role member type {0} does not match accepted list of {1} in template {2}"
 msgstr ""
 
-msgid "Empty role found"
+msgid "<empty>"
 msgstr ""
 
-msgid "Member for role ''{0}'' does not match ''{1}''"
+msgid "Role {0} unknown in templates {1}"
 msgstr ""
 
-msgid "Member for role {0} of wrong type"
+msgid "Empty role type found when expecting one of {0}"
 msgstr ""
 
 msgid "Role {0} missing"
@@ -4560,10 +4564,35 @@ msgstr ""
 msgid "options provided as Java system properties"
 msgstr ""
 
-msgid "/PATH/TO/JOSM/FOLDER/         "
+msgid "/PATH/TO/JOSM/PREF    "
+msgstr ""
+
+msgid "Set the preferences directory"
+msgstr ""
+
+msgid "/PATH/TO/JOSM/USERDATA"
+msgstr ""
+
+msgid "Set the user data directory"
+msgstr ""
+
+msgid "/PATH/TO/JOSM/CACHE   "
+msgstr ""
+
+msgid "Set the cache directory"
 msgstr ""
 
-msgid "Change the folder for all user settings"
+msgid "/PATH/TO/JOSM/HOMEDIR "
+msgstr ""
+
+msgid ""
+"Relocate all 3 directories to homedir. Cache directory will be in "
+"homedir/cache"
+msgstr ""
+
+msgid ""
+"-Djosm.home has lower precedence, i.e. the specific setting overrides the "
+"general one"
 msgstr ""
 
 msgid ""
@@ -4818,6 +4847,21 @@ msgstr "Kiht ei ole nimistus."
 msgid "Layer ''{0}'' must be in list of layers"
 msgstr "Kiht ''{0}'' peab olema kihtide nimistus"
 
+msgid "Default (open, closed, new)"
+msgstr ""
+
+msgid "Username"
+msgstr "Kasutajanimi"
+
+msgid "Created date"
+msgstr ""
+
+msgid "Last change date"
+msgstr ""
+
+msgid "Select note sorting method"
+msgstr ""
+
 msgid "Click to cancel the current operation"
 msgstr ""
 
@@ -6163,6 +6207,12 @@ msgstr ""
 msgid "Reopen note with message:"
 msgstr ""
 
+msgid "Sort notes"
+msgstr ""
+
+msgid "Sort"
+msgstr ""
+
 msgid "Object type:"
 msgstr "Objekti tüüp:"
 
@@ -7162,9 +7212,6 @@ msgstr ""
 msgid "Sort the relation members"
 msgstr ""
 
-msgid "Sort"
-msgstr ""
-
 msgid "Relation Editor: Sort"
 msgstr ""
 
@@ -7966,9 +8013,6 @@ msgstr ""
 msgid "Enter credentials for HTTP proxy"
 msgstr ""
 
-msgid "Username"
-msgstr "Kasutajanimi"
-
 msgid "Password"
 msgstr "Salasõna"
 
@@ -8674,6 +8718,9 @@ msgstr ""
 msgid "Save Layer"
 msgstr "Salvesta kiht"
 
+msgid "Note"
+msgstr "Märkus"
+
 msgid "Notes layer"
 msgstr ""
 
@@ -9131,6 +9178,9 @@ msgstr ""
 msgid "Delete File from disk"
 msgstr ""
 
+msgid "Copy image path"
+msgstr ""
+
 msgid "Next"
 msgstr ""
 
@@ -12552,6 +12602,9 @@ msgstr ""
 msgid "Illegal long value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
+msgid "{0} bytes have been read"
+msgstr ""
+
 msgid "Prepare OSM data..."
 msgstr "OSM andmeid ettevalmistamine..."
 
@@ -12738,7 +12791,7 @@ msgstr "Protokolli versiooni lugemine"
 msgid "Cannot start remotecontrol server on port {0}: {1}"
 msgstr ""
 
-msgid "RemoteControl::Accepting connections on port {0}"
+msgid "RemoteControl::Accepting connections on {0}:{1}"
 msgstr ""
 
 msgid "RemoteControl::Server stopped."
@@ -12750,7 +12803,7 @@ msgstr ""
 msgid "Unable to initialize Remote Control HTTPS Server"
 msgstr ""
 
-msgid "RemoteControl::Accepting secure connections on port {0}"
+msgid "RemoteControl::Accepting secure connections on {0}:{1}"
 msgstr ""
 
 msgid "RemoteControl::Server (https) stopped."
@@ -13730,9 +13783,6 @@ msgid ""
 "contain any JOSM object or suitable text. </p></html>"
 msgstr ""
 
-msgid "Invalid bz2 file."
-msgstr ""
-
 msgid "ms"
 msgstr ""
 
@@ -14972,6 +15022,10 @@ msgstr ""
 msgid "Coins"
 msgstr "Mündid"
 
+msgctxt "payment"
+msgid "Notes"
+msgstr ""
+
 msgid "Electronic purses and Charge cards"
 msgstr "Elektroonilised rahakotid ja krediitkaardid"
 
@@ -15794,6 +15848,9 @@ msgstr ""
 msgid "Cross on horseback"
 msgstr ""
 
+msgid "Optional values for specific countries"
+msgstr ""
+
 msgid "Stop"
 msgstr ""
 
@@ -15851,6 +15908,18 @@ msgstr ""
 msgid "Speed Camera"
 msgstr "Kiiruskaamera"
 
+msgid "Traffic Mirror"
+msgstr ""
+
+msgctxt "junction=yes"
+msgid "Named Junction"
+msgstr ""
+
+msgid ""
+"Used in some countries for a named road junction who’s name serves for local "
+"orientation."
+msgstr ""
+
 msgid "Elevator"
 msgstr ""
 
@@ -17295,6 +17364,9 @@ msgstr "Piknikuplats"
 msgid "Fireplace"
 msgstr "Lõkkease"
 
+msgid "Picnic Table"
+msgstr ""
+
 msgid "Public Grill"
 msgstr ""
 
@@ -17900,6 +17972,12 @@ msgstr "imemine"
 msgid "Count"
 msgstr "Arv"
 
+msgid "Advertising Column"
+msgstr ""
+
+msgid "Billboard"
+msgstr ""
+
 msgid "Sports"
 msgstr "Sporditarbed"
 
@@ -19770,9 +19848,6 @@ msgstr "mänguasjad"
 msgid "vouchers"
 msgstr "maksedokumendid"
 
-msgid "Note"
-msgstr "Märkus"
-
 msgid "Geography"
 msgstr "Geograafia"
 
@@ -20156,9 +20231,6 @@ msgstr ""
 msgid "House number"
 msgstr "Maja number"
 
-msgid "House name"
-msgstr "Maja nimi"
-
 msgid "Street name"
 msgstr "Tänava nimi"
 
@@ -20171,8 +20243,8 @@ msgstr "Linna nimi"
 msgid "Country code"
 msgstr "Riigi kood"
 
-msgid "Optional values for specific countries"
-msgstr ""
+msgid "House name"
+msgstr "Maja nimi"
 
 msgid "Subdistrict"
 msgstr ""
@@ -20843,6 +20915,13 @@ msgstr ""
 msgid "VoGIS: DOM (Surface model)"
 msgstr ""
 
+msgid ""
+"AGIV(laanderen) aerial imagery (covers Brussels region as well) (2013)"
+msgstr ""
+
+msgid "Geoservices Wallonie aerial imagery (2009)"
+msgstr ""
+
 msgid "IBGE Mapa de Setores Urbanos"
 msgstr ""
 
@@ -20977,6 +21056,9 @@ msgstr ""
 msgid "Hamburg (40 cm)"
 msgstr ""
 
+msgid "Hamburg (20 cm)"
+msgstr ""
+
 msgid "Hamburg (DK5)"
 msgstr ""
 
@@ -21222,6 +21304,9 @@ msgstr ""
 msgid "Kanton Aargau 25cm (AGIS 2011)"
 msgstr ""
 
+msgid "Kanton Aargau 25cm (AGIS 2014)"
+msgstr ""
+
 msgid "Stadt Uster Orthophoto 2008 10cm"
 msgstr ""
 
@@ -21579,6 +21664,9 @@ msgstr ""
 msgid "{0} without {1}, {2} or {3}"
 msgstr ""
 
+msgid "{0} together with {1}"
+msgstr ""
+
 msgid "{0} on suspicious object"
 msgstr ""
 
@@ -21597,6 +21685,12 @@ 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 "{0}={1} is deprecated"
 msgstr ""
 
@@ -21633,6 +21727,9 @@ msgstr ""
 msgid "{0} should be replaced with {1}"
 msgstr ""
 
+msgid "{0} = {1}; remove {0}"
+msgstr ""
+
 msgid ""
 "{0}={1} is unspecific. Please replace ''{1}'' by ''left'', ''right'' or "
 "''both''."
@@ -21671,6 +21768,9 @@ msgstr ""
 msgid "Overlapping Identical Landuses"
 msgstr ""
 
+msgid "{0} must be connected to a way"
+msgstr ""
+
 msgid "abbreviated street name"
 msgstr ""
 
@@ -21692,9 +21792,17 @@ msgstr ""
 msgid "street name contains ss"
 msgstr ""
 
+msgid ""
+"Value of ''{0}'' should either be ''{1}'' or ''{2}''. For sidewalks use "
+"''{3}'' instead."
+msgstr ""
+
 msgid "{0} with multiple values"
 msgstr ""
 
+msgid "empty value in semicolon-separated ''{0}''"
+msgstr ""
+
 msgid "numerical key"
 msgstr ""
 
@@ -21729,6 +21837,9 @@ msgstr ""
 msgid "{0} must be a numeric value"
 msgstr ""
 
+msgid "{0} must be a positive integer number"
+msgstr ""
+
 msgid "relation without type"
 msgstr ""
 
@@ -22933,6 +23044,12 @@ msgstr ""
 msgid "merge nodes"
 msgstr ""
 
+msgid "How often thinning operation should be applied (Default {0})."
+msgstr ""
+
+msgid "Thinning Iterations"
+msgstr ""
+
 msgid "Street Name:"
 msgstr "Tänava nimi:"
 
@@ -25962,7 +26079,9 @@ msgstr ""
 msgid "Move and position photos"
 msgstr ""
 
-msgid "Click+drag photo or shift+click to position photo."
+msgid ""
+"Click+drag photo, shift+click to position photo, control+click to set "
+"direction."
 msgstr ""
 
 msgid "Please load some photos."
@@ -26623,6 +26742,9 @@ msgstr ""
 msgid "Reconstruct polygons from relation {0}"
 msgstr ""
 
+msgid "Reconstruct route"
+msgstr ""
+
 msgid "Open relation wiki page"
 msgstr ""
 
@@ -26662,6 +26784,12 @@ msgstr ""
 msgid "Way without ''inner'' or ''outer'' role found"
 msgstr ""
 
+msgid "Node without ''stop'' or ''platform'' role found"
+msgstr ""
+
+msgid "Way platform without ''platform'' role found"
+msgstr ""
+
 msgid "Revert changeset fully"
 msgstr ""
 
@@ -27152,7 +27280,7 @@ msgstr ""
 msgid "create an associatedStreet relation"
 msgstr ""
 
-msgid "delete outline way"
+msgid "keep outline way"
 msgstr ""
 
 msgid "Street name: "
diff --git a/i18n/po/eu.po b/i18n/po/eu.po
index 20c4cb2..1280557 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: 2014-12-10 03:42+0100\n"
+"POT-Creation-Date: 2014-12-29 01:14+0100\n"
 "PO-Revision-Date: 2013-03-30 13:56+0000\n"
 "Last-Translator: Txopi <txopi at sindominio.net>\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: 2014-12-10 04:36+0000\n"
-"X-Generator: Launchpad (build 17283)\n"
+"X-Launchpad-Export-Date: 2014-12-29 04:38+0000\n"
+"X-Generator: Launchpad (build 17286)\n"
 "Language: eu\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -3873,6 +3873,9 @@ msgstr ""
 msgid "Checks for errors in internet-related tags."
 msgstr ""
 
+msgid " URL cannot be converted to ASCII: {0}"
+msgstr ""
+
 msgid "''{0}'': {1}"
 msgstr ""
 
@@ -4079,19 +4082,20 @@ msgstr ""
 msgid "Relation is empty"
 msgstr ""
 
-msgid "<empty>"
+msgid "Role member does not match expression {0} in template {1}"
 msgstr ""
 
-msgid "Role {0} unknown"
+msgid ""
+"Role member type {0} does not match accepted list of {1} in template {2}"
 msgstr ""
 
-msgid "Empty role found"
+msgid "<empty>"
 msgstr ""
 
-msgid "Member for role ''{0}'' does not match ''{1}''"
+msgid "Role {0} unknown in templates {1}"
 msgstr ""
 
-msgid "Member for role {0} of wrong type"
+msgid "Empty role type found when expecting one of {0}"
 msgstr ""
 
 msgid "Role {0} missing"
@@ -4643,11 +4647,36 @@ msgstr ""
 msgid "options provided as Java system properties"
 msgstr "aukera hauek Java-ren sistema propietate moduan ematen dira"
 
-msgid "/PATH/TO/JOSM/FOLDER/         "
-msgstr "/JOSM/KARPETARA/BIDEA/         "
+msgid "/PATH/TO/JOSM/PREF    "
+msgstr ""
+
+msgid "Set the preferences directory"
+msgstr ""
+
+msgid "/PATH/TO/JOSM/USERDATA"
+msgstr ""
+
+msgid "Set the user data directory"
+msgstr ""
+
+msgid "/PATH/TO/JOSM/CACHE   "
+msgstr ""
+
+msgid "Set the cache directory"
+msgstr ""
+
+msgid "/PATH/TO/JOSM/HOMEDIR "
+msgstr ""
+
+msgid ""
+"Relocate all 3 directories to homedir. Cache directory will be in "
+"homedir/cache"
+msgstr ""
 
-msgid "Change the folder for all user settings"
-msgstr "Erabiltzailearen hobespen guztientzat karpeta aldatu"
+msgid ""
+"-Djosm.home has lower precedence, i.e. the specific setting overrides the "
+"general one"
+msgstr ""
 
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4910,6 +4939,21 @@ msgstr "Geruza hau ez dago zerrendan."
 msgid "Layer ''{0}'' must be in list of layers"
 msgstr "\"{0}\" geruzak, geruzen zerrendan egon behar du"
 
+msgid "Default (open, closed, new)"
+msgstr ""
+
+msgid "Username"
+msgstr "Erabiltzaile izena"
+
+msgid "Created date"
+msgstr ""
+
+msgid "Last change date"
+msgstr ""
+
+msgid "Select note sorting method"
+msgstr ""
+
 msgid "Click to cancel the current operation"
 msgstr "Klik egin ekintza hau ezeztatzeko"
 
@@ -6281,6 +6325,12 @@ msgstr ""
 msgid "Reopen note with message:"
 msgstr ""
 
+msgid "Sort notes"
+msgstr ""
+
+msgid "Sort"
+msgstr "Ordenatu"
+
 msgid "Object type:"
 msgstr "Objektu mota"
 
@@ -7264,9 +7314,6 @@ msgstr ""
 msgid "Sort the relation members"
 msgstr ""
 
-msgid "Sort"
-msgstr "Ordenatu"
-
 msgid "Relation Editor: Sort"
 msgstr ""
 
@@ -8048,9 +8095,6 @@ msgstr ""
 msgid "Enter credentials for HTTP proxy"
 msgstr ""
 
-msgid "Username"
-msgstr "Erabiltzaile izena"
-
 msgid "Password"
 msgstr "Pasahitza"
 
@@ -8730,6 +8774,9 @@ msgstr ""
 msgid "Save Layer"
 msgstr "Geruza gorde"
 
+msgid "Note"
+msgstr "Oharra"
+
 msgid "Notes layer"
 msgstr ""
 
@@ -9181,6 +9228,9 @@ msgstr ""
 msgid "Delete File from disk"
 msgstr ""
 
+msgid "Copy image path"
+msgstr ""
+
 msgid "Next"
 msgstr ""
 
@@ -12561,6 +12611,9 @@ msgstr ""
 msgid "Illegal long value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
+msgid "{0} bytes have been read"
+msgstr ""
+
 msgid "Prepare OSM data..."
 msgstr ""
 
@@ -12741,7 +12794,7 @@ msgstr ""
 msgid "Cannot start remotecontrol server on port {0}: {1}"
 msgstr ""
 
-msgid "RemoteControl::Accepting connections on port {0}"
+msgid "RemoteControl::Accepting connections on {0}:{1}"
 msgstr ""
 
 msgid "RemoteControl::Server stopped."
@@ -12753,7 +12806,7 @@ msgstr ""
 msgid "Unable to initialize Remote Control HTTPS Server"
 msgstr ""
 
-msgid "RemoteControl::Accepting secure connections on port {0}"
+msgid "RemoteControl::Accepting secure connections on {0}:{1}"
 msgstr ""
 
 msgid "RemoteControl::Server (https) stopped."
@@ -13713,9 +13766,6 @@ msgid ""
 "contain any JOSM object or suitable text. </p></html>"
 msgstr ""
 
-msgid "Invalid bz2 file."
-msgstr ""
-
 msgid "ms"
 msgstr ""
 
@@ -15000,6 +15050,10 @@ msgstr ""
 msgid "Coins"
 msgstr "Txanponak"
 
+msgctxt "payment"
+msgid "Notes"
+msgstr ""
+
 msgid "Electronic purses and Charge cards"
 msgstr "Errekarga-txartelak eta diru-zorro elektronikoak"
 
@@ -15822,6 +15876,9 @@ msgstr "Bizikleten bidegurutzea"
 msgid "Cross on horseback"
 msgstr "Zaldien bidegurutzea"
 
+msgid "Optional values for specific countries"
+msgstr ""
+
 msgid "Stop"
 msgstr "Gelditu"
 
@@ -15879,6 +15936,18 @@ msgstr "Bigarren izena"
 msgid "Speed Camera"
 msgstr "Abiadura radarra"
 
+msgid "Traffic Mirror"
+msgstr ""
+
+msgctxt "junction=yes"
+msgid "Named Junction"
+msgstr ""
+
+msgid ""
+"Used in some countries for a named road junction who’s name serves for local "
+"orientation."
+msgstr ""
+
 msgid "Elevator"
 msgstr ""
 
@@ -17323,6 +17392,9 @@ msgstr "Piknik-gunea"
 msgid "Fireplace"
 msgstr "Barbakoa"
 
+msgid "Picnic Table"
+msgstr ""
+
 msgid "Public Grill"
 msgstr ""
 
@@ -17928,6 +18000,12 @@ msgstr ""
 msgid "Count"
 msgstr ""
 
+msgid "Advertising Column"
+msgstr ""
+
+msgid "Billboard"
+msgstr ""
+
 msgid "Sports"
 msgstr "Kirolak"
 
@@ -19798,9 +19876,6 @@ msgstr "jostailuak"
 msgid "vouchers"
 msgstr "Bonuak"
 
-msgid "Note"
-msgstr "Oharra"
-
 msgid "Geography"
 msgstr "Geografia"
 
@@ -20184,9 +20259,6 @@ msgstr ""
 msgid "House number"
 msgstr "Eraikinaren atari zenbakia"
 
-msgid "House name"
-msgstr "Eraikinaren izena"
-
 msgid "Street name"
 msgstr "Kale-izena"
 
@@ -20199,8 +20271,8 @@ msgstr "Hiriaren izena"
 msgid "Country code"
 msgstr "Estatuaren kodea"
 
-msgid "Optional values for specific countries"
-msgstr ""
+msgid "House name"
+msgstr "Eraikinaren izena"
 
 msgid "Subdistrict"
 msgstr ""
@@ -20871,6 +20943,13 @@ msgstr ""
 msgid "VoGIS: DOM (Surface model)"
 msgstr ""
 
+msgid ""
+"AGIV(laanderen) aerial imagery (covers Brussels region as well) (2013)"
+msgstr ""
+
+msgid "Geoservices Wallonie aerial imagery (2009)"
+msgstr ""
+
 msgid "IBGE Mapa de Setores Urbanos"
 msgstr ""
 
@@ -21005,6 +21084,9 @@ msgstr ""
 msgid "Hamburg (40 cm)"
 msgstr ""
 
+msgid "Hamburg (20 cm)"
+msgstr ""
+
 msgid "Hamburg (DK5)"
 msgstr ""
 
@@ -21250,6 +21332,9 @@ msgstr ""
 msgid "Kanton Aargau 25cm (AGIS 2011)"
 msgstr ""
 
+msgid "Kanton Aargau 25cm (AGIS 2014)"
+msgstr ""
+
 msgid "Stadt Uster Orthophoto 2008 10cm"
 msgstr ""
 
@@ -21607,6 +21692,9 @@ msgstr ""
 msgid "{0} without {1}, {2} or {3}"
 msgstr ""
 
+msgid "{0} together with {1}"
+msgstr ""
+
 msgid "{0} on suspicious object"
 msgstr ""
 
@@ -21625,6 +21713,12 @@ 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 "{0}={1} is deprecated"
 msgstr ""
 
@@ -21661,6 +21755,9 @@ msgstr ""
 msgid "{0} should be replaced with {1}"
 msgstr ""
 
+msgid "{0} = {1}; remove {0}"
+msgstr ""
+
 msgid ""
 "{0}={1} is unspecific. Please replace ''{1}'' by ''left'', ''right'' or "
 "''both''."
@@ -21699,6 +21796,9 @@ msgstr ""
 msgid "Overlapping Identical Landuses"
 msgstr ""
 
+msgid "{0} must be connected to a way"
+msgstr ""
+
 msgid "abbreviated street name"
 msgstr ""
 
@@ -21720,9 +21820,17 @@ msgstr ""
 msgid "street name contains ss"
 msgstr ""
 
+msgid ""
+"Value of ''{0}'' should either be ''{1}'' or ''{2}''. For sidewalks use "
+"''{3}'' instead."
+msgstr ""
+
 msgid "{0} with multiple values"
 msgstr ""
 
+msgid "empty value in semicolon-separated ''{0}''"
+msgstr ""
+
 msgid "numerical key"
 msgstr ""
 
@@ -21757,6 +21865,9 @@ msgstr ""
 msgid "{0} must be a numeric value"
 msgstr ""
 
+msgid "{0} must be a positive integer number"
+msgstr ""
+
 msgid "relation without type"
 msgstr ""
 
@@ -22951,6 +23062,12 @@ msgstr ""
 msgid "merge nodes"
 msgstr ""
 
+msgid "How often thinning operation should be applied (Default {0})."
+msgstr ""
+
+msgid "Thinning Iterations"
+msgstr ""
+
 msgid "Street Name:"
 msgstr ""
 
@@ -25973,7 +26090,9 @@ msgstr ""
 msgid "Move and position photos"
 msgstr ""
 
-msgid "Click+drag photo or shift+click to position photo."
+msgid ""
+"Click+drag photo, shift+click to position photo, control+click to set "
+"direction."
 msgstr ""
 
 msgid "Please load some photos."
@@ -26634,6 +26753,9 @@ msgstr ""
 msgid "Reconstruct polygons from relation {0}"
 msgstr ""
 
+msgid "Reconstruct route"
+msgstr ""
+
 msgid "Open relation wiki page"
 msgstr ""
 
@@ -26673,6 +26795,12 @@ msgstr ""
 msgid "Way without ''inner'' or ''outer'' role found"
 msgstr ""
 
+msgid "Node without ''stop'' or ''platform'' role found"
+msgstr ""
+
+msgid "Way platform without ''platform'' role found"
+msgstr ""
+
 msgid "Revert changeset fully"
 msgstr ""
 
@@ -27163,7 +27291,7 @@ msgstr ""
 msgid "create an associatedStreet relation"
 msgstr ""
 
-msgid "delete outline way"
+msgid "keep outline way"
 msgstr ""
 
 msgid "Street name: "
diff --git a/i18n/po/fa.po b/i18n/po/fa.po
index 0483f6a..85165bd 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: 2014-12-10 03:42+0100\n"
+"POT-Creation-Date: 2014-12-29 01:14+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: 2014-12-10 05:05+0000\n"
-"X-Generator: Launchpad (build 17283)\n"
+"X-Launchpad-Export-Date: 2014-12-29 05:15+0000\n"
+"X-Generator: Launchpad (build 17286)\n"
 "Language: fa\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -3791,6 +3791,9 @@ msgstr ""
 msgid "Checks for errors in internet-related tags."
 msgstr ""
 
+msgid " URL cannot be converted to ASCII: {0}"
+msgstr ""
+
 msgid "''{0}'': {1}"
 msgstr ""
 
@@ -3997,19 +4000,20 @@ msgstr ""
 msgid "Relation is empty"
 msgstr ""
 
-msgid "<empty>"
+msgid "Role member does not match expression {0} in template {1}"
 msgstr ""
 
-msgid "Role {0} unknown"
+msgid ""
+"Role member type {0} does not match accepted list of {1} in template {2}"
 msgstr ""
 
-msgid "Empty role found"
+msgid "<empty>"
 msgstr ""
 
-msgid "Member for role ''{0}'' does not match ''{1}''"
+msgid "Role {0} unknown in templates {1}"
 msgstr ""
 
-msgid "Member for role {0} of wrong type"
+msgid "Empty role type found when expecting one of {0}"
 msgstr ""
 
 msgid "Role {0} missing"
@@ -4546,10 +4550,35 @@ msgstr ""
 msgid "options provided as Java system properties"
 msgstr ""
 
-msgid "/PATH/TO/JOSM/FOLDER/         "
+msgid "/PATH/TO/JOSM/PREF    "
+msgstr ""
+
+msgid "Set the preferences directory"
+msgstr ""
+
+msgid "/PATH/TO/JOSM/USERDATA"
+msgstr ""
+
+msgid "Set the user data directory"
+msgstr ""
+
+msgid "/PATH/TO/JOSM/CACHE   "
+msgstr ""
+
+msgid "Set the cache directory"
 msgstr ""
 
-msgid "Change the folder for all user settings"
+msgid "/PATH/TO/JOSM/HOMEDIR "
+msgstr ""
+
+msgid ""
+"Relocate all 3 directories to homedir. Cache directory will be in "
+"homedir/cache"
+msgstr ""
+
+msgid ""
+"-Djosm.home has lower precedence, i.e. the specific setting overrides the "
+"general one"
 msgstr ""
 
 msgid ""
@@ -4804,6 +4833,21 @@ msgstr ""
 msgid "Layer ''{0}'' must be in list of layers"
 msgstr ""
 
+msgid "Default (open, closed, new)"
+msgstr ""
+
+msgid "Username"
+msgstr ""
+
+msgid "Created date"
+msgstr ""
+
+msgid "Last change date"
+msgstr ""
+
+msgid "Select note sorting method"
+msgstr ""
+
 msgid "Click to cancel the current operation"
 msgstr ""
 
@@ -6144,6 +6188,12 @@ msgstr ""
 msgid "Reopen note with message:"
 msgstr ""
 
+msgid "Sort notes"
+msgstr ""
+
+msgid "Sort"
+msgstr ""
+
 msgid "Object type:"
 msgstr "نوع شئ:"
 
@@ -7126,9 +7176,6 @@ msgstr ""
 msgid "Sort the relation members"
 msgstr ""
 
-msgid "Sort"
-msgstr ""
-
 msgid "Relation Editor: Sort"
 msgstr ""
 
@@ -7910,9 +7957,6 @@ msgstr ""
 msgid "Enter credentials for HTTP proxy"
 msgstr ""
 
-msgid "Username"
-msgstr ""
-
 msgid "Password"
 msgstr ""
 
@@ -8597,6 +8641,9 @@ msgstr ""
 msgid "Save Layer"
 msgstr ""
 
+msgid "Note"
+msgstr ""
+
 msgid "Notes layer"
 msgstr ""
 
@@ -9043,6 +9090,9 @@ msgstr ""
 msgid "Delete File from disk"
 msgstr ""
 
+msgid "Copy image path"
+msgstr ""
+
 msgid "Next"
 msgstr ""
 
@@ -12423,6 +12473,9 @@ msgstr ""
 msgid "Illegal long value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
+msgid "{0} bytes have been read"
+msgstr ""
+
 msgid "Prepare OSM data..."
 msgstr ""
 
@@ -12603,7 +12656,7 @@ msgstr ""
 msgid "Cannot start remotecontrol server on port {0}: {1}"
 msgstr ""
 
-msgid "RemoteControl::Accepting connections on port {0}"
+msgid "RemoteControl::Accepting connections on {0}:{1}"
 msgstr ""
 
 msgid "RemoteControl::Server stopped."
@@ -12615,7 +12668,7 @@ msgstr ""
 msgid "Unable to initialize Remote Control HTTPS Server"
 msgstr ""
 
-msgid "RemoteControl::Accepting secure connections on port {0}"
+msgid "RemoteControl::Accepting secure connections on {0}:{1}"
 msgstr ""
 
 msgid "RemoteControl::Server (https) stopped."
@@ -13575,9 +13628,6 @@ msgid ""
 "contain any JOSM object or suitable text. </p></html>"
 msgstr ""
 
-msgid "Invalid bz2 file."
-msgstr ""
-
 msgid "ms"
 msgstr ""
 
@@ -14813,6 +14863,10 @@ msgstr ""
 msgid "Coins"
 msgstr ""
 
+msgctxt "payment"
+msgid "Notes"
+msgstr ""
+
 msgid "Electronic purses and Charge cards"
 msgstr ""
 
@@ -15635,6 +15689,9 @@ msgstr ""
 msgid "Cross on horseback"
 msgstr ""
 
+msgid "Optional values for specific countries"
+msgstr ""
+
 msgid "Stop"
 msgstr ""
 
@@ -15692,6 +15749,18 @@ msgstr ""
 msgid "Speed Camera"
 msgstr ""
 
+msgid "Traffic Mirror"
+msgstr ""
+
+msgctxt "junction=yes"
+msgid "Named Junction"
+msgstr ""
+
+msgid ""
+"Used in some countries for a named road junction who’s name serves for local "
+"orientation."
+msgstr ""
+
 msgid "Elevator"
 msgstr ""
 
@@ -17136,6 +17205,9 @@ msgstr ""
 msgid "Fireplace"
 msgstr ""
 
+msgid "Picnic Table"
+msgstr ""
+
 msgid "Public Grill"
 msgstr ""
 
@@ -17741,6 +17813,12 @@ msgstr ""
 msgid "Count"
 msgstr ""
 
+msgid "Advertising Column"
+msgstr ""
+
+msgid "Billboard"
+msgstr ""
+
 msgid "Sports"
 msgstr ""
 
@@ -19611,9 +19689,6 @@ msgstr ""
 msgid "vouchers"
 msgstr ""
 
-msgid "Note"
-msgstr ""
-
 msgid "Geography"
 msgstr ""
 
@@ -19997,9 +20072,6 @@ msgstr ""
 msgid "House number"
 msgstr ""
 
-msgid "House name"
-msgstr ""
-
 msgid "Street name"
 msgstr ""
 
@@ -20012,7 +20084,7 @@ msgstr ""
 msgid "Country code"
 msgstr ""
 
-msgid "Optional values for specific countries"
+msgid "House name"
 msgstr ""
 
 msgid "Subdistrict"
@@ -20684,6 +20756,13 @@ msgstr ""
 msgid "VoGIS: DOM (Surface model)"
 msgstr ""
 
+msgid ""
+"AGIV(laanderen) aerial imagery (covers Brussels region as well) (2013)"
+msgstr ""
+
+msgid "Geoservices Wallonie aerial imagery (2009)"
+msgstr ""
+
 msgid "IBGE Mapa de Setores Urbanos"
 msgstr ""
 
@@ -20818,6 +20897,9 @@ msgstr ""
 msgid "Hamburg (40 cm)"
 msgstr ""
 
+msgid "Hamburg (20 cm)"
+msgstr ""
+
 msgid "Hamburg (DK5)"
 msgstr ""
 
@@ -21063,6 +21145,9 @@ msgstr ""
 msgid "Kanton Aargau 25cm (AGIS 2011)"
 msgstr ""
 
+msgid "Kanton Aargau 25cm (AGIS 2014)"
+msgstr ""
+
 msgid "Stadt Uster Orthophoto 2008 10cm"
 msgstr ""
 
@@ -21420,6 +21505,9 @@ msgstr ""
 msgid "{0} without {1}, {2} or {3}"
 msgstr ""
 
+msgid "{0} together with {1}"
+msgstr ""
+
 msgid "{0} on suspicious object"
 msgstr ""
 
@@ -21438,6 +21526,12 @@ 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 "{0}={1} is deprecated"
 msgstr ""
 
@@ -21474,6 +21568,9 @@ msgstr ""
 msgid "{0} should be replaced with {1}"
 msgstr ""
 
+msgid "{0} = {1}; remove {0}&q