[josm] 02/06: Imported Upstream version 0.0.svn7778+dfsg1

Bas Couwenberg sebastic at xs4all.nl
Wed Dec 10 21:15:49 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 94c03805a19ce02cd24a82f3b85e811fe21d3188
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Wed Dec 10 20:35:58 2014 +0100

    Imported Upstream version 0.0.svn7778+dfsg1
---
 REVISION                                           |   10 +-
 data/defaultpresets.xml                            |  496 +-
 data/maps.xsd                                      |    2 +
 data/validator/combinations.mapcss                 |    7 +-
 data/validator/deprecated.mapcss                   |   32 +-
 data/validator/geometry.mapcss                     |   49 +-
 geticons.pl                                        |   79 +-
 i18n/po/af.po                                      |  567 +-
 i18n/po/am.po                                      |  567 +-
 i18n/po/ar.po                                      |  573 +-
 i18n/po/ast.po                                     |  604 +-
 i18n/po/az.po                                      |  567 +-
 i18n/po/be.po                                      |  570 +-
 i18n/po/bg.po                                      |  658 ++-
 i18n/po/bn.po                                      |  567 +-
 i18n/po/br.po                                      |  567 +-
 i18n/po/bs.po                                      |  567 +-
 i18n/po/ca.po                                      |  625 +-
 i18n/po/ca at valencia.po                             |  592 +-
 i18n/po/cs.po                                      | 2091 ++++---
 i18n/po/cy.po                                      |  567 +-
 i18n/po/da.po                                      | 1332 +++--
 i18n/po/de.po                                      |  642 +-
 i18n/po/de_DE.po                                   |  567 +-
 i18n/po/el.po                                      |  617 +-
 i18n/po/en_AU.po                                   |  575 +-
 i18n/po/en_CA.po                                   |  567 +-
 i18n/po/en_GB.po                                   |  594 +-
 i18n/po/eo.po                                      |  567 +-
 i18n/po/es.po                                      |  677 ++-
 i18n/po/et.po                                      |  589 +-
 i18n/po/eu.po                                      |  575 +-
 i18n/po/fa.po                                      |  571 +-
 i18n/po/fi.po                                      |  583 +-
 i18n/po/fil.po                                     |  567 +-
 i18n/po/fr.po                                      |  693 ++-
 i18n/po/gl.po                                      |  581 +-
 i18n/po/he.po                                      |  567 +-
 i18n/po/hi.po                                      |  567 +-
 i18n/po/hr.po                                      |  573 +-
 i18n/po/ht.po                                      |  567 +-
 i18n/po/hu.po                                      | 5410 ++++++++++-------
 i18n/po/hy.po                                      |  567 +-
 i18n/po/ia.po                                      |  567 +-
 i18n/po/id.po                                      |  584 +-
 i18n/po/is.po                                      |  569 +-
 i18n/po/it.po                                      |  687 ++-
 i18n/po/ja.po                                      |  863 ++-
 i18n/po/ka.po                                      |  567 +-
 i18n/po/km.po                                      | 1359 +++--
 i18n/po/ko.po                                      |  571 +-
 i18n/po/ky.po                                      |  567 +-
 i18n/po/lo.po                                      |  567 +-
 i18n/po/lt.po                                      |  577 +-
 i18n/po/lv.po                                      |  567 +-
 i18n/po/mk.po                                      |  567 +-
 i18n/po/ms.po                                      |  567 +-
 i18n/po/nb.po                                      |  575 +-
 i18n/po/nds.po                                     |  567 +-
 i18n/po/nl.po                                      |  593 +-
 i18n/po/nn.po                                      |  567 +-
 i18n/po/oc.po                                      |  567 +-
 i18n/po/pa.po                                      |  567 +-
 i18n/po/pl.po                                      | 1139 ++--
 i18n/po/pt.po                                      | 1096 +++-
 i18n/po/pt_BR.po                                   |  632 +-
 i18n/po/rm.po                                      |  567 +-
 i18n/po/ro.po                                      |  567 +-
 i18n/po/ru.po                                      |  612 +-
 i18n/po/sk.po                                      |  678 ++-
 i18n/po/sl.po                                      |  567 +-
 i18n/po/sq.po                                      |  567 +-
 i18n/po/sr.po                                      |  567 +-
 i18n/po/sv.po                                      |  738 ++-
 i18n/po/ta.po                                      |  567 +-
 i18n/po/te.po                                      |  567 +-
 i18n/po/th.po                                      |  567 +-
 i18n/po/tr.po                                      |  575 +-
 i18n/po/ug.po                                      |  567 +-
 i18n/po/uk.po                                      |  676 ++-
 i18n/po/ur.po                                      |  567 +-
 i18n/po/vi.po                                      |  567 +-
 i18n/po/zh_CN.po                                   |  588 +-
 i18n/po/zh_TW.po                                   |  589 +-
 images/about.png                                   |  Bin 1910 -> 0 bytes
 images/cursor/modifier/add_node.png                |  Bin 132 -> 0 bytes
 images/data/user.png                               |  Bin 0 -> 663 bytes
 images/dialogs/conflict/mergecomplete.png          |  Bin 242 -> 0 bytes
 images/dialogs/mappaint/josm_small.png             |  Bin 809 -> 808 bytes
 images/icons/airport.png                           |  Bin 268 -> 0 bytes
 images/icons/bar.png                               |  Bin 312 -> 0 bytes
 images/icons/bus_stop.png                          |  Bin 369 -> 0 bytes
 images/icons/cafe.png                              |  Bin 371 -> 0 bytes
 images/icons/cinema.png                            |  Bin 279 -> 0 bytes
 images/icons/convenience.png                       |  Bin 457 -> 0 bytes
 images/icons/fast_food.png                         |  Bin 428 -> 0 bytes
 images/icons/ferry_terminal.png                    |  Bin 467 -> 0 bytes
 images/icons/fire_station.png                      |  Bin 459 -> 0 bytes
 images/icons/gate.png                              |  Bin 89 -> 0 bytes
 images/icons/hospital.png                          |  Bin 161 -> 0 bytes
 images/icons/hotel.png                             |  Bin 214 -> 0 bytes
 images/icons/museum.png                            |  Bin 290 -> 0 bytes
 images/icons/natural_blank.png                     |  Bin 84 -> 0 bytes
 images/icons/pharmacy.png                          |  Bin 171 -> 0 bytes
 images/icons/pharmacy_dispensing.png               |  Bin 165 -> 0 bytes
 images/icons/place_of_worship.png                  |  Bin 234 -> 0 bytes
 images/icons/police.png                            |  Bin 518 -> 0 bytes
 images/icons/post_box.png                          |  Bin 401 -> 0 bytes
 images/icons/pub.png                               |  Bin 400 -> 0 bytes
 images/icons/recycling.png                         |  Bin 481 -> 0 bytes
 images/icons/restaurant.png                        |  Bin 380 -> 0 bytes
 images/icons/restriction.png                       |  Bin 228 -> 0 bytes
 images/icons/school.png                            |  Bin 290 -> 0 bytes
 images/icons/speed_hump_16.png                     |  Bin 124 -> 0 bytes
 images/icons/station.png                           |  Bin 412 -> 0 bytes
 images/icons/supermarket.png                       |  Bin 484 -> 0 bytes
 images/icons/taxi.png                              |  Bin 419 -> 0 bytes
 images/icons/theatre.png                           |  Bin 483 -> 0 bytes
 images/logo.png                                    |  Bin 33600 -> 11323 bytes
 images/logo.svg                                    |    1 +
 images/logo_16x16x32.png                           |  Bin 1004 -> 998 bytes
 images/logo_16x16x8.png                            |  Bin 768 -> 958 bytes
 images/logo_32x32x32.png                           |  Bin 3329 -> 2661 bytes
 images/logo_32x32x8.png                            |  Bin 1282 -> 1704 bytes
 images/logo_48x48x32.png                           |  Bin 6369 -> 4440 bytes
 images/logo_48x48x8.png                            |  Bin 2343 -> 2234 bytes
 images/misc/grey_check.png                         |  Bin 282 -> 0 bytes
 images/misc/red_x.png                              |  Bin 413 -> 0 bytes
 images/presets/baseball.png                        |  Bin 373 -> 0 bytes
 images/presets/breakwater.png                      |  Bin 0 -> 386 bytes
 images/presets/canoe.png                           |  Bin 146 -> 0 bytes
 images/presets/chicane.png                         |  Bin 247 -> 0 bytes
 images/presets/church.png                          |  Bin 276 -> 0 bytes
 images/presets/cricket.png                         |  Bin 336 -> 0 bytes
 images/presets/cycling.png                         |  Bin 187 -> 0 bytes
 images/presets/drinking_water.png                  |  Bin 141 -> 0 bytes
 images/presets/equestrian.png                      |  Bin 185 -> 356 bytes
 images/presets/golf.png                            |  Bin 205 -> 0 bytes
 images/presets/gymnastics.png                      |  Bin 504 -> 1145 bytes
 images/presets/incline.png                         |  Bin 326 -> 0 bytes
 images/presets/incline_steep.png                   |  Bin 321 -> 0 bytes
 images/presets/pitch.png                           |  Bin 149 -> 0 bytes
 images/presets/racquetball.png                     |  Bin 257 -> 0 bytes
 images/presets/skiing_downhill.png                 |  Bin 426 -> 0 bytes
 images/presets/soccer.png                          |  Bin 271 -> 0 bytes
 images/presets/sports_centre.png                   |  Bin 637 -> 0 bytes
 images/presets/tennis.png                          |  Bin 323 -> 0 bytes
 images/upload-preferences.png                      |  Bin 877 -> 0 bytes
 .../usr/share/appdata/josm-latest.appdata.xml      |    2 +-
 linux/latest/usr/share/pixmaps/josm-latest-16.xpm  |  431 +-
 linux/latest/usr/share/pixmaps/josm-latest-32.xpm  | 1006 +++-
 linux/latest/usr/share/pixmaps/josm-latest.png     |  Bin 33608 -> 19675 bytes
 linux/tested/usr/share/appdata/josm.appdata.xml    |    2 +-
 linux/tested/usr/share/pixmaps/josm-16.xpm         |  431 +-
 linux/tested/usr/share/pixmaps/josm-32.xpm         | 1006 +++-
 linux/tested/usr/share/pixmaps/josm.png            |  Bin 33608 -> 19675 bytes
 macosx/JOSM.app/Contents/Resources/JOSM.icns       |  Bin 62131 -> 312279 bytes
 patches/10trim_svgsalamander.patch                 | 6249 +-------------------
 scripts/sync_editor-imagery-index.groovy           |  267 +
 src/org/openstreetmap/josm/Main.java               |   22 +
 .../openstreetmap/josm/actions/AboutAction.java    |    2 +-
 .../josm/actions/AbstractInfoAction.java           |   44 -
 .../josm/actions/AddImageryLayerAction.java        |   18 +-
 .../josm/actions/AutoScaleAction.java              |   16 +-
 .../josm/actions/CreateMultipolygonAction.java     |   11 +-
 .../josm/actions/DialogsToggleAction.java          |    5 +-
 .../openstreetmap/josm/actions/DownloadAction.java |    5 +-
 .../josm/actions/ExtensionFileFilter.java          |    3 +-
 src/org/openstreetmap/josm/actions/HelpAction.java |    3 +-
 .../josm/actions/HistoryInfoAction.java            |    2 +-
 .../josm/actions/HistoryInfoWebAction.java         |    5 +-
 src/org/openstreetmap/josm/actions/InfoAction.java |    2 +-
 .../openstreetmap/josm/actions/InfoWebAction.java  |    5 +-
 .../josm/actions/JoinNodeWayAction.java            |    4 +-
 src/org/openstreetmap/josm/actions/JosmAction.java |   41 +-
 .../openstreetmap/josm/actions/JumpToAction.java   |    4 +-
 .../josm/actions/LassoModeAction.java              |    2 +-
 .../josm/actions/OpenLocationAction.java           |    7 +-
 .../openstreetmap/josm/actions/RestartAction.java  |   18 +-
 .../openstreetmap/josm/actions/ToggleAction.java   |   18 +-
 .../josm/actions/UploadNotesAction.java            |   58 +
 .../downloadtasks/AbstractDownloadTask.java        |   25 +-
 .../actions/downloadtasks/DownloadGpsTask.java     |    5 +
 .../actions/downloadtasks/DownloadNotesTask.java   |    5 +
 .../actions/downloadtasks/DownloadOsmTask.java     |    5 +
 .../actions/downloadtasks/DownloadSessionTask.java |   12 +
 .../josm/actions/downloadtasks/DownloadTask.java   |    8 +-
 .../josm/actions/mapmode/AddNoteAction.java        |   40 +-
 .../josm/actions/mapmode/DeleteAction.java         |   14 +-
 .../josm/actions/mapmode/DrawAction.java           |    2 +-
 .../josm/actions/mapmode/ExtrudeAction.java        |    4 +-
 .../actions/mapmode/ImproveWayAccuracyHelper.java  |   30 +-
 .../josm/actions/mapmode/SelectAction.java         |   30 +-
 .../actions/relation/AddSelectionToRelations.java  |    5 +-
 .../josm/actions/upload/UploadNotesTask.java       |  144 +
 .../openstreetmap/josm/command/DeleteCommand.java  |   57 +-
 src/org/openstreetmap/josm/data/Preferences.java   |    2 +-
 .../josm/data/imagery/ImageryInfo.java             |   10 +
 src/org/openstreetmap/josm/data/osm/Changeset.java |   61 +-
 .../josm/data/osm/ChangesetDiscussionComment.java  |   65 +
 src/org/openstreetmap/josm/data/osm/DataSet.java   |    4 +-
 src/org/openstreetmap/josm/data/osm/NoteData.java  |   75 +-
 .../openstreetmap/josm/data/osm/TagCollection.java |   24 +
 src/org/openstreetmap/josm/data/osm/Way.java       |    7 +-
 .../data/osm/visitor/paint/StyledMapRenderer.java  |   25 +-
 .../visitor/paint/relations/MultipolygonCache.java |    6 +-
 .../data/validation/routines/UrlValidator.java     |    6 +
 .../josm/data/validation/tests/DuplicateWay.java   |   63 +-
 .../data/validation/tests/MapCSSTagChecker.java    |    3 +-
 .../josm/data/validation/tests/UnclosedWays.java   |    2 +-
 .../data/validation/tests/WayConnectedToArea.java  |   10 +-
 .../openstreetmap/josm/gui/IconToggleButton.java   |    5 +-
 src/org/openstreetmap/josm/gui/ImageryMenu.java    |    9 +-
 src/org/openstreetmap/josm/gui/MainMenu.java       |    2 +-
 src/org/openstreetmap/josm/gui/MapFrame.java       |    2 -
 src/org/openstreetmap/josm/gui/MapStatus.java      |    6 +-
 .../openstreetmap/josm/gui/NoteInputDialog.java    |   67 +
 src/org/openstreetmap/josm/gui/SplashScreen.java   |    7 +-
 .../josm/gui/conflict/ConflictColors.java          |    2 +
 .../josm/gui/conflict/pair/ListMerger.java         |   22 +-
 .../tags/CombinePrimitiveResolverDialog.java       |   18 +-
 .../gui/conflict/tags/MultiValueCellEditor.java    |   26 +-
 .../gui/conflict/tags/MultiValueCellRenderer.java  |   30 +-
 .../gui/conflict/tags/MultiValueDecisionType.java  |    5 +-
 .../tags/MultiValueResolutionDecision.java         |   52 +-
 .../tags/RelationMemberConflictResolver.java       |    8 +-
 .../tags/RelationMemberConflictResolverModel.java  |   17 +-
 .../conflict/tags/TagConflictResolverModel.java    |    3 +
 .../conflict/tags/TagConflictResolverTable.java    |    2 +-
 .../josm/gui/dialogs/ChangesetDialog.java          |    4 +-
 .../josm/gui/dialogs/FilterDialog.java             |    9 +
 .../josm/gui/dialogs/HistoryDialog.java            |  335 --
 .../josm/gui/dialogs/MapPaintDialog.java           |    2 +-
 .../openstreetmap/josm/gui/dialogs/NoteDialog.java |   68 +-
 .../josm/gui/dialogs/SelectionListDialog.java      |   69 +-
 .../josm/gui/dialogs/ToggleDialog.java             |    6 +-
 .../josm/gui/dialogs/UserListDialog.java           |    4 +-
 .../dialogs/changeset/AbstractCellRenderer.java    |   76 +
 .../dialogs/changeset/ChangesetCacheManager.java   |    7 +
 .../changeset/ChangesetCacheTableCellRenderer.java |   67 +-
 .../changeset/ChangesetCacheTableColumnModel.java  |    5 +-
 .../changeset/ChangesetContentDownloadTask.java    |    2 +-
 .../dialogs/changeset/ChangesetContentPanel.java   |    2 +-
 .../ChangesetContentTableCellRenderer.java         |   35 +-
 .../ChangesetContentTableColumnModel.java          |    3 +
 .../changeset/ChangesetContentTableModel.java      |    3 +-
 .../changeset/ChangesetDiscussionPanel.java        |  144 +
 .../ChangesetDiscussionTableCellRenderer.java      |   41 +
 .../ChangesetDiscussionTableColumnModel.java       |   48 +
 .../changeset/ChangesetDiscussionTableModel.java   |   55 +
 .../changeset/ChangesetHeaderDownloadTask.java     |   25 +-
 .../changeset/query/UrlBasedQueryPanel.java        |    2 +-
 .../gui/dialogs/properties/PropertiesDialog.java   |    6 +-
 .../josm/gui/dialogs/properties/TagEditHelper.java |    7 +-
 .../dialogs/relation/GenericRelationEditor.java    |   22 +-
 .../gui/dialogs/relation/sort/RelationNodeMap.java |    2 +-
 .../josm/gui/download/BoundingBoxSelection.java    |    2 +-
 .../josm/gui/download/DownloadDialog.java          |   29 +-
 .../josm/gui/history/VersionInfoPanel.java         |    5 +-
 .../josm/gui/history/VersionTable.java             |    8 +-
 .../josm/gui/io/RecentlyOpenedFilesMenu.java       |    2 +-
 .../josm/gui/io/UploadStrategySelectionPanel.java  |    2 +-
 .../openstreetmap/josm/gui/layer/NoteLayer.java    |   35 +-
 .../openstreetmap/josm/gui/layer/OsmDataLayer.java |    7 +-
 .../josm/gui/layer/geoimage/GeoImageLayer.java     |    7 +-
 .../josm/gui/layer/geoimage/ImageViewerDialog.java |    6 +-
 .../josm/gui/layer/markerlayer/Marker.java         |    3 +
 .../josm/gui/mappaint/MapPaintMenu.java            |    5 +-
 .../gui/mappaint/mapcss/ExpressionFactory.java     |    2 +-
 .../josm/gui/mappaint/mapcss/MapCSSParser.jj       |    2 +-
 .../gui/oauth/FullyAutomaticAuthorizationUI.java   |    2 +-
 .../josm/gui/preferences/ToolbarPreferences.java   |    9 +-
 .../preferences/advanced/AdvancedPreference.java   |    2 +-
 .../gui/preferences/audio/AudioPreference.java     |    2 +-
 .../gui/preferences/display/DisplayPreference.java |    2 +-
 .../gui/preferences/imagery/ImageryPreference.java |   12 +-
 .../josm/gui/preferences/map/MapPreference.java    |    2 +-
 .../gui/preferences/plugin/PluginPreference.java   |    2 +-
 .../projection/CodeProjectionChoice.java           |    2 +-
 .../projection/CustomProjectionChoice.java         |    2 +-
 .../projection/GaussKruegerProjectionChoice.java   |    2 +-
 .../LambertCC9ZonesProjectionChoice.java           |    2 +-
 .../projection/LambertProjectionChoice.java        |    2 +-
 .../projection/PuwgProjectionChoice.java           |    2 +-
 .../projection/SwissGridProjectionChoice.java      |    2 +-
 .../projection/UTMFranceDOMProjectionChoice.java   |    2 +-
 .../projection/UTMProjectionChoice.java            |    2 +-
 .../remotecontrol/RemoteControlPreference.java     |    2 +-
 .../preferences/server/ServerAccessPreference.java |    2 +-
 .../preferences/shortcut/ShortcutPreference.java   |    2 +-
 .../preferences/validator/ValidatorPreference.java |    2 +-
 .../josm/gui/tagging/TaggingPreset.java            |   17 +-
 .../josm/gui/tagging/TaggingPresetItems.java       |    4 +-
 .../josm/gui/tagging/TaggingPresetType.java        |    5 +-
 .../gui/tagging/ac/AutoCompletionItemPriority.java |   34 +-
 .../josm/gui/tagging/ac/AutoCompletionList.java    |   15 +
 .../josm/gui/tagging/ac/AutoCompletionManager.java |  118 +-
 .../openstreetmap/josm/io/DiffResultProcessor.java |   26 +-
 src/org/openstreetmap/josm/io/MessageNotifier.java |    2 +-
 src/org/openstreetmap/josm/io/NoteExporter.java    |   48 +
 src/org/openstreetmap/josm/io/NoteReader.java      |   17 +
 src/org/openstreetmap/josm/io/NoteWriter.java      |   84 +
 src/org/openstreetmap/josm/io/OsmApi.java          |  143 +-
 .../openstreetmap/josm/io/OsmChangesetParser.java  |   82 +-
 .../josm/io/OsmServerChangesetReader.java          |   40 +-
 .../josm/io/OsmServerWritePostprocessor.java       |    4 +-
 src/org/openstreetmap/josm/io/OsmServerWriter.java |   22 +-
 .../openstreetmap/josm/io/imagery/WMSGrabber.java  |    1 +
 .../josm/io/remotecontrol/AddTagsDialog.java       |   68 +-
 .../josm/io/remotecontrol/RemoteControl.java       |    2 +-
 .../io/remotecontrol/handler/ImageryHandler.java   |   20 +-
 .../io/remotecontrol/handler/ImportHandler.java    |    2 +-
 .../josm/plugins/PluginInformation.java            |   11 +-
 .../plugins/ReadLocalPluginInformationTask.java    |   24 +-
 .../plugins/ReadRemotePluginInformationTask.java   |   74 +-
 src/org/openstreetmap/josm/tools/Geometry.java     |   38 -
 .../openstreetmap/josm/tools/ImageProvider.java    |  173 +-
 .../openstreetmap/josm/tools/ImageResource.java    |   31 +-
 styles/standard/elemstyles.mapcss                  |  515 +-
 styles/standard/potlatch2.mapcss                   |   24 +-
 320 files changed, 48943 insertions(+), 19726 deletions(-)

diff --git a/REVISION b/REVISION
index 12c0d0d..fc69434 100644
--- a/REVISION
+++ b/REVISION
@@ -1,18 +1,18 @@
 <?xml version="1.0"?>
 <info>
 <entry
-   kind="dir"
    path="trunk"
-   revision="7643">
+   revision="7778"
+   kind="dir">
 <url>http://josm.openstreetmap.de/svn/trunk</url>
 <repository>
 <root>http://josm.openstreetmap.de/svn</root>
 <uuid>0c6e7542-c601-0410-84e7-c038aed88b3b</uuid>
 </repository>
 <commit
-   revision="7643">
-<author>Don-vip</author>
-<date>2014-10-21T19:19:16.087295Z</date>
+   revision="7778">
+<author>bastiK</author>
+<date>2014-12-10T00:39:46.964719Z</date>
 </commit>
 </entry>
 </info>
diff --git a/data/defaultpresets.xml b/data/defaultpresets.xml
index 9672a22..27bc283 100644
--- a/data/defaultpresets.xml
+++ b/data/defaultpresets.xml
@@ -7,164 +7,10 @@
     http://www.kde.org
     http://openclipart.org/media/view/media/clip_art
     http://www.sjjb.co.uk/mapicons/ (meanwhile in osm svn)
--->
-<!--
-item:
-  name: the text to display
-  icon: the icon to display
-  - relative to the icon path
-  - URL's are also supported to allow remote icons (are cached locally)
-  type: the data types - way,node,relation,closedway (separated by comma)
-  name_template: define custom formatting for OSM primitives
-                 see https://josm.openstreetmap.de/wiki/NameTemplate
-  preset_name_label: whether to insert "[preset name]" label in dialog
-                     (defaults to "false" for backward-compatibility on external presets)
-
-group: a group of items (same syntax as "item")
-
-link: link to the relating map features website
-  href: the URL
-
-preset_link: a link to an other preset
-  preset_name: the exact name of the preset to link to
-
-label: simple static text label
-  text: the text to display
-  icon: location of icon to display (optional)
-  icon_size: maximal size of icon (optional). If no value is given, default is 16px
-
-space: empty line
-
-optional: optional tags, short for "space" plus "label" plus "space"
-  text: the text to display (defaults to "Optional Attributes:")
-
-separator: separator line in menus
-
-item_separator: horizontal separator line between items (in window)
-
-key: fixed key/value pair to be set
-  key: key to set
-  value: value to set
-  match: none/key/key!/keyvalue/keyvalue! (default is "keyvalue!", see below for more information)
-
-text: text box
-  key: key to set
-  text: fixed label to display
-  default: default string to display (defaults to "")
-  use_last_as_default: true/false/force (default is "false")
-  auto_increment: may contain a comma separated list of integer increments or
-                  decrements, e.g. "-2,-1,+1,+2"; a button will be shown next
-                  to the text field for each value, allowing the user to select
-                  auto-increment with the given stepping. auto-increment only
-                  happens if the user selects it. default is no auto-increment;
-                  mutually exclusive with use_last_as_default.
-  match: none/key/key!/keyvalue/keyvalue! (default is "none", see below for more information)
-  length: length of input box (number of characters allowed)
-  alternative_autocomplete_keys: comma separated list of alternative keys to use for autocompletion
-
-combo: combo box, with multiple choices and possible to enter free form text
-  key: key to set
-  text: fixed label to display
-  delimiter: character that separates values (default: comma)
-  values: separated list of values
-  values_from: to use instead of "values" if the list of values has to be obtained with a Java method
-               of this form: public static String[] getValues();
-               The value must be: "full.package.name.ClassName#methodName"
-  display_values: comma separated list of values to be displayed instead of the
-                  database values, order and number must be equal to values
-  short_descriptions: comma separated list of texts to be displayed below each
-                      display_value. (Only if it is not possible to describe
-                      the entry in 2-3 words.) Instead of comma separated list
-  instead using values, display_values and short_descriptions, the following form is also supported:
-    <list_entry value="" display_value="" short_description="" icon="" icon_size="" />
-        icon: location of icon
-        icon_size: maximal size of icon. If tag is not setup it is taken default size of icon file
-  default: default string to display (defaults to "")
-  use_last_as_default: true/false/force (default is "false")
-  editable: allow to add other values as text (default is "true")
-  match: none/key/key!/keyvalue/keyvalue! (default is none, see below for more information)
-  values_searchable: true/false (whether to search in combo (display_)values when searching for presets)
-  length: length of input box (number of characters allowed)
 
-multiselect: list of values from which zero or more can be selected
-  key: key to set
-  text: fixed label to display
-  delimiter: character that separates values (default: semicolon) - this
-             will also be used to separate selected values in the tag.
-  values: delimiter-separated list of values (delimiter can be escaped with backslash)
-  values_from: to use instead of "values" if the list of values has to be obtained with a Java method
-               of this form: public static String[] getValues();
-               The value must be: "full.package.name.ClassName#methodName"
-  rows: specify the number of rows to display (default -1)
-  display_values: delimiter-separated list of values to be displayed instead of the
-                  database values, order and number must be equal to values
-  short_descriptions: delimiter-separated list of texts to be displayed below each
-                      display_value. (Only if it is not possible to describe
-                      the entry in 2-3 words.) Instead of a separated list
-  instead using values, display_values and short_descriptions, the following form is also supported:
-    <list_entry value="" display_value="' short_description="" icon="" icon_size="" />
-        icon: location of icon
-        icon_size: maximal size of icon. If tag is not setup it is taken default size of icon file
-  default: default string to display (defaults to "")
-  use_last_as_default: true/false/force (default is "false")
-  match: none/key/key!/keyvalue/keyvalue! (default is "none", see below for more information)
-  values_searchable: true/false (whether to search in multiselect (display_)values when searching for presets)
-
-checkgroup: group of checks
-  columns: number of columns
-
-check: checkbox
-  key: key to set
-  text: fixed label to display
-  default: ticked on/off (default is "off")
-  value_on: the value to set when checked (default is "yes")
-  value_off: the value to set when unchecked (default is "no")
-  disable_off: whether the off value is disabled in the dialog, i.e., only unset or yes are provided
-  match: none/key/key!/keyvalue/keyvalue! (default is "none", see below for more information)
-
-role: type to specify possible roles in relations
-  key: the role name used in relation
-  text: fixed label to display
-  requisite: optional/required (default is "optional")
-  count: how often can the role occur (if not given unlimited number is assumed)
-  type: the data types - way,node,relation,closedway (separated by comma)
-  member_expression: an expression (cf. search dialog) for objects of this role
-
-chunk: a template of elements for later (repeated) use
-  id: the unique identifier for this chunk
-
-reference: include an earlier defined template
-  ref: the unique identifier of the (already defined) template to include
-
- presets: For external files <presets> should have following attributes:
-   author: the author of the preset
-   version: a version number of some sort (e.g. creation date)
-   description: what is your preset meant to be
-   shortdescription: very short description
-   link: a link to a helpful website (optional)
-   icon: an icon for the whole presets
- The fields description, shortdescription and link may also be localized (e.g. de.link)
-
-See also https://josm.openstreetmap.de/wiki/TaggingPresets wiki page.
-
-The fields "name", "text", "display_values" may also be localized (e.g. de.name).
-When translations of equal words but different meanings may conflict, a translation
-context should be specified. Use "name_context", "text_context" or "values_context"
-for this. The context should be a meaningful short description to help translators.
-
-In JOSM internally all "name", "text" and "display_values" are translated when
-no specific translation has been given in XML file. When no "display_values"
-are supplied, then "values" will be treated as "display_values" and translated instead.
-
-The match attribute allows to change the matching process, i.e., determining whether
-the tags of an OSM object fit into this preset.
- - none: neutral, i.e., do not consider this item for matching
- - key: positive if key matches, neutral otherwise
- - key!: positive if key matches, negative otherwise
- - keyvalue: positive if key and value matches, neutral otherwise
- - keyvalue!: positive if key and value matches, negative otherwise
-Note that for a match, at least one positive and no negative is required.
+    Format description: https://josm.openstreetmap.de/wiki/TaggingPresets
 -->
+
     <!-- Item chunks -->
     <chunk id="surface">
         <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground,sett" />
@@ -198,6 +44,10 @@ Note that for a match, at least one positive and no negative is required.
         <reference ref="highway_yesno_incline_oneway_lit" />
         <text key="width" text="Width (meters)" />
     </chunk>
+    <chunk id="highway_yesno_incline_oneway_lit_width_sidewalk">
+        <reference ref="highway_yesno_incline_oneway_lit_width" />
+        <combo key="sidewalk" text="Sidewalk" values="both,left,right,no" values_context="sidewalk" />
+    </chunk>
     <chunk id="railway_service">
         <combo key="service" text="Service type" values="yard,siding,spur" />
     </chunk>
@@ -336,7 +186,7 @@ Note that for a match, at least one positive and no negative is required.
     </chunk>
     <chunk id="parking_name_type_ref">
         <text key="name" text="Name" />
-        <combo key="parking" text="Type" values="multi-storey,surface,underground,rooftop" />
+        <combo key="parking" text="Type" values="multi-storey,surface,underground,rooftop" values_context="parking" />
         <text key="ref" text="Reference number" />
     </chunk>
     <chunk id="parking_access_fee_operator_surface">
@@ -484,6 +334,7 @@ Note that for a match, at least one positive and no negative is required.
             <optional>
                 <text key="name" text="Name" />
                 <reference ref="highway_base" />
+                <text key="width" text="Width (meters)" />
                 <checkgroup columns="4">
                     <check key="oneway" text="Oneway" default="on" />
                     <check key="bridge" text="Bridge" disable_off="true" />
@@ -508,6 +359,7 @@ Note that for a match, at least one positive and no negative is required.
             <key key="highway" value="motorway_link" />
             <optional>
                 <reference ref="highway_base" />
+                <text key="width" text="Width (meters)" />
                 <checkgroup columns="4">
                     <check key="oneway" text="Oneway" default="on" />
                     <check key="bridge" text="Bridge" disable_off="true" />
@@ -535,6 +387,7 @@ Note that for a match, at least one positive and no negative is required.
             <optional>
                 <text key="name" text="Name" />
                 <reference ref="highway_base" />
+                <text key="width" text="Width (meters)" />
                 <checkgroup columns="4">
                     <check key="oneway" text="Oneway" default="on" />
                     <check key="motorroad" text="Motorroad" default="on" />
@@ -560,6 +413,7 @@ Note that for a match, at least one positive and no negative is required.
             <text key="ref" text="Reference" />
             <optional>
                 <reference ref="highway_base" />
+                <text key="width" text="Width (meters)" />
                 <checkgroup columns="4">
                     <check key="oneway" text="Oneway" default="on" />
                     <check key="motorroad" text="Motorroad" default="on" />
@@ -591,7 +445,7 @@ Note that for a match, at least one positive and no negative is required.
                 <text key="name" text="Name" />
                 <reference ref="highway_base" />
                 <check key="motorroad" text="Motorroad" />
-                <reference ref="highway_yesno_incline_oneway_lit" />
+                <reference ref="highway_yesno_incline_oneway_lit_width_sidewalk" />
             </optional>
         </item> <!-- Primary -->
         <item name="Primary Link" icon="presets/way_primary.png" type="way" preset_name_label="true">
@@ -606,7 +460,7 @@ Note that for a match, at least one positive and no negative is required.
             <optional>
                 <reference ref="highway_base" />
                 <check key="motorroad" text="Motorroad" />
-                <reference ref="highway_yesno_incline_oneway_lit" />
+                <reference ref="highway_yesno_incline_oneway_lit_width_sidewalk" />
             </optional>
         </item> <!-- Primary Link -->
         <item name="Secondary" icon="presets/way_secondary.png" type="way,closedway" preset_name_label="true">
@@ -627,7 +481,7 @@ Note that for a match, at least one positive and no negative is required.
             <optional>
                 <text key="name" text="Name" />
                 <reference ref="highway_base" />
-                <reference ref="highway_yesno_incline_oneway_lit" />
+                <reference ref="highway_yesno_incline_oneway_lit_width_sidewalk" />
             </optional>
         </item> <!-- Secondary -->
         <item name="Secondary Link" icon="presets/way_secondary.png" type="way" preset_name_label="true">
@@ -641,7 +495,7 @@ Note that for a match, at least one positive and no negative is required.
             <key key="highway" value="secondary_link" />
             <optional>
                 <reference ref="highway_base" />
-                <reference ref="highway_yesno_incline_oneway_lit" />
+                <reference ref="highway_yesno_incline_oneway_lit_width_sidewalk" />
             </optional>
         </item> <!-- Secondary Link -->
         <item name="Tertiary" icon="presets/way_tertiary.png" type="way,closedway" preset_name_label="true">
@@ -662,7 +516,7 @@ Note that for a match, at least one positive and no negative is required.
             <optional>
                 <text key="name" text="Name" />
                 <reference ref="highway_base" />
-                <reference ref="highway_yesno_incline_oneway_lit" />
+                <reference ref="highway_yesno_incline_oneway_lit_width_sidewalk" />
             </optional>
         </item> <!-- Tertiary -->
         <item name="Tertiary Link" icon="presets/way_tertiary.png" type="way" preset_name_label="true">
@@ -676,7 +530,7 @@ Note that for a match, at least one positive and no negative is required.
             <key key="highway" value="tertiary_link" />
             <optional>
                 <reference ref="highway_base" />
-                <reference ref="highway_yesno_incline_oneway_lit" />
+                <reference ref="highway_yesno_incline_oneway_lit_width_sidewalk" />
             </optional>
         </item> <!-- Tertiary Link -->
         <item name="Unclassified" icon="presets/way_unclassified.png" type="way,closedway" preset_name_label="true">
@@ -694,9 +548,8 @@ Note that for a match, at least one positive and no negative is required.
                 <text key="name" text="Name" />
                 <text key="ref" text="Reference" />
                 <reference ref="highway_base" />
-                <reference ref="highway_yesno_incline_oneway_lit" />
+                <reference ref="highway_yesno_incline_oneway_lit_width_sidewalk" />
                 <check key="passing_places" text="Passing Places" />
-                <text key="width" text="Width (meters)" />
             </optional>
         </item> <!-- Unclassified -->
         <item name="Residential" icon="presets/residential.png" type="way,closedway" preset_name_label="true">
@@ -716,8 +569,7 @@ Note that for a match, at least one positive and no negative is required.
             <optional>
                 <text key="ref" text="Reference" />
                 <reference ref="highway_base" />
-                <reference ref="highway_yesno_incline_oneway_lit" />
-                <text key="width" text="Width (meters)" />
+                <reference ref="highway_yesno_incline_oneway_lit_width_sidewalk" />
             </optional>
         </item> <!-- Residential -->
         <item name="Bicycle Road" icon="presets/bicycle_road.svg" type="way" preset_name_label="true">
@@ -740,6 +592,7 @@ Note that for a match, at least one positive and no negative is required.
                 <reference ref="highway_yesno_incline" />
                 <check key="lit" text="Lit" />
                 <text key="width" text="Width (meters)" />
+                <combo key="sidewalk" text="Sidewalk" values="both,left,right,no" values_context="sidewalk" />
             </optional>
         </item> <!-- Bicycle Road -->
         <item name="Living Street" icon="presets/living_street.png" type="way,closedway" preset_name_label="true">
@@ -758,8 +611,7 @@ Note that for a match, at least one positive and no negative is required.
                 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
                 <combo key="lanes" text="Lanes" values="1,2,3,4,5" length="3" />
                 <reference ref="surface" />
-                <reference ref="highway_yesno_incline_oneway_lit" />
-                <text key="width" text="Width (meters)" />
+                <reference ref="highway_yesno_incline_oneway_lit_width" />
             </optional>
         </item> <!-- Living Street -->
         <item name="Pedestrian" icon="presets/pedestrian.png" type="way,closedway,relation" preset_name_label="true">
@@ -801,9 +653,8 @@ Note that for a match, at least one positive and no negative is required.
             <optional>
                 <text key="name" text="Name" />
                 <reference ref="highway_base" />
-                <reference ref="highway_yesno_incline_oneway_lit" />
+                <reference ref="highway_yesno_incline_oneway_lit_width_sidewalk" />
                 <check key="passing_places" text="Passing Places" />
-                <text key="width" text="Width (meters)" />
             </optional>
         </item> <!-- Service -->
         <item name="Parking Aisle" icon="presets/way_unclassified.png" type="way,closedway" preset_name_label="true">
@@ -836,7 +687,7 @@ Note that for a match, at least one positive and no negative is required.
             <optional>
                 <text key="name" text="Name" />
                 <reference ref="highway_base" />
-                <reference ref="highway_yesno_incline_oneway_lit_width" />
+                <reference ref="highway_yesno_incline_oneway_lit_width_sidewalk" />
             </optional>
         </item> <!-- Road (Unknown Type) -->
         <item name="Construction" icon="presets/construction.png" type="way,closedway" preset_name_label="true">
@@ -852,9 +703,8 @@ Note that for a match, at least one positive and no negative is required.
             <optional>
                 <text key="name" text="Name" />
                 <reference ref="highway_base" />
-                <reference ref="highway_yesno_incline_oneway_lit" />
+                <reference ref="highway_yesno_incline_oneway_lit_width_sidewalk" />
                 <combo key="junction" text="Junction" values="roundabout,jughandle,yes" />
-                <text key="width" text="Width (meters)" />
             </optional>
         </item> <!-- Construction -->
         <separator/>
@@ -902,7 +752,7 @@ Note that for a match, at least one positive and no negative is required.
             <text key="maxheight" text="Max. height (meters)" match="key" />
             <text key="maxwidth" text="Max. width (meters)" match="key" />
             <text key="maxlength" text="Max. length (meters)" match="key" />
-            <combo key="overtaking" text="Overtaking" values="yes,both,forward,backward,no" match="key" />
+            <combo key="overtaking" text="Overtaking" values="yes,both,forward,backward,no" values_context="overtaking" match="key" />
         </item> <!-- Road Restrictions -->
         <separator/>
         <item name="Roundabout" icon="presets/roundabout.png" type="node,closedway" preset_name_label="true">
@@ -949,6 +799,7 @@ Note that for a match, at least one positive and no negative is required.
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=track"
                   fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=track"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=track"
+                  id.href="http://wiki.openstreetmap.org/wiki/Id:Tag:highway=track"
                   it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=track"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:highway=track"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:highway=track"
@@ -962,13 +813,12 @@ Note that for a match, at least one positive and no negative is required.
             <optional>
                 <reference ref="name_layer" />
                 <combo key="surface" text="Surface" values="paved,concrete,cobblestone,gravel,ground,grass,sand" />
-                <reference ref="highway_yesno_incline_oneway_lit" />
+                <reference ref="highway_yesno_incline_oneway_lit_width" />
                 <combo key="mtb:scale" text="MTB Scale" values="0,1,2,3,4,5" />
                 <reference ref="general_access" />
                 <combo key="motor_vehicle" text="Motor vehicles" values="yes,official,designated,destination,delivery,permissive,private,agricultural,forestry,no" />
                 <combo key="motorcycle" text="Motorcycle" values="yes,official,designated,destination,delivery,permissive,private,agricultural,forestry,no" />
                 <combo key="motorcar" text="Motorcar" values="yes,official,designated,destination,delivery,permissive,private,agricultural,forestry,no" />
-                <text key="width" text="Width (meters)" />
             </optional>
         </item> <!-- Track -->
         <item name="Path" icon="presets/path.png" type="way,closedway" preset_name_label="true">
@@ -987,7 +837,7 @@ Note that for a match, at least one positive and no negative is required.
             <optional>
                 <reference ref="name_layer" />
                 <reference ref="surface" />
-                <reference ref="highway_yesno_incline_oneway_lit" />
+                <reference ref="highway_yesno_incline_oneway_lit_width" />
                 <combo key="sac_scale" text="SAC Scale" values_searchable="true">
                     <list_entry value="hiking" display_value="T1 - hiking trail" short_description="Trail well cleared. Area flat or slightly sloped, no fall hazard" />
                     <list_entry value="mountain_hiking" display_value="T2 - mountain hiking trail" short_description="Trail with continuous line and balanced ascent. Terrain partially steep, fall hazard possible" />
@@ -1005,7 +855,6 @@ Note that for a match, at least one positive and no negative is required.
                 <combo key="ski" text="Ski" values="yes,official,designated,permissive,private,no" />
                 <combo key="snowmobile" text="Snowmobile" values="yes,official,designated,permissive,destination,delivery,private,no" />
                 <!-- <combo key="motorcar" text="Motorcar" values="yes,designated,no" default="no" /> -->
-                <text key="width" text="Width (meters)" />
             </optional>
         </item> <!-- Path -->
         <separator/>
@@ -1022,8 +871,7 @@ Note that for a match, at least one positive and no negative is required.
                 <reference ref="name_layer" />
                 <text key="maxspeed" text="Max. speed (km/h)" />
                 <reference ref="surface" />
-                <reference ref="highway_yesno_incline_oneway_lit" />
-                <text key="width" text="Width (meters)" />
+                <reference ref="highway_yesno_incline_oneway_lit_width" />
             </optional>
         </item> <!-- Dedicated Bridleway -->
         <item name="Cycle Lane/Track" type="way" preset_name_label="true">
@@ -1064,9 +912,8 @@ Note that for a match, at least one positive and no negative is required.
             <optional>
                 <reference ref="name_layer" />
                 <reference ref="surface" />
-                <reference ref="highway_yesno_incline_oneway_lit" />
+                <reference ref="highway_yesno_incline_oneway_lit_width" />
                 <combo key="foot" text="Pedestrians" values="unknown,yes,no" />
-                <text key="width" text="Width (meters)" />
             </optional>
         </item> <!-- Dedicated Cycleway -->
         <item name="Segregated Foot- and Cycleway" icon="presets/foot_and_cycleway_segregated.png" type="way" preset_name_label="true">
@@ -1080,8 +927,7 @@ Note that for a match, at least one positive and no negative is required.
             <optional>
                 <reference ref="name_layer" />
                 <reference ref="surface" />
-                <reference ref="highway_yesno_incline_oneway_lit" />
-                <text key="width" text="Width (meters)" />
+                <reference ref="highway_yesno_incline_oneway_lit_width" />
             </optional>
         </item> <!-- Segregated Foot- and Cycleway -->
         <item name="Combined Foot- and Cycleway" icon="presets/foot_and_cycleway_combined.png" type="way" preset_name_label="true">
@@ -1095,9 +941,8 @@ Note that for a match, at least one positive and no negative is required.
             <optional>
                 <reference ref="name_layer" />
                 <reference ref="surface" />
-                <reference ref="highway_yesno_incline_oneway_lit" />
+                <reference ref="highway_yesno_incline_oneway_lit_width" />
                 <check key="passing_places" text="Passing Places" />
-                <text key="width" text="Width (meters)" />
             </optional>
         </item> <!-- Combined Foot- and Cycleway -->
         <item name="Dedicated Footway" icon="presets/footway.png" type="way" preset_name_label="true">
@@ -1131,14 +976,14 @@ Note that for a match, at least one positive and no negative is required.
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:highway=steps"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:highway=steps"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:highway=steps"
-                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:highway=steps" />
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:highway=steps"
+                  uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:highway=steps" />
             <key key="highway" value="steps" />
             <optional>
                 <reference ref="name_layer" />
                 <reference ref="surface" />
                 <text key="step_count" text="Amount of Steps" />
-                <reference ref="highway_yesno_incline_oneway_lit" />
-                <text key="width" text="Width (meters)" />
+                <reference ref="highway_yesno_incline_oneway_lit_width" />
             </optional>
         </item> <!-- Steps -->
     </group> <!-- Ways -->
@@ -1201,6 +1046,8 @@ Note that for a match, at least one positive and no negative is required.
             <optional text="Optional crossing attributes:">
                 <combo key="crossing" text="Pedestrian crossing type" values="uncontrolled,traffic_signals,island,unmarked,no,unknown" />
                 <combo key="crossing_ref" text="Crossing type name (UK)" values="zebra,pelican,toucan,puffin,pegasus,tiger" />
+                <check key="button_operated" text="Button operated" />
+                <check key="traffic_signals:sound" text="Sound signals" />
                 <combo key="supervised" text="Crossing attendant" delimiter="|" values="yes|no|06:00-20:00|Mo-Fr 09:00-18:00,Sa 08:00-14:00|May-Sep 09:30-12:30,14:15-19:30" />
                 <check key="bicycle" text="Cross by bicycle" />
                 <check key="horse" text="Cross on horseback" />
@@ -1277,6 +1124,7 @@ Note that for a match, at least one positive and no negative is required.
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=turning_circle"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=turning_circle"
+                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:highway=turning_circle"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:highway=turning_circle"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:highway=turning_circle"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:highway=turning_circle" />
@@ -1396,7 +1244,7 @@ Note that for a match, at least one positive and no negative is required.
             <key key="barrier" value="bus_trap" />
             <reference ref="optional_maxwidth" />
         </item> <!-- Bus Trap -->
-        <item name="Spikes" icon="presets/empty.png" type="node" preset_name_label="true">
+        <item name="Spikes" icon="styles/standard/vehicle/spikes.svg" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Key:barrier"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Key:barrier"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Key:barrier"
@@ -1861,7 +1709,7 @@ Note that for a match, at least one positive and no negative is required.
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:man_made=groyne" />
             <key key="man_made" value="groyne" />
         </item> <!-- Groyne -->
-        <item name="Breakwater" icon="presets/groyne.png" type="way,closedway" preset_name_label="true">
+        <item name="Breakwater" icon="presets/breakwater.png" type="way,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=breakwater"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=breakwater"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:man_made=breakwater"
@@ -1914,6 +1762,7 @@ Note that for a match, at least one positive and no negative is required.
         <item name="Covered Reservoir" icon="presets/reservoir_covered.png" type="node,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=reservoir_covered"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=reservoir_covered"
+                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:man_made=reservoir_covered"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:man_made=reservoir_covered"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:man_made=reservoir_covered" />
             <space />
@@ -1921,7 +1770,7 @@ Note that for a match, at least one positive and no negative is required.
             <text key="name" text="Name" />
         </item> <!-- Covered Reservoir -->
         <separator/>
-        <item name="Water" icon="presets/water.png" type="node,closedway,relation" preset_name_label="true">
+        <item name="Water" icon="presets/water.png" type="closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:natural=water"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=water"
@@ -1993,7 +1842,7 @@ Note that for a match, at least one positive and no negative is required.
             <key key="natural" value="mud" />
             <text key="name" text="Name" />
         </item> <!-- Mud -->
-        <item name="Beach" icon="presets/beach.png" type="node,closedway,relation" preset_name_label="true">
+        <item name="Beach" icon="presets/beach.png" type="closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=beach"
                   es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:natural=beach"
@@ -2104,7 +1953,7 @@ Note that for a match, at least one positive and no negative is required.
             <key key="waterway" value="turning_point" />
         </item> <!-- Turning Point -->
         <separator/>
-        <item name="Slipway" icon="styles/standard/nautical/slipway.png" type="node" preset_name_label="true">
+        <item name="Slipway" icon="styles/standard/nautical/slipway.png" type="node,way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=slipway"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=slipway"
                   fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:leisure=slipway"
@@ -2179,7 +2028,9 @@ Note that for a match, at least one positive and no negative is required.
         </item> <!-- Monorail -->
         <item name="Preserved" icon="presets/rail_preserved.png" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=preserved"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=preserved"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:railway=preserved"
+                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:railway=preserved"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:railway=preserved" />
             <key key="railway" value="preserved" />
             <optional>
@@ -2294,16 +2145,19 @@ Note that for a match, at least one positive and no negative is required.
         <item name="Turntable" icon="presets/turntable.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=turntable"
+                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:railway=turntable"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:railway=turntable" />
             <key key="railway" value="turntable" />
         </item> <!-- Turntable -->
         <item name="Buffer Stop" icon="styles/standard/transport/buffer_stop.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=buffer_stop"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=buffer_stop"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:railway=buffer_stop" />
             <key key="railway" value="buffer_stop" />
         </item> <!-- Buffer Stop -->
         <item name="Railway Switch" icon="presets/railway_switch.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=switch"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=switch"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:railway=switch" />
             <key key="railway" value="switch" />
             <text key="ref" text="Reference" />
@@ -2701,6 +2555,7 @@ Note that for a match, at least one positive and no negative is required.
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:amenity=bicycle_parking"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:amenity=bicycle_parking"
                   pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:amenity=bicycle_parking"
+                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=bicycle_parking"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=bicycle_parking"
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:amenity=bicycle_parking" />
             <space />
@@ -2891,6 +2746,7 @@ Note that for a match, at least one positive and no negative is required.
             <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=subway_entrance"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=subway_entrance"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:railway=subway_entrance"
+                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:railway=subway_entrance"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:railway=subway_entrance"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:railway=subway_entrance" />
             <key key="railway" value="subway_entrance" />
@@ -2957,6 +2813,7 @@ Note that for a match, at least one positive and no negative is required.
         <item name="Railway Halt" icon="presets/station.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=halt"
+                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:railway=halt"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:railway=halt"
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:railway=halt" />
             <key key="railway" value="halt" />
@@ -3729,6 +3586,7 @@ Note that for a match, at least one positive and no negative is required.
         </item> <!-- Public Grill -->
         <item name="Firepit" icon="styles/standard/leisure/firepit.svg" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=firepit"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=firepit"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:leisure=firepit"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:leisure=firepit" />
             <space />
@@ -3850,6 +3708,7 @@ Note that for a match, at least one positive and no negative is required.
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=place_of_worship"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=place_of_worship"
                   sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship"
+                  uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:amenity=place_of_worship"
                   zh_TW.href="http://wiki.openstreetmap.org/wiki/Zh-hant:Tag:amenity=place_of_worship" />
             <space />
             <key key="amenity" value="place_of_worship" />
@@ -4106,6 +3965,7 @@ Note that for a match, at least one positive and no negative is required.
             <space />
             <key key="amenity" value="post_office" />
             <reference ref="name_operator_oh" />
+            <text key="ref" text="Reference" />
         </item> <!-- Post Office -->
     </group> <!-- Public Buildings -->
     <group name="Education" icon="presets/school.png">
@@ -4533,7 +4393,7 @@ Note that for a match, at least one positive and no negative is required.
             <combo key="lock" text="Lock" values="yes,no,unknown" />
         </item> <!-- Hunting Stand -->
         <separator/>
-        <item name="Drinking Water" icon="presets/drinking_water.png" type="node" preset_name_label="true">
+        <item name="Drinking Water" icon="styles/standard/food/drinking_water.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:amenity=drinking_water"
@@ -4573,9 +4433,9 @@ Note that for a match, at least one positive and no negative is required.
         </item> <!-- Fire Hydrant -->
     </group> <!-- Facilities -->
   </group>  <!-- Facilities -->
-  <group name="Sports" icon="presets/soccer.png">
+  <group name="Sports" icon="styles/standard/sport/soccer.png">
     <group name="Sport Facilities" icon="presets/stadium.png">
-        <item name="Stadium" icon="presets/stadium.png" type="node,closedway" preset_name_label="true">
+        <item name="Stadium" icon="styles/standard/sport/stadium.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=stadium"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=stadium"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:leisure=stadium"
@@ -4588,7 +4448,7 @@ Note that for a match, at least one positive and no negative is required.
             <text key="name" text="Name" />
             <reference ref="optional_sport" />
         </item> <!-- Stadium -->
-        <item name="Sports Centre" icon="presets/sports_centre.png" type="node,closedway" preset_name_label="true">
+        <item name="Sports Centre" icon="styles/standard/sport/centre.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=sports_centre"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=sports_centre"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:leisure=sports_centre"
@@ -4600,7 +4460,7 @@ Note that for a match, at least one positive and no negative is required.
             <text key="name" text="Name" />
             <reference ref="optional_sport" />
         </item> <!-- Sports Centre -->
-        <item name="Pitch" icon="presets/pitch.png" type="node,closedway" preset_name_label="true">
+        <item name="Pitch" icon="styles/standard/sport/pitch.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=pitch"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=pitch"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:leisure=pitch"
@@ -4615,7 +4475,7 @@ Note that for a match, at least one positive and no negative is required.
             <text key="name" text="Name" />
             <reference ref="optional_sport" />
         </item> <!-- Pitch -->
-        <item name="Racetrack" icon="presets/stadium.png" type="node,way,closedway,relation" preset_name_label="true">
+        <item name="Racetrack" icon="styles/standard/sport/track.png" type="node,way,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=track"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=track"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:leisure=track"
@@ -4628,7 +4488,7 @@ Note that for a match, at least one positive and no negative is required.
             <text key="name" text="Name" />
             <reference ref="optional_sport" />
         </item> <!-- Racetrack -->
-        <item name="Golf Course" icon="presets/golf.png" type="node,closedway" preset_name_label="true">
+        <item name="Golf Course" icon="styles/standard/sport/golf.svg" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=golf_course"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=golf_course"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:leisure=golf_course"
@@ -4639,7 +4499,7 @@ Note that for a match, at least one positive and no negative is required.
             <key key="leisure" value="golf_course" />
             <reference ref="name_oh" />
         </item> <!-- Golf Course -->
-        <item name="Miniature Golf" icon="presets/golf.png" type="node,closedway" preset_name_label="true">
+        <item name="Miniature Golf" icon="styles/standard/sport/miniature_golf.svg" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=miniature_golf"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=miniature_golf"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:leisure=miniature_golf"
@@ -4696,13 +4556,13 @@ Note that for a match, at least one positive and no negative is required.
             <text key="name" text="Name" />
             <combo key="leisure" text="Type" values="sports_centre" />
         </item> <!-- Climbing -->
-        <item name="Canoeing/Kayaking" icon="presets/canoe.png" type="node,way,closedway" preset_name_label="true">
+        <item name="Canoeing/Kayaking" icon="styles/standard/sport/canoe.svg" type="node,way,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=canoe" />
             <space />
             <key key="sport" value="canoe" />
             <text key="name" text="Name" />
         </item> <!-- Canoeing/Kayaking -->
-        <item name="Cycling" icon="presets/cycling.png" type="node,closedway" preset_name_label="true">
+        <item name="Cycling" icon="styles/standard/sport/cycling.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=cycling" />
             <space />
             <key key="sport" value="cycling" />
@@ -4723,7 +4583,7 @@ Note that for a match, at least one positive and no negative is required.
             <text key="name" text="Name" />
             <reference ref="riding_surface" />
         </item> <!-- Equestrian -->
-        <item name="Horse Racing" icon="presets/equestrian.png" type="node,closedway" preset_name_label="true">
+        <item name="Horse Racing" icon="styles/standard/sport/riding.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=horse_racing" />
             <space />
             <key key="sport" value="horse_racing" />
@@ -4753,7 +4613,7 @@ Note that for a match, at least one positive and no negative is required.
             <text key="name" text="Name" />
             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium,track" default="pitch" values_context="racing" />
         </item> <!-- Skateboard -->
-        <item name="Swimming" icon="presets/swimming.png" type="node,closedway" preset_name_label="true">
+        <item name="Swimming" icon="styles/standard/sport/pool.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=swimming"
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:sport=swimming" />
             <space />
@@ -4769,7 +4629,7 @@ Note that for a match, at least one positive and no negative is required.
             <key key="sport" value="scuba_diving" />
             <text key="name" text="Name" />
         </item> <!-- Scuba Diving -->
-        <item name="Skiing" icon="presets/skiing_downhill.png" type="node,way,closedway" preset_name_label="true">
+        <item name="Skiing" icon="styles/standard/sport/skiing.png" type="node,way,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Piste_Maps"
                   it.href="http://wiki.openstreetmap.org/wiki/IT:Piste_Maps"
@@ -4793,8 +4653,8 @@ Note that for a match, at least one positive and no negative is required.
             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" />
         </item> <!-- Shooting -->
     </group> <!-- Sport -->
-    <group name="Sport (Ball)" icon="presets/soccer.png">
-        <item name="Soccer" icon="presets/soccer.png" type="node,closedway" preset_name_label="true">
+    <group name="Sport (Ball)" icon="styles/standard/sport/soccer.png">
+        <item name="Soccer" icon="styles/standard/sport/soccer.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=soccer"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:sport=soccer"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:sport=soccer"
@@ -4803,7 +4663,7 @@ Note that for a match, at least one positive and no negative is required.
             <key key="sport" value="soccer" />
             <reference ref="name_leisure_pitch" />
         </item> <!-- Soccer -->
-        <item name="Australian Football" icon="presets/soccer.png" type="node,closedway" preset_name_label="true">
+        <item name="Australian Football" icon="presets/football.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=australian_football" />
             <space />
             <key key="sport" value="australian_football" />
@@ -4821,7 +4681,7 @@ Note that for a match, at least one positive and no negative is required.
             <key key="sport" value="canadian_football" />
             <reference ref="name_leisure_pitch" />
         </item> <!-- Canadian Football -->
-        <item name="Gaelic Games" icon="presets/soccer.png" type="node,closedway" preset_name_label="true">
+        <item name="Gaelic Games" icon="styles/standard/sport/soccer.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=gaelic_games" />
             <space />
             <key key="sport" value="gaelic_games" />
@@ -4847,7 +4707,7 @@ Note that for a match, at least one positive and no negative is required.
             <key key="sport" value="rugby_union" />
             <reference ref="name_leisure_pitch" />
         </item> <!-- Rugby Union -->
-        <item name="Baseball" icon="presets/baseball.png" type="node,closedway" preset_name_label="true">
+        <item name="Baseball" icon="styles/standard/sport/baseball.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=baseball" />
             <space />
             <key key="sport" value="baseball" />
@@ -4873,7 +4733,7 @@ Note that for a match, at least one positive and no negative is required.
             <reference ref="name_operator" />
             <combo key="leisure" text="Type" values="stadium,pitch,sports_centre" />
         </item> <!-- Beach Volleyball -->
-        <item name="Golf" icon="presets/golf.png" type="node,closedway" preset_name_label="true">
+        <item name="Golf" icon="styles/standard/sport/golf.svg" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=golf"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:sport=golf"
                   pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:sport=golf"
@@ -4895,13 +4755,13 @@ Note that for a match, at least one positive and no negative is required.
             <key key="sport" value="bowls" />
             <reference ref="name_leisure_pitch" />
         </item> <!-- Lawn Bowling -->
-        <item name="Cricket" icon="presets/cricket.png" type="node,closedway" preset_name_label="true">
+        <item name="Cricket" icon="styles/standard/sport/cricket.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=cricket" />
             <space />
             <key key="sport" value="cricket" />
             <reference ref="name_leisure_pitch" />
         </item> <!-- Cricket -->
-        <item name="Cricket Nets" icon="presets/cricket.png" type="node,closedway" preset_name_label="true">
+        <item name="Cricket Nets" icon="styles/standard/sport/cricket.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=cricket_nets" />
             <space />
             <key key="sport" value="cricket_nets" />
@@ -4928,7 +4788,7 @@ Note that for a match, at least one positive and no negative is required.
             <key key="sport" value="pelota" />
             <reference ref="name_leisure_pitch" />
         </item> <!-- Pelota -->
-        <item name="Racquetball" icon="presets/racquetball.png" type="node,closedway" preset_name_label="true">
+        <item name="Racquetball" icon="styles/standard/sport/racquetball.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=racquet"
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:sport=racquet" />
             <space />
@@ -4943,7 +4803,7 @@ Note that for a match, at least one positive and no negative is required.
             <text key="name" text="Name" />
             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" />
         </item> <!-- Table Tennis/Ping-Pong -->
-        <item name="Tennis" icon="presets/tennis.png" type="node,closedway" preset_name_label="true">
+        <item name="Tennis" icon="styles/standard/sport/tennis.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=tennis" />
             <space />
             <key key="sport" value="tennis" />
@@ -5007,7 +4867,7 @@ Note that for a match, at least one positive and no negative is required.
             <text key="name" text="Name" />
             <combo key="leisure" text="Type" values="pitch,sports_centre,track" values_context="aerialway" />
         </item> <!-- Model Aerodrome -->
-        <item name="RC Car" icon="presets/car.png" type="node,closedway" preset_name_label="true">
+        <item name="RC Car" icon="styles/standard/transport/car.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=rc_car"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Key:sport"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sport"
@@ -5024,7 +4884,7 @@ Note that for a match, at least one positive and no negative is required.
             <text key="name" text="Name" />
             <combo key="leisure" text="Type" values="pitch,sports_centre,track" values_context="racing" />
         </item> <!-- RC Car -->
-        <item name="Raceway" icon="styles/standard/sport/raceway.svg" type="closedway" preset_name_label="true">
+        <item name="Raceway" icon="styles/standard/sport/raceway.svg" type="way,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=raceway"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=raceway"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=raceway"
@@ -5124,8 +4984,9 @@ Note that for a match, at least one positive and no negative is required.
             <key key="man_made" value="works" />
             <text key="name" text="Name" />
         </item> <!-- Works -->
-        <item name="Chimney" icon="presets/chimney.png" type="node" preset_name_label="true">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=chimney" />
+        <item name="Chimney" icon="presets/chimney.png" type="node,closedway" preset_name_label="true">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=chimney"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=chimney" />
             <space />
             <key key="man_made" value="chimney" />
             <reference ref="name_operator" />
@@ -5149,6 +5010,13 @@ Note that for a match, at least one positive and no negative is required.
             <key key="man_made" value="gasometer" />
             <text key="name" text="Name" />
         </item> <!-- Gasometer -->
+        <item name="Bunker Silo" icon="styles/standard/bunker_silo.svg" type="node,closedway" preset_name_label="true">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=bunker_silo"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=bunker_silo" />
+            <space />
+            <key key="man_made" value="bunker_silo" />
+            <text key="name" text="Name" />
+        </item> <!-- Bunker Silo -->
         <item name="Pipeline" icon="presets/path.png" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"
@@ -5310,6 +5178,7 @@ Note that for a match, at least one positive and no negative is required.
         <item name="Monitoring Station" icon="presets/monitoring_station.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=monitoring_station"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=monitoring_station"
+                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:man_made=monitoring_station"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:man_made=monitoring_station"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:man_made=monitoring_station" />
             <space />
@@ -5317,15 +5186,16 @@ Note that for a match, at least one positive and no negative is required.
             <reference ref="name_operator" />
             <label text="Monitoring:" />
             <checkgroup columns="3">
-                <check key="monitoring:weather" text="Weather" />
                 <check key="monitoring:water_level" text="Water level" />
                 <check key="monitoring:tide_gauge" text="Tide Level" />
+                <check key="monitoring:groundwater" text="Groundwater" />
                 <check key="monitoring:traffic" text="Traffic" />
                 <check key="monitoring:air_quality" text="Air Quality" />
                 <check key="monitoring:noise" text="Noise" />
                 <check key="monitoring:gps" text="GPS Signals" />
                 <check key="monitoring:glonass" text="GLONASS Signals" />
                 <check key="monitoring:galileo" text="Galileo Signals" />
+                <check key="monitoring:weather" text="Weather" />
                 <check key="monitoring:radiation" text="Radiation" />
                 <check key="monitoring:seismic_activity" text="Seismic Activity" />
             </checkgroup>
@@ -5412,6 +5282,14 @@ Note that for a match, at least one positive and no negative is required.
             <space />
             <combo key="bridge:support" text="Type" values="pier,abutment,lift_pier,pivot_pier" match="key" />
         </item> <!-- Bridge Support -->
+        <item name="Bridge outline" icon="presets/bridge.png" type="closedway" preset_name_label="true">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=bridge" />
+            <space />
+            <key key="man_made" value="bridge" />
+            <optional>
+                <reference ref="name_layer" />
+            </optional>
+        </item> <!-- Bridge outline -->
     </group> <!-- Bridges -->
     <group name="Power" icon="presets/power.png">
         <item name="Power Plant" icon="icons/power_station.png" type="closedway,relation" preset_name_label="true">
@@ -5755,6 +5633,30 @@ Note that for a match, at least one positive and no negative is required.
             <combo key="material" text="Material" values="metal,plastic,steel,stone,wood,concrete" />
             <reference ref="ref_operator_branch" />
         </item> <!-- Pole -->
+        <item name="Pole with Transformer" icon="icons/power_tower_low.n.16.png" type="node" preset_name_label="true">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:power=pole"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=pole"
+                  es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:power=pole"
+                  fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=pole"
+                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=pole"
+                  it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:power=pole"
+                  pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:power=pole"
+                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:power=pole" />
+            <space />
+            <key key="power" value="pole" />
+            <label text="Pole Attributes:" />
+            <text key="height" text="Height in meter (m)" />
+            <combo key="material" text="Material" values="metal,plastic,steel,stone,wood,concrete" />
+            <reference ref="ref_operator_branch" />
+            <space />
+            <label text="Transformer Attributes:" />
+            <key key="transformer" value="distribution" match="key!" />
+            <reference ref="voltage_frequency" />
+            <optional>
+                <combo key="rating" text="Power rating (kVA/MVA)" values="2700 kVA,12500 kVA,15 MVA,50 MVA,100 MVA" />
+                <combo key="phases" text="Phases" values="1,3" length="1" />
+            </optional>
+        </item> <!-- Pole with Transformer-->
         <item name="Power Line" icon="presets/power.png" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line"
@@ -5785,7 +5687,7 @@ Note that for a match, at least one positive and no negative is required.
             <reference ref="ref_operator_branch" />
             <optional>
                 <reference ref="cable_circuit" />
-                <combo key="location" text="Location" values="underground,underwater,overground" />
+                <combo key="location" text="Location" values="underground,underwater,overground" values_context="power cable" />
                 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
                 <check key="communication" text="Used for data communications" value_on="line" value_off="" default="off" />
             </optional>
@@ -5824,6 +5726,7 @@ Note that for a match, at least one positive and no negative is required.
         </item> <!-- Archaeological Site -->
         <item name="Battlefield" icon="presets/battlefield.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=battlefield"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:historic=battlefield"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:historic=battlefield"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:historic=battlefield"
@@ -5869,6 +5772,13 @@ Note that for a match, at least one positive and no negative is required.
             <space />
             <key key="historic" value="memorial" />
             <text key="name" text="Name" />
+            <combo key="memorial" text="Type" values="statue,bust,plaque,stele,stone,war_memorial" values_context="memorial" />
+            <optional>
+                <text key="inscription" text="Inscription" />
+                <text key="artist_name" text="Artist Name" />
+                <text key="start_date" text="Start date" />
+                <text key="wikipedia" text="Wikipedia" />
+            </optional>
         </item> <!-- Memorial -->
         <item name="Wayside Cross" icon="presets/wayside_cross.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=wayside_cross"
@@ -5934,6 +5844,7 @@ Note that for a match, at least one positive and no negative is required.
         <item name="Kiosk" icon="presets/kiosk.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=kiosk"
+                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:shop=kiosk"
                   it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:shop=kiosk"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:shop=kiosk"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=kiosk"
@@ -6106,6 +6017,14 @@ Note that for a match, at least one positive and no negative is required.
             <reference ref="name_oh" />
             <reference ref="link_contact" />
         </item> <!-- Beverages -->
+        <item name="Wine" icon="styles/standard/shop/wine.svg" type="node,closedway" preset_name_label="true">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=wine"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=wine" />
+            <space />
+            <key key="shop" value="wine" />
+            <reference ref="name_oh" />
+            <reference ref="link_contact" />
+        </item> <!-- Wine -->
     </group> <!-- Food -->
     <group name="Clothes" icon="styles/standard/shop/clothes.png">
         <item name="Clothes" icon="styles/standard/shop/clothes.png" type="node,closedway" preset_name_label="true">
@@ -6288,6 +6207,13 @@ Note that for a match, at least one positive and no negative is required.
             <reference ref="name_oh" />
             <reference ref="link_contact" />
         </item> <!-- Video Games -->
+        <item name="Music" icon="styles/standard/shop/music.svg" type="node,closedway" preset_name_label="true">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=music" />
+            <space />
+            <key key="shop" value="music" />
+            <reference ref="name_oh" />
+            <reference ref="link_contact" />
+        </item> <!-- Music -->
     </group> <!-- Electronic -->
     <group name="Cash" icon="presets/dollar.png">
         <item name="Bank" icon="styles/standard/money/bank.png" type="node,closedway" preset_name_label="true">
@@ -6305,6 +6231,7 @@ Note that for a match, at least one positive and no negative is required.
             <key key="amenity" value="bank" />
             <reference ref="name_brand_operator_oh" />
             <check key="atm" text="Automated Teller Machine" default="on" />
+            <text key="ref" text="Reference" />
             <reference ref="link_contact" />
         </item> <!-- Bank -->
         <item name="Money Exchange" icon="styles/standard/money/exchange.png" type="node,closedway" preset_name_label="true">
@@ -6380,6 +6307,16 @@ Note that for a match, at least one positive and no negative is required.
             <reference ref="name_operator_oh" />
             <reference ref="link_contact" />
         </item> <!-- Curtain -->
+        <item name="Art" icon="styles/standard/shop/art.svg" type="node,closedway" preset_name_label="true">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=art"
+                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:shop=art"
+                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=art"
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=art" />
+            <space />
+            <key key="shop" value="art" />
+            <reference ref="name_operator_oh" />
+            <reference ref="link_contact" />
+        </item> <!-- Art -->
         <item name="Frame" icon="presets/frame.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=frame"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:shop=frame"
@@ -6534,6 +6471,16 @@ Note that for a match, at least one positive and no negative is required.
             <reference ref="name_oh" />
             <reference ref="link_contact" />
         </item> <!-- Beauty -->
+        <item name="Tattoo" icon="styles/standard/shop/tattoo.svg" type="node,closedway" preset_name_label="true">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=tattoo"
+                  es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:shop=tattoo"
+                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=tattoo"
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=tattoo" />
+            <space />
+            <key key="shop" value="tattoo" />
+            <reference ref="name_oh" />
+            <reference ref="link_contact" />
+        </item> <!-- Tattoo -->
         <item name="Optician" icon="styles/standard/shop/optician.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=optician"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=optician"
@@ -6710,6 +6657,19 @@ Note that for a match, at least one positive and no negative is required.
             <reference ref="name_oh" />
             <reference ref="link_contact" />
         </item> <!-- Pet -->
+        <item name="Funeral Directors" icon="styles/standard/shop/funeral_directors.svg" type="node,closedway" preset_name_label="true">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=funeral_directors"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=funeral_directors"
+                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:shop=funeral_directors"
+                  pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:shop=funeral_directors"
+                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=funeral_directors"
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=funeral_directors"
+                  zh_TW.href="http://wiki.openstreetmap.org/wiki/Zh-hant:Tag:shop=funeral_directors" />
+            <space />
+            <key key="shop" value="funeral_directors" />
+            <reference ref="name_oh" />
+            <reference ref="link_contact" />
+        </item> <!-- Funeral Directors -->
     </group> <!-- Other -->
         <separator/>
     <item name="Vending Machine" icon="presets/vending_machine.png" type="node" preset_name_label="true">
@@ -6755,7 +6715,8 @@ Note that for a match, at least one positive and no negative is required.
             <text key="name" text="Name" />
         </item> <!-- Political -->
         <item name="Postal Code" icon="presets/boundaries.png" type="closedway,relation" preset_name_label="true">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:boundary=postal_code" />
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:boundary=postal_code"
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:boundary=postal_code" />
             <space />
             <key key="boundary" value="postal_code" />
             <text key="postal_code" text="Postal Code" />
@@ -6769,6 +6730,22 @@ Note that for a match, at least one positive and no negative is required.
             <key key="boundary" value="national_park" />
             <text key="name" text="Name" />
         </item> <!-- National Park -->
+        <item name="Protected Area" icon="presets/boundaries.png" type="closedway,relation" preset_name_label="true">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:boundary=protected_area"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:boundary=protected_area"
+                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:boundary=protected_area"
+                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:boundary=protected_area"
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:boundary=protected_area" />
+            <space />
+            <key key="boundary" value="protected_area" />
+            <text key="protected_class" text="Protected Class" length="2" />
+            <text key="protection_title" text="Title or type of protection" />
+            <optional>
+                <reference ref="name_operator_oh" />
+                <text key="wikipedia" text="Wikipedia" />
+                <text key="start_date" text="Start date" />
+            </optional>
+        </item> <!-- Protected Area -->
     </group> <!-- Boundaries -->
     <group name="Places" icon="presets/places.png">
         <item name="Continent" icon="presets/places.png" type="node,closedway" preset_name_label="true">
@@ -7063,7 +7040,7 @@ Note that for a match, at least one positive and no negative is required.
                 <reference ref="leaf" />
             </optional>
         </item> <!-- Tree Row -->
-        <item name="Wood" icon="presets/landuse.png" type="node,closedway,relation" preset_name_label="true">
+        <item name="Wood" icon="styles/standard/misc/landmark/trees.png" type="closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:natural=wood"
@@ -7076,7 +7053,7 @@ Note that for a match, at least one positive and no negative is required.
             <text key="name" text="Name" />
             <reference ref="leaf" />
         </item> <!-- Wood -->
-        <item name="Forest" icon="presets/landuse.png" type="node,closedway,relation" preset_name_label="true">
+        <item name="Forest" icon="styles/standard/misc/landmark/trees.png" type="closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:landuse=forest"
@@ -7089,7 +7066,7 @@ Note that for a match, at least one positive and no negative is required.
             <text key="name" text="Name" />
             <reference ref="leaf" />
         </item> <!-- Forest -->
-        <item name="Grassland" icon="presets/landuse.png" type="closedway,relation" preset_name_label="true">
+        <item name="Grassland" icon="styles/standard/misc/landuse/meadow.svg" type="closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=grassland"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=grassland"
                   it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:natural=grassland"
@@ -7116,7 +7093,7 @@ Note that for a match, at least one positive and no negative is required.
             <text key="name" text="Name" />
         </item> <!-- Nature Reserve -->
         <separator/>
-        <item name="Scree" icon="presets/empty.png" type="node,closedway,relation" preset_name_label="true">
+        <item name="Scree" icon="presets/empty.png" type="closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=scree"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=scree"
                   it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:natural=scree"
@@ -7128,7 +7105,7 @@ Note that for a match, at least one positive and no negative is required.
             <key key="natural" value="scree" />
             <text key="name" text="Name" />
         </item> <!-- Scree -->
-        <item name="Fell" icon="presets/empty.png" type="node,closedway,relation" preset_name_label="true">
+        <item name="Fell" icon="presets/empty.png" type="closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=fell"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:natural=fell"
@@ -7139,7 +7116,7 @@ Note that for a match, at least one positive and no negative is required.
             <key key="natural" value="fell" />
             <text key="name" text="Name" />
         </item> <!-- Fell -->
-        <item name="Scrub" icon="presets/scrub.svg" type="node,closedway,relation" preset_name_label="true">
+        <item name="Scrub" icon="presets/scrub.svg" type="closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=scrub"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=scrub"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:natural=scrub"
@@ -7155,7 +7132,7 @@ Note that for a match, at least one positive and no negative is required.
                 <reference ref="leaf" />
             </optional>
         </item> <!-- Scrub -->
-        <item name="Heath" icon="presets/empty.png" type="node,closedway,relation" preset_name_label="true">
+        <item name="Heath" icon="presets/empty.png" type="closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath"
                   bg.href="http://wiki.openstreetmap.org/wiki/Bg:Tag:natural=heath"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=heath"
@@ -7203,7 +7180,7 @@ Note that for a match, at least one positive and no negative is required.
         </item> <!-- Stone -->
     </group> <!-- Nature -->
     <group name="Land use" icon="presets/landuse.png">
-        <item name="Farmyard" icon="presets/landuse.png" type="closedway,relation" preset_name_label="true">
+        <item name="Farmyard" icon="styles/standard/misc/landuse/farmyard.png" type="closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=farmyard"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=farmyard"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:landuse=farmyard"
@@ -7226,7 +7203,7 @@ Note that for a match, at least one positive and no negative is required.
             <key key="landuse" value="farmland" />
             <text key="name" text="Name" />
         </item> <!-- Farmland -->
-        <item name="Meadow" icon="presets/landuse.png" type="node,closedway,relation" preset_name_label="true">
+        <item name="Meadow" icon="styles/standard/misc/landuse/meadow.svg" type="closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=meadow"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=meadow"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:landuse=meadow"
@@ -7237,7 +7214,7 @@ Note that for a match, at least one positive and no negative is required.
             <key key="landuse" value="meadow" />
             <text key="name" text="Name" />
         </item> <!-- Meadow -->
-        <item name="Orchard" icon="presets/landuse.png" type="closedway,relation" preset_name_label="true">
+        <item name="Orchard" icon="styles/standard/misc/landuse/orchard.svg" type="closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=orchard"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=orchard"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:landuse=orchard"
@@ -7248,7 +7225,7 @@ Note that for a match, at least one positive and no negative is required.
             <key key="landuse" value="orchard" />
             <text key="name" text="Name" />
         </item> <!-- Orchard -->
-        <item name="Vineyard" icon="presets/fruits.png" type="node,closedway,relation" preset_name_label="true">
+        <item name="Vineyard" icon="presets/fruits.png" type="closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=vineyard"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=vineyard"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:landuse=vineyard"
@@ -7282,7 +7259,7 @@ Note that for a match, at least one positive and no negative is required.
             <text key="genus" text="Genus" />
             <text key="species" text="Species" />
         </item> <!-- Plant Nursery -->
-        <item name="Allotments" icon="presets/landuse.png" type="node,closedway,relation" preset_name_label="true">
+        <item name="Allotments" icon="styles/standard/misc/landuse/allotments.svg" type="closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=allotments"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:landuse=allotments"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=allotments"
@@ -7297,7 +7274,7 @@ Note that for a match, at least one positive and no negative is required.
             <text key="name" text="Name" />
         </item> <!-- Allotments -->
         <separator/>
-        <item name="Garden" icon="presets/empty.png" type="node,closedway,relation" preset_name_label="true">
+        <item name="Garden" icon="styles/standard/leisure/garden.png" type="node,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=garden"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=garden"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:leisure=garden"
@@ -7307,7 +7284,7 @@ Note that for a match, at least one positive and no negative is required.
             <key key="leisure" value="garden" />
             <text key="name" text="Name" />
         </item> <!-- Garden -->
-        <item name="Grass" icon="presets/landuse.png" type="node,closedway,relation" preset_name_label="true">
+        <item name="Grass" icon="styles/standard/misc/landuse/meadow.svg" type="closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=grass"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=grass"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:landuse=grass"
@@ -7320,7 +7297,7 @@ Note that for a match, at least one positive and no negative is required.
             <key key="landuse" value="grass" />
             <text key="name" text="Name" />
         </item> <!-- Grass -->
-        <item name="Village Green" icon="presets/landuse.png" type="node,closedway,relation" preset_name_label="true">
+        <item name="Village Green" icon="styles/standard/leisure/common.png" type="closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=village_green"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:landuse=village_green"
@@ -7332,7 +7309,7 @@ Note that for a match, at least one positive and no negative is required.
             <key key="landuse" value="village_green" />
             <text key="name" text="Name" />
         </item> <!-- Village Green -->
-        <item name="Common" icon="presets/empty.png" type="node,closedway,relation" preset_name_label="true">
+        <item name="Common" icon="styles/standard/leisure/common.png" type="closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:leisure=common"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:leisure=common" />
@@ -7340,7 +7317,7 @@ Note that for a match, at least one positive and no negative is required.
             <key key="leisure" value="common" />
             <text key="name" text="Name" />
         </item> <!-- Common -->
-        <item name="Park" icon="presets/empty.png" type="node,closedway,relation" preset_name_label="true">
+        <item name="Park" icon="styles/standard/leisure/park.png" type="closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=park"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=park"
                   es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:leisure=park"
@@ -7353,7 +7330,7 @@ Note that for a match, at least one positive and no negative is required.
             <key key="leisure" value="park" />
             <text key="name" text="Name" />
         </item> <!-- Park -->
-        <item name="Recreation Ground" icon="presets/landuse.png" type="node,closedway,relation" preset_name_label="true">
+        <item name="Recreation Ground" icon="styles/standard/leisure/common.png" type="closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=recreation_ground"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:landuse=recreation_ground"
@@ -7391,7 +7368,7 @@ Note that for a match, at least one positive and no negative is required.
             <key key="amenity" value="grave_yard" />
             <reference ref="religious" />
         </item> <!-- Graveyard -->
-        <item name="Cemetery" icon="presets/cemetery.png" type="node,closedway,relation" preset_name_label="true">
+        <item name="Cemetery" icon="presets/cemetery.png" type="closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=cemetery"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:landuse=cemetery"
@@ -7406,7 +7383,7 @@ Note that for a match, at least one positive and no negative is required.
             <key key="landuse" value="cemetery" />
             <reference ref="religious" />
         </item> <!-- Cemetery -->
-        <item name="Religious" icon="styles/standard/religion.png" type="node,closedway,relation" preset_name_label="true">
+        <item name="Religious" icon="styles/standard/religion.png" type="closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=religious"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=religious"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:landuse=religious"
@@ -7415,7 +7392,7 @@ Note that for a match, at least one positive and no negative is required.
             <key key="landuse" value="religious" />
             <reference ref="religious" />
         </item> <!-- Religious -->
-        <item name="Retail" icon="styles/standard/shop/supermarket.png" type="node,closedway,relation" preset_name_label="true">
+        <item name="Retail" icon="styles/standard/shop/mall.png" type="closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=retail"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=retail"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:landuse=retail"
@@ -7426,7 +7403,7 @@ Note that for a match, at least one positive and no negative is required.
             <key key="landuse" value="retail" />
             <text key="name" text="Name" />
         </item> <!-- Retail -->
-        <item name="Commercial" icon="presets/empty.png" type="node,closedway,relation" preset_name_label="true">
+        <item name="Commercial" icon="styles/standard/misc/landuse/commercial.png" type="closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=commercial"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=commercial"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:landuse=commercial"
@@ -7437,7 +7414,7 @@ Note that for a match, at least one positive and no negative is required.
             <key key="landuse" value="commercial" />
             <text key="name" text="Name" />
         </item> <!-- Commercial -->
-        <item name="Industrial" icon="presets/works.png" type="node,closedway,relation" preset_name_label="true">
+        <item name="Industrial" icon="styles/standard/misc/landmark/works.png" type="closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=industrial"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=industrial"
                   es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:landuse=industrial"
@@ -7449,7 +7426,7 @@ Note that for a match, at least one positive and no negative is required.
             <key key="landuse" value="industrial" />
             <text key="name" text="Name" />
         </item> <!-- Industrial -->
-        <item name="Garages" icon="presets/garages.png" type="closedway" preset_name_label="true">
+        <item name="Garages" icon="presets/garages.png" type="closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=garages"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=garages"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:landuse=garages"
@@ -7472,7 +7449,7 @@ Note that for a match, at least one positive and no negative is required.
             <key key="landuse" value="railway" />
             <text key="name" text="Name" />
         </item> <!-- Railway Land -->
-        <item name="Military" icon="presets/military.png" type="node,closedway,relation" preset_name_label="true">
+        <item name="Military" icon="presets/military.png" type="closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=military"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=military"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:landuse=military"
@@ -7483,7 +7460,7 @@ Note that for a match, at least one positive and no negative is required.
             <text key="name" text="Name" />
         </item> <!-- Military -->
         <separator/>
-        <item name="Construction Area" icon="presets/construction.png" type="node,closedway,relation" preset_name_label="true">
+        <item name="Construction Area" icon="presets/construction.png" type="closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=construction"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=construction"
                   it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:landuse=construction"
@@ -7495,18 +7472,19 @@ Note that for a match, at least one positive and no negative is required.
             <key key="landuse" value="construction" />
             <text key="name" text="Name" />
         </item> <!-- Construction Area -->
-        <item name="Brownfield" icon="presets/landuse.png" type="node,closedway,relation" preset_name_label="true">
+        <item name="Brownfield" icon="presets/landuse.png" type="closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=brownfield"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:landuse=brownfield"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=brownfield"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:landuse=brownfield"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:landuse=brownfield"
-                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:landuse=brownfield" />
+                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:landuse=brownfield"
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:landuse=brownfield" />
             <space />
             <key key="landuse" value="brownfield" />
             <text key="name" text="Name" />
         </item> <!-- Brownfield -->
-        <item name="Greenfield" icon="presets/landuse.png" type="node,closedway,relation" preset_name_label="true">
+        <item name="Greenfield" icon="presets/landuse.png" type="closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=greenfield"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:landuse=greenfield"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=greenfield"
@@ -7516,7 +7494,7 @@ Note that for a match, at least one positive and no negative is required.
             <key key="landuse" value="greenfield" />
             <text key="name" text="Name" />
         </item> <!-- Greenfield -->
-        <item name="Landfill" icon="presets/landuse.png" type="node,closedway,relation" preset_name_label="true">
+        <item name="Landfill" icon="presets/landuse.png" type="closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=landfill"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=landfill"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:landuse=landfill"
@@ -7527,7 +7505,7 @@ Note that for a match, at least one positive and no negative is required.
             <key key="landuse" value="landfill" />
             <text key="name" text="Name" />
         </item> <!-- Landfill -->
-        <item name="Quarry" icon="presets/mine.png" type="node,closedway,relation" preset_name_label="true">
+        <item name="Quarry" icon="presets/mine.png" type="closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=quarry"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=quarry"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:landuse=quarry"
@@ -7630,7 +7608,8 @@ Note that for a match, at least one positive and no negative is required.
             <link href="http://wiki.openstreetmap.org/wiki/Annotations"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Annotations"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Annotations"
-                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Annotations" />
+                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Annotations"
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Annotations" />
             <space />
             <text key="phone" text="Phone Number" match="key" />
             <text key="fax" text="Fax Number" match="key" />
@@ -7811,7 +7790,8 @@ Note that for a match, at least one positive and no negative is required.
                   it.href="http://wiki.openstreetmap.org/wiki/IT:Hiking"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Hiking"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Hiking"
-                  ro.href="http://wiki.openstreetmap.org/wiki/Ro:Hiking" />
+                  ro.href="http://wiki.openstreetmap.org/wiki/Ro:Hiking"
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Hiking" />
                 <space/>
                 <key key="type" value="route"/>
                 <key key="route" value="hiking"/>
diff --git a/data/maps.xsd b/data/maps.xsd
index 772b88f..724e7b3 100644
--- a/data/maps.xsd
+++ b/data/maps.xsd
@@ -617,6 +617,8 @@
 						<xs:element name="max-zoom" minOccurs="0" maxOccurs="1" type="tns:zoom" />
 						<!-- The area of use, e.g. <bounds min-lat='45.7' min-lon='5.9' max-lat='55.0' max-lon='17.3'/> -->
 						<xs:element name="bounds" minOccurs="0" maxOccurs="1" type="tns:bounds" />
+						<!-- Provide a source that this background can be used for OSM. A page on the OSM-wiki with additional explanation and further references is preferred, but other sources (for example the license text) can also be linked. -->
+						<xs:element name="permission-ref" minOccurs="0" maxOccurs="1" type="xs:anyURI" />
 						<!-- A link to an EULA text that has to be accepted by the user, before the imagery source is added. -->
 						<xs:element name="eula" minOccurs="0" maxOccurs="1" type="tns:eula" />
 						<!-- The attribution text to be shown all the time on the map. -->
diff --git a/data/validator/combinations.mapcss b/data/validator/combinations.mapcss
index 98c7623..7024184 100644
--- a/data/validator/combinations.mapcss
+++ b/data/validator/combinations.mapcss
@@ -118,6 +118,11 @@ way[junction                   ][!highway],
   throwWarning: tr("{0} without {1} or {2}", "{0.key}", "{1.key}", "{2.tag}");
 }
 
+/* {0.key} without {1.tag} or {2.tag} */
+*[parking                      ][amenity!=parking][amenity!=parking_entrance] {
+  throwWarning: tr("{0} without {1} or {2}", "{0.key}", "{1.tag}", "{2.tag}");
+}
+
 /* {0.key} without {1.key}, {2.key} or {3.key} */
 *[snowplowing                  ][!highway][!amenity][!leisure] {
   throwWarning: tr("{0} without {1}, {2} or {3}", "{0.key}", "{1.key}", "{2.key}", "{3.key}");
@@ -134,7 +139,7 @@ way[junction                   ][!highway],
 *[psv     ][!highway][!railway][!waterway][amenity !~ /^parking.*/],
 *[width   ][!highway][!railway][!waterway][!aeroway][!cycleway][!footway][!barrier][!man_made][!entrance],
 *[maxspeed][!highway][!railway][traffic_sign !~ /^(.*;)?maxspeed(;.*)?$/][type != enforcement][waterway !~ /^(river|canal|lock)$/],
-*[lit     ][!highway][!railway][!piste:type][amenity !~ /^(parking|shelter)/][public_transport!=platform][advertising!=billboard][!leisure] {
+*[lit     ][!highway][!railway][!piste:type][amenity !~ /^(parking|shelter)/][public_transport!=platform][advertising!=billboard][!leisure][!tourism] {
   throwWarning: tr("{0} on suspicious object", "{0.key}");
 }
 
diff --git a/data/validator/deprecated.mapcss b/data/validator/deprecated.mapcss
index 22a2819..fb67b73 100644
--- a/data/validator/deprecated.mapcss
+++ b/data/validator/deprecated.mapcss
@@ -305,7 +305,7 @@
 *[fee=interval],
 *[lit=interval],
 *[supervised=interval] {
-  throwWarning: tr("{0} is deprecated. Please specify ìnterval by using opening_hours syntax", "{0.tag}");
+  throwWarning: tr("{0} is deprecated. Please specify interval by using opening_hours syntax", "{0.tag}");
 }
 
 /* See #10582 - JOSM supported this tag as "don't upload this" feature, before the introduction of upload flag at layer level */
@@ -316,15 +316,41 @@
 
 /* see #8281 */
 *[sport=diving] {
-  throwWarning: tr("{0} is deprecated", "{0.tag}"); 
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
   suggestAlternative: "sport=scuba_diving";
   suggestAlternative: "sport=cliff_diving";
 }
 
 /* see #8281 */
 *[parking=park_and_ride] {
-  throwWarning: tr("{0} is deprecated", "{0.tag}"); 
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
   fixRemove: "parking";
   fixAdd: "amenity=parking";
   fixAdd: "park_ride=yes";
+}
+
+/* see #10661 */
+*[barrier=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 */
+*[place_name][!name] {
+  throwWarning: tr("{0} should be replaced with {1}", "{0.key}", "{1.key}");
+  fixChangeKey: "place_name => name";
+}
+
+way[sidewalk=yes] {
+  throwWarning: tr("{0}={1} is unspecific. Please replace ''{1}'' by ''left'', ''right'' or ''both''.", "{0.key}", "{0.value}");
+}
+
+*[waterway=water_point],
+*[waterway=waste_disposal] {
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
+  fixChangeKey: "waterway => amenity";
+}
+*[waterway=mooring] {
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
+  fixRemove: "waterway";
+  fixAdd: "mooring=yes";
 }
\ No newline at end of file
diff --git a/data/validator/geometry.mapcss b/data/validator/geometry.mapcss
index 33d085d..280ae39 100644
--- a/data/validator/geometry.mapcss
+++ b/data/validator/geometry.mapcss
@@ -1,17 +1,52 @@
-/* {0} on a node */
+/* {0} on a node, should be a way */
 node[oneway],
 node[bridge?],
-node[landuse],
-node[source:outline] {
-  throwWarning: tr("{0} on a node", "{0.key}");
+node[sidewalk],
+node[waterway=river],
+node[waterway=riverbank],
+node[waterway=canal],
+node[waterway=wadi],
+node[waterway=stream],
+node[waterway=ditch],
+node[natural=coastline],
+node[natural=ridge],
+node[natural=tree_row] {
+  throwWarning: tr("{0} on a node. Should be used on a way.", "{0.key}");
   assertMatch: "node oneway=-1";
   assertNoMatch: "way oneway=-1";
   assertMatch: "node bridge=yes";
   assertNoMatch: "node bridge=13";
 }
 
-node[natural=wood] {
-  throwOther: tr("{0} on a node. Should be drawn as an area", "{0.tag}");
+/* {0} on a node, should be an area; see ticket #10679 */
+node[landuse],
+node[natural=scree],
+node[natural=scrub],
+node[natural=fell],
+node[natural=heath],
+node[natural=wood],
+node[natural=grassland],
+node[natural=wetland],
+node[natural=water],
+node[natural=mud],
+node[natural=beach],
+node[natural=sand],
+node[natural=wood],
+node[natural=bare_rock],
+node[waterway=riverbank],
+node[source:outline] {
+  throwWarning: tr("{0} on a node. Should be drawn as an area.", "{0.tag}");
+}
+
+/* {0} on a node, should be a relation; see #10252, #10769 */
+node[route],
+node[restriction] {
+  throwWarning: tr("{0}=* on a node. Should be used in a relation", "{0.key}"); 
+}
+
+/* {0} on a way, should be a relation; see #10252 */
+way[route=bus] {
+  throwWarning: tr("{0} on a way. Should be used in a relation", "{0.tag}"); 
 }
 
 /* see ticket:#10125 */
@@ -70,4 +105,4 @@ 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")));
-}
+}
\ No newline at end of file
diff --git a/geticons.pl b/geticons.pl
index a10a30c..e5b3faf 100755
--- a/geticons.pl
+++ b/geticons.pl
@@ -28,143 +28,99 @@ for my $arg (@ARGV ? @ARGV : @default)
     my $extends = "";
     while(my $l = <FILE>)
     {
-      if($l =~ /src\s*=\s*["'](.*?)["']/)
-      {
-        my $img = "styles/standard/$1";
-        $img = "styles/$1" if((!-f "images/$img") && -f "images/styles/$1");
-        $img = $1 if((!-f "images/$img") && -f "images/$1");
-        ++$icons{$img};
-      }
-      elsif($l =~ /icon\s*[:=]\s*["']([^+]+?)["']/)
+      next if $l =~ /NO-ICON/;
+      if($l =~ /icon\s*[:=]\s*["']([^+]+?)["']/)
       {
         ++$icons{$1};
       }
 
-      if($l =~ /(?:icon-image|repeat-image|fill-image)\s*:\s*\"?(.*?)\"?\s*;/)
+      if(($l =~ /(?:icon-image|repeat-image|fill-image)\s*:\s*(\"?(.*?)\"?)\s*;/) && ($1 ne "none"))
       {
-        my $img = "styles/standard/$1";
-        $img = "styles/$1" if((!-f "images/$img") && -f "images/styles/$1");
-        $img = $1 if((!-f "images/$img") && -f "images/$1");
+        my $val = $2;
+        my $img = "styles/standard/$val";
+        $img = "styles/$val" if((!-f "images/$img") && -f "images/styles/$val");
+        $img = $val if((!-f "images/$img") && -f "images/$val");
         ++$icons{$img};
       }
-      if($l =~ /ImageProvider\.get\(\"([^\"]*?)\"\)/)
+      if($l =~ /ImageProvider(?:\.get)?\(\"([^\"]*?)\"\)/)
       {
         my $i = $1;
-        $i .= ".png" if !($i =~ /\.png$/);
+        $i = "styles/standard/$i" if $i eq "misc/no_icon.png";
         ++$icons{$i};
       }
       while($l =~ /\/\*\s*ICON\s*\*\/\s*\"(.*?)\"/g)
       {
         my $i = $1;
-        $i .= ".png" if !($i =~ /\.png$/);
         ++$icons{$i};
       }
       while($l =~ /\/\*\s*ICON\((.*?)\)\s*\*\/\s*\"(.*?)\"/g)
       {
         my $i = "$1$2";
-        $i .= ".png" if !($i =~ /\.png$/);
         ++$icons{$i};
       }
       if($l =~ /new\s+ImageLabel\(\"(.*?)\"/)
       {
         my $i = "statusline/$1";
-        $i .= ".png" if !($i =~ /\.png$/);
         ++$icons{$i};
       }
       if($l =~ /createPreferenceTab\(\"(.*?)\"/)
       {
         my $i = "preferences/$1";
-        $i .= ".png" if !($i =~ /\.png$/);
         ++$icons{$i};
       }
       if($l =~ /ImageProvider\.get\(\"(.*?)\",\s*\"(.*?)\"\s*\)/)
       {
         my $i = "$1/$2";
-        $i .= ".png" if !($i =~ /\.png$/);
         ++$icons{$i};
       }
       if($l =~ /ImageProvider\.overlay\(.*?,\s*\"(.*?)\",/)
       {
         my $i = $1;
-        $i .= ".png" if !($i =~ /\.png$/);
         ++$icons{$i};
       }
       if($l =~ /getCursor\(\"(.*?)\",\s*\"(.*?)\"/)
       {
         my $i = "cursor/modifier/$2";
-        $i .= ".png" if !($i =~ /\.png$/);
         ++$icons{$i};
         $i = "cursor/$1";
-        $i .= ".png" if !($i =~ /\.png$/);
         ++$icons{$i};
       }
       if($l =~ /ImageProvider\.getCursor\(\"(.*?)\",\s*null\)/)
       {
         my $i = "cursor/$1";
-        $i .= ".png" if !($i =~ /\.png$/);
         ++$icons{$i};
       }
       if($l =~ /SideButton*\(\s*(?:mark)?tr\s*\(\s*\".*?\"\s*\)\s*,\s*\"(.*?)\"/)
       {
         my $i = "dialogs/$1";
-        $i .= ".png" if !($i =~ /\.png$/);
         ++$icons{$i};
       }
       if($l =~ /super\(\s*tr\(\".*?\"\),\s*\"(.*?)\"/s)
       {
         my $i = "$extends$1";
-        $i .= ".png" if !($i =~ /\.png$/);
         ++$icons{$i};
       }
       if($l =~ /super\(\s*trc\(\".*?\",\s*\".*?\"\),\s*\"(.*?)\"/s)
       {
         my $i = "$extends$1";
-        $i .= ".png" if !($i =~ /\.png$/);
         ++$icons{$i};
       }
       if($l =~ /audiotracericon\",\s*\"(.*?)\"/s)
       {
         my $i = "markers/$1";
-        $i .= ".png" if !($i =~ /\.png$/);
         ++$icons{$i};
       }
       if($l =~ /\"(.*?)\",\s*parentLayer/s)
       {
         my $i = "markers/$1";
-        $i .= ".png" if !($i =~ /\.png$/);
         ++$icons{$i};
       }
-      if($l =~ /allowedtypes\s+=.*\{(.*)\}/s)
-      {
-        my $t = $1;
-        while($t =~ /\"(.*?)\"/g)
-        {
-          ++$icons{"Mf_$1.png"};
-        }
-      }
-      if($l =~ /MODES\s+=.*\{(.*)\}/s)
-      {
-        my $t = $1;
-        while($t =~ /\"(.*?)\"/g)
-        {
-          ++$icons{"dialogs/autoscale/$1.png"};
-        }
-      }
-      if($l =~ /enum\s+DeleteMode\s*\{(.*)/s)
-      {
-        my $t = $1;
-        while($t =~ /\"(.*?)\"/g)
-        {
-          ++$icons{"cursor/modifier/$1.png"};
-        }
-      }
       if($l =~ /\.setButtonIcons.*\{(.*)\}/)
       {
         my $t = $1;
         while($t =~ /\"(.*?)\"/g)
         {
           my $i = $1;
-          $i .= ".png" if !($i =~ /\.png$/);
           ++$icons{$i};
         }
       }
@@ -172,7 +128,7 @@ for my $arg (@ARGV ? @ARGV : @default)
       {
         $extends = "mapmode/";
       }
-      if($l =~ /extends ToggleDialog/)
+      elsif($l =~ /extends ToggleDialog/)
       {
         $extends = "dialogs/";
       }
@@ -183,7 +139,7 @@ for my $arg (@ARGV ? @ARGV : @default)
 
 my %haveicons;
 
-for($i = 1; my @ifiles = glob("images".("/*" x $i).".png"); ++$i)
+for($i = 1; my @ifiles = (glob("images".("/*" x $i).".png"), glob("images".("/*" x $i).".svg")); ++$i)
 {
   for my $ifile (sort @ifiles)
   {
@@ -194,8 +150,17 @@ for($i = 1; my @ifiles = glob("images".("/*" x $i).".png"); ++$i)
 
 for my $img (sort keys %icons)
 {
-  print STDERR "File $img does not exist!\n" if(!-f "images/$img");
-  delete $haveicons{$img};
+  if($img =~ /\.(png|svg)/)
+  {
+    print STDERR "File $img does not exist!\n" if(!-f "images/$img");
+    delete $haveicons{$img};
+  }
+  else
+  {
+    print STDERR "File $img(.svg|.png) does not exist!\n" if(!-f "images/$img.png" && !-f "images/$img.svg");
+    delete $haveicons{"$img.svg"};
+    delete $haveicons{"$img.png"};
+  }
 }
 
 for my $img (sort keys %haveicons)
diff --git a/i18n/po/af.po b/i18n/po/af.po
index 97aea92..4efbc30 100644
--- a/i18n/po/af.po
+++ b/i18n/po/af.po
@@ -1,8 +1,13 @@
+# Afrikaans translation for josm
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the josm package.
+# FIRST AUTHOR <EMAIL at ADDRESS>, 2010.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-21 03:38+0200\n"
+"POT-Creation-Date: 2014-12-10 03:42+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"
@@ -10,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-10-21 04:31+0000\n"
-"X-Generator: Launchpad (build 17203)\n"
+"X-Launchpad-Export-Date: 2014-12-10 04:31+0000\n"
+"X-Generator: Launchpad (build 17283)\n"
 "Language: af\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -168,16 +173,6 @@ msgid "About JOSM..."
 msgstr ""
 
 msgid ""
-"Unexpected format of API base URL. Redirection to info or history page for "
-"OSM object will probably fail. API base URL is: ''{0}''"
-msgstr ""
-
-msgid ""
-"Unexpected format of API base URL. Redirection to user page for OSM user "
-"will probably fail. API base URL is: ''{0}''"
-msgstr ""
-
-msgid ""
 "You are about to launch {0} browser window.<br>This may both clutter your "
 "screen with browser windows<br>and take some time to finish."
 msgid_plural ""
@@ -1519,6 +1514,15 @@ msgstr ""
 msgid "Nothing to upload. Get some data first."
 msgstr ""
 
+msgid "Upload note changes to server"
+msgstr ""
+
+msgid "Upload notes"
+msgstr ""
+
+msgid "Uploading notes to server"
+msgstr ""
+
 msgid "Upload selection"
 msgstr ""
 
@@ -1791,10 +1795,16 @@ msgstr ""
 msgid "Click the location where you wish to create a new note"
 msgstr ""
 
-msgid "Enter a comment for a new note"
+msgid "Create new note"
 msgstr ""
 
-msgid "Create new note"
+msgid "Create note"
+msgstr ""
+
+msgid "Enter a detailed comment to create a note"
+msgstr ""
+
+msgid "You must enter a comment to create a new note"
 msgstr ""
 
 msgid "Delete Mode"
@@ -2665,6 +2675,15 @@ msgstr ""
 msgid "Cycling dependencies"
 msgstr ""
 
+msgid "Uploading modified notes"
+msgstr ""
+
+msgid "Note {0} failed: {1}"
+msgstr ""
+
+msgid "Notes failed to upload"
+msgstr ""
+
 msgid ""
 "The following are results of automatic validation. Try fixing these, but be "
 "careful (don''t destroy valid data). When in doubt ignore them.<br>When you "
@@ -4894,6 +4913,12 @@ msgstr ""
 msgid "Conflict foreground: keep all tags"
 msgstr ""
 
+msgid "Conflict background: sum all numeric tags"
+msgstr ""
+
+msgid "Conflict foreground: sum all numeric tags"
+msgstr ""
+
 msgid "Conflict background: keep member"
 msgstr ""
 
@@ -5312,12 +5337,19 @@ msgstr ""
 msgid "all"
 msgstr ""
 
+msgid "sum"
+msgstr ""
+
 msgid "Please decide which values to keep"
 msgstr ""
 
 msgid "Value ''{0}'' is going to be applied for key ''{1}''"
 msgstr ""
 
+msgid ""
+"All numeric values sumed as ''{0}'' are going to be applied for key ''{1}''"
+msgstr ""
+
 msgid "The key ''{0}'' and all its values are going to be removed"
 msgstr ""
 
@@ -5680,24 +5712,6 @@ msgstr[1] ""
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
 
-msgid "Display the history of all selected items."
-msgstr ""
-
-msgid "Object with history"
-msgstr ""
-
-msgid "Reload"
-msgstr ""
-
-msgid "Reload all currently selected objects and refresh the list."
-msgstr ""
-
-msgid "Show"
-msgstr ""
-
-msgid "Display the history of the selected objects."
-msgstr ""
-
 msgid "Advanced object info"
 msgstr ""
 
@@ -6035,6 +6049,9 @@ msgstr ""
 msgid "Comment"
 msgstr ""
 
+msgid "Comment on note"
+msgstr ""
+
 msgid "Add comment to note:"
 msgstr ""
 
@@ -6044,9 +6061,6 @@ msgstr ""
 msgid "Close note with message:"
 msgstr ""
 
-msgid "Close Note"
-msgstr ""
-
 msgid "Create a new note"
 msgstr ""
 
@@ -6119,6 +6133,9 @@ msgstr ""
 msgid "Search for objects"
 msgstr ""
 
+msgid "Display the history of the selected objects."
+msgstr ""
+
 msgid "Zoom to selection"
 msgstr ""
 
@@ -6238,6 +6255,9 @@ msgstr ""
 msgid "Updating map ..."
 msgstr ""
 
+msgid "anonymous"
+msgstr ""
+
 msgid "Display the basic properties of the changeset"
 msgstr ""
 
@@ -6250,6 +6270,12 @@ msgstr ""
 msgid "Display the objects created, updated, and deleted by the changeset"
 msgstr ""
 
+msgid "Discussion"
+msgstr ""
+
+msgid "Display the public discussion around this changeset"
+msgstr ""
+
 msgid "Changeset Management Dialog"
 msgstr ""
 
@@ -6307,9 +6333,6 @@ msgctxt "changeset.state"
 msgid "Closed"
 msgstr ""
 
-msgid "anonymous"
-msgstr ""
-
 msgid "ID"
 msgstr ""
 
@@ -6325,6 +6348,9 @@ msgstr ""
 msgid "Closed at"
 msgstr ""
 
+msgid "Discussions"
+msgstr ""
+
 msgid "Downloading changeset content"
 msgstr ""
 
@@ -6436,6 +6462,15 @@ msgid ""
 "layer"
 msgstr ""
 
+msgid "Update changeset discussion"
+msgstr ""
+
+msgid "Update the changeset discussion from the OSM server"
+msgstr ""
+
+msgid "Date"
+msgstr ""
+
 msgid "Download changesets"
 msgstr ""
 
@@ -6853,7 +6888,7 @@ msgstr ""
 msgid "Set number of recently added tags"
 msgstr ""
 
-msgid "Remember last used tags"
+msgid "Remember last used tags after a restart"
 msgstr ""
 
 msgid "Please enter the number of recently added tags to display"
@@ -7199,6 +7234,9 @@ msgstr ""
 msgid "Load parent relations"
 msgstr ""
 
+msgid "Reload"
+msgstr ""
+
 msgid "Loading parent relations"
 msgstr ""
 
@@ -7321,6 +7359,12 @@ msgstr ""
 msgid "Select to download GPS traces in the selected download area."
 msgstr ""
 
+msgid "Notes"
+msgstr ""
+
+msgid "Select to download notes in the selected download area."
+msgstr ""
+
 msgid "Download as new layer"
 msgstr ""
 
@@ -7626,9 +7670,6 @@ msgstr ""
 msgid "B"
 msgstr ""
 
-msgid "Date"
-msgstr ""
-
 msgid ""
 "Failed to update primitive with id {0} because current edit layer is null"
 msgstr ""
@@ -8483,9 +8524,6 @@ msgstr ""
 msgid "Save Layer"
 msgstr ""
 
-msgid "Notes"
-msgstr ""
-
 msgid "Notes layer"
 msgstr ""
 
@@ -8501,9 +8539,6 @@ msgstr ""
 msgid "outside downloaded area"
 msgstr ""
 
-msgid "version {0}"
-msgstr ""
-
 msgid "Merging layers"
 msgstr ""
 
@@ -12129,6 +12164,15 @@ msgstr ""
 msgid "Open changeset expected. Got closed changeset with id {0}."
 msgstr ""
 
+msgid "Note upload failed"
+msgstr ""
+
+msgid "Error parsing note response from server"
+msgstr ""
+
+msgid "Error encoding string: {0}"
+msgstr ""
+
 msgid "(Code={0})"
 msgstr ""
 
@@ -12177,13 +12221,13 @@ msgstr ""
 msgid "Parsing changeset content ..."
 msgstr ""
 
-msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
-msgid "Illegal numeric value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
-msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal numeric value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
 msgid "Missing mandatory attribute ''{0}'' of XML element {1}."
@@ -12975,9 +13019,6 @@ msgstr ""
 msgid "Failed to scan file ''{0}'' for plugin information. Skipping."
 msgstr ""
 
-msgid "Processing plugin site cache icon files..."
-msgstr ""
-
 msgid "Processing plugin files..."
 msgstr ""
 
@@ -12996,12 +13037,6 @@ msgstr ""
 msgid "Details:"
 msgstr ""
 
-msgid "Plugin icons download error"
-msgstr ""
-
-msgid "JOSM failed to download plugin icons:"
-msgstr ""
-
 msgid ""
 "Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
 "plugin site ''{1}''."
@@ -13887,7 +13922,9 @@ msgid ""
 "Creating and handling address nodes and buildings within Czech Republic."
 msgstr ""
 
-msgid "Allows to import various file formats into JOSM directly."
+msgid ""
+"Allows to import various file formats into JOSM directly. Currently "
+"supported: TangoGPS, Garmin Trainings Center TCX."
 msgstr ""
 
 msgid "Download your GPX tracks from openstreetmap.org"
@@ -13984,6 +14021,11 @@ msgid "A helper for IRS satellite adjustment."
 msgstr ""
 
 msgid ""
+"Provides Java Native Access (JNA) library. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
+msgid ""
 "Provides Java Topology Suite (JTS) library and related utilities. Not meant "
 "to be installed directly by users, but rather as a dependency for other "
 "plugins."
@@ -14339,6 +14381,25 @@ msgstr ""
 msgid "Width (meters)"
 msgstr ""
 
+msgid "Sidewalk"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "both"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "left"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "right"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "no"
+msgstr ""
+
 msgid "Service type"
 msgstr ""
 
@@ -14703,15 +14764,19 @@ msgstr ""
 msgid "May-Sep 09:30-12:30,14:15-19:30"
 msgstr ""
 
+msgctxt "parking"
 msgid "multi-storey"
 msgstr ""
 
+msgctxt "parking"
 msgid "surface"
 msgstr ""
 
+msgctxt "parking"
 msgid "underground"
 msgstr ""
 
+msgctxt "parking"
 msgid "rooftop"
 msgstr ""
 
@@ -15169,15 +15234,26 @@ msgstr ""
 msgid "Overtaking"
 msgstr ""
 
+msgctxt "overtaking"
+msgid "yes"
+msgstr ""
+
+msgctxt "overtaking"
 msgid "both"
 msgstr ""
 
+msgctxt "overtaking"
 msgid "forward"
 msgstr ""
 
+msgctxt "overtaking"
 msgid "backward"
 msgstr ""
 
+msgctxt "overtaking"
+msgid "no"
+msgstr ""
+
 msgid "Roundabout"
 msgstr ""
 
@@ -15471,6 +15547,12 @@ msgstr ""
 msgid "tiger"
 msgstr ""
 
+msgid "Button operated"
+msgstr ""
+
+msgid "Sound signals"
+msgstr ""
+
 msgid "Crossing attendant"
 msgstr ""
 
@@ -15992,9 +16074,6 @@ msgstr ""
 msgid "Traffic lights"
 msgstr ""
 
-msgid "Sound signals"
-msgstr ""
-
 msgid "Barrier"
 msgstr ""
 
@@ -18054,6 +18133,9 @@ msgstr ""
 msgid "Gasometer"
 msgstr ""
 
+msgid "Bunker Silo"
+msgstr ""
+
 msgid "Pipeline"
 msgstr ""
 
@@ -18200,15 +18282,15 @@ msgstr ""
 msgid "Monitoring:"
 msgstr ""
 
-msgid "Weather"
-msgstr ""
-
 msgid "Water level"
 msgstr ""
 
 msgid "Tide Level"
 msgstr ""
 
+msgid "Groundwater"
+msgstr ""
+
 msgid "Traffic"
 msgstr ""
 
@@ -18227,6 +18309,9 @@ msgstr ""
 msgid "Galileo Signals"
 msgstr ""
 
+msgid "Weather"
+msgstr ""
+
 msgid "Radiation"
 msgstr ""
 
@@ -18407,6 +18492,9 @@ msgstr ""
 msgid "pivot_pier"
 msgstr ""
 
+msgid "Bridge outline"
+msgstr ""
+
 msgid "Power Plant"
 msgstr ""
 
@@ -19014,6 +19102,15 @@ msgstr ""
 msgid "Pole"
 msgstr ""
 
+msgid "Pole with Transformer"
+msgstr ""
+
+msgid "Pole Attributes:"
+msgstr ""
+
+msgid "Transformer Attributes:"
+msgstr ""
+
 msgid "Power Line"
 msgstr ""
 
@@ -19063,9 +19160,15 @@ msgstr ""
 msgid "Power Cable"
 msgstr ""
 
+msgctxt "power cable"
+msgid "underground"
+msgstr ""
+
+msgctxt "power cable"
 msgid "underwater"
 msgstr ""
 
+msgctxt "power cable"
 msgid "overground"
 msgstr ""
 
@@ -19093,6 +19196,33 @@ msgstr ""
 msgid "Memorial"
 msgstr ""
 
+msgctxt "memorial"
+msgid "statue"
+msgstr ""
+
+msgctxt "memorial"
+msgid "bust"
+msgstr ""
+
+msgctxt "memorial"
+msgid "plaque"
+msgstr ""
+
+msgctxt "memorial"
+msgid "stele"
+msgstr ""
+
+msgctxt "memorial"
+msgid "stone"
+msgstr ""
+
+msgctxt "memorial"
+msgid "war_memorial"
+msgstr ""
+
+msgid "Inscription"
+msgstr ""
+
 msgid "Wayside Cross"
 msgstr ""
 
@@ -19162,6 +19292,9 @@ msgstr ""
 msgid "Beverages"
 msgstr ""
 
+msgid "Wine"
+msgstr ""
+
 msgid "Boutique"
 msgstr ""
 
@@ -19207,6 +19340,9 @@ msgstr ""
 msgid "Video Games"
 msgstr ""
 
+msgid "Music"
+msgstr ""
+
 msgid "Cash"
 msgstr ""
 
@@ -19234,6 +19370,9 @@ msgstr ""
 msgid "Curtain"
 msgstr ""
 
+msgid "Art"
+msgstr ""
+
 msgid "Frame"
 msgstr ""
 
@@ -19279,6 +19418,9 @@ msgstr ""
 msgid "Beauty"
 msgstr ""
 
+msgid "Tattoo"
+msgstr ""
+
 msgid "Optician"
 msgstr ""
 
@@ -19330,6 +19472,9 @@ msgstr ""
 msgid "Pet"
 msgstr ""
 
+msgid "Funeral Directors"
+msgstr ""
+
 msgid "Vending Machine"
 msgstr ""
 
@@ -19429,6 +19574,15 @@ msgstr ""
 msgid "National Park"
 msgstr ""
 
+msgid "Protected Area"
+msgstr ""
+
+msgid "Protected Class"
+msgstr ""
+
+msgid "Title or type of protection"
+msgstr ""
+
 msgid "Places"
 msgstr ""
 
@@ -20505,7 +20659,13 @@ msgstr ""
 msgid "Estonia Ortho (Maaamet)"
 msgstr ""
 
-msgid "Estonia Multi (Maaamet)"
+msgid "Estonia Hillshade (Maaamet)"
+msgstr ""
+
+msgid "Estonia Cadastre (Maaamet)"
+msgstr ""
+
+msgid "Estonia Forestry (Maaamet)"
 msgstr ""
 
 msgid "Bordeaux - 2012"
@@ -20529,7 +20689,7 @@ msgstr ""
 msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
 msgstr ""
 
-msgid "CUGN Nancy - Orthophoto 2012"
+msgid "GrandNancy Orthophotographie 2012"
 msgstr ""
 
 msgid "Géobretagne - Brest 2010 - 10 cm"
@@ -20576,9 +20736,6 @@ msgid ""
 "- 1 m"
 msgstr ""
 
-msgid "Streets NRW Geofabrik.de"
-msgstr ""
-
 msgid "Hike & Bike"
 msgstr ""
 
@@ -20638,6 +20795,9 @@ msgstr ""
 msgid "NRW-Atlas: Topographische Karte 1:10000"
 msgstr ""
 
+msgid "Metropole Ruhr: Luftbilder (10 cm)"
+msgstr ""
+
 msgid "Drone Imagery (Haiti)"
 msgstr ""
 
@@ -20839,6 +20999,9 @@ msgstr ""
 msgid "Stadt Zürich Übersichtsplan (Strassen, Gebäude, Hausnummer)"
 msgstr ""
 
+msgid "Stadt Zürich Luftbild 2011"
+msgstr ""
+
 msgid "Orthofoto Kanton Solothurn RGB (SOGIS 2011/2012/2013)"
 msgstr ""
 
@@ -20857,7 +21020,7 @@ msgstr ""
 msgid "Canton de Fribourg 50cm (2005)"
 msgstr ""
 
-msgid "Stadt Bern 10cm/25cm (2008)"
+msgid "Stadt Bern 10cm/25cm (2012)"
 msgstr ""
 
 msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
@@ -20896,7 +21059,7 @@ msgstr ""
 msgid "OSM US TIGER 2012 Roads Overlay"
 msgstr ""
 
-msgid "New & Misaligned TIGER Roads (TIGER 2013)"
+msgid "New & Misaligned TIGER Roads (TIGER 2014)"
 msgstr ""
 
 msgid "MassGIS L3 Parcels"
@@ -20944,9 +21107,234 @@ msgstr ""
 msgid "NLS - Bartholomew Half Inch, 1897-1907"
 msgstr ""
 
+msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Annan 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgstr ""
+
 msgid "OS Town Plans, Cupar 1854 (NLS)"
 msgstr ""
 
+msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Elgin 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Forres 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Galashiels 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Girvan 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Greenock 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Haddington 1853 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Haddington 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Hamilton 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Irvine 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Jedburgh 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kelso 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Lanark 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Linlithgow 1856 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Musselburgh 1853 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Musselburgh 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Oban 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Peebles 1856 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Perth 1860 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Peterhead 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Selkirk 1865 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, St Andrews 1854 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, St Andrews 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stirling 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stonehaven 1864 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1847 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Strathaven 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wick 1872 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wigtown 1848 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wigtown 1894 (NLS)"
+msgstr ""
+
 msgid "Decreasing house numbers in addresses interpolation"
 msgstr ""
 
@@ -21000,17 +21388,37 @@ msgid "{0}={1} is deprecated. Please use instead a multipolygon."
 msgstr ""
 
 msgid ""
-"{0} is deprecated. Please specify ìnterval by using opening_hours syntax"
+"{0} is deprecated. Please specify interval by using opening_hours syntax"
 msgstr ""
 
 msgid ""
 "{0} is deprecated. Please delete this object and use a private layer instead"
 msgstr ""
 
-msgid "{0} on a node"
+msgid "{0}={1} is unspecific. Please replace ''{1}'' by a specific value."
 msgstr ""
 
-msgid "{0} on a node. Should be drawn as an area"
+msgid "{0} should be replaced with {1}"
+msgstr ""
+
+msgid ""
+"{0}={1} is unspecific. Please replace ''{1}'' by ''left'', ''right'' or "
+"''both''."
+msgstr ""
+
+msgid "{0} on a node. Should be used on a way."
+msgstr ""
+
+msgid "{0} on a node. Should be drawn as an area."
+msgstr ""
+
+msgid "{0}=* on a node. Should be used in a relation"
+msgstr ""
+
+msgid "{0} on a way. Should be used in a relation"
+msgstr ""
+
+msgid "{0} on a node"
 msgstr ""
 
 msgid "Building inside building"
@@ -25680,6 +26088,9 @@ msgstr ""
 msgid "Find"
 msgstr ""
 
+msgid "Show"
+msgstr ""
+
 msgid "Mark"
 msgstr ""
 
diff --git a/i18n/po/am.po b/i18n/po/am.po
index eeba648..6f66608 100644
--- a/i18n/po/am.po
+++ b/i18n/po/am.po
@@ -1,8 +1,13 @@
+# Amharic translation for josm
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the josm package.
+# FIRST AUTHOR <EMAIL at ADDRESS>, 2010.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-21 03:38+0200\n"
+"POT-Creation-Date: 2014-12-10 03:42+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"
@@ -10,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-10-21 04:33+0000\n"
-"X-Generator: Launchpad (build 17203)\n"
+"X-Launchpad-Export-Date: 2014-12-10 04:32+0000\n"
+"X-Generator: Launchpad (build 17283)\n"
 "Language: am\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -168,16 +173,6 @@ msgid "About JOSM..."
 msgstr ""
 
 msgid ""
-"Unexpected format of API base URL. Redirection to info or history page for "
-"OSM object will probably fail. API base URL is: ''{0}''"
-msgstr ""
-
-msgid ""
-"Unexpected format of API base URL. Redirection to user page for OSM user "
-"will probably fail. API base URL is: ''{0}''"
-msgstr ""
-
-msgid ""
 "You are about to launch {0} browser window.<br>This may both clutter your "
 "screen with browser windows<br>and take some time to finish."
 msgid_plural ""
@@ -1519,6 +1514,15 @@ msgstr ""
 msgid "Nothing to upload. Get some data first."
 msgstr ""
 
+msgid "Upload note changes to server"
+msgstr ""
+
+msgid "Upload notes"
+msgstr ""
+
+msgid "Uploading notes to server"
+msgstr ""
+
 msgid "Upload selection"
 msgstr ""
 
@@ -1791,10 +1795,16 @@ msgstr ""
 msgid "Click the location where you wish to create a new note"
 msgstr ""
 
-msgid "Enter a comment for a new note"
+msgid "Create new note"
 msgstr ""
 
-msgid "Create new note"
+msgid "Create note"
+msgstr ""
+
+msgid "Enter a detailed comment to create a note"
+msgstr ""
+
+msgid "You must enter a comment to create a new note"
 msgstr ""
 
 msgid "Delete Mode"
@@ -2665,6 +2675,15 @@ msgstr ""
 msgid "Cycling dependencies"
 msgstr ""
 
+msgid "Uploading modified notes"
+msgstr ""
+
+msgid "Note {0} failed: {1}"
+msgstr ""
+
+msgid "Notes failed to upload"
+msgstr ""
+
 msgid ""
 "The following are results of automatic validation. Try fixing these, but be "
 "careful (don''t destroy valid data). When in doubt ignore them.<br>When you "
@@ -4894,6 +4913,12 @@ msgstr ""
 msgid "Conflict foreground: keep all tags"
 msgstr ""
 
+msgid "Conflict background: sum all numeric tags"
+msgstr ""
+
+msgid "Conflict foreground: sum all numeric tags"
+msgstr ""
+
 msgid "Conflict background: keep member"
 msgstr ""
 
@@ -5312,12 +5337,19 @@ msgstr ""
 msgid "all"
 msgstr ""
 
+msgid "sum"
+msgstr ""
+
 msgid "Please decide which values to keep"
 msgstr ""
 
 msgid "Value ''{0}'' is going to be applied for key ''{1}''"
 msgstr ""
 
+msgid ""
+"All numeric values sumed as ''{0}'' are going to be applied for key ''{1}''"
+msgstr ""
+
 msgid "The key ''{0}'' and all its values are going to be removed"
 msgstr ""
 
@@ -5680,24 +5712,6 @@ msgstr[1] ""
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
 
-msgid "Display the history of all selected items."
-msgstr ""
-
-msgid "Object with history"
-msgstr ""
-
-msgid "Reload"
-msgstr ""
-
-msgid "Reload all currently selected objects and refresh the list."
-msgstr ""
-
-msgid "Show"
-msgstr ""
-
-msgid "Display the history of the selected objects."
-msgstr ""
-
 msgid "Advanced object info"
 msgstr ""
 
@@ -6035,6 +6049,9 @@ msgstr ""
 msgid "Comment"
 msgstr ""
 
+msgid "Comment on note"
+msgstr ""
+
 msgid "Add comment to note:"
 msgstr ""
 
@@ -6044,9 +6061,6 @@ msgstr ""
 msgid "Close note with message:"
 msgstr ""
 
-msgid "Close Note"
-msgstr ""
-
 msgid "Create a new note"
 msgstr ""
 
@@ -6119,6 +6133,9 @@ msgstr ""
 msgid "Search for objects"
 msgstr ""
 
+msgid "Display the history of the selected objects."
+msgstr ""
+
 msgid "Zoom to selection"
 msgstr ""
 
@@ -6238,6 +6255,9 @@ msgstr ""
 msgid "Updating map ..."
 msgstr ""
 
+msgid "anonymous"
+msgstr ""
+
 msgid "Display the basic properties of the changeset"
 msgstr ""
 
@@ -6250,6 +6270,12 @@ msgstr ""
 msgid "Display the objects created, updated, and deleted by the changeset"
 msgstr ""
 
+msgid "Discussion"
+msgstr ""
+
+msgid "Display the public discussion around this changeset"
+msgstr ""
+
 msgid "Changeset Management Dialog"
 msgstr ""
 
@@ -6307,9 +6333,6 @@ msgctxt "changeset.state"
 msgid "Closed"
 msgstr ""
 
-msgid "anonymous"
-msgstr ""
-
 msgid "ID"
 msgstr ""
 
@@ -6325,6 +6348,9 @@ msgstr ""
 msgid "Closed at"
 msgstr ""
 
+msgid "Discussions"
+msgstr ""
+
 msgid "Downloading changeset content"
 msgstr ""
 
@@ -6436,6 +6462,15 @@ msgid ""
 "layer"
 msgstr ""
 
+msgid "Update changeset discussion"
+msgstr ""
+
+msgid "Update the changeset discussion from the OSM server"
+msgstr ""
+
+msgid "Date"
+msgstr ""
+
 msgid "Download changesets"
 msgstr ""
 
@@ -6853,7 +6888,7 @@ msgstr ""
 msgid "Set number of recently added tags"
 msgstr ""
 
-msgid "Remember last used tags"
+msgid "Remember last used tags after a restart"
 msgstr ""
 
 msgid "Please enter the number of recently added tags to display"
@@ -7199,6 +7234,9 @@ msgstr ""
 msgid "Load parent relations"
 msgstr ""
 
+msgid "Reload"
+msgstr ""
+
 msgid "Loading parent relations"
 msgstr ""
 
@@ -7321,6 +7359,12 @@ msgstr ""
 msgid "Select to download GPS traces in the selected download area."
 msgstr ""
 
+msgid "Notes"
+msgstr ""
+
+msgid "Select to download notes in the selected download area."
+msgstr ""
+
 msgid "Download as new layer"
 msgstr ""
 
@@ -7626,9 +7670,6 @@ msgstr ""
 msgid "B"
 msgstr ""
 
-msgid "Date"
-msgstr ""
-
 msgid ""
 "Failed to update primitive with id {0} because current edit layer is null"
 msgstr ""
@@ -8483,9 +8524,6 @@ msgstr ""
 msgid "Save Layer"
 msgstr ""
 
-msgid "Notes"
-msgstr ""
-
 msgid "Notes layer"
 msgstr ""
 
@@ -8501,9 +8539,6 @@ msgstr ""
 msgid "outside downloaded area"
 msgstr ""
 
-msgid "version {0}"
-msgstr ""
-
 msgid "Merging layers"
 msgstr ""
 
@@ -12129,6 +12164,15 @@ msgstr ""
 msgid "Open changeset expected. Got closed changeset with id {0}."
 msgstr ""
 
+msgid "Note upload failed"
+msgstr ""
+
+msgid "Error parsing note response from server"
+msgstr ""
+
+msgid "Error encoding string: {0}"
+msgstr ""
+
 msgid "(Code={0})"
 msgstr ""
 
@@ -12177,13 +12221,13 @@ msgstr ""
 msgid "Parsing changeset content ..."
 msgstr ""
 
-msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
-msgid "Illegal numeric value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
-msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal numeric value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
 msgid "Missing mandatory attribute ''{0}'' of XML element {1}."
@@ -12975,9 +13019,6 @@ msgstr ""
 msgid "Failed to scan file ''{0}'' for plugin information. Skipping."
 msgstr ""
 
-msgid "Processing plugin site cache icon files..."
-msgstr ""
-
 msgid "Processing plugin files..."
 msgstr ""
 
@@ -12996,12 +13037,6 @@ msgstr ""
 msgid "Details:"
 msgstr ""
 
-msgid "Plugin icons download error"
-msgstr ""
-
-msgid "JOSM failed to download plugin icons:"
-msgstr ""
-
 msgid ""
 "Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
 "plugin site ''{1}''."
@@ -13887,7 +13922,9 @@ msgid ""
 "Creating and handling address nodes and buildings within Czech Republic."
 msgstr ""
 
-msgid "Allows to import various file formats into JOSM directly."
+msgid ""
+"Allows to import various file formats into JOSM directly. Currently "
+"supported: TangoGPS, Garmin Trainings Center TCX."
 msgstr ""
 
 msgid "Download your GPX tracks from openstreetmap.org"
@@ -13984,6 +14021,11 @@ msgid "A helper for IRS satellite adjustment."
 msgstr ""
 
 msgid ""
+"Provides Java Native Access (JNA) library. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
+msgid ""
 "Provides Java Topology Suite (JTS) library and related utilities. Not meant "
 "to be installed directly by users, but rather as a dependency for other "
 "plugins."
@@ -14339,6 +14381,25 @@ msgstr ""
 msgid "Width (meters)"
 msgstr ""
 
+msgid "Sidewalk"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "both"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "left"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "right"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "no"
+msgstr ""
+
 msgid "Service type"
 msgstr ""
 
@@ -14703,15 +14764,19 @@ msgstr ""
 msgid "May-Sep 09:30-12:30,14:15-19:30"
 msgstr ""
 
+msgctxt "parking"
 msgid "multi-storey"
 msgstr ""
 
+msgctxt "parking"
 msgid "surface"
 msgstr ""
 
+msgctxt "parking"
 msgid "underground"
 msgstr ""
 
+msgctxt "parking"
 msgid "rooftop"
 msgstr ""
 
@@ -15169,15 +15234,26 @@ msgstr ""
 msgid "Overtaking"
 msgstr ""
 
+msgctxt "overtaking"
+msgid "yes"
+msgstr ""
+
+msgctxt "overtaking"
 msgid "both"
 msgstr ""
 
+msgctxt "overtaking"
 msgid "forward"
 msgstr ""
 
+msgctxt "overtaking"
 msgid "backward"
 msgstr ""
 
+msgctxt "overtaking"
+msgid "no"
+msgstr ""
+
 msgid "Roundabout"
 msgstr ""
 
@@ -15471,6 +15547,12 @@ msgstr ""
 msgid "tiger"
 msgstr ""
 
+msgid "Button operated"
+msgstr ""
+
+msgid "Sound signals"
+msgstr ""
+
 msgid "Crossing attendant"
 msgstr ""
 
@@ -15992,9 +16074,6 @@ msgstr ""
 msgid "Traffic lights"
 msgstr ""
 
-msgid "Sound signals"
-msgstr ""
-
 msgid "Barrier"
 msgstr ""
 
@@ -18054,6 +18133,9 @@ msgstr ""
 msgid "Gasometer"
 msgstr ""
 
+msgid "Bunker Silo"
+msgstr ""
+
 msgid "Pipeline"
 msgstr ""
 
@@ -18200,15 +18282,15 @@ msgstr ""
 msgid "Monitoring:"
 msgstr ""
 
-msgid "Weather"
-msgstr ""
-
 msgid "Water level"
 msgstr ""
 
 msgid "Tide Level"
 msgstr ""
 
+msgid "Groundwater"
+msgstr ""
+
 msgid "Traffic"
 msgstr ""
 
@@ -18227,6 +18309,9 @@ msgstr ""
 msgid "Galileo Signals"
 msgstr ""
 
+msgid "Weather"
+msgstr ""
+
 msgid "Radiation"
 msgstr ""
 
@@ -18407,6 +18492,9 @@ msgstr ""
 msgid "pivot_pier"
 msgstr ""
 
+msgid "Bridge outline"
+msgstr ""
+
 msgid "Power Plant"
 msgstr ""
 
@@ -19014,6 +19102,15 @@ msgstr ""
 msgid "Pole"
 msgstr ""
 
+msgid "Pole with Transformer"
+msgstr ""
+
+msgid "Pole Attributes:"
+msgstr ""
+
+msgid "Transformer Attributes:"
+msgstr ""
+
 msgid "Power Line"
 msgstr ""
 
@@ -19063,9 +19160,15 @@ msgstr ""
 msgid "Power Cable"
 msgstr ""
 
+msgctxt "power cable"
+msgid "underground"
+msgstr ""
+
+msgctxt "power cable"
 msgid "underwater"
 msgstr ""
 
+msgctxt "power cable"
 msgid "overground"
 msgstr ""
 
@@ -19093,6 +19196,33 @@ msgstr ""
 msgid "Memorial"
 msgstr ""
 
+msgctxt "memorial"
+msgid "statue"
+msgstr ""
+
+msgctxt "memorial"
+msgid "bust"
+msgstr ""
+
+msgctxt "memorial"
+msgid "plaque"
+msgstr ""
+
+msgctxt "memorial"
+msgid "stele"
+msgstr ""
+
+msgctxt "memorial"
+msgid "stone"
+msgstr ""
+
+msgctxt "memorial"
+msgid "war_memorial"
+msgstr ""
+
+msgid "Inscription"
+msgstr ""
+
 msgid "Wayside Cross"
 msgstr ""
 
@@ -19162,6 +19292,9 @@ msgstr ""
 msgid "Beverages"
 msgstr ""
 
+msgid "Wine"
+msgstr ""
+
 msgid "Boutique"
 msgstr ""
 
@@ -19207,6 +19340,9 @@ msgstr ""
 msgid "Video Games"
 msgstr ""
 
+msgid "Music"
+msgstr ""
+
 msgid "Cash"
 msgstr ""
 
@@ -19234,6 +19370,9 @@ msgstr ""
 msgid "Curtain"
 msgstr ""
 
+msgid "Art"
+msgstr ""
+
 msgid "Frame"
 msgstr ""
 
@@ -19279,6 +19418,9 @@ msgstr ""
 msgid "Beauty"
 msgstr ""
 
+msgid "Tattoo"
+msgstr ""
+
 msgid "Optician"
 msgstr ""
 
@@ -19330,6 +19472,9 @@ msgstr ""
 msgid "Pet"
 msgstr ""
 
+msgid "Funeral Directors"
+msgstr ""
+
 msgid "Vending Machine"
 msgstr ""
 
@@ -19429,6 +19574,15 @@ msgstr ""
 msgid "National Park"
 msgstr ""
 
+msgid "Protected Area"
+msgstr ""
+
+msgid "Protected Class"
+msgstr ""
+
+msgid "Title or type of protection"
+msgstr ""
+
 msgid "Places"
 msgstr ""
 
@@ -20505,7 +20659,13 @@ msgstr ""
 msgid "Estonia Ortho (Maaamet)"
 msgstr ""
 
-msgid "Estonia Multi (Maaamet)"
+msgid "Estonia Hillshade (Maaamet)"
+msgstr ""
+
+msgid "Estonia Cadastre (Maaamet)"
+msgstr ""
+
+msgid "Estonia Forestry (Maaamet)"
 msgstr ""
 
 msgid "Bordeaux - 2012"
@@ -20529,7 +20689,7 @@ msgstr ""
 msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
 msgstr ""
 
-msgid "CUGN Nancy - Orthophoto 2012"
+msgid "GrandNancy Orthophotographie 2012"
 msgstr ""
 
 msgid "Géobretagne - Brest 2010 - 10 cm"
@@ -20576,9 +20736,6 @@ msgid ""
 "- 1 m"
 msgstr ""
 
-msgid "Streets NRW Geofabrik.de"
-msgstr ""
-
 msgid "Hike & Bike"
 msgstr ""
 
@@ -20638,6 +20795,9 @@ msgstr ""
 msgid "NRW-Atlas: Topographische Karte 1:10000"
 msgstr ""
 
+msgid "Metropole Ruhr: Luftbilder (10 cm)"
+msgstr ""
+
 msgid "Drone Imagery (Haiti)"
 msgstr ""
 
@@ -20839,6 +20999,9 @@ msgstr ""
 msgid "Stadt Zürich Übersichtsplan (Strassen, Gebäude, Hausnummer)"
 msgstr ""
 
+msgid "Stadt Zürich Luftbild 2011"
+msgstr ""
+
 msgid "Orthofoto Kanton Solothurn RGB (SOGIS 2011/2012/2013)"
 msgstr ""
 
@@ -20857,7 +21020,7 @@ msgstr ""
 msgid "Canton de Fribourg 50cm (2005)"
 msgstr ""
 
-msgid "Stadt Bern 10cm/25cm (2008)"
+msgid "Stadt Bern 10cm/25cm (2012)"
 msgstr ""
 
 msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
@@ -20896,7 +21059,7 @@ msgstr ""
 msgid "OSM US TIGER 2012 Roads Overlay"
 msgstr ""
 
-msgid "New & Misaligned TIGER Roads (TIGER 2013)"
+msgid "New & Misaligned TIGER Roads (TIGER 2014)"
 msgstr ""
 
 msgid "MassGIS L3 Parcels"
@@ -20944,9 +21107,234 @@ msgstr ""
 msgid "NLS - Bartholomew Half Inch, 1897-1907"
 msgstr ""
 
+msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Annan 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgstr ""
+
 msgid "OS Town Plans, Cupar 1854 (NLS)"
 msgstr ""
 
+msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Elgin 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Forres 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Galashiels 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Girvan 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Greenock 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Haddington 1853 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Haddington 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Hamilton 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Irvine 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Jedburgh 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kelso 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Lanark 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Linlithgow 1856 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Musselburgh 1853 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Musselburgh 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Oban 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Peebles 1856 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Perth 1860 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Peterhead 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Selkirk 1865 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, St Andrews 1854 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, St Andrews 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stirling 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stonehaven 1864 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1847 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Strathaven 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wick 1872 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wigtown 1848 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wigtown 1894 (NLS)"
+msgstr ""
+
 msgid "Decreasing house numbers in addresses interpolation"
 msgstr ""
 
@@ -21000,17 +21388,37 @@ msgid "{0}={1} is deprecated. Please use instead a multipolygon."
 msgstr ""
 
 msgid ""
-"{0} is deprecated. Please specify ìnterval by using opening_hours syntax"
+"{0} is deprecated. Please specify interval by using opening_hours syntax"
 msgstr ""
 
 msgid ""
 "{0} is deprecated. Please delete this object and use a private layer instead"
 msgstr ""
 
-msgid "{0} on a node"
+msgid "{0}={1} is unspecific. Please replace ''{1}'' by a specific value."
 msgstr ""
 
-msgid "{0} on a node. Should be drawn as an area"
+msgid "{0} should be replaced with {1}"
+msgstr ""
+
+msgid ""
+"{0}={1} is unspecific. Please replace ''{1}'' by ''left'', ''right'' or "
+"''both''."
+msgstr ""
+
+msgid "{0} on a node. Should be used on a way."
+msgstr ""
+
+msgid "{0} on a node. Should be drawn as an area."
+msgstr ""
+
+msgid "{0}=* on a node. Should be used in a relation"
+msgstr ""
+
+msgid "{0} on a way. Should be used in a relation"
+msgstr ""
+
+msgid "{0} on a node"
 msgstr ""
 
 msgid "Building inside building"
@@ -25680,6 +26088,9 @@ msgstr ""
 msgid "Find"
 msgstr ""
 
+msgid "Show"
+msgstr ""
+
 msgid "Mark"
 msgstr ""
 
diff --git a/i18n/po/ar.po b/i18n/po/ar.po
index f43198a..12b982e 100644
--- a/i18n/po/ar.po
+++ b/i18n/po/ar.po
@@ -1,8 +1,13 @@
+# Arabic translation for josm
+# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
+# This file is distributed under the same license as the josm package.
+# FIRST AUTHOR <EMAIL at ADDRESS>, 2009.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-21 03:38+0200\n"
+"POT-Creation-Date: 2014-12-10 03:42+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"
@@ -11,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-10-21 04:34+0000\n"
-"X-Generator: Launchpad (build 17203)\n"
+"X-Launchpad-Export-Date: 2014-12-10 04:33+0000\n"
+"X-Generator: Launchpad (build 17283)\n"
 "Language: ar\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -169,16 +174,6 @@ msgid "About JOSM..."
 msgstr "حول JOSM..."
 
 msgid ""
-"Unexpected format of API base URL. Redirection to info or history page for "
-"OSM object will probably fail. API base URL is: ''{0}''"
-msgstr ""
-
-msgid ""
-"Unexpected format of API base URL. Redirection to user page for OSM user "
-"will probably fail. API base URL is: ''{0}''"
-msgstr ""
-
-msgid ""
 "You are about to launch {0} browser window.<br>This may both clutter your "
 "screen with browser windows<br>and take some time to finish."
 msgid_plural ""
@@ -1525,6 +1520,15 @@ msgstr "لا يوجد تغييرات للتحميل."
 msgid "Nothing to upload. Get some data first."
 msgstr "لا شيء للتحميل. إحصل على بعض المعطيات أولاً"
 
+msgid "Upload note changes to server"
+msgstr ""
+
+msgid "Upload notes"
+msgstr ""
+
+msgid "Uploading notes to server"
+msgstr ""
+
 msgid "Upload selection"
 msgstr ""
 
@@ -1797,10 +1801,16 @@ msgstr ""
 msgid "Click the location where you wish to create a new note"
 msgstr ""
 
-msgid "Enter a comment for a new note"
+msgid "Create new note"
 msgstr ""
 
-msgid "Create new note"
+msgid "Create note"
+msgstr ""
+
+msgid "Enter a detailed comment to create a note"
+msgstr ""
+
+msgid "You must enter a comment to create a new note"
 msgstr ""
 
 msgid "Delete Mode"
@@ -2671,6 +2681,15 @@ msgstr ""
 msgid "Cycling dependencies"
 msgstr ""
 
+msgid "Uploading modified notes"
+msgstr ""
+
+msgid "Note {0} failed: {1}"
+msgstr ""
+
+msgid "Notes failed to upload"
+msgstr ""
+
 msgid ""
 "The following are results of automatic validation. Try fixing these, but be "
 "careful (don''t destroy valid data). When in doubt ignore them.<br>When you "
@@ -4917,6 +4936,12 @@ msgstr ""
 msgid "Conflict foreground: keep all tags"
 msgstr ""
 
+msgid "Conflict background: sum all numeric tags"
+msgstr ""
+
+msgid "Conflict foreground: sum all numeric tags"
+msgstr ""
+
 msgid "Conflict background: keep member"
 msgstr ""
 
@@ -5335,12 +5360,19 @@ msgstr ""
 msgid "all"
 msgstr "الكلّ"
 
+msgid "sum"
+msgstr ""
+
 msgid "Please decide which values to keep"
 msgstr ""
 
 msgid "Value ''{0}'' is going to be applied for key ''{1}''"
 msgstr ""
 
+msgid ""
+"All numeric values sumed as ''{0}'' are going to be applied for key ''{1}''"
+msgstr ""
+
 msgid "The key ''{0}'' and all its values are going to be removed"
 msgstr ""
 
@@ -5707,24 +5739,6 @@ msgstr[1] ""
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
 
-msgid "Display the history of all selected items."
-msgstr "أعرض الخط الزمني للبنود المختارة."
-
-msgid "Object with history"
-msgstr ""
-
-msgid "Reload"
-msgstr "أعد التحميل"
-
-msgid "Reload all currently selected objects and refresh the list."
-msgstr "إعادة تعبئة كلّ الأغراض المختارة حالياً ثم أنعش اللائحة."
-
-msgid "Show"
-msgstr ""
-
-msgid "Display the history of the selected objects."
-msgstr ""
-
 msgid "Advanced object info"
 msgstr ""
 
@@ -6062,6 +6076,9 @@ msgstr ""
 msgid "Comment"
 msgstr ""
 
+msgid "Comment on note"
+msgstr ""
+
 msgid "Add comment to note:"
 msgstr ""
 
@@ -6071,9 +6088,6 @@ msgstr ""
 msgid "Close note with message:"
 msgstr ""
 
-msgid "Close Note"
-msgstr ""
-
 msgid "Create a new note"
 msgstr ""
 
@@ -6146,6 +6160,9 @@ msgstr "الخيار الحالي"
 msgid "Search for objects"
 msgstr ""
 
+msgid "Display the history of the selected objects."
+msgstr ""
+
 msgid "Zoom to selection"
 msgstr ""
 
@@ -6265,6 +6282,9 @@ msgstr ""
 msgid "Updating map ..."
 msgstr ""
 
+msgid "anonymous"
+msgstr ""
+
 msgid "Display the basic properties of the changeset"
 msgstr ""
 
@@ -6277,6 +6297,12 @@ msgstr ""
 msgid "Display the objects created, updated, and deleted by the changeset"
 msgstr ""
 
+msgid "Discussion"
+msgstr ""
+
+msgid "Display the public discussion around this changeset"
+msgstr ""
+
 msgid "Changeset Management Dialog"
 msgstr ""
 
@@ -6334,9 +6360,6 @@ msgctxt "changeset.state"
 msgid "Closed"
 msgstr ""
 
-msgid "anonymous"
-msgstr ""
-
 msgid "ID"
 msgstr ""
 
@@ -6352,6 +6375,9 @@ msgstr ""
 msgid "Closed at"
 msgstr ""
 
+msgid "Discussions"
+msgstr ""
+
 msgid "Downloading changeset content"
 msgstr ""
 
@@ -6463,6 +6489,15 @@ msgid ""
 "layer"
 msgstr ""
 
+msgid "Update changeset discussion"
+msgstr ""
+
+msgid "Update the changeset discussion from the OSM server"
+msgstr ""
+
+msgid "Date"
+msgstr "التاريخ"
+
 msgid "Download changesets"
 msgstr ""
 
@@ -6880,7 +6915,7 @@ msgstr "الرجاء إختيار قيمة"
 msgid "Set number of recently added tags"
 msgstr ""
 
-msgid "Remember last used tags"
+msgid "Remember last used tags after a restart"
 msgstr ""
 
 msgid "Please enter the number of recently added tags to display"
@@ -7226,6 +7261,9 @@ msgstr ""
 msgid "Load parent relations"
 msgstr ""
 
+msgid "Reload"
+msgstr "أعد التحميل"
+
 msgid "Loading parent relations"
 msgstr ""
 
@@ -7348,6 +7386,12 @@ msgstr "المعطيات الخام لجهاز نظام تحديد المواق
 msgid "Select to download GPS traces in the selected download area."
 msgstr ""
 
+msgid "Notes"
+msgstr "الملاحظات"
+
+msgid "Select to download notes in the selected download area."
+msgstr ""
+
 msgid "Download as new layer"
 msgstr "نزّل كطبقة جديدة"
 
@@ -7653,9 +7697,6 @@ msgstr ""
 msgid "B"
 msgstr ""
 
-msgid "Date"
-msgstr "التاريخ"
-
 msgid ""
 "Failed to update primitive with id {0} because current edit layer is null"
 msgstr ""
@@ -8511,9 +8552,6 @@ msgstr ""
 msgid "Save Layer"
 msgstr "إحفظ الطبقة"
 
-msgid "Notes"
-msgstr "الملاحظات"
-
 msgid "Notes layer"
 msgstr ""
 
@@ -8529,9 +8567,6 @@ msgstr "طبقة المعطيات {0}"
 msgid "outside downloaded area"
 msgstr "خارج عن المنطقة المنزلة"
 
-msgid "version {0}"
-msgstr ""
-
 msgid "Merging layers"
 msgstr ""
 
@@ -12169,6 +12204,15 @@ msgstr ""
 msgid "Open changeset expected. Got closed changeset with id {0}."
 msgstr ""
 
+msgid "Note upload failed"
+msgstr ""
+
+msgid "Error parsing note response from server"
+msgstr ""
+
+msgid "Error encoding string: {0}"
+msgstr ""
+
 msgid "(Code={0})"
 msgstr ""
 
@@ -12217,13 +12261,13 @@ msgstr ""
 msgid "Parsing changeset content ..."
 msgstr ""
 
-msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
-msgid "Illegal numeric value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
-msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal numeric value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
 msgid "Missing mandatory attribute ''{0}'' of XML element {1}."
@@ -13015,9 +13059,6 @@ msgstr ""
 msgid "Failed to scan file ''{0}'' for plugin information. Skipping."
 msgstr ""
 
-msgid "Processing plugin site cache icon files..."
-msgstr ""
-
 msgid "Processing plugin files..."
 msgstr ""
 
@@ -13036,12 +13077,6 @@ msgstr ""
 msgid "Details:"
 msgstr ""
 
-msgid "Plugin icons download error"
-msgstr ""
-
-msgid "JOSM failed to download plugin icons:"
-msgstr ""
-
 msgid ""
 "Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
 "plugin site ''{1}''."
@@ -13927,7 +13962,9 @@ msgid ""
 "Creating and handling address nodes and buildings within Czech Republic."
 msgstr ""
 
-msgid "Allows to import various file formats into JOSM directly."
+msgid ""
+"Allows to import various file formats into JOSM directly. Currently "
+"supported: TangoGPS, Garmin Trainings Center TCX."
 msgstr ""
 
 msgid "Download your GPX tracks from openstreetmap.org"
@@ -14024,6 +14061,11 @@ msgid "A helper for IRS satellite adjustment."
 msgstr ""
 
 msgid ""
+"Provides Java Native Access (JNA) library. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
+msgid ""
 "Provides Java Topology Suite (JTS) library and related utilities. Not meant "
 "to be installed directly by users, but rather as a dependency for other "
 "plugins."
@@ -14379,6 +14421,25 @@ msgstr ""
 msgid "Width (meters)"
 msgstr ""
 
+msgid "Sidewalk"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "both"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "left"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "right"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "no"
+msgstr ""
+
 msgid "Service type"
 msgstr ""
 
@@ -14743,15 +14804,19 @@ msgstr ""
 msgid "May-Sep 09:30-12:30,14:15-19:30"
 msgstr ""
 
+msgctxt "parking"
 msgid "multi-storey"
-msgstr "متعدد الطوابق"
+msgstr ""
 
+msgctxt "parking"
 msgid "surface"
-msgstr "مساحة"
+msgstr ""
 
+msgctxt "parking"
 msgid "underground"
-msgstr "تحت الأرض"
+msgstr ""
 
+msgctxt "parking"
 msgid "rooftop"
 msgstr ""
 
@@ -15209,15 +15274,26 @@ msgstr ""
 msgid "Overtaking"
 msgstr ""
 
+msgctxt "overtaking"
+msgid "yes"
+msgstr ""
+
+msgctxt "overtaking"
 msgid "both"
 msgstr ""
 
+msgctxt "overtaking"
 msgid "forward"
 msgstr ""
 
+msgctxt "overtaking"
 msgid "backward"
 msgstr ""
 
+msgctxt "overtaking"
+msgid "no"
+msgstr ""
+
 msgid "Roundabout"
 msgstr ""
 
@@ -15511,6 +15587,12 @@ msgstr ""
 msgid "tiger"
 msgstr "نمر"
 
+msgid "Button operated"
+msgstr ""
+
+msgid "Sound signals"
+msgstr ""
+
 msgid "Crossing attendant"
 msgstr ""
 
@@ -16032,9 +16114,6 @@ msgstr ""
 msgid "Traffic lights"
 msgstr ""
 
-msgid "Sound signals"
-msgstr ""
-
 msgid "Barrier"
 msgstr ""
 
@@ -18094,6 +18173,9 @@ msgstr "طاحونة هوائية"
 msgid "Gasometer"
 msgstr "خزان محروقات"
 
+msgid "Bunker Silo"
+msgstr ""
+
 msgid "Pipeline"
 msgstr "خط أنابيب"
 
@@ -18240,15 +18322,15 @@ msgstr ""
 msgid "Monitoring:"
 msgstr ""
 
-msgid "Weather"
-msgstr ""
-
 msgid "Water level"
 msgstr ""
 
 msgid "Tide Level"
 msgstr ""
 
+msgid "Groundwater"
+msgstr ""
+
 msgid "Traffic"
 msgstr ""
 
@@ -18267,6 +18349,9 @@ msgstr ""
 msgid "Galileo Signals"
 msgstr ""
 
+msgid "Weather"
+msgstr ""
+
 msgid "Radiation"
 msgstr ""
 
@@ -18447,6 +18532,9 @@ msgstr ""
 msgid "pivot_pier"
 msgstr ""
 
+msgid "Bridge outline"
+msgstr ""
+
 msgid "Power Plant"
 msgstr ""
 
@@ -19054,6 +19142,15 @@ msgstr ""
 msgid "Pole"
 msgstr ""
 
+msgid "Pole with Transformer"
+msgstr ""
+
+msgid "Pole Attributes:"
+msgstr ""
+
+msgid "Transformer Attributes:"
+msgstr ""
+
 msgid "Power Line"
 msgstr "سلك/خط كهربائي"
 
@@ -19103,9 +19200,15 @@ msgstr ""
 msgid "Power Cable"
 msgstr ""
 
+msgctxt "power cable"
+msgid "underground"
+msgstr ""
+
+msgctxt "power cable"
 msgid "underwater"
 msgstr ""
 
+msgctxt "power cable"
 msgid "overground"
 msgstr ""
 
@@ -19133,6 +19236,33 @@ msgstr "نصب تذكاري"
 msgid "Memorial"
 msgstr "ضريح"
 
+msgctxt "memorial"
+msgid "statue"
+msgstr ""
+
+msgctxt "memorial"
+msgid "bust"
+msgstr ""
+
+msgctxt "memorial"
+msgid "plaque"
+msgstr ""
+
+msgctxt "memorial"
+msgid "stele"
+msgstr ""
+
+msgctxt "memorial"
+msgid "stone"
+msgstr ""
+
+msgctxt "memorial"
+msgid "war_memorial"
+msgstr ""
+
+msgid "Inscription"
+msgstr ""
+
 msgid "Wayside Cross"
 msgstr ""
 
@@ -19202,6 +19332,9 @@ msgstr ""
 msgid "Beverages"
 msgstr "مشروبات"
 
+msgid "Wine"
+msgstr ""
+
 msgid "Boutique"
 msgstr ""
 
@@ -19247,6 +19380,9 @@ msgstr "مرئيّات"
 msgid "Video Games"
 msgstr ""
 
+msgid "Music"
+msgstr ""
+
 msgid "Cash"
 msgstr "نقود/أموال"
 
@@ -19274,6 +19410,9 @@ msgstr ""
 msgid "Curtain"
 msgstr ""
 
+msgid "Art"
+msgstr ""
+
 msgid "Frame"
 msgstr ""
 
@@ -19319,6 +19458,9 @@ msgstr ""
 msgid "Beauty"
 msgstr ""
 
+msgid "Tattoo"
+msgstr ""
+
 msgid "Optician"
 msgstr ""
 
@@ -19370,6 +19512,9 @@ msgstr ""
 msgid "Pet"
 msgstr ""
 
+msgid "Funeral Directors"
+msgstr ""
+
 msgid "Vending Machine"
 msgstr ""
 
@@ -19469,6 +19614,15 @@ msgstr ""
 msgid "National Park"
 msgstr ""
 
+msgid "Protected Area"
+msgstr ""
+
+msgid "Protected Class"
+msgstr ""
+
+msgid "Title or type of protection"
+msgstr ""
+
 msgid "Places"
 msgstr "الأماكن"
 
@@ -20545,7 +20699,13 @@ msgstr ""
 msgid "Estonia Ortho (Maaamet)"
 msgstr ""
 
-msgid "Estonia Multi (Maaamet)"
+msgid "Estonia Hillshade (Maaamet)"
+msgstr ""
+
+msgid "Estonia Cadastre (Maaamet)"
+msgstr ""
+
+msgid "Estonia Forestry (Maaamet)"
 msgstr ""
 
 msgid "Bordeaux - 2012"
@@ -20569,7 +20729,7 @@ msgstr ""
 msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
 msgstr ""
 
-msgid "CUGN Nancy - Orthophoto 2012"
+msgid "GrandNancy Orthophotographie 2012"
 msgstr ""
 
 msgid "Géobretagne - Brest 2010 - 10 cm"
@@ -20616,9 +20776,6 @@ msgid ""
 "- 1 m"
 msgstr ""
 
-msgid "Streets NRW Geofabrik.de"
-msgstr ""
-
 msgid "Hike & Bike"
 msgstr ""
 
@@ -20678,6 +20835,9 @@ msgstr ""
 msgid "NRW-Atlas: Topographische Karte 1:10000"
 msgstr ""
 
+msgid "Metropole Ruhr: Luftbilder (10 cm)"
+msgstr ""
+
 msgid "Drone Imagery (Haiti)"
 msgstr ""
 
@@ -20879,6 +21039,9 @@ msgstr ""
 msgid "Stadt Zürich Übersichtsplan (Strassen, Gebäude, Hausnummer)"
 msgstr ""
 
+msgid "Stadt Zürich Luftbild 2011"
+msgstr ""
+
 msgid "Orthofoto Kanton Solothurn RGB (SOGIS 2011/2012/2013)"
 msgstr ""
 
@@ -20897,7 +21060,7 @@ msgstr ""
 msgid "Canton de Fribourg 50cm (2005)"
 msgstr ""
 
-msgid "Stadt Bern 10cm/25cm (2008)"
+msgid "Stadt Bern 10cm/25cm (2012)"
 msgstr ""
 
 msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
@@ -20936,7 +21099,7 @@ msgstr ""
 msgid "OSM US TIGER 2012 Roads Overlay"
 msgstr ""
 
-msgid "New & Misaligned TIGER Roads (TIGER 2013)"
+msgid "New & Misaligned TIGER Roads (TIGER 2014)"
 msgstr ""
 
 msgid "MassGIS L3 Parcels"
@@ -20984,9 +21147,234 @@ msgstr ""
 msgid "NLS - Bartholomew Half Inch, 1897-1907"
 msgstr ""
 
+msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Annan 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgstr ""
+
 msgid "OS Town Plans, Cupar 1854 (NLS)"
 msgstr ""
 
+msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Elgin 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Forres 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Galashiels 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Girvan 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Greenock 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Haddington 1853 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Haddington 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Hamilton 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Irvine 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Jedburgh 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kelso 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Lanark 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Linlithgow 1856 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Musselburgh 1853 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Musselburgh 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Oban 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Peebles 1856 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Perth 1860 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Peterhead 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Selkirk 1865 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, St Andrews 1854 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, St Andrews 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stirling 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stonehaven 1864 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1847 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Strathaven 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wick 1872 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wigtown 1848 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wigtown 1894 (NLS)"
+msgstr ""
+
 msgid "Decreasing house numbers in addresses interpolation"
 msgstr ""
 
@@ -21040,17 +21428,37 @@ msgid "{0}={1} is deprecated. Please use instead a multipolygon."
 msgstr ""
 
 msgid ""
-"{0} is deprecated. Please specify ìnterval by using opening_hours syntax"
+"{0} is deprecated. Please specify interval by using opening_hours syntax"
 msgstr ""
 
 msgid ""
 "{0} is deprecated. Please delete this object and use a private layer instead"
 msgstr ""
 
-msgid "{0} on a node"
+msgid "{0}={1} is unspecific. Please replace ''{1}'' by a specific value."
 msgstr ""
 
-msgid "{0} on a node. Should be drawn as an area"
+msgid "{0} should be replaced with {1}"
+msgstr ""
+
+msgid ""
+"{0}={1} is unspecific. Please replace ''{1}'' by ''left'', ''right'' or "
+"''both''."
+msgstr ""
+
+msgid "{0} on a node. Should be used on a way."
+msgstr ""
+
+msgid "{0} on a node. Should be drawn as an area."
+msgstr ""
+
+msgid "{0}=* on a node. Should be used in a relation"
+msgstr ""
+
+msgid "{0} on a way. Should be used in a relation"
+msgstr ""
+
+msgid "{0} on a node"
 msgstr ""
 
 msgid "Building inside building"
@@ -25720,6 +26128,9 @@ msgstr ""
 msgid "Find"
 msgstr ""
 
+msgid "Show"
+msgstr ""
+
 msgid "Mark"
 msgstr ""
 
diff --git a/i18n/po/ast.po b/i18n/po/ast.po
index e7635e4..f7733d0 100644
--- a/i18n/po/ast.po
+++ b/i18n/po/ast.po
@@ -1,8 +1,13 @@
+# Asturian translation for josm
+# Copyright (c) 2008 Rosetta Contributors and Canonical Ltd 2008
+# This file is distributed under the same license as the josm package.
+# FIRST AUTHOR <EMAIL at ADDRESS>, 2008.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-21 03:38+0200\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"
 "Language-Team: Asturian <ast at li.org>\n"
@@ -10,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-10-21 04:36+0000\n"
-"X-Generator: Launchpad (build 17203)\n"
+"X-Launchpad-Export-Date: 2014-12-10 04:35+0000\n"
+"X-Generator: Launchpad (build 17283)\n"
 "Language: ast\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -171,21 +176,6 @@ msgid "About JOSM..."
 msgstr "Tocante a JOSM..."
 
 msgid ""
-"Unexpected format of API base URL. Redirection to info or history page for "
-"OSM object will probably fail. API base URL is: ''{0}''"
-msgstr ""
-"Formatu inesperáu d´URL base API. La redirección d´información o páxina de "
-"la hestoria por oxetu OSM probablemente va fracasar. URL base API ye: ''{0}''"
-
-msgid ""
-"Unexpected format of API base URL. Redirection to user page for OSM user "
-"will probably fail. API base URL is: ''{0}''"
-msgstr ""
-"Formatu inesperáu pa la URL base de l'API . La redirección a la páxina "
-"d'usuariu pal usuariu de OSM probablemente va fallar. La URL base de la API "
-"ye: ''{0}''"
-
-msgid ""
 "You are about to launch {0} browser window.<br>This may both clutter your "
 "screen with browser windows<br>and take some time to finish."
 msgid_plural ""
@@ -1658,6 +1648,15 @@ msgstr "Dengún cambéu pa xubir"
 msgid "Nothing to upload. Get some data first."
 msgstr "Ná que xubir. Primero inxerta dellos datos."
 
+msgid "Upload note changes to server"
+msgstr ""
+
+msgid "Upload notes"
+msgstr ""
+
+msgid "Uploading notes to server"
+msgstr ""
+
 msgid "Upload selection"
 msgstr "Xubir seleición"
 
@@ -1945,10 +1944,16 @@ msgstr ""
 msgid "Click the location where you wish to create a new note"
 msgstr ""
 
-msgid "Enter a comment for a new note"
+msgid "Create new note"
 msgstr ""
 
-msgid "Create new note"
+msgid "Create note"
+msgstr ""
+
+msgid "Enter a detailed comment to create a note"
+msgstr ""
+
+msgid "You must enter a comment to create a new note"
 msgstr ""
 
 msgid "Delete Mode"
@@ -2925,6 +2930,15 @@ msgstr "... fai referencia a la rellación"
 msgid "Cycling dependencies"
 msgstr "Dependencies cícliques"
 
+msgid "Uploading modified notes"
+msgstr ""
+
+msgid "Note {0} failed: {1}"
+msgstr ""
+
+msgid "Notes failed to upload"
+msgstr ""
+
 msgid ""
 "The following are results of automatic validation. Try fixing these, but be "
 "careful (don''t destroy valid data). When in doubt ignore them.<br>When you "
@@ -5340,6 +5354,12 @@ msgstr "Conflictu de fondu: caltenga toes les etiquetes"
 msgid "Conflict foreground: keep all tags"
 msgstr "Conflictu de primer planu: caltenga toes les etiquetes"
 
+msgid "Conflict background: sum all numeric tags"
+msgstr ""
+
+msgid "Conflict foreground: sum all numeric tags"
+msgstr ""
+
 msgid "Conflict background: keep member"
 msgstr "Conflictu de fondu: caltenga el miembru"
 
@@ -5818,12 +5838,19 @@ msgstr "nengún"
 msgid "all"
 msgstr "toos"
 
+msgid "sum"
+msgstr ""
+
 msgid "Please decide which values to keep"
 msgstr "Por favor, decida que valores hai que caltener"
 
 msgid "Value ''{0}'' is going to be applied for key ''{1}''"
 msgstr "El valor ''{0}'' va ser aplicáu a la clave ''{1}''"
 
+msgid ""
+"All numeric values sumed as ''{0}'' are going to be applied for key ''{1}''"
+msgstr ""
+
 msgid "The key ''{0}'' and all its values are going to be removed"
 msgstr "La clave ''{0}'' y tolos sos valores van ser suprimíos"
 
@@ -6222,24 +6249,6 @@ 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>"
 
-msgid "Display the history of all selected items."
-msgstr "Amosar l'historial de tolos elementos escoyíos"
-
-msgid "Object with history"
-msgstr "Oxetu con hestóricu"
-
-msgid "Reload"
-msgstr "Recargar"
-
-msgid "Reload all currently selected objects and refresh the list."
-msgstr "Recargar tolos oxetos anguaño escoyíos y enfrescar la llista"
-
-msgid "Show"
-msgstr "Amosar"
-
-msgid "Display the history of the selected objects."
-msgstr "Amosar l'hestóricu de los oxetos escoyíos."
-
 msgid "Advanced object info"
 msgstr "Información ampliada sobre l'oxetu"
 
@@ -6602,6 +6611,9 @@ msgstr ""
 msgid "Comment"
 msgstr "Comentariu"
 
+msgid "Comment on note"
+msgstr ""
+
 msgid "Add comment to note:"
 msgstr ""
 
@@ -6611,9 +6623,6 @@ msgstr ""
 msgid "Close note with message:"
 msgstr ""
 
-msgid "Close Note"
-msgstr ""
-
 msgid "Create a new note"
 msgstr ""
 
@@ -6691,6 +6700,9 @@ msgstr "Seleición actual"
 msgid "Search for objects"
 msgstr "Busca d'oxetos"
 
+msgid "Display the history of the selected objects."
+msgstr "Amosar l'hestóricu de los oxetos escoyíos."
+
 msgid "Zoom to selection"
 msgstr "Zoom a la escoyeta"
 
@@ -6816,6 +6828,9 @@ msgstr "Iguando ({0}/{1}): ''{2}''"
 msgid "Updating map ..."
 msgstr "Actualizando mapa..."
 
+msgid "anonymous"
+msgstr "anónimu"
+
 msgid "Display the basic properties of the changeset"
 msgstr "Amosar les propiedaes básiques de la modificación"
 
@@ -6829,6 +6844,12 @@ msgid "Display the objects created, updated, and deleted by the changeset"
 msgstr ""
 "Amosar los oxetos creaos, actualizaos y borraos del conxuntu de cambeos"
 
+msgid "Discussion"
+msgstr ""
+
+msgid "Display the public discussion around this changeset"
+msgstr ""
+
 msgid "Changeset Management Dialog"
 msgstr "Diálogu d'alministración de conxuntos de cambeos"
 
@@ -6890,9 +6911,6 @@ msgctxt "changeset.state"
 msgid "Closed"
 msgstr "Peslláu"
 
-msgid "anonymous"
-msgstr "anónimu"
-
 msgid "ID"
 msgstr "ID"
 
@@ -6908,6 +6926,9 @@ msgstr "Creáu el"
 msgid "Closed at"
 msgstr "Peslláu el"
 
+msgid "Discussions"
+msgstr ""
+
 msgid "Downloading changeset content"
 msgstr "Descargando el conteníu del cambéu"
 
@@ -7029,6 +7050,15 @@ msgstr ""
 "Facer zoom a los oxetos que formen parte d'esti conxuntu de cambeos na capa "
 "de datos actual"
 
+msgid "Update changeset discussion"
+msgstr ""
+
+msgid "Update the changeset discussion from the OSM server"
+msgstr ""
+
+msgid "Date"
+msgstr "Fecha"
+
 msgid "Download changesets"
 msgstr "Descargar modificaciones"
 
@@ -7496,8 +7526,8 @@ msgstr "Escueye un valor"
 msgid "Set number of recently added tags"
 msgstr "Establecer el númberu d'etiquetes añedíes pocayá"
 
-msgid "Remember last used tags"
-msgstr "Recordar últimes etiquetes usaes"
+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"
@@ -7883,6 +7913,9 @@ msgstr "incluyendo los fíos inmediatos de les rellaciones padre"
 msgid "Load parent relations"
 msgstr "Cargar rellaciones padre"
 
+msgid "Reload"
+msgstr "Recargar"
+
 msgid "Loading parent relations"
 msgstr "Cargando rellaciones padre"
 
@@ -8011,6 +8044,12 @@ msgstr "Datos GPS en brutu"
 msgid "Select to download GPS traces in the selected download area."
 msgstr "Escueya pa descargar traces GPS de la área de descarga escoyida."
 
+msgid "Notes"
+msgstr "Billetes"
+
+msgid "Select to download notes in the selected download area."
+msgstr ""
+
 msgid "Download as new layer"
 msgstr "Descargar como nueva capa"
 
@@ -8361,9 +8400,6 @@ msgstr "A"
 msgid "B"
 msgstr "B"
 
-msgid "Date"
-msgstr "Fecha"
-
 msgid ""
 "Failed to update primitive with id {0} because current edit layer is null"
 msgstr ""
@@ -9369,9 +9405,6 @@ msgstr ""
 msgid "Save Layer"
 msgstr "Guardar capa"
 
-msgid "Notes"
-msgstr "Billetes"
-
 msgid "Notes layer"
 msgstr "Capa de Notes"
 
@@ -9387,9 +9420,6 @@ msgstr "Capa de datos {0}"
 msgid "outside downloaded area"
 msgstr "fora de la área descargada"
 
-msgid "version {0}"
-msgstr "versión {0}"
-
 msgid "Merging layers"
 msgstr "Combinar capes"
 
@@ -13462,6 +13492,15 @@ msgstr ""
 "Esperábase apertura del conxuntu de cambeos. Llogróse´l cierre de conxuntu "
 "de cambeos con ID {0}."
 
+msgid "Note upload failed"
+msgstr ""
+
+msgid "Error parsing note response from server"
+msgstr ""
+
+msgid "Error encoding string: {0}"
+msgstr ""
+
 msgid "(Code={0})"
 msgstr "(Códigu={0})"
 
@@ -13520,15 +13559,15 @@ msgstr ""
 msgid "Parsing changeset content ..."
 msgstr "Verificando conteníu del conxuntu de cambeos..."
 
+msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
+msgstr "Valor booleano illegal pal atributu ''{0}''. Llogróse ''{1}''."
+
 msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
 msgstr "Valor illegal pal atributu ''{0}''. Llogróse ''{1}''."
 
 msgid "Illegal numeric value for attribute ''{0}''. Got ''{1}''."
 msgstr "Valor numbéricu illegal pal atributu ''{0}''. Llogróse ''{1}''."
 
-msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
-msgstr "Valor booleano illegal pal atributu ''{0}''. Llogróse ''{1}''."
-
 msgid "Missing mandatory attribute ''{0}'' of XML element {1}."
 msgstr "Fai falta l´atributu obligatoriu ''{0}'' pal elementu XML {1}."
 
@@ -14420,9 +14459,6 @@ msgstr ""
 "Erru al analizar l´arquivu ''{0}'' pa llograr la información del "
 "complementu. Omitiendo."
 
-msgid "Processing plugin site cache icon files..."
-msgstr "Procesando arquivos d'iconu del caxé del sitiu del complementu..."
-
 msgid "Processing plugin files..."
 msgstr "Procesando arquivos de complementos..."
 
@@ -14441,12 +14477,6 @@ msgstr "JOSM falló al descargar la llista del complementu:"
 msgid "Details:"
 msgstr "Detalles:"
 
-msgid "Plugin icons download error"
-msgstr "Erru al descargar los iconos del complementu"
-
-msgid "JOSM failed to download plugin icons:"
-msgstr "JOSM falló al descargar iconos del complementu"
-
 msgid ""
 "Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
 "plugin site ''{1}''."
@@ -15544,8 +15574,10 @@ msgstr ""
 "Creación y manipulación de nodos de direcciones y edificios dientro de la "
 "República Checa."
 
-msgid "Allows to import various file formats into JOSM directly."
-msgstr "Dexa importar directamente distintos formatos d'arquivu en JOSM."
+msgid ""
+"Allows to import various file formats into JOSM directly. Currently "
+"supported: TangoGPS, Garmin Trainings Center TCX."
+msgstr ""
 
 msgid "Download your GPX tracks from openstreetmap.org"
 msgstr "Descarga los tos traces GPX dende openstreetmap.org"
@@ -15665,6 +15697,11 @@ msgid "A helper for IRS satellite adjustment."
 msgstr "Un ayudante pal axuste del satélite IRS."
 
 msgid ""
+"Provides Java Native Access (JNA) library. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
+msgid ""
 "Provides Java Topology Suite (JTS) library and related utilities. Not meant "
 "to be installed directly by users, but rather as a dependency for other "
 "plugins."
@@ -16097,6 +16134,25 @@ msgstr "Llume"
 msgid "Width (meters)"
 msgstr "Anchor (metros)"
 
+msgid "Sidewalk"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "both"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "left"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "right"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "no"
+msgstr ""
+
 msgid "Service type"
 msgstr "Tipu de serviciu"
 
@@ -16464,17 +16520,21 @@ msgstr ""
 msgid "May-Sep 09:30-12:30,14:15-19:30"
 msgstr ""
 
+msgctxt "parking"
 msgid "multi-storey"
-msgstr "de pisos"
+msgstr ""
 
+msgctxt "parking"
 msgid "surface"
-msgstr "al campu"
+msgstr ""
 
+msgctxt "parking"
 msgid "underground"
-msgstr "soterrañu"
+msgstr ""
 
+msgctxt "parking"
 msgid "rooftop"
-msgstr "n'azotea"
+msgstr ""
 
 msgid "Reference number"
 msgstr "Númberu de referencia"
@@ -16932,14 +16992,25 @@ msgstr "Llargor máximu (metros)"
 msgid "Overtaking"
 msgstr "Sobrepasu"
 
+msgctxt "overtaking"
+msgid "yes"
+msgstr ""
+
+msgctxt "overtaking"
 msgid "both"
-msgstr "dambos"
+msgstr ""
 
+msgctxt "overtaking"
 msgid "forward"
-msgstr "avanzar"
+msgstr ""
 
+msgctxt "overtaking"
 msgid "backward"
-msgstr "recular"
+msgstr ""
+
+msgctxt "overtaking"
+msgid "no"
+msgstr ""
 
 msgid "Roundabout"
 msgstr "Rotonda"
@@ -17248,6 +17319,12 @@ msgstr "pegasu"
 msgid "tiger"
 msgstr "tigre"
 
+msgid "Button operated"
+msgstr ""
+
+msgid "Sound signals"
+msgstr "Señales sonores"
+
 msgid "Crossing attendant"
 msgstr "Guarda cruces"
 
@@ -17777,9 +17854,6 @@ msgstr "Pasu a nivel"
 msgid "Traffic lights"
 msgstr "Semáforos"
 
-msgid "Sound signals"
-msgstr "Señales sonores"
-
 msgid "Barrier"
 msgstr "Barrera"
 
@@ -19843,6 +19917,9 @@ msgstr "Molín de vientu"
 msgid "Gasometer"
 msgstr "Gasómetru"
 
+msgid "Bunker Silo"
+msgstr ""
+
 msgid "Pipeline"
 msgstr "Tubería"
 
@@ -19989,15 +20066,15 @@ msgstr "Estación de monitorización"
 msgid "Monitoring:"
 msgstr "Monitoreo:"
 
-msgid "Weather"
-msgstr "Clima"
-
 msgid "Water level"
 msgstr "Nivel de l'agua"
 
 msgid "Tide Level"
 msgstr "Nivel de la marea"
 
+msgid "Groundwater"
+msgstr ""
+
 msgid "Traffic"
 msgstr "Tráficu"
 
@@ -20016,6 +20093,9 @@ msgstr "Señales GLONASS"
 msgid "Galileo Signals"
 msgstr "Señales GALILEO"
 
+msgid "Weather"
+msgstr "Clima"
+
 msgid "Radiation"
 msgstr "Radiación"
 
@@ -20196,6 +20276,9 @@ msgstr "muelle levadizu"
 msgid "pivot_pier"
 msgstr "muelle pivot"
 
+msgid "Bridge outline"
+msgstr ""
+
 msgid "Power Plant"
 msgstr "Planta xeneradora d'enerxía"
 
@@ -20805,6 +20888,15 @@ msgstr "Torre incompleta"
 msgid "Pole"
 msgstr "Poste"
 
+msgid "Pole with Transformer"
+msgstr ""
+
+msgid "Pole Attributes:"
+msgstr ""
+
+msgid "Transformer Attributes:"
+msgstr ""
+
 msgid "Power Line"
 msgstr "Tendíu elléctricu"
 
@@ -20854,11 +20946,17 @@ msgstr "Utilizáu pa comunicaciones de datos"
 msgid "Power Cable"
 msgstr "Cable d'enerxía"
 
+msgctxt "power cable"
+msgid "underground"
+msgstr ""
+
+msgctxt "power cable"
 msgid "underwater"
-msgstr "submarín"
+msgstr ""
 
+msgctxt "power cable"
 msgid "overground"
-msgstr "en superficie"
+msgstr ""
 
 msgid "Historic Places"
 msgstr "Llugares históricos"
@@ -20884,6 +20982,33 @@ msgstr "Monumentu"
 msgid "Memorial"
 msgstr "Monumentu conmemorativo"
 
+msgctxt "memorial"
+msgid "statue"
+msgstr ""
+
+msgctxt "memorial"
+msgid "bust"
+msgstr ""
+
+msgctxt "memorial"
+msgid "plaque"
+msgstr ""
+
+msgctxt "memorial"
+msgid "stele"
+msgstr ""
+
+msgctxt "memorial"
+msgid "stone"
+msgstr ""
+
+msgctxt "memorial"
+msgid "war_memorial"
+msgstr ""
+
+msgid "Inscription"
+msgstr ""
+
 msgid "Wayside Cross"
 msgstr "Cruceru"
 
@@ -20953,6 +21078,9 @@ msgstr "Tienda de bébores alcohóliques"
 msgid "Beverages"
 msgstr "Bébores"
 
+msgid "Wine"
+msgstr ""
+
 msgid "Boutique"
 msgstr "Boutique"
 
@@ -20998,6 +21126,9 @@ msgstr "Vídeu"
 msgid "Video Games"
 msgstr "Videoxuegos"
 
+msgid "Music"
+msgstr ""
+
 msgid "Cash"
 msgstr "Dineru n'efectivu"
 
@@ -21025,6 +21156,9 @@ msgstr "Cocines"
 msgid "Curtain"
 msgstr "Cortinaxes"
 
+msgid "Art"
+msgstr ""
+
 msgid "Frame"
 msgstr "Enmarcaciones"
 
@@ -21070,6 +21204,9 @@ msgstr "Peluquería/Barbería"
 msgid "Beauty"
 msgstr "Salón de guapura"
 
+msgid "Tattoo"
+msgstr ""
+
 msgid "Optician"
 msgstr "Óptica"
 
@@ -21121,6 +21258,9 @@ msgstr "Cartera"
 msgid "Pet"
 msgstr "Mascota"
 
+msgid "Funeral Directors"
+msgstr ""
+
 msgid "Vending Machine"
 msgstr "Máquina espendedora"
 
@@ -21220,6 +21360,15 @@ msgstr "Códigu postal"
 msgid "National Park"
 msgstr "Parque Nacional"
 
+msgid "Protected Area"
+msgstr ""
+
+msgid "Protected Class"
+msgstr ""
+
+msgid "Title or type of protection"
+msgstr ""
+
 msgid "Places"
 msgstr "Llugares"
 
@@ -22317,8 +22466,14 @@ msgstr "Estonia Basemap (Maaamet)"
 msgid "Estonia Ortho (Maaamet)"
 msgstr "Estonia Ortho (Maaamet)"
 
-msgid "Estonia Multi (Maaamet)"
-msgstr "Estonia Multi (Maaamet)"
+msgid "Estonia Hillshade (Maaamet)"
+msgstr ""
+
+msgid "Estonia Cadastre (Maaamet)"
+msgstr ""
+
+msgid "Estonia Forestry (Maaamet)"
+msgstr ""
 
 msgid "Bordeaux - 2012"
 msgstr "Bordeaux - 2012"
@@ -22341,8 +22496,8 @@ msgstr "CRAIG - Le Puy 2010 - 15 cm"
 msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
 msgstr "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
 
-msgid "CUGN Nancy - Orthophoto 2012"
-msgstr "CUGN Nancy - Orthophoto 2012"
+msgid "GrandNancy Orthophotographie 2012"
+msgstr ""
 
 msgid "Géobretagne - Brest 2010 - 10 cm"
 msgstr "Géobretagne - Brest 2010 - 10 cm"
@@ -22390,9 +22545,6 @@ msgstr ""
 "Vercors - Réserve naturelle des Hauts-Plateaux du Vercors - Orthophotos 1999 "
 "- 1 m"
 
-msgid "Streets NRW Geofabrik.de"
-msgstr "Streets NRW Geofabrik.de"
-
 msgid "Hike & Bike"
 msgstr "Hike & Bike"
 
@@ -22455,6 +22607,9 @@ msgstr "NRW-Atlas: Luftbilder"
 msgid "NRW-Atlas: Topographische Karte 1:10000"
 msgstr "NRW-Atlas: Topographische Karte 1:10000"
 
+msgid "Metropole Ruhr: Luftbilder (10 cm)"
+msgstr ""
+
 msgid "Drone Imagery (Haiti)"
 msgstr "Drone Imagery (Haiti)"
 
@@ -22656,6 +22811,9 @@ msgstr "Stadtplan Zürich"
 msgid "Stadt Zürich Übersichtsplan (Strassen, Gebäude, Hausnummer)"
 msgstr "Stadt Zürich Übersichtsplan (Strassen, Gebäude, Hausnummer)"
 
+msgid "Stadt Zürich Luftbild 2011"
+msgstr ""
+
 msgid "Orthofoto Kanton Solothurn RGB (SOGIS 2011/2012/2013)"
 msgstr "Orthofoto Kanton Solothurn RGB (SOGIS 2011/2012/2013)"
 
@@ -22674,8 +22832,8 @@ msgstr "Canton du Jura 50cm (RCJU 1998)"
 msgid "Canton de Fribourg 50cm (2005)"
 msgstr "Canton de Fribourg 50cm (2005)"
 
-msgid "Stadt Bern 10cm/25cm (2008)"
-msgstr "Stadt Bern 10cm/25cm (2008)"
+msgid "Stadt Bern 10cm/25cm (2012)"
+msgstr ""
 
 msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
 msgstr "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
@@ -22713,8 +22871,8 @@ msgstr "USGS Large Scale Imagery"
 msgid "OSM US TIGER 2012 Roads Overlay"
 msgstr "OSM US TIGER 2012 Roads Overlay"
 
-msgid "New & Misaligned TIGER Roads (TIGER 2013)"
-msgstr "New & Misaligned TIGER Roads (TIGER 2013)"
+msgid "New & Misaligned TIGER Roads (TIGER 2014)"
+msgstr ""
 
 msgid "MassGIS L3 Parcels"
 msgstr "MassGIS L3 Parcels"
@@ -22761,9 +22919,234 @@ msgstr "OS Scottish Popular historic"
 msgid "NLS - Bartholomew Half Inch, 1897-1907"
 msgstr "NLS - Bartholomew Half Inch, 1897-1907"
 
+msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Annan 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgstr ""
+
 msgid "OS Town Plans, Cupar 1854 (NLS)"
 msgstr "OS Town Plans, Cupar 1854 (NLS)"
 
+msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Elgin 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Forres 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Galashiels 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Girvan 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Greenock 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Haddington 1853 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Haddington 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Hamilton 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Irvine 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Jedburgh 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kelso 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Lanark 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Linlithgow 1856 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Musselburgh 1853 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Musselburgh 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Oban 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Peebles 1856 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Perth 1860 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Peterhead 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Selkirk 1865 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, St Andrews 1854 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, St Andrews 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stirling 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stonehaven 1864 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1847 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Strathaven 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wick 1872 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wigtown 1848 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wigtown 1894 (NLS)"
+msgstr ""
+
 msgid "Decreasing house numbers in addresses interpolation"
 msgstr "Decrementando númberos de portal na interpolación de portales"
 
@@ -22822,19 +23205,39 @@ msgstr ""
 "{0}={1} ta en desusu. Por favor utilice nel so llugar un multipolígono."
 
 msgid ""
-"{0} is deprecated. Please specify ìnterval by using opening_hours syntax"
+"{0} is deprecated. Please specify interval by using opening_hours syntax"
 msgstr ""
 
 msgid ""
 "{0} is deprecated. Please delete this object and use a private layer instead"
 msgstr ""
 
+msgid "{0}={1} is unspecific. Please replace ''{1}'' by a specific value."
+msgstr ""
+
+msgid "{0} should be replaced with {1}"
+msgstr ""
+
+msgid ""
+"{0}={1} is unspecific. Please replace ''{1}'' by ''left'', ''right'' or "
+"''both''."
+msgstr ""
+
+msgid "{0} on a node. Should be used on a way."
+msgstr ""
+
+msgid "{0} on a node. Should be drawn as an area."
+msgstr ""
+
+msgid "{0}=* on a node. Should be used in a relation"
+msgstr ""
+
+msgid "{0} on a way. Should be used in a relation"
+msgstr ""
+
 msgid "{0} on a node"
 msgstr "{0} nun nodo"
 
-msgid "{0} on a node. Should be drawn as an area"
-msgstr "{0} nun nodo. Tendría de ser dibuxáu como una área"
-
 msgid "Building inside building"
 msgstr "Edificiu dientro d'un edificiu"
 
@@ -27939,6 +28342,9 @@ msgstr "Paraes suxuríes"
 msgid "Find"
 msgstr "Atopar"
 
+msgid "Show"
+msgstr "Amosar"
+
 msgid "Mark"
 msgstr "Marca"
 
diff --git a/i18n/po/az.po b/i18n/po/az.po
index 568c9eb..cdd4b73 100644
--- a/i18n/po/az.po
+++ b/i18n/po/az.po
@@ -1,8 +1,13 @@
+# Azerbaijani translation for josm
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the josm package.
+# FIRST AUTHOR <EMAIL at ADDRESS>, 2013.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL at ADDRESS>\n"
-"POT-Creation-Date: 2014-10-21 03:38+0200\n"
+"POT-Creation-Date: 2014-12-10 03:42+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"
@@ -10,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-10-21 04:37+0000\n"
-"X-Generator: Launchpad (build 17203)\n"
+"X-Launchpad-Export-Date: 2014-12-10 04:36+0000\n"
+"X-Generator: Launchpad (build 17283)\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
 msgstr ""
@@ -167,16 +172,6 @@ msgid "About JOSM..."
 msgstr ""
 
 msgid ""
-"Unexpected format of API base URL. Redirection to info or history page for "
-"OSM object will probably fail. API base URL is: ''{0}''"
-msgstr ""
-
-msgid ""
-"Unexpected format of API base URL. Redirection to user page for OSM user "
-"will probably fail. API base URL is: ''{0}''"
-msgstr ""
-
-msgid ""
 "You are about to launch {0} browser window.<br>This may both clutter your "
 "screen with browser windows<br>and take some time to finish."
 msgid_plural ""
@@ -1518,6 +1513,15 @@ msgstr ""
 msgid "Nothing to upload. Get some data first."
 msgstr ""
 
+msgid "Upload note changes to server"
+msgstr ""
+
+msgid "Upload notes"
+msgstr ""
+
+msgid "Uploading notes to server"
+msgstr ""
+
 msgid "Upload selection"
 msgstr ""
 
@@ -1790,10 +1794,16 @@ msgstr ""
 msgid "Click the location where you wish to create a new note"
 msgstr ""
 
-msgid "Enter a comment for a new note"
+msgid "Create new note"
 msgstr ""
 
-msgid "Create new note"
+msgid "Create note"
+msgstr ""
+
+msgid "Enter a detailed comment to create a note"
+msgstr ""
+
+msgid "You must enter a comment to create a new note"
 msgstr ""
 
 msgid "Delete Mode"
@@ -2664,6 +2674,15 @@ msgstr ""
 msgid "Cycling dependencies"
 msgstr ""
 
+msgid "Uploading modified notes"
+msgstr ""
+
+msgid "Note {0} failed: {1}"
+msgstr ""
+
+msgid "Notes failed to upload"
+msgstr ""
+
 msgid ""
 "The following are results of automatic validation. Try fixing these, but be "
 "careful (don''t destroy valid data). When in doubt ignore them.<br>When you "
@@ -4893,6 +4912,12 @@ msgstr ""
 msgid "Conflict foreground: keep all tags"
 msgstr ""
 
+msgid "Conflict background: sum all numeric tags"
+msgstr ""
+
+msgid "Conflict foreground: sum all numeric tags"
+msgstr ""
+
 msgid "Conflict background: keep member"
 msgstr ""
 
@@ -5311,12 +5336,19 @@ msgstr ""
 msgid "all"
 msgstr ""
 
+msgid "sum"
+msgstr ""
+
 msgid "Please decide which values to keep"
 msgstr ""
 
 msgid "Value ''{0}'' is going to be applied for key ''{1}''"
 msgstr ""
 
+msgid ""
+"All numeric values sumed as ''{0}'' are going to be applied for key ''{1}''"
+msgstr ""
+
 msgid "The key ''{0}'' and all its values are going to be removed"
 msgstr ""
 
@@ -5679,24 +5711,6 @@ msgstr[1] ""
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
 
-msgid "Display the history of all selected items."
-msgstr ""
-
-msgid "Object with history"
-msgstr ""
-
-msgid "Reload"
-msgstr ""
-
-msgid "Reload all currently selected objects and refresh the list."
-msgstr ""
-
-msgid "Show"
-msgstr ""
-
-msgid "Display the history of the selected objects."
-msgstr ""
-
 msgid "Advanced object info"
 msgstr ""
 
@@ -6034,6 +6048,9 @@ msgstr ""
 msgid "Comment"
 msgstr ""
 
+msgid "Comment on note"
+msgstr ""
+
 msgid "Add comment to note:"
 msgstr ""
 
@@ -6043,9 +6060,6 @@ msgstr ""
 msgid "Close note with message:"
 msgstr ""
 
-msgid "Close Note"
-msgstr ""
-
 msgid "Create a new note"
 msgstr ""
 
@@ -6118,6 +6132,9 @@ msgstr ""
 msgid "Search for objects"
 msgstr ""
 
+msgid "Display the history of the selected objects."
+msgstr ""
+
 msgid "Zoom to selection"
 msgstr ""
 
@@ -6237,6 +6254,9 @@ msgstr ""
 msgid "Updating map ..."
 msgstr ""
 
+msgid "anonymous"
+msgstr ""
+
 msgid "Display the basic properties of the changeset"
 msgstr ""
 
@@ -6249,6 +6269,12 @@ msgstr ""
 msgid "Display the objects created, updated, and deleted by the changeset"
 msgstr ""
 
+msgid "Discussion"
+msgstr ""
+
+msgid "Display the public discussion around this changeset"
+msgstr ""
+
 msgid "Changeset Management Dialog"
 msgstr ""
 
@@ -6306,9 +6332,6 @@ msgctxt "changeset.state"
 msgid "Closed"
 msgstr ""
 
-msgid "anonymous"
-msgstr ""
-
 msgid "ID"
 msgstr ""
 
@@ -6324,6 +6347,9 @@ msgstr ""
 msgid "Closed at"
 msgstr ""
 
+msgid "Discussions"
+msgstr ""
+
 msgid "Downloading changeset content"
 msgstr ""
 
@@ -6435,6 +6461,15 @@ msgid ""
 "layer"
 msgstr ""
 
+msgid "Update changeset discussion"
+msgstr ""
+
+msgid "Update the changeset discussion from the OSM server"
+msgstr ""
+
+msgid "Date"
+msgstr ""
+
 msgid "Download changesets"
 msgstr ""
 
@@ -6852,7 +6887,7 @@ msgstr ""
 msgid "Set number of recently added tags"
 msgstr ""
 
-msgid "Remember last used tags"
+msgid "Remember last used tags after a restart"
 msgstr ""
 
 msgid "Please enter the number of recently added tags to display"
@@ -7198,6 +7233,9 @@ msgstr ""
 msgid "Load parent relations"
 msgstr ""
 
+msgid "Reload"
+msgstr ""
+
 msgid "Loading parent relations"
 msgstr ""
 
@@ -7320,6 +7358,12 @@ msgstr ""
 msgid "Select to download GPS traces in the selected download area."
 msgstr ""
 
+msgid "Notes"
+msgstr ""
+
+msgid "Select to download notes in the selected download area."
+msgstr ""
+
 msgid "Download as new layer"
 msgstr ""
 
@@ -7625,9 +7669,6 @@ msgstr ""
 msgid "B"
 msgstr ""
 
-msgid "Date"
-msgstr ""
-
 msgid ""
 "Failed to update primitive with id {0} because current edit layer is null"
 msgstr ""
@@ -8482,9 +8523,6 @@ msgstr ""
 msgid "Save Layer"
 msgstr ""
 
-msgid "Notes"
-msgstr ""
-
 msgid "Notes layer"
 msgstr ""
 
@@ -8500,9 +8538,6 @@ msgstr ""
 msgid "outside downloaded area"
 msgstr ""
 
-msgid "version {0}"
-msgstr ""
-
 msgid "Merging layers"
 msgstr ""
 
@@ -12128,6 +12163,15 @@ msgstr ""
 msgid "Open changeset expected. Got closed changeset with id {0}."
 msgstr ""
 
+msgid "Note upload failed"
+msgstr ""
+
+msgid "Error parsing note response from server"
+msgstr ""
+
+msgid "Error encoding string: {0}"
+msgstr ""
+
 msgid "(Code={0})"
 msgstr ""
 
@@ -12176,13 +12220,13 @@ msgstr ""
 msgid "Parsing changeset content ..."
 msgstr ""
 
-msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
-msgid "Illegal numeric value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
-msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal numeric value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
 msgid "Missing mandatory attribute ''{0}'' of XML element {1}."
@@ -12974,9 +13018,6 @@ msgstr ""
 msgid "Failed to scan file ''{0}'' for plugin information. Skipping."
 msgstr ""
 
-msgid "Processing plugin site cache icon files..."
-msgstr ""
-
 msgid "Processing plugin files..."
 msgstr ""
 
@@ -12995,12 +13036,6 @@ msgstr ""
 msgid "Details:"
 msgstr ""
 
-msgid "Plugin icons download error"
-msgstr ""
-
-msgid "JOSM failed to download plugin icons:"
-msgstr ""
-
 msgid ""
 "Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
 "plugin site ''{1}''."
@@ -13886,7 +13921,9 @@ msgid ""
 "Creating and handling address nodes and buildings within Czech Republic."
 msgstr ""
 
-msgid "Allows to import various file formats into JOSM directly."
+msgid ""
+"Allows to import various file formats into JOSM directly. Currently "
+"supported: TangoGPS, Garmin Trainings Center TCX."
 msgstr ""
 
 msgid "Download your GPX tracks from openstreetmap.org"
@@ -13983,6 +14020,11 @@ msgid "A helper for IRS satellite adjustment."
 msgstr ""
 
 msgid ""
+"Provides Java Native Access (JNA) library. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
+msgid ""
 "Provides Java Topology Suite (JTS) library and related utilities. Not meant "
 "to be installed directly by users, but rather as a dependency for other "
 "plugins."
@@ -14338,6 +14380,25 @@ msgstr ""
 msgid "Width (meters)"
 msgstr ""
 
+msgid "Sidewalk"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "both"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "left"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "right"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "no"
+msgstr ""
+
 msgid "Service type"
 msgstr ""
 
@@ -14702,15 +14763,19 @@ msgstr ""
 msgid "May-Sep 09:30-12:30,14:15-19:30"
 msgstr ""
 
+msgctxt "parking"
 msgid "multi-storey"
 msgstr ""
 
+msgctxt "parking"
 msgid "surface"
 msgstr ""
 
+msgctxt "parking"
 msgid "underground"
 msgstr ""
 
+msgctxt "parking"
 msgid "rooftop"
 msgstr ""
 
@@ -15168,15 +15233,26 @@ msgstr ""
 msgid "Overtaking"
 msgstr ""
 
+msgctxt "overtaking"
+msgid "yes"
+msgstr ""
+
+msgctxt "overtaking"
 msgid "both"
 msgstr ""
 
+msgctxt "overtaking"
 msgid "forward"
 msgstr ""
 
+msgctxt "overtaking"
 msgid "backward"
 msgstr ""
 
+msgctxt "overtaking"
+msgid "no"
+msgstr ""
+
 msgid "Roundabout"
 msgstr ""
 
@@ -15470,6 +15546,12 @@ msgstr ""
 msgid "tiger"
 msgstr ""
 
+msgid "Button operated"
+msgstr ""
+
+msgid "Sound signals"
+msgstr ""
+
 msgid "Crossing attendant"
 msgstr ""
 
@@ -15991,9 +16073,6 @@ msgstr ""
 msgid "Traffic lights"
 msgstr ""
 
-msgid "Sound signals"
-msgstr ""
-
 msgid "Barrier"
 msgstr ""
 
@@ -18053,6 +18132,9 @@ msgstr ""
 msgid "Gasometer"
 msgstr ""
 
+msgid "Bunker Silo"
+msgstr ""
+
 msgid "Pipeline"
 msgstr ""
 
@@ -18199,15 +18281,15 @@ msgstr ""
 msgid "Monitoring:"
 msgstr ""
 
-msgid "Weather"
-msgstr ""
-
 msgid "Water level"
 msgstr ""
 
 msgid "Tide Level"
 msgstr ""
 
+msgid "Groundwater"
+msgstr ""
+
 msgid "Traffic"
 msgstr ""
 
@@ -18226,6 +18308,9 @@ msgstr ""
 msgid "Galileo Signals"
 msgstr ""
 
+msgid "Weather"
+msgstr ""
+
 msgid "Radiation"
 msgstr ""
 
@@ -18406,6 +18491,9 @@ msgstr ""
 msgid "pivot_pier"
 msgstr ""
 
+msgid "Bridge outline"
+msgstr ""
+
 msgid "Power Plant"
 msgstr ""
 
@@ -19013,6 +19101,15 @@ msgstr ""
 msgid "Pole"
 msgstr ""
 
+msgid "Pole with Transformer"
+msgstr ""
+
+msgid "Pole Attributes:"
+msgstr ""
+
+msgid "Transformer Attributes:"
+msgstr ""
+
 msgid "Power Line"
 msgstr ""
 
@@ -19062,9 +19159,15 @@ msgstr ""
 msgid "Power Cable"
 msgstr ""
 
+msgctxt "power cable"
+msgid "underground"
+msgstr ""
+
+msgctxt "power cable"
 msgid "underwater"
 msgstr ""
 
+msgctxt "power cable"
 msgid "overground"
 msgstr ""
 
@@ -19092,6 +19195,33 @@ msgstr ""
 msgid "Memorial"
 msgstr ""
 
+msgctxt "memorial"
+msgid "statue"
+msgstr ""
+
+msgctxt "memorial"
+msgid "bust"
+msgstr ""
+
+msgctxt "memorial"
+msgid "plaque"
+msgstr ""
+
+msgctxt "memorial"
+msgid "stele"
+msgstr ""
+
+msgctxt "memorial"
+msgid "stone"
+msgstr ""
+
+msgctxt "memorial"
+msgid "war_memorial"
+msgstr ""
+
+msgid "Inscription"
+msgstr ""
+
 msgid "Wayside Cross"
 msgstr ""
 
@@ -19161,6 +19291,9 @@ msgstr ""
 msgid "Beverages"
 msgstr ""
 
+msgid "Wine"
+msgstr ""
+
 msgid "Boutique"
 msgstr ""
 
@@ -19206,6 +19339,9 @@ msgstr ""
 msgid "Video Games"
 msgstr ""
 
+msgid "Music"
+msgstr ""
+
 msgid "Cash"
 msgstr ""
 
@@ -19233,6 +19369,9 @@ msgstr ""
 msgid "Curtain"
 msgstr ""
 
+msgid "Art"
+msgstr ""
+
 msgid "Frame"
 msgstr ""
 
@@ -19278,6 +19417,9 @@ msgstr ""
 msgid "Beauty"
 msgstr ""
 
+msgid "Tattoo"
+msgstr ""
+
 msgid "Optician"
 msgstr ""
 
@@ -19329,6 +19471,9 @@ msgstr ""
 msgid "Pet"
 msgstr ""
 
+msgid "Funeral Directors"
+msgstr ""
+
 msgid "Vending Machine"
 msgstr ""
 
@@ -19428,6 +19573,15 @@ msgstr ""
 msgid "National Park"
 msgstr ""
 
+msgid "Protected Area"
+msgstr ""
+
+msgid "Protected Class"
+msgstr ""
+
+msgid "Title or type of protection"
+msgstr ""
+
 msgid "Places"
 msgstr ""
 
@@ -20504,7 +20658,13 @@ msgstr ""
 msgid "Estonia Ortho (Maaamet)"
 msgstr ""
 
-msgid "Estonia Multi (Maaamet)"
+msgid "Estonia Hillshade (Maaamet)"
+msgstr ""
+
+msgid "Estonia Cadastre (Maaamet)"
+msgstr ""
+
+msgid "Estonia Forestry (Maaamet)"
 msgstr ""
 
 msgid "Bordeaux - 2012"
@@ -20528,7 +20688,7 @@ msgstr ""
 msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
 msgstr ""
 
-msgid "CUGN Nancy - Orthophoto 2012"
+msgid "GrandNancy Orthophotographie 2012"
 msgstr ""
 
 msgid "Géobretagne - Brest 2010 - 10 cm"
@@ -20575,9 +20735,6 @@ msgid ""
 "- 1 m"
 msgstr ""
 
-msgid "Streets NRW Geofabrik.de"
-msgstr ""
-
 msgid "Hike & Bike"
 msgstr ""
 
@@ -20637,6 +20794,9 @@ msgstr ""
 msgid "NRW-Atlas: Topographische Karte 1:10000"
 msgstr ""
 
+msgid "Metropole Ruhr: Luftbilder (10 cm)"
+msgstr ""
+
 msgid "Drone Imagery (Haiti)"
 msgstr ""
 
@@ -20838,6 +20998,9 @@ msgstr ""
 msgid "Stadt Zürich Übersichtsplan (Strassen, Gebäude, Hausnummer)"
 msgstr ""
 
+msgid "Stadt Zürich Luftbild 2011"
+msgstr ""
+
 msgid "Orthofoto Kanton Solothurn RGB (SOGIS 2011/2012/2013)"
 msgstr ""
 
@@ -20856,7 +21019,7 @@ msgstr ""
 msgid "Canton de Fribourg 50cm (2005)"
 msgstr ""
 
-msgid "Stadt Bern 10cm/25cm (2008)"
+msgid "Stadt Bern 10cm/25cm (2012)"
 msgstr ""
 
 msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
@@ -20895,7 +21058,7 @@ msgstr ""
 msgid "OSM US TIGER 2012 Roads Overlay"
 msgstr ""
 
-msgid "New & Misaligned TIGER Roads (TIGER 2013)"
+msgid "New & Misaligned TIGER Roads (TIGER 2014)"
 msgstr ""
 
 msgid "MassGIS L3 Parcels"
@@ -20943,9 +21106,234 @@ msgstr ""
 msgid "NLS - Bartholomew Half Inch, 1897-1907"
 msgstr ""
 
+msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Annan 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgstr ""
+
 msgid "OS Town Plans, Cupar 1854 (NLS)"
 msgstr ""
 
+msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Elgin 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Forres 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Galashiels 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Girvan 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Greenock 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Haddington 1853 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Haddington 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Hamilton 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Irvine 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Jedburgh 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kelso 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Lanark 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Linlithgow 1856 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Musselburgh 1853 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Musselburgh 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Oban 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Peebles 1856 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Perth 1860 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Peterhead 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Selkirk 1865 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, St Andrews 1854 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, St Andrews 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stirling 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stonehaven 1864 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1847 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Strathaven 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wick 1872 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wigtown 1848 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wigtown 1894 (NLS)"
+msgstr ""
+
 msgid "Decreasing house numbers in addresses interpolation"
 msgstr ""
 
@@ -20999,17 +21387,37 @@ msgid "{0}={1} is deprecated. Please use instead a multipolygon."
 msgstr ""
 
 msgid ""
-"{0} is deprecated. Please specify ìnterval by using opening_hours syntax"
+"{0} is deprecated. Please specify interval by using opening_hours syntax"
 msgstr ""
 
 msgid ""
 "{0} is deprecated. Please delete this object and use a private layer instead"
 msgstr ""
 
-msgid "{0} on a node"
+msgid "{0}={1} is unspecific. Please replace ''{1}'' by a specific value."
 msgstr ""
 
-msgid "{0} on a node. Should be drawn as an area"
+msgid "{0} should be replaced with {1}"
+msgstr ""
+
+msgid ""
+"{0}={1} is unspecific. Please replace ''{1}'' by ''left'', ''right'' or "
+"''both''."
+msgstr ""
+
+msgid "{0} on a node. Should be used on a way."
+msgstr ""
+
+msgid "{0} on a node. Should be drawn as an area."
+msgstr ""
+
+msgid "{0}=* on a node. Should be used in a relation"
+msgstr ""
+
+msgid "{0} on a way. Should be used in a relation"
+msgstr ""
+
+msgid "{0} on a node"
 msgstr ""
 
 msgid "Building inside building"
@@ -25679,6 +26087,9 @@ msgstr ""
 msgid "Find"
 msgstr ""
 
+msgid "Show"
+msgstr ""
+
 msgid "Mark"
 msgstr ""
 
diff --git a/i18n/po/be.po b/i18n/po/be.po
index a0c03fb..d77b2cf 100644
--- a/i18n/po/be.po
+++ b/i18n/po/be.po
@@ -1,8 +1,16 @@
+# Belarusian translation for josm
+# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
+# This file is distributed under the same license as the josm package.
+#
+# FIRST AUTHOR <EMAIL at ADDRESS>, 2009.
+# Darafei Praliaskouski <komzpa at gmail.com>, 2009.
+#
+# Contribution by Alex Kuzmenkov, Jekhor, Mikola Tsekhan.
 msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-21 03:38+0200\n"
+"POT-Creation-Date: 2014-12-10 03:42+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"
@@ -11,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-10-21 04:39+0000\n"
-"X-Generator: Launchpad (build 17203)\n"
+"X-Launchpad-Export-Date: 2014-12-10 04:37+0000\n"
+"X-Generator: Launchpad (build 17283)\n"
 "Language: be\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -169,16 +177,6 @@ msgid "About JOSM..."
 msgstr "Пра JOSM..."
 
 msgid ""
-"Unexpected format of API base URL. Redirection to info or history page for "
-"OSM object will probably fail. API base URL is: ''{0}''"
-msgstr ""
-
-msgid ""
-"Unexpected format of API base URL. Redirection to user page for OSM user "
-"will probably fail. API base URL is: ''{0}''"
-msgstr ""
-
-msgid ""
 "You are about to launch {0} browser window.<br>This may both clutter your "
 "screen with browser windows<br>and take some time to finish."
 msgid_plural ""
@@ -1617,6 +1615,15 @@ msgid "Nothing to upload. Get some data first."
 msgstr ""
 "Няма дадзеных для запампоўкі на сервер. Спачатку трэба штосці спампаваць."
 
+msgid "Upload note changes to server"
+msgstr ""
+
+msgid "Upload notes"
+msgstr ""
+
+msgid "Uploading notes to server"
+msgstr ""
+
 msgid "Upload selection"
 msgstr "Запампаваць выбранае"
 
@@ -1909,10 +1916,16 @@ msgstr ""
 msgid "Click the location where you wish to create a new note"
 msgstr ""
 
-msgid "Enter a comment for a new note"
+msgid "Create new note"
 msgstr ""
 
-msgid "Create new note"
+msgid "Create note"
+msgstr ""
+
+msgid "Enter a detailed comment to create a note"
+msgstr ""
+
+msgid "You must enter a comment to create a new note"
 msgstr ""
 
 msgid "Delete Mode"
@@ -2835,6 +2848,15 @@ msgstr ""
 msgid "Cycling dependencies"
 msgstr ""
 
+msgid "Uploading modified notes"
+msgstr ""
+
+msgid "Note {0} failed: {1}"
+msgstr ""
+
+msgid "Notes failed to upload"
+msgstr ""
+
 msgid ""
 "The following are results of automatic validation. Try fixing these, but be "
 "careful (don''t destroy valid data). When in doubt ignore them.<br>When you "
@@ -5065,6 +5087,12 @@ msgstr ""
 msgid "Conflict foreground: keep all tags"
 msgstr ""
 
+msgid "Conflict background: sum all numeric tags"
+msgstr ""
+
+msgid "Conflict foreground: sum all numeric tags"
+msgstr ""
+
 msgid "Conflict background: keep member"
 msgstr ""
 
@@ -5483,12 +5511,19 @@ msgstr ""
 msgid "all"
 msgstr ""
 
+msgid "sum"
+msgstr ""
+
 msgid "Please decide which values to keep"
 msgstr ""
 
 msgid "Value ''{0}'' is going to be applied for key ''{1}''"
 msgstr ""
 
+msgid ""
+"All numeric values sumed as ''{0}'' are going to be applied for key ''{1}''"
+msgstr ""
+
 msgid "The key ''{0}'' and all its values are going to be removed"
 msgstr ""
 
@@ -5851,24 +5886,6 @@ msgstr[1] ""
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
 
-msgid "Display the history of all selected items."
-msgstr ""
-
-msgid "Object with history"
-msgstr ""
-
-msgid "Reload"
-msgstr "Абнавіць"
-
-msgid "Reload all currently selected objects and refresh the list."
-msgstr ""
-
-msgid "Show"
-msgstr ""
-
-msgid "Display the history of the selected objects."
-msgstr ""
-
 msgid "Advanced object info"
 msgstr ""
 
@@ -6206,6 +6223,9 @@ msgstr ""
 msgid "Comment"
 msgstr ""
 
+msgid "Comment on note"
+msgstr ""
+
 msgid "Add comment to note:"
 msgstr ""
 
@@ -6215,9 +6235,6 @@ msgstr ""
 msgid "Close note with message:"
 msgstr ""
 
-msgid "Close Note"
-msgstr ""
-
 msgid "Create a new note"
 msgstr ""
 
@@ -6290,6 +6307,9 @@ msgstr ""
 msgid "Search for objects"
 msgstr ""
 
+msgid "Display the history of the selected objects."
+msgstr ""
+
 msgid "Zoom to selection"
 msgstr ""
 
@@ -6409,6 +6429,9 @@ msgstr ""
 msgid "Updating map ..."
 msgstr ""
 
+msgid "anonymous"
+msgstr ""
+
 msgid "Display the basic properties of the changeset"
 msgstr ""
 
@@ -6421,6 +6444,12 @@ msgstr ""
 msgid "Display the objects created, updated, and deleted by the changeset"
 msgstr ""
 
+msgid "Discussion"
+msgstr ""
+
+msgid "Display the public discussion around this changeset"
+msgstr ""
+
 msgid "Changeset Management Dialog"
 msgstr ""
 
@@ -6478,9 +6507,6 @@ msgctxt "changeset.state"
 msgid "Closed"
 msgstr ""
 
-msgid "anonymous"
-msgstr ""
-
 msgid "ID"
 msgstr ""
 
@@ -6496,6 +6522,9 @@ msgstr ""
 msgid "Closed at"
 msgstr ""
 
+msgid "Discussions"
+msgstr ""
+
 msgid "Downloading changeset content"
 msgstr ""
 
@@ -6607,6 +6636,15 @@ msgid ""
 "layer"
 msgstr ""
 
+msgid "Update changeset discussion"
+msgstr ""
+
+msgid "Update the changeset discussion from the OSM server"
+msgstr ""
+
+msgid "Date"
+msgstr ""
+
 msgid "Download changesets"
 msgstr ""
 
@@ -7024,7 +7062,7 @@ msgstr ""
 msgid "Set number of recently added tags"
 msgstr ""
 
-msgid "Remember last used tags"
+msgid "Remember last used tags after a restart"
 msgstr ""
 
 msgid "Please enter the number of recently added tags to display"
@@ -7370,6 +7408,9 @@ msgstr ""
 msgid "Load parent relations"
 msgstr ""
 
+msgid "Reload"
+msgstr "Абнавіць"
+
 msgid "Loading parent relations"
 msgstr ""
 
@@ -7492,6 +7533,12 @@ msgstr ""
 msgid "Select to download GPS traces in the selected download area."
 msgstr ""
 
+msgid "Notes"
+msgstr ""
+
+msgid "Select to download notes in the selected download area."
+msgstr ""
+
 msgid "Download as new layer"
 msgstr ""
 
@@ -7799,9 +7846,6 @@ msgstr ""
 msgid "B"
 msgstr ""
 
-msgid "Date"
-msgstr ""
-
 msgid ""
 "Failed to update primitive with id {0} because current edit layer is null"
 msgstr ""
@@ -8661,9 +8705,6 @@ msgstr ""
 msgid "Save Layer"
 msgstr "Запісаць слой"
 
-msgid "Notes"
-msgstr ""
-
 msgid "Notes layer"
 msgstr ""
 
@@ -8679,9 +8720,6 @@ msgstr ""
 msgid "outside downloaded area"
 msgstr ""
 
-msgid "version {0}"
-msgstr ""
-
 msgid "Merging layers"
 msgstr ""
 
@@ -12309,6 +12347,15 @@ msgstr ""
 msgid "Open changeset expected. Got closed changeset with id {0}."
 msgstr ""
 
+msgid "Note upload failed"
+msgstr ""
+
+msgid "Error parsing note response from server"
+msgstr ""
+
+msgid "Error encoding string: {0}"
+msgstr ""
+
 msgid "(Code={0})"
 msgstr ""
 
@@ -12357,13 +12404,13 @@ msgstr ""
 msgid "Parsing changeset content ..."
 msgstr ""
 
-msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
-msgid "Illegal numeric value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
-msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal numeric value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
 msgid "Missing mandatory attribute ''{0}'' of XML element {1}."
@@ -13155,9 +13202,6 @@ msgstr ""
 msgid "Failed to scan file ''{0}'' for plugin information. Skipping."
 msgstr ""
 
-msgid "Processing plugin site cache icon files..."
-msgstr ""
-
 msgid "Processing plugin files..."
 msgstr ""
 
@@ -13176,12 +13220,6 @@ msgstr ""
 msgid "Details:"
 msgstr ""
 
-msgid "Plugin icons download error"
-msgstr ""
-
-msgid "JOSM failed to download plugin icons:"
-msgstr ""
-
 msgid ""
 "Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
 "plugin site ''{1}''."
@@ -14067,7 +14105,9 @@ msgid ""
 "Creating and handling address nodes and buildings within Czech Republic."
 msgstr ""
 
-msgid "Allows to import various file formats into JOSM directly."
+msgid ""
+"Allows to import various file formats into JOSM directly. Currently "
+"supported: TangoGPS, Garmin Trainings Center TCX."
 msgstr ""
 
 msgid "Download your GPX tracks from openstreetmap.org"
@@ -14164,6 +14204,11 @@ msgid "A helper for IRS satellite adjustment."
 msgstr ""
 
 msgid ""
+"Provides Java Native Access (JNA) library. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
+msgid ""
 "Provides Java Topology Suite (JTS) library and related utilities. Not meant "
 "to be installed directly by users, but rather as a dependency for other "
 "plugins."
@@ -14519,6 +14564,25 @@ msgstr ""
 msgid "Width (meters)"
 msgstr ""
 
+msgid "Sidewalk"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "both"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "left"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "right"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "no"
+msgstr ""
+
 msgid "Service type"
 msgstr ""
 
@@ -14883,15 +14947,19 @@ msgstr ""
 msgid "May-Sep 09:30-12:30,14:15-19:30"
 msgstr ""
 
+msgctxt "parking"
 msgid "multi-storey"
 msgstr ""
 
+msgctxt "parking"
 msgid "surface"
 msgstr ""
 
+msgctxt "parking"
 msgid "underground"
 msgstr ""
 
+msgctxt "parking"
 msgid "rooftop"
 msgstr ""
 
@@ -15349,15 +15417,26 @@ msgstr ""
 msgid "Overtaking"
 msgstr ""
 
+msgctxt "overtaking"
+msgid "yes"
+msgstr ""
+
+msgctxt "overtaking"
 msgid "both"
 msgstr ""
 
+msgctxt "overtaking"
 msgid "forward"
 msgstr ""
 
+msgctxt "overtaking"
 msgid "backward"
 msgstr ""
 
+msgctxt "overtaking"
+msgid "no"
+msgstr ""
+
 msgid "Roundabout"
 msgstr ""
 
@@ -15651,6 +15730,12 @@ msgstr ""
 msgid "tiger"
 msgstr ""
 
+msgid "Button operated"
+msgstr ""
+
+msgid "Sound signals"
+msgstr ""
+
 msgid "Crossing attendant"
 msgstr ""
 
@@ -16172,9 +16257,6 @@ msgstr ""
 msgid "Traffic lights"
 msgstr ""
 
-msgid "Sound signals"
-msgstr ""
-
 msgid "Barrier"
 msgstr ""
 
@@ -18234,6 +18316,9 @@ msgstr ""
 msgid "Gasometer"
 msgstr ""
 
+msgid "Bunker Silo"
+msgstr ""
+
 msgid "Pipeline"
 msgstr ""
 
@@ -18380,15 +18465,15 @@ msgstr ""
 msgid "Monitoring:"
 msgstr ""
 
-msgid "Weather"
-msgstr ""
-
 msgid "Water level"
 msgstr ""
 
 msgid "Tide Level"
 msgstr ""
 
+msgid "Groundwater"
+msgstr ""
+
 msgid "Traffic"
 msgstr ""
 
@@ -18407,6 +18492,9 @@ msgstr ""
 msgid "Galileo Signals"
 msgstr ""
 
+msgid "Weather"
+msgstr ""
+
 msgid "Radiation"
 msgstr ""
 
@@ -18587,6 +18675,9 @@ msgstr ""
 msgid "pivot_pier"
 msgstr ""
 
+msgid "Bridge outline"
+msgstr ""
+
 msgid "Power Plant"
 msgstr ""
 
@@ -19194,6 +19285,15 @@ msgstr ""
 msgid "Pole"
 msgstr ""
 
+msgid "Pole with Transformer"
+msgstr ""
+
+msgid "Pole Attributes:"
+msgstr ""
+
+msgid "Transformer Attributes:"
+msgstr ""
+
 msgid "Power Line"
 msgstr ""
 
@@ -19243,9 +19343,15 @@ msgstr ""
 msgid "Power Cable"
 msgstr ""
 
+msgctxt "power cable"
+msgid "underground"
+msgstr ""
+
+msgctxt "power cable"
 msgid "underwater"
 msgstr ""
 
+msgctxt "power cable"
 msgid "overground"
 msgstr ""
 
@@ -19273,6 +19379,33 @@ msgstr ""
 msgid "Memorial"
 msgstr ""
 
+msgctxt "memorial"
+msgid "statue"
+msgstr ""
+
+msgctxt "memorial"
+msgid "bust"
+msgstr ""
+
+msgctxt "memorial"
+msgid "plaque"
+msgstr ""
+
+msgctxt "memorial"
+msgid "stele"
+msgstr ""
+
+msgctxt "memorial"
+msgid "stone"
+msgstr ""
+
+msgctxt "memorial"
+msgid "war_memorial"
+msgstr ""
+
+msgid "Inscription"
+msgstr ""
+
 msgid "Wayside Cross"
 msgstr ""
 
@@ -19342,6 +19475,9 @@ msgstr ""
 msgid "Beverages"
 msgstr ""
 
+msgid "Wine"
+msgstr ""
+
 msgid "Boutique"
 msgstr ""
 
@@ -19387,6 +19523,9 @@ msgstr ""
 msgid "Video Games"
 msgstr ""
 
+msgid "Music"
+msgstr ""
+
 msgid "Cash"
 msgstr ""
 
@@ -19414,6 +19553,9 @@ msgstr ""
 msgid "Curtain"
 msgstr ""
 
+msgid "Art"
+msgstr ""
+
 msgid "Frame"
 msgstr ""
 
@@ -19459,6 +19601,9 @@ msgstr ""
 msgid "Beauty"
 msgstr ""
 
+msgid "Tattoo"
+msgstr ""
+
 msgid "Optician"
 msgstr ""
 
@@ -19510,6 +19655,9 @@ msgstr ""
 msgid "Pet"
 msgstr ""
 
+msgid "Funeral Directors"
+msgstr ""
+
 msgid "Vending Machine"
 msgstr ""
 
@@ -19609,6 +19757,15 @@ msgstr ""
 msgid "National Park"
 msgstr ""
 
+msgid "Protected Area"
+msgstr ""
+
+msgid "Protected Class"
+msgstr ""
+
+msgid "Title or type of protection"
+msgstr ""
+
 msgid "Places"
 msgstr ""
 
@@ -20685,7 +20842,13 @@ msgstr ""
 msgid "Estonia Ortho (Maaamet)"
 msgstr ""
 
-msgid "Estonia Multi (Maaamet)"
+msgid "Estonia Hillshade (Maaamet)"
+msgstr ""
+
+msgid "Estonia Cadastre (Maaamet)"
+msgstr ""
+
+msgid "Estonia Forestry (Maaamet)"
 msgstr ""
 
 msgid "Bordeaux - 2012"
@@ -20709,7 +20872,7 @@ msgstr ""
 msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
 msgstr ""
 
-msgid "CUGN Nancy - Orthophoto 2012"
+msgid "GrandNancy Orthophotographie 2012"
 msgstr ""
 
 msgid "Géobretagne - Brest 2010 - 10 cm"
@@ -20756,9 +20919,6 @@ msgid ""
 "- 1 m"
 msgstr ""
 
-msgid "Streets NRW Geofabrik.de"
-msgstr ""
-
 msgid "Hike & Bike"
 msgstr ""
 
@@ -20818,6 +20978,9 @@ msgstr ""
 msgid "NRW-Atlas: Topographische Karte 1:10000"
 msgstr ""
 
+msgid "Metropole Ruhr: Luftbilder (10 cm)"
+msgstr ""
+
 msgid "Drone Imagery (Haiti)"
 msgstr ""
 
@@ -21019,6 +21182,9 @@ msgstr ""
 msgid "Stadt Zürich Übersichtsplan (Strassen, Gebäude, Hausnummer)"
 msgstr ""
 
+msgid "Stadt Zürich Luftbild 2011"
+msgstr ""
+
 msgid "Orthofoto Kanton Solothurn RGB (SOGIS 2011/2012/2013)"
 msgstr ""
 
@@ -21037,7 +21203,7 @@ msgstr ""
 msgid "Canton de Fribourg 50cm (2005)"
 msgstr ""
 
-msgid "Stadt Bern 10cm/25cm (2008)"
+msgid "Stadt Bern 10cm/25cm (2012)"
 msgstr ""
 
 msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
@@ -21076,7 +21242,7 @@ msgstr ""
 msgid "OSM US TIGER 2012 Roads Overlay"
 msgstr ""
 
-msgid "New & Misaligned TIGER Roads (TIGER 2013)"
+msgid "New & Misaligned TIGER Roads (TIGER 2014)"
 msgstr ""
 
 msgid "MassGIS L3 Parcels"
@@ -21124,9 +21290,234 @@ msgstr ""
 msgid "NLS - Bartholomew Half Inch, 1897-1907"
 msgstr ""
 
+msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Annan 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgstr ""
+
 msgid "OS Town Plans, Cupar 1854 (NLS)"
 msgstr ""
 
+msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Elgin 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Forres 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Galashiels 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Girvan 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Greenock 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Haddington 1853 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Haddington 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Hamilton 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Irvine 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Jedburgh 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kelso 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Lanark 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Linlithgow 1856 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Musselburgh 1853 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Musselburgh 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Oban 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Peebles 1856 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Perth 1860 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Peterhead 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Selkirk 1865 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, St Andrews 1854 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, St Andrews 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stirling 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stonehaven 1864 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1847 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Strathaven 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wick 1872 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wigtown 1848 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wigtown 1894 (NLS)"
+msgstr ""
+
 msgid "Decreasing house numbers in addresses interpolation"
 msgstr ""
 
@@ -21180,17 +21571,37 @@ msgid "{0}={1} is deprecated. Please use instead a multipolygon."
 msgstr ""
 
 msgid ""
-"{0} is deprecated. Please specify ìnterval by using opening_hours syntax"
+"{0} is deprecated. Please specify interval by using opening_hours syntax"
 msgstr ""
 
 msgid ""
 "{0} is deprecated. Please delete this object and use a private layer instead"
 msgstr ""
 
-msgid "{0} on a node"
+msgid "{0}={1} is unspecific. Please replace ''{1}'' by a specific value."
 msgstr ""
 
-msgid "{0} on a node. Should be drawn as an area"
+msgid "{0} should be replaced with {1}"
+msgstr ""
+
+msgid ""
+"{0}={1} is unspecific. Please replace ''{1}'' by ''left'', ''right'' or "
+"''both''."
+msgstr ""
+
+msgid "{0} on a node. Should be used on a way."
+msgstr ""
+
+msgid "{0} on a node. Should be drawn as an area."
+msgstr ""
+
+msgid "{0}=* on a node. Should be used in a relation"
+msgstr ""
+
+msgid "{0} on a way. Should be used in a relation"
+msgstr ""
+
+msgid "{0} on a node"
 msgstr ""
 
 msgid "Building inside building"
@@ -25864,6 +26275,9 @@ msgstr ""
 msgid "Find"
 msgstr ""
 
+msgid "Show"
+msgstr ""
+
 msgid "Mark"
 msgstr ""
 
diff --git a/i18n/po/bg.po b/i18n/po/bg.po
index 5e3aae6..2d2abd9 100644
--- a/i18n/po/bg.po
+++ b/i18n/po/bg.po
@@ -1,17 +1,22 @@
+# Bulgarian translation for josm
+# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
+# This file is distributed under the same license as the josm package.
+# FIRST AUTHOR <EMAIL at ADDRESS>, 2009.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-21 03:38+0200\n"
-"PO-Revision-Date: 2014-03-09 08:52+0000\n"
-"Last-Translator: pl71 <Unknown>\n"
+"POT-Creation-Date: 2014-12-10 03:42+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"
 "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-10-21 04:42+0000\n"
-"X-Generator: Launchpad (build 17203)\n"
+"X-Launchpad-Export-Date: 2014-12-10 04:39+0000\n"
+"X-Generator: Launchpad (build 17283)\n"
 "Language: bg\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -52,7 +57,7 @@ msgstr ""
 "Отварянето на връзката не се поддържа на текущата платформа (''{0}'')"
 
 msgid "ERROR: {0}"
-msgstr ""
+msgstr "ГРЕШКА: {0}"
 
 msgid "WARNING: {0}"
 msgstr "ПРЕДУПРЕЖДЕНИЕ: {0}"
@@ -64,7 +69,7 @@ msgid "DEBUG: {0}"
 msgstr "DEBUG: {0}"
 
 msgid "Cause: "
-msgstr ""
+msgstr "Причина: "
 
 msgid "Executing platform startup hook"
 msgstr ""
@@ -114,6 +119,10 @@ msgid ""
 "can <ul><li>update your Java (JRE) or</li><li>use an earlier (Java {2} "
 "compatible) version of JOSM.</li></ul>More Info:"
 msgstr ""
+"<h2>JOSM изисква версия на Java {0}.</h2>Открита версия на Java : "
+"{1}.<br>Вие можете или<ul><li>да обновите Вашата Java (JRE) или</li><li>да "
+"използвате по-ранна версия на JOSM (съвместима с Java {2}).</li></ul>За "
+"повече информация:"
 
 msgid "Exit JOSM"
 msgstr "Изход от програмата"
@@ -170,16 +179,6 @@ msgid "About JOSM..."
 msgstr "За JOSM..."
 
 msgid ""
-"Unexpected format of API base URL. Redirection to info or history page for "
-"OSM object will probably fail. API base URL is: ''{0}''"
-msgstr ""
-
-msgid ""
-"Unexpected format of API base URL. Redirection to user page for OSM user "
-"will probably fail. API base URL is: ''{0}''"
-msgstr ""
-
-msgid ""
 "You are about to launch {0} browser window.<br>This may both clutter your "
 "screen with browser windows<br>and take some time to finish."
 msgid_plural ""
@@ -1593,6 +1592,15 @@ msgstr "Няма промени за качване."
 msgid "Nothing to upload. Get some data first."
 msgstr "Нищо за качване. Първо създайте някакви данни."
 
+msgid "Upload note changes to server"
+msgstr ""
+
+msgid "Upload notes"
+msgstr ""
+
+msgid "Uploading notes to server"
+msgstr ""
+
 msgid "Upload selection"
 msgstr "Качване на избраното"
 
@@ -1865,10 +1873,16 @@ msgstr ""
 msgid "Click the location where you wish to create a new note"
 msgstr ""
 
-msgid "Enter a comment for a new note"
+msgid "Create new note"
 msgstr ""
 
-msgid "Create new note"
+msgid "Create note"
+msgstr ""
+
+msgid "Enter a detailed comment to create a note"
+msgstr ""
+
+msgid "You must enter a comment to create a new note"
 msgstr ""
 
 msgid "Delete Mode"
@@ -2761,6 +2775,15 @@ msgstr "... се отнася за релация"
 msgid "Cycling dependencies"
 msgstr "Циклични зависимости"
 
+msgid "Uploading modified notes"
+msgstr ""
+
+msgid "Note {0} failed: {1}"
+msgstr ""
+
+msgid "Notes failed to upload"
+msgstr ""
+
 msgid ""
 "The following are results of automatic validation. Try fixing these, but be "
 "careful (don''t destroy valid data). When in doubt ignore them.<br>When you "
@@ -5020,6 +5043,12 @@ msgstr ""
 msgid "Conflict foreground: keep all tags"
 msgstr ""
 
+msgid "Conflict background: sum all numeric tags"
+msgstr ""
+
+msgid "Conflict foreground: sum all numeric tags"
+msgstr ""
+
 msgid "Conflict background: keep member"
 msgstr ""
 
@@ -5439,12 +5468,19 @@ msgstr "няма/никой"
 msgid "all"
 msgstr "всички"
 
+msgid "sum"
+msgstr ""
+
 msgid "Please decide which values to keep"
 msgstr ""
 
 msgid "Value ''{0}'' is going to be applied for key ''{1}''"
 msgstr ""
 
+msgid ""
+"All numeric values sumed as ''{0}'' are going to be applied for key ''{1}''"
+msgstr ""
+
 msgid "The key ''{0}'' and all its values are going to be removed"
 msgstr ""
 
@@ -5808,25 +5844,6 @@ msgstr[1] ""
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
 
-msgid "Display the history of all selected items."
-msgstr "Показване историята на всички избрани обекти."
-
-msgid "Object with history"
-msgstr "Обект с история"
-
-msgid "Reload"
-msgstr "Презареди"
-
-msgid "Reload all currently selected objects and refresh the list."
-msgstr ""
-"Презареждане на всички текущо избрани обекти и опресняване на списъка."
-
-msgid "Show"
-msgstr "Покажи"
-
-msgid "Display the history of the selected objects."
-msgstr "Показване историята на избраните елементи."
-
 msgid "Advanced object info"
 msgstr ""
 
@@ -6164,6 +6181,9 @@ msgstr ""
 msgid "Comment"
 msgstr ""
 
+msgid "Comment on note"
+msgstr ""
+
 msgid "Add comment to note:"
 msgstr ""
 
@@ -6173,9 +6193,6 @@ msgstr ""
 msgid "Close note with message:"
 msgstr ""
 
-msgid "Close Note"
-msgstr ""
-
 msgid "Create a new note"
 msgstr ""
 
@@ -6248,6 +6265,9 @@ msgstr "Текуща селекция"
 msgid "Search for objects"
 msgstr "Търсене на обекти"
 
+msgid "Display the history of the selected objects."
+msgstr "Показване историята на избраните елементи."
+
 msgid "Zoom to selection"
 msgstr "Мащабиране по селекцията"
 
@@ -6369,6 +6389,9 @@ msgstr "Поправяне на ({0}/{1}): ''{2}''"
 msgid "Updating map ..."
 msgstr ""
 
+msgid "anonymous"
+msgstr ""
+
 msgid "Display the basic properties of the changeset"
 msgstr ""
 
@@ -6381,6 +6404,12 @@ msgstr ""
 msgid "Display the objects created, updated, and deleted by the changeset"
 msgstr ""
 
+msgid "Discussion"
+msgstr ""
+
+msgid "Display the public discussion around this changeset"
+msgstr ""
+
 msgid "Changeset Management Dialog"
 msgstr ""
 
@@ -6438,9 +6467,6 @@ msgctxt "changeset.state"
 msgid "Closed"
 msgstr ""
 
-msgid "anonymous"
-msgstr ""
-
 msgid "ID"
 msgstr ""
 
@@ -6456,6 +6482,9 @@ msgstr ""
 msgid "Closed at"
 msgstr ""
 
+msgid "Discussions"
+msgstr ""
+
 msgid "Downloading changeset content"
 msgstr ""
 
@@ -6567,6 +6596,15 @@ msgid ""
 "layer"
 msgstr ""
 
+msgid "Update changeset discussion"
+msgstr ""
+
+msgid "Update the changeset discussion from the OSM server"
+msgstr ""
+
+msgid "Date"
+msgstr "Дата"
+
 msgid "Download changesets"
 msgstr ""
 
@@ -6984,7 +7022,7 @@ msgstr "Изберете стойност"
 msgid "Set number of recently added tags"
 msgstr ""
 
-msgid "Remember last used tags"
+msgid "Remember last used tags after a restart"
 msgstr ""
 
 msgid "Please enter the number of recently added tags to display"
@@ -7330,6 +7368,9 @@ msgstr "включително непосредствените наследни
 msgid "Load parent relations"
 msgstr "Зареди родителските релации"
 
+msgid "Reload"
+msgstr "Презареди"
+
 msgid "Loading parent relations"
 msgstr "Зареждане на родителските релации"
 
@@ -7454,6 +7495,12 @@ msgstr "Изходни GPS данни"
 msgid "Select to download GPS traces in the selected download area."
 msgstr ""
 
+msgid "Notes"
+msgstr "Банкноти"
+
+msgid "Select to download notes in the selected download area."
+msgstr ""
+
 msgid "Download as new layer"
 msgstr "Свали като нов слой"
 
@@ -7761,9 +7808,6 @@ msgstr ""
 msgid "B"
 msgstr ""
 
-msgid "Date"
-msgstr "Дата"
-
 msgid ""
 "Failed to update primitive with id {0} because current edit layer is null"
 msgstr ""
@@ -7827,7 +7871,7 @@ msgid "Changeset closed"
 msgstr "Пакета с изменения е затворен"
 
 msgid "Prepare conflict resolution"
-msgstr ""
+msgstr "Подготовка разрешаването на конфликт"
 
 msgid "Click to download all referring objects for {0}"
 msgstr ""
@@ -8647,9 +8691,6 @@ msgstr ""
 msgid "Save Layer"
 msgstr "Запис на слой"
 
-msgid "Notes"
-msgstr "Банкноти"
-
 msgid "Notes layer"
 msgstr ""
 
@@ -8665,9 +8706,6 @@ msgstr "Слой Данни {0}"
 msgid "outside downloaded area"
 msgstr "извън областта за сваляне"
 
-msgid "version {0}"
-msgstr "версия {0}"
-
 msgid "Merging layers"
 msgstr ""
 
@@ -12363,6 +12401,15 @@ msgstr ""
 msgid "Open changeset expected. Got closed changeset with id {0}."
 msgstr ""
 
+msgid "Note upload failed"
+msgstr ""
+
+msgid "Error parsing note response from server"
+msgstr ""
+
+msgid "Error encoding string: {0}"
+msgstr ""
+
 msgid "(Code={0})"
 msgstr "(Code={0})"
 
@@ -12411,13 +12458,13 @@ msgstr ""
 msgid "Parsing changeset content ..."
 msgstr ""
 
-msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
-msgid "Illegal numeric value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
-msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal numeric value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
 msgid "Missing mandatory attribute ''{0}'' of XML element {1}."
@@ -13222,9 +13269,6 @@ msgstr ""
 msgid "Failed to scan file ''{0}'' for plugin information. Skipping."
 msgstr ""
 
-msgid "Processing plugin site cache icon files..."
-msgstr ""
-
 msgid "Processing plugin files..."
 msgstr ""
 
@@ -13243,12 +13287,6 @@ msgstr ""
 msgid "Details:"
 msgstr ""
 
-msgid "Plugin icons download error"
-msgstr ""
-
-msgid "JOSM failed to download plugin icons:"
-msgstr ""
-
 msgid ""
 "Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
 "plugin site ''{1}''."
@@ -13828,7 +13866,7 @@ msgid "You must make your edits public to upload new data"
 msgstr "Трябва да направите редакциите си публични за да качвате нови данни"
 
 msgid "town"
-msgstr ""
+msgstr "град"
 
 msgctxt "landuse"
 msgid "forest"
@@ -14138,7 +14176,9 @@ msgid ""
 "Creating and handling address nodes and buildings within Czech Republic."
 msgstr ""
 
-msgid "Allows to import various file formats into JOSM directly."
+msgid ""
+"Allows to import various file formats into JOSM directly. Currently "
+"supported: TangoGPS, Garmin Trainings Center TCX."
 msgstr ""
 
 msgid "Download your GPX tracks from openstreetmap.org"
@@ -14240,6 +14280,11 @@ msgid "A helper for IRS satellite adjustment."
 msgstr ""
 
 msgid ""
+"Provides Java Native Access (JNA) library. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
+msgid ""
 "Provides Java Topology Suite (JTS) library and related utilities. Not meant "
 "to be installed directly by users, but rather as a dependency for other "
 "plugins."
@@ -14609,6 +14654,25 @@ msgstr "осветен(-а)"
 msgid "Width (meters)"
 msgstr "Ширина (метри)"
 
+msgid "Sidewalk"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "both"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "left"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "right"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "no"
+msgstr ""
+
 msgid "Service type"
 msgstr ""
 
@@ -14973,15 +15037,19 @@ msgstr ""
 msgid "May-Sep 09:30-12:30,14:15-19:30"
 msgstr ""
 
+msgctxt "parking"
 msgid "multi-storey"
-msgstr "на няколко нива"
+msgstr ""
 
+msgctxt "parking"
 msgid "surface"
-msgstr "наземен"
+msgstr ""
 
+msgctxt "parking"
 msgid "underground"
-msgstr "подземен"
+msgstr ""
 
+msgctxt "parking"
 msgid "rooftop"
 msgstr ""
 
@@ -15439,15 +15507,26 @@ msgstr ""
 msgid "Overtaking"
 msgstr ""
 
+msgctxt "overtaking"
+msgid "yes"
+msgstr ""
+
+msgctxt "overtaking"
 msgid "both"
 msgstr ""
 
+msgctxt "overtaking"
 msgid "forward"
 msgstr ""
 
+msgctxt "overtaking"
 msgid "backward"
 msgstr ""
 
+msgctxt "overtaking"
+msgid "no"
+msgstr ""
+
 msgid "Roundabout"
 msgstr "Кръгово движение"
 
@@ -15741,6 +15820,12 @@ msgstr "pegasus"
 msgid "tiger"
 msgstr "tiger"
 
+msgid "Button operated"
+msgstr ""
+
+msgid "Sound signals"
+msgstr ""
+
 msgid "Crossing attendant"
 msgstr "Помощник при пресъчане"
 
@@ -16262,9 +16347,6 @@ msgstr "Регулиран ЖП прелез"
 msgid "Traffic lights"
 msgstr ""
 
-msgid "Sound signals"
-msgstr ""
-
 msgid "Barrier"
 msgstr ""
 
@@ -18324,6 +18406,9 @@ msgstr "Мелница"
 msgid "Gasometer"
 msgstr "Газохранилище"
 
+msgid "Bunker Silo"
+msgstr ""
+
 msgid "Pipeline"
 msgstr "Тръбопровод"
 
@@ -18366,7 +18451,7 @@ msgid "air"
 msgstr ""
 
 msgid "Depth in meters"
-msgstr ""
+msgstr "Дълбочина в метри"
 
 msgid "Resource"
 msgstr ""
@@ -18402,22 +18487,22 @@ msgid "limestone"
 msgstr ""
 
 msgid "nickel"
-msgstr ""
+msgstr "никел"
 
 msgid "rutile"
 msgstr ""
 
 msgid "salt"
-msgstr ""
+msgstr "сол"
 
 msgid "silver"
-msgstr ""
+msgstr "сребро"
 
 msgid "tin"
-msgstr ""
+msgstr "олово"
 
 msgid "zinc"
-msgstr ""
+msgstr "цинк"
 
 msgid "zircon"
 msgstr ""
@@ -18470,15 +18555,15 @@ msgstr ""
 msgid "Monitoring:"
 msgstr ""
 
-msgid "Weather"
-msgstr ""
-
 msgid "Water level"
 msgstr ""
 
 msgid "Tide Level"
 msgstr ""
 
+msgid "Groundwater"
+msgstr ""
+
 msgid "Traffic"
 msgstr ""
 
@@ -18489,19 +18574,22 @@ msgid "Noise"
 msgstr ""
 
 msgid "GPS Signals"
-msgstr ""
+msgstr "GPS сигнали"
 
 msgid "GLONASS Signals"
-msgstr ""
+msgstr "GLONASS сигнали"
 
 msgid "Galileo Signals"
+msgstr "Galileo сигнали"
+
+msgid "Weather"
 msgstr ""
 
 msgid "Radiation"
-msgstr ""
+msgstr "Радиация"
 
 msgid "Seismic Activity"
-msgstr ""
+msgstr "Сеизмична активност"
 
 msgid "Recording:"
 msgstr ""
@@ -18528,35 +18616,35 @@ msgid "Survey Point"
 msgstr "Точка на наблюдение"
 
 msgid "Surveillance Camera"
-msgstr ""
+msgstr "Видео-наблюдение"
 
 msgid "indoor"
-msgstr ""
+msgstr "в сграда"
 
 msgid "outdoor"
-msgstr ""
+msgstr "извън сграда"
 
 msgid "Zone"
-msgstr ""
+msgstr "Зона"
 
 msgid "parking"
-msgstr ""
+msgstr "паркинг"
 
 msgid "traffic"
-msgstr ""
+msgstr "трафик"
 
 msgid "shop"
 msgstr "магазин"
 
 msgid "bank"
-msgstr ""
+msgstr "банка"
 
 msgid "Camera"
-msgstr ""
+msgstr "Камера"
 
 msgctxt "camera:type"
 msgid "fixed"
-msgstr ""
+msgstr "фиксирана"
 
 msgctxt "camera:type"
 msgid "panning"
@@ -18564,34 +18652,34 @@ msgstr ""
 
 msgctxt "camera:type"
 msgid "dome"
-msgstr ""
+msgstr "куполна"
 
 msgid "Mounted on"
-msgstr ""
+msgstr "Монтаж"
 
 msgctxt "camera:mount"
 msgid "wall"
-msgstr ""
+msgstr "стена"
 
 msgctxt "camera:mount"
 msgid "pole"
-msgstr ""
+msgstr "стълб"
 
 msgctxt "camera:mount"
 msgid "ceiling"
-msgstr ""
+msgstr "таван"
 
 msgid "Direction in degrees"
-msgstr ""
+msgstr "Посока (в градуси)"
 
 msgid "Inclination in degrees"
-msgstr ""
+msgstr "Наклон (в градуси)"
 
 msgid "Height in meter (m)"
 msgstr "Височина (м)"
 
 msgid "Bridges"
-msgstr ""
+msgstr "мостове"
 
 msgid "aqueduct"
 msgstr "акведукт"
@@ -18677,6 +18765,9 @@ msgstr ""
 msgid "pivot_pier"
 msgstr ""
 
+msgid "Bridge outline"
+msgstr ""
+
 msgid "Power Plant"
 msgstr ""
 
@@ -18693,7 +18784,7 @@ msgid "Generator Type"
 msgstr ""
 
 msgid "gas_turbine"
-msgstr ""
+msgstr "газова турбина"
 
 msgid "reciprocating_engine"
 msgstr ""
@@ -18702,13 +18793,13 @@ msgid "steam_generator"
 msgstr ""
 
 msgid "Biogas Power Generator"
-msgstr ""
+msgstr "Генератор на биогаз"
 
 msgid "Biomass Power Generator"
-msgstr ""
+msgstr "Генератор на биомаса"
 
 msgid "Method"
-msgstr ""
+msgstr "Метод"
 
 msgctxt "generator method"
 msgid "anaerobic_digestion"
@@ -18729,10 +18820,10 @@ msgid "anaerobic_digestion / combustion"
 msgstr ""
 
 msgid "pyrolysis"
-msgstr ""
+msgstr "пиролиза"
 
 msgid "combustion"
-msgstr ""
+msgstr "изгаряне"
 
 msgid "steam_turbine"
 msgstr ""
@@ -19284,6 +19375,15 @@ msgstr ""
 msgid "Pole"
 msgstr ""
 
+msgid "Pole with Transformer"
+msgstr ""
+
+msgid "Pole Attributes:"
+msgstr ""
+
+msgid "Transformer Attributes:"
+msgstr ""
+
 msgid "Power Line"
 msgstr "Линия за електропренос"
 
@@ -19333,9 +19433,15 @@ msgstr ""
 msgid "Power Cable"
 msgstr ""
 
+msgctxt "power cable"
+msgid "underground"
+msgstr ""
+
+msgctxt "power cable"
 msgid "underwater"
 msgstr ""
 
+msgctxt "power cable"
 msgid "overground"
 msgstr ""
 
@@ -19363,6 +19469,33 @@ msgstr "Забележителност"
 msgid "Memorial"
 msgstr "Паметник"
 
+msgctxt "memorial"
+msgid "statue"
+msgstr ""
+
+msgctxt "memorial"
+msgid "bust"
+msgstr ""
+
+msgctxt "memorial"
+msgid "plaque"
+msgstr ""
+
+msgctxt "memorial"
+msgid "stele"
+msgstr ""
+
+msgctxt "memorial"
+msgid "stone"
+msgstr ""
+
+msgctxt "memorial"
+msgid "war_memorial"
+msgstr ""
+
+msgid "Inscription"
+msgstr ""
+
 msgid "Wayside Cross"
 msgstr "Крайпътен кръст"
 
@@ -19432,6 +19565,9 @@ msgstr "Алкохол"
 msgid "Beverages"
 msgstr "Напитки"
 
+msgid "Wine"
+msgstr ""
+
 msgid "Boutique"
 msgstr ""
 
@@ -19477,6 +19613,9 @@ msgstr "Видео"
 msgid "Video Games"
 msgstr ""
 
+msgid "Music"
+msgstr ""
+
 msgid "Cash"
 msgstr "Пари"
 
@@ -19504,6 +19643,9 @@ msgstr ""
 msgid "Curtain"
 msgstr ""
 
+msgid "Art"
+msgstr ""
+
 msgid "Frame"
 msgstr ""
 
@@ -19549,6 +19691,9 @@ msgstr ""
 msgid "Beauty"
 msgstr ""
 
+msgid "Tattoo"
+msgstr ""
+
 msgid "Optician"
 msgstr "Оптика"
 
@@ -19600,6 +19745,9 @@ msgstr ""
 msgid "Pet"
 msgstr ""
 
+msgid "Funeral Directors"
+msgstr ""
+
 msgid "Vending Machine"
 msgstr ""
 
@@ -19699,6 +19847,15 @@ msgstr ""
 msgid "National Park"
 msgstr ""
 
+msgid "Protected Area"
+msgstr ""
+
+msgid "Protected Class"
+msgstr ""
+
+msgid "Title or type of protection"
+msgstr ""
+
 msgid "Places"
 msgstr "Места"
 
@@ -20775,7 +20932,13 @@ msgstr ""
 msgid "Estonia Ortho (Maaamet)"
 msgstr ""
 
-msgid "Estonia Multi (Maaamet)"
+msgid "Estonia Hillshade (Maaamet)"
+msgstr ""
+
+msgid "Estonia Cadastre (Maaamet)"
+msgstr ""
+
+msgid "Estonia Forestry (Maaamet)"
 msgstr ""
 
 msgid "Bordeaux - 2012"
@@ -20799,7 +20962,7 @@ msgstr ""
 msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
 msgstr ""
 
-msgid "CUGN Nancy - Orthophoto 2012"
+msgid "GrandNancy Orthophotographie 2012"
 msgstr ""
 
 msgid "Géobretagne - Brest 2010 - 10 cm"
@@ -20846,9 +21009,6 @@ msgid ""
 "- 1 m"
 msgstr ""
 
-msgid "Streets NRW Geofabrik.de"
-msgstr ""
-
 msgid "Hike & Bike"
 msgstr ""
 
@@ -20908,6 +21068,9 @@ msgstr ""
 msgid "NRW-Atlas: Topographische Karte 1:10000"
 msgstr ""
 
+msgid "Metropole Ruhr: Luftbilder (10 cm)"
+msgstr ""
+
 msgid "Drone Imagery (Haiti)"
 msgstr ""
 
@@ -21109,6 +21272,9 @@ msgstr ""
 msgid "Stadt Zürich Übersichtsplan (Strassen, Gebäude, Hausnummer)"
 msgstr ""
 
+msgid "Stadt Zürich Luftbild 2011"
+msgstr ""
+
 msgid "Orthofoto Kanton Solothurn RGB (SOGIS 2011/2012/2013)"
 msgstr ""
 
@@ -21127,7 +21293,7 @@ msgstr ""
 msgid "Canton de Fribourg 50cm (2005)"
 msgstr ""
 
-msgid "Stadt Bern 10cm/25cm (2008)"
+msgid "Stadt Bern 10cm/25cm (2012)"
 msgstr ""
 
 msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
@@ -21166,7 +21332,7 @@ msgstr ""
 msgid "OSM US TIGER 2012 Roads Overlay"
 msgstr ""
 
-msgid "New & Misaligned TIGER Roads (TIGER 2013)"
+msgid "New & Misaligned TIGER Roads (TIGER 2014)"
 msgstr ""
 
 msgid "MassGIS L3 Parcels"
@@ -21214,9 +21380,234 @@ msgstr ""
 msgid "NLS - Bartholomew Half Inch, 1897-1907"
 msgstr ""
 
+msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Annan 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgstr ""
+
 msgid "OS Town Plans, Cupar 1854 (NLS)"
 msgstr ""
 
+msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Elgin 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Forres 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Galashiels 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Girvan 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Greenock 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Haddington 1853 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Haddington 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Hamilton 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Irvine 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Jedburgh 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kelso 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Lanark 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Linlithgow 1856 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Musselburgh 1853 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Musselburgh 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Oban 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Peebles 1856 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Perth 1860 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Peterhead 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Selkirk 1865 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, St Andrews 1854 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, St Andrews 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stirling 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stonehaven 1864 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1847 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Strathaven 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wick 1872 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wigtown 1848 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wigtown 1894 (NLS)"
+msgstr ""
+
 msgid "Decreasing house numbers in addresses interpolation"
 msgstr ""
 
@@ -21270,17 +21661,37 @@ msgid "{0}={1} is deprecated. Please use instead a multipolygon."
 msgstr ""
 
 msgid ""
-"{0} is deprecated. Please specify ìnterval by using opening_hours syntax"
+"{0} is deprecated. Please specify interval by using opening_hours syntax"
 msgstr ""
 
 msgid ""
 "{0} is deprecated. Please delete this object and use a private layer instead"
 msgstr ""
 
-msgid "{0} on a node"
+msgid "{0}={1} is unspecific. Please replace ''{1}'' by a specific value."
 msgstr ""
 
-msgid "{0} on a node. Should be drawn as an area"
+msgid "{0} should be replaced with {1}"
+msgstr ""
+
+msgid ""
+"{0}={1} is unspecific. Please replace ''{1}'' by ''left'', ''right'' or "
+"''both''."
+msgstr ""
+
+msgid "{0} on a node. Should be used on a way."
+msgstr ""
+
+msgid "{0} on a node. Should be drawn as an area."
+msgstr ""
+
+msgid "{0}=* on a node. Should be used in a relation"
+msgstr ""
+
+msgid "{0} on a way. Should be used in a relation"
+msgstr ""
+
+msgid "{0} on a node"
 msgstr ""
 
 msgid "Building inside building"
@@ -21885,7 +22296,7 @@ msgstr ""
 
 msgctxt "address"
 msgid "City"
-msgstr ""
+msgstr "Град"
 
 msgid "Postcode"
 msgstr ""
@@ -26000,6 +26411,9 @@ msgstr ""
 msgid "Find"
 msgstr ""
 
+msgid "Show"
+msgstr "Покажи"
+
 msgid "Mark"
 msgstr ""
 
diff --git a/i18n/po/bn.po b/i18n/po/bn.po
index 632d515..6c68e41 100644
--- a/i18n/po/bn.po
+++ b/i18n/po/bn.po
@@ -1,8 +1,13 @@
+# Bengali translation for josm
+# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
+# This file is distributed under the same license as the josm package.
+# FIRST AUTHOR <EMAIL at ADDRESS>, 2009.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-21 03:38+0200\n"
+"POT-Creation-Date: 2014-12-10 03:42+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"
@@ -10,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-10-21 04:39+0000\n"
-"X-Generator: Launchpad (build 17203)\n"
+"X-Launchpad-Export-Date: 2014-12-10 04:37+0000\n"
+"X-Generator: Launchpad (build 17283)\n"
 "Language: bn\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -168,16 +173,6 @@ msgid "About JOSM..."
 msgstr "JOSMএর সম্বন্ধে।"
 
 msgid ""
-"Unexpected format of API base URL. Redirection to info or history page for "
-"OSM object will probably fail. API base URL is: ''{0}''"
-msgstr ""
-
-msgid ""
-"Unexpected format of API base URL. Redirection to user page for OSM user "
-"will probably fail. API base URL is: ''{0}''"
-msgstr ""
-
-msgid ""
 "You are about to launch {0} browser window.<br>This may both clutter your "
 "screen with browser windows<br>and take some time to finish."
 msgid_plural ""
@@ -1522,6 +1517,15 @@ msgstr ""
 msgid "Nothing to upload. Get some data first."
 msgstr ""
 
+msgid "Upload note changes to server"
+msgstr ""
+
+msgid "Upload notes"
+msgstr ""
+
+msgid "Uploading notes to server"
+msgstr ""
+
 msgid "Upload selection"
 msgstr ""
 
@@ -1794,10 +1798,16 @@ msgstr ""
 msgid "Click the location where you wish to create a new note"
 msgstr ""
 
-msgid "Enter a comment for a new note"
+msgid "Create new note"
 msgstr ""
 
-msgid "Create new note"
+msgid "Create note"
+msgstr ""
+
+msgid "Enter a detailed comment to create a note"
+msgstr ""
+
+msgid "You must enter a comment to create a new note"
 msgstr ""
 
 msgid "Delete Mode"
@@ -2668,6 +2678,15 @@ msgstr ""
 msgid "Cycling dependencies"
 msgstr ""
 
+msgid "Uploading modified notes"
+msgstr ""
+
+msgid "Note {0} failed: {1}"
+msgstr ""
+
+msgid "Notes failed to upload"
+msgstr ""
+
 msgid ""
 "The following are results of automatic validation. Try fixing these, but be "
 "careful (don''t destroy valid data). When in doubt ignore them.<br>When you "
@@ -4897,6 +4916,12 @@ msgstr ""
 msgid "Conflict foreground: keep all tags"
 msgstr ""
 
+msgid "Conflict background: sum all numeric tags"
+msgstr ""
+
+msgid "Conflict foreground: sum all numeric tags"
+msgstr ""
+
 msgid "Conflict background: keep member"
 msgstr ""
 
@@ -5315,12 +5340,19 @@ msgstr ""
 msgid "all"
 msgstr ""
 
+msgid "sum"
+msgstr ""
+
 msgid "Please decide which values to keep"
 msgstr ""
 
 msgid "Value ''{0}'' is going to be applied for key ''{1}''"
 msgstr ""
 
+msgid ""
+"All numeric values sumed as ''{0}'' are going to be applied for key ''{1}''"
+msgstr ""
+
 msgid "The key ''{0}'' and all its values are going to be removed"
 msgstr ""
 
@@ -5683,24 +5715,6 @@ msgstr[1] ""
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
 
-msgid "Display the history of all selected items."
-msgstr ""
-
-msgid "Object with history"
-msgstr ""
-
-msgid "Reload"
-msgstr ""
-
-msgid "Reload all currently selected objects and refresh the list."
-msgstr ""
-
-msgid "Show"
-msgstr ""
-
-msgid "Display the history of the selected objects."
-msgstr ""
-
 msgid "Advanced object info"
 msgstr ""
 
@@ -6038,6 +6052,9 @@ msgstr ""
 msgid "Comment"
 msgstr ""
 
+msgid "Comment on note"
+msgstr ""
+
 msgid "Add comment to note:"
 msgstr ""
 
@@ -6047,9 +6064,6 @@ msgstr ""
 msgid "Close note with message:"
 msgstr ""
 
-msgid "Close Note"
-msgstr ""
-
 msgid "Create a new note"
 msgstr ""
 
@@ -6122,6 +6136,9 @@ msgstr ""
 msgid "Search for objects"
 msgstr ""
 
+msgid "Display the history of the selected objects."
+msgstr ""
+
 msgid "Zoom to selection"
 msgstr ""
 
@@ -6241,6 +6258,9 @@ msgstr ""
 msgid "Updating map ..."
 msgstr ""
 
+msgid "anonymous"
+msgstr ""
+
 msgid "Display the basic properties of the changeset"
 msgstr ""
 
@@ -6253,6 +6273,12 @@ msgstr ""
 msgid "Display the objects created, updated, and deleted by the changeset"
 msgstr ""
 
+msgid "Discussion"
+msgstr ""
+
+msgid "Display the public discussion around this changeset"
+msgstr ""
+
 msgid "Changeset Management Dialog"
 msgstr ""
 
@@ -6310,9 +6336,6 @@ msgctxt "changeset.state"
 msgid "Closed"
 msgstr ""
 
-msgid "anonymous"
-msgstr ""
-
 msgid "ID"
 msgstr ""
 
@@ -6328,6 +6351,9 @@ msgstr ""
 msgid "Closed at"
 msgstr ""
 
+msgid "Discussions"
+msgstr ""
+
 msgid "Downloading changeset content"
 msgstr ""
 
@@ -6439,6 +6465,15 @@ msgid ""
 "layer"
 msgstr ""
 
+msgid "Update changeset discussion"
+msgstr ""
+
+msgid "Update the changeset discussion from the OSM server"
+msgstr ""
+
+msgid "Date"
+msgstr ""
+
 msgid "Download changesets"
 msgstr ""
 
@@ -6856,7 +6891,7 @@ msgstr ""
 msgid "Set number of recently added tags"
 msgstr ""
 
-msgid "Remember last used tags"
+msgid "Remember last used tags after a restart"
 msgstr ""
 
 msgid "Please enter the number of recently added tags to display"
@@ -7202,6 +7237,9 @@ msgstr ""
 msgid "Load parent relations"
 msgstr ""
 
+msgid "Reload"
+msgstr ""
+
 msgid "Loading parent relations"
 msgstr ""
 
@@ -7324,6 +7362,12 @@ msgstr ""
 msgid "Select to download GPS traces in the selected download area."
 msgstr ""
 
+msgid "Notes"
+msgstr ""
+
+msgid "Select to download notes in the selected download area."
+msgstr ""
+
 msgid "Download as new layer"
 msgstr ""
 
@@ -7629,9 +7673,6 @@ msgstr ""
 msgid "B"
 msgstr ""
 
-msgid "Date"
-msgstr ""
-
 msgid ""
 "Failed to update primitive with id {0} because current edit layer is null"
 msgstr ""
@@ -8486,9 +8527,6 @@ msgstr ""
 msgid "Save Layer"
 msgstr ""
 
-msgid "Notes"
-msgstr ""
-
 msgid "Notes layer"
 msgstr ""
 
@@ -8504,9 +8542,6 @@ msgstr ""
 msgid "outside downloaded area"
 msgstr ""
 
-msgid "version {0}"
-msgstr ""
-
 msgid "Merging layers"
 msgstr ""
 
@@ -12132,6 +12167,15 @@ msgstr ""
 msgid "Open changeset expected. Got closed changeset with id {0}."
 msgstr ""
 
+msgid "Note upload failed"
+msgstr ""
+
+msgid "Error parsing note response from server"
+msgstr ""
+
+msgid "Error encoding string: {0}"
+msgstr ""
+
 msgid "(Code={0})"
 msgstr ""
 
@@ -12180,13 +12224,13 @@ msgstr ""
 msgid "Parsing changeset content ..."
 msgstr ""
 
-msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
-msgid "Illegal numeric value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
-msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal numeric value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
 msgid "Missing mandatory attribute ''{0}'' of XML element {1}."
@@ -12978,9 +13022,6 @@ msgstr ""
 msgid "Failed to scan file ''{0}'' for plugin information. Skipping."
 msgstr ""
 
-msgid "Processing plugin site cache icon files..."
-msgstr ""
-
 msgid "Processing plugin files..."
 msgstr ""
 
@@ -12999,12 +13040,6 @@ msgstr ""
 msgid "Details:"
 msgstr ""
 
-msgid "Plugin icons download error"
-msgstr ""
-
-msgid "JOSM failed to download plugin icons:"
-msgstr ""
-
 msgid ""
 "Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
 "plugin site ''{1}''."
@@ -13890,7 +13925,9 @@ msgid ""
 "Creating and handling address nodes and buildings within Czech Republic."
 msgstr ""
 
-msgid "Allows to import various file formats into JOSM directly."
+msgid ""
+"Allows to import various file formats into JOSM directly. Currently "
+"supported: TangoGPS, Garmin Trainings Center TCX."
 msgstr ""
 
 msgid "Download your GPX tracks from openstreetmap.org"
@@ -13987,6 +14024,11 @@ msgid "A helper for IRS satellite adjustment."
 msgstr ""
 
 msgid ""
+"Provides Java Native Access (JNA) library. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
+msgid ""
 "Provides Java Topology Suite (JTS) library and related utilities. Not meant "
 "to be installed directly by users, but rather as a dependency for other "
 "plugins."
@@ -14342,6 +14384,25 @@ msgstr ""
 msgid "Width (meters)"
 msgstr ""
 
+msgid "Sidewalk"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "both"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "left"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "right"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "no"
+msgstr ""
+
 msgid "Service type"
 msgstr ""
 
@@ -14706,15 +14767,19 @@ msgstr ""
 msgid "May-Sep 09:30-12:30,14:15-19:30"
 msgstr ""
 
+msgctxt "parking"
 msgid "multi-storey"
 msgstr ""
 
+msgctxt "parking"
 msgid "surface"
 msgstr ""
 
+msgctxt "parking"
 msgid "underground"
 msgstr ""
 
+msgctxt "parking"
 msgid "rooftop"
 msgstr ""
 
@@ -15172,15 +15237,26 @@ msgstr ""
 msgid "Overtaking"
 msgstr ""
 
+msgctxt "overtaking"
+msgid "yes"
+msgstr ""
+
+msgctxt "overtaking"
 msgid "both"
 msgstr ""
 
+msgctxt "overtaking"
 msgid "forward"
 msgstr ""
 
+msgctxt "overtaking"
 msgid "backward"
 msgstr ""
 
+msgctxt "overtaking"
+msgid "no"
+msgstr ""
+
 msgid "Roundabout"
 msgstr ""
 
@@ -15474,6 +15550,12 @@ msgstr ""
 msgid "tiger"
 msgstr ""
 
+msgid "Button operated"
+msgstr ""
+
+msgid "Sound signals"
+msgstr ""
+
 msgid "Crossing attendant"
 msgstr ""
 
@@ -15995,9 +16077,6 @@ msgstr ""
 msgid "Traffic lights"
 msgstr ""
 
-msgid "Sound signals"
-msgstr ""
-
 msgid "Barrier"
 msgstr ""
 
@@ -18057,6 +18136,9 @@ msgstr ""
 msgid "Gasometer"
 msgstr ""
 
+msgid "Bunker Silo"
+msgstr ""
+
 msgid "Pipeline"
 msgstr ""
 
@@ -18203,15 +18285,15 @@ msgstr ""
 msgid "Monitoring:"
 msgstr ""
 
-msgid "Weather"
-msgstr ""
-
 msgid "Water level"
 msgstr ""
 
 msgid "Tide Level"
 msgstr ""
 
+msgid "Groundwater"
+msgstr ""
+
 msgid "Traffic"
 msgstr ""
 
@@ -18230,6 +18312,9 @@ msgstr ""
 msgid "Galileo Signals"
 msgstr ""
 
+msgid "Weather"
+msgstr ""
+
 msgid "Radiation"
 msgstr ""
 
@@ -18410,6 +18495,9 @@ msgstr ""
 msgid "pivot_pier"
 msgstr ""
 
+msgid "Bridge outline"
+msgstr ""
+
 msgid "Power Plant"
 msgstr ""
 
@@ -19017,6 +19105,15 @@ msgstr ""
 msgid "Pole"
 msgstr ""
 
+msgid "Pole with Transformer"
+msgstr ""
+
+msgid "Pole Attributes:"
+msgstr ""
+
+msgid "Transformer Attributes:"
+msgstr ""
+
 msgid "Power Line"
 msgstr ""
 
@@ -19066,9 +19163,15 @@ msgstr ""
 msgid "Power Cable"
 msgstr ""
 
+msgctxt "power cable"
+msgid "underground"
+msgstr ""
+
+msgctxt "power cable"
 msgid "underwater"
 msgstr ""
 
+msgctxt "power cable"
 msgid "overground"
 msgstr ""
 
@@ -19096,6 +19199,33 @@ msgstr ""
 msgid "Memorial"
 msgstr ""
 
+msgctxt "memorial"
+msgid "statue"
+msgstr ""
+
+msgctxt "memorial"
+msgid "bust"
+msgstr ""
+
+msgctxt "memorial"
+msgid "plaque"
+msgstr ""
+
+msgctxt "memorial"
+msgid "stele"
+msgstr ""
+
+msgctxt "memorial"
+msgid "stone"
+msgstr ""
+
+msgctxt "memorial"
+msgid "war_memorial"
+msgstr ""
+
+msgid "Inscription"
+msgstr ""
+
 msgid "Wayside Cross"
 msgstr ""
 
@@ -19165,6 +19295,9 @@ msgstr ""
 msgid "Beverages"
 msgstr ""
 
+msgid "Wine"
+msgstr ""
+
 msgid "Boutique"
 msgstr ""
 
@@ -19210,6 +19343,9 @@ msgstr ""
 msgid "Video Games"
 msgstr ""
 
+msgid "Music"
+msgstr ""
+
 msgid "Cash"
 msgstr ""
 
@@ -19237,6 +19373,9 @@ msgstr ""
 msgid "Curtain"
 msgstr ""
 
+msgid "Art"
+msgstr ""
+
 msgid "Frame"
 msgstr ""
 
@@ -19282,6 +19421,9 @@ msgstr ""
 msgid "Beauty"
 msgstr ""
 
+msgid "Tattoo"
+msgstr ""
+
 msgid "Optician"
 msgstr ""
 
@@ -19333,6 +19475,9 @@ msgstr ""
 msgid "Pet"
 msgstr ""
 
+msgid "Funeral Directors"
+msgstr ""
+
 msgid "Vending Machine"
 msgstr ""
 
@@ -19432,6 +19577,15 @@ msgstr ""
 msgid "National Park"
 msgstr ""
 
+msgid "Protected Area"
+msgstr ""
+
+msgid "Protected Class"
+msgstr ""
+
+msgid "Title or type of protection"
+msgstr ""
+
 msgid "Places"
 msgstr ""
 
@@ -20508,7 +20662,13 @@ msgstr ""
 msgid "Estonia Ortho (Maaamet)"
 msgstr ""
 
-msgid "Estonia Multi (Maaamet)"
+msgid "Estonia Hillshade (Maaamet)"
+msgstr ""
+
+msgid "Estonia Cadastre (Maaamet)"
+msgstr ""
+
+msgid "Estonia Forestry (Maaamet)"
 msgstr ""
 
 msgid "Bordeaux - 2012"
@@ -20532,7 +20692,7 @@ msgstr ""
 msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
 msgstr ""
 
-msgid "CUGN Nancy - Orthophoto 2012"
+msgid "GrandNancy Orthophotographie 2012"
 msgstr ""
 
 msgid "Géobretagne - Brest 2010 - 10 cm"
@@ -20579,9 +20739,6 @@ msgid ""
 "- 1 m"
 msgstr ""
 
-msgid "Streets NRW Geofabrik.de"
-msgstr ""
-
 msgid "Hike & Bike"
 msgstr ""
 
@@ -20641,6 +20798,9 @@ msgstr ""
 msgid "NRW-Atlas: Topographische Karte 1:10000"
 msgstr ""
 
+msgid "Metropole Ruhr: Luftbilder (10 cm)"
+msgstr ""
+
 msgid "Drone Imagery (Haiti)"
 msgstr ""
 
@@ -20842,6 +21002,9 @@ msgstr ""
 msgid "Stadt Zürich Übersichtsplan (Strassen, Gebäude, Hausnummer)"
 msgstr ""
 
+msgid "Stadt Zürich Luftbild 2011"
+msgstr ""
+
 msgid "Orthofoto Kanton Solothurn RGB (SOGIS 2011/2012/2013)"
 msgstr ""
 
@@ -20860,7 +21023,7 @@ msgstr ""
 msgid "Canton de Fribourg 50cm (2005)"
 msgstr ""
 
-msgid "Stadt Bern 10cm/25cm (2008)"
+msgid "Stadt Bern 10cm/25cm (2012)"
 msgstr ""
 
 msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
@@ -20899,7 +21062,7 @@ msgstr ""
 msgid "OSM US TIGER 2012 Roads Overlay"
 msgstr ""
 
-msgid "New & Misaligned TIGER Roads (TIGER 2013)"
+msgid "New & Misaligned TIGER Roads (TIGER 2014)"
 msgstr ""
 
 msgid "MassGIS L3 Parcels"
@@ -20947,9 +21110,234 @@ msgstr ""
 msgid "NLS - Bartholomew Half Inch, 1897-1907"
 msgstr ""
 
+msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Annan 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgstr ""
+
 msgid "OS Town Plans, Cupar 1854 (NLS)"
 msgstr ""
 
+msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Elgin 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Forres 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Galashiels 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Girvan 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Greenock 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Haddington 1853 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Haddington 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Hamilton 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Irvine 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Jedburgh 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kelso 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Lanark 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Linlithgow 1856 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Musselburgh 1853 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Musselburgh 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Oban 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Peebles 1856 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Perth 1860 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Peterhead 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Selkirk 1865 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, St Andrews 1854 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, St Andrews 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stirling 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stonehaven 1864 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1847 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Strathaven 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wick 1872 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wigtown 1848 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wigtown 1894 (NLS)"
+msgstr ""
+
 msgid "Decreasing house numbers in addresses interpolation"
 msgstr ""
 
@@ -21003,17 +21391,37 @@ msgid "{0}={1} is deprecated. Please use instead a multipolygon."
 msgstr ""
 
 msgid ""
-"{0} is deprecated. Please specify ìnterval by using opening_hours syntax"
+"{0} is deprecated. Please specify interval by using opening_hours syntax"
 msgstr ""
 
 msgid ""
 "{0} is deprecated. Please delete this object and use a private layer instead"
 msgstr ""
 
-msgid "{0} on a node"
+msgid "{0}={1} is unspecific. Please replace ''{1}'' by a specific value."
 msgstr ""
 
-msgid "{0} on a node. Should be drawn as an area"
+msgid "{0} should be replaced with {1}"
+msgstr ""
+
+msgid ""
+"{0}={1} is unspecific. Please replace ''{1}'' by ''left'', ''right'' or "
+"''both''."
+msgstr ""
+
+msgid "{0} on a node. Should be used on a way."
+msgstr ""
+
+msgid "{0} on a node. Should be drawn as an area."
+msgstr ""
+
+msgid "{0}=* on a node. Should be used in a relation"
+msgstr ""
+
+msgid "{0} on a way. Should be used in a relation"
+msgstr ""
+
+msgid "{0} on a node"
 msgstr ""
 
 msgid "Building inside building"
@@ -25683,6 +26091,9 @@ msgstr ""
 msgid "Find"
 msgstr ""
 
+msgid "Show"
+msgstr ""
+
 msgid "Mark"
 msgstr ""
 
diff --git a/i18n/po/br.po b/i18n/po/br.po
index 7494629..9decd39 100644
--- a/i18n/po/br.po
+++ b/i18n/po/br.po
@@ -1,8 +1,13 @@
+# Breton translation for josm
+# Copyright (c) 2008 Rosetta Contributors and Canonical Ltd 2008
+# This file is distributed under the same license as the josm package.
+# FIRST AUTHOR <EMAIL at ADDRESS>, 2008.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-21 03:38+0200\n"
+"POT-Creation-Date: 2014-12-10 03:42+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"
@@ -10,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-10-21 04:41+0000\n"
-"X-Generator: Launchpad (build 17203)\n"
+"X-Launchpad-Export-Date: 2014-12-10 04:39+0000\n"
+"X-Generator: Launchpad (build 17283)\n"
 "Language: br\n"
 
 msgid "License"
@@ -168,16 +173,6 @@ msgid "About JOSM..."
 msgstr "Diwar-benn JOSM"
 
 msgid ""
-"Unexpected format of API base URL. Redirection to info or history page for "
-"OSM object will probably fail. API base URL is: ''{0}''"
-msgstr ""
-
-msgid ""
-"Unexpected format of API base URL. Redirection to user page for OSM user "
-"will probably fail. API base URL is: ''{0}''"
-msgstr ""
-
-msgid ""
 "You are about to launch {0} browser window.<br>This may both clutter your "
 "screen with browser windows<br>and take some time to finish."
 msgid_plural ""
@@ -1519,6 +1514,15 @@ msgstr ""
 msgid "Nothing to upload. Get some data first."
 msgstr ""
 
+msgid "Upload note changes to server"
+msgstr ""
+
+msgid "Upload notes"
+msgstr ""
+
+msgid "Uploading notes to server"
+msgstr ""
+
 msgid "Upload selection"
 msgstr ""
 
@@ -1791,10 +1795,16 @@ msgstr ""
 msgid "Click the location where you wish to create a new note"
 msgstr ""
 
-msgid "Enter a comment for a new note"
+msgid "Create new note"
 msgstr ""
 
-msgid "Create new note"
+msgid "Create note"
+msgstr ""
+
+msgid "Enter a detailed comment to create a note"
+msgstr ""
+
+msgid "You must enter a comment to create a new note"
 msgstr ""
 
 msgid "Delete Mode"
@@ -2665,6 +2675,15 @@ msgstr ""
 msgid "Cycling dependencies"
 msgstr ""
 
+msgid "Uploading modified notes"
+msgstr ""
+
+msgid "Note {0} failed: {1}"
+msgstr ""
+
+msgid "Notes failed to upload"
+msgstr ""
+
 msgid ""
 "The following are results of automatic validation. Try fixing these, but be "
 "careful (don''t destroy valid data). When in doubt ignore them.<br>When you "
@@ -4894,6 +4913,12 @@ msgstr ""
 msgid "Conflict foreground: keep all tags"
 msgstr ""
 
+msgid "Conflict background: sum all numeric tags"
+msgstr ""
+
+msgid "Conflict foreground: sum all numeric tags"
+msgstr ""
+
 msgid "Conflict background: keep member"
 msgstr ""
 
@@ -5312,12 +5337,19 @@ msgstr ""
 msgid "all"
 msgstr ""
 
+msgid "sum"
+msgstr ""
+
 msgid "Please decide which values to keep"
 msgstr ""
 
 msgid "Value ''{0}'' is going to be applied for key ''{1}''"
 msgstr ""
 
+msgid ""
+"All numeric values sumed as ''{0}'' are going to be applied for key ''{1}''"
+msgstr ""
+
 msgid "The key ''{0}'' and all its values are going to be removed"
 msgstr ""
 
@@ -5680,24 +5712,6 @@ msgstr[1] ""
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
 
-msgid "Display the history of all selected items."
-msgstr ""
-
-msgid "Object with history"
-msgstr ""
-
-msgid "Reload"
-msgstr ""
-
-msgid "Reload all currently selected objects and refresh the list."
-msgstr ""
-
-msgid "Show"
-msgstr ""
-
-msgid "Display the history of the selected objects."
-msgstr ""
-
 msgid "Advanced object info"
 msgstr ""
 
@@ -6035,6 +6049,9 @@ msgstr ""
 msgid "Comment"
 msgstr ""
 
+msgid "Comment on note"
+msgstr ""
+
 msgid "Add comment to note:"
 msgstr ""
 
@@ -6044,9 +6061,6 @@ msgstr ""
 msgid "Close note with message:"
 msgstr ""
 
-msgid "Close Note"
-msgstr ""
-
 msgid "Create a new note"
 msgstr ""
 
@@ -6119,6 +6133,9 @@ msgstr ""
 msgid "Search for objects"
 msgstr ""
 
+msgid "Display the history of the selected objects."
+msgstr ""
+
 msgid "Zoom to selection"
 msgstr ""
 
@@ -6238,6 +6255,9 @@ msgstr ""
 msgid "Updating map ..."
 msgstr ""
 
+msgid "anonymous"
+msgstr ""
+
 msgid "Display the basic properties of the changeset"
 msgstr ""
 
@@ -6250,6 +6270,12 @@ msgstr ""
 msgid "Display the objects created, updated, and deleted by the changeset"
 msgstr ""
 
+msgid "Discussion"
+msgstr ""
+
+msgid "Display the public discussion around this changeset"
+msgstr ""
+
 msgid "Changeset Management Dialog"
 msgstr ""
 
@@ -6307,9 +6333,6 @@ msgctxt "changeset.state"
 msgid "Closed"
 msgstr ""
 
-msgid "anonymous"
-msgstr ""
-
 msgid "ID"
 msgstr ""
 
@@ -6325,6 +6348,9 @@ msgstr ""
 msgid "Closed at"
 msgstr ""
 
+msgid "Discussions"
+msgstr ""
+
 msgid "Downloading changeset content"
 msgstr ""
 
@@ -6436,6 +6462,15 @@ msgid ""
 "layer"
 msgstr ""
 
+msgid "Update changeset discussion"
+msgstr ""
+
+msgid "Update the changeset discussion from the OSM server"
+msgstr ""
+
+msgid "Date"
+msgstr ""
+
 msgid "Download changesets"
 msgstr ""
 
@@ -6853,7 +6888,7 @@ msgstr ""
 msgid "Set number of recently added tags"
 msgstr ""
 
-msgid "Remember last used tags"
+msgid "Remember last used tags after a restart"
 msgstr ""
 
 msgid "Please enter the number of recently added tags to display"
@@ -7199,6 +7234,9 @@ msgstr ""
 msgid "Load parent relations"
 msgstr ""
 
+msgid "Reload"
+msgstr ""
+
 msgid "Loading parent relations"
 msgstr ""
 
@@ -7321,6 +7359,12 @@ msgstr ""
 msgid "Select to download GPS traces in the selected download area."
 msgstr ""
 
+msgid "Notes"
+msgstr ""
+
+msgid "Select to download notes in the selected download area."
+msgstr ""
+
 msgid "Download as new layer"
 msgstr ""
 
@@ -7626,9 +7670,6 @@ msgstr ""
 msgid "B"
 msgstr ""
 
-msgid "Date"
-msgstr ""
-
 msgid ""
 "Failed to update primitive with id {0} because current edit layer is null"
 msgstr ""
@@ -8483,9 +8524,6 @@ msgstr ""
 msgid "Save Layer"
 msgstr ""
 
-msgid "Notes"
-msgstr ""
-
 msgid "Notes layer"
 msgstr ""
 
@@ -8501,9 +8539,6 @@ msgstr ""
 msgid "outside downloaded area"
 msgstr ""
 
-msgid "version {0}"
-msgstr ""
-
 msgid "Merging layers"
 msgstr ""
 
@@ -12129,6 +12164,15 @@ msgstr ""
 msgid "Open changeset expected. Got closed changeset with id {0}."
 msgstr ""
 
+msgid "Note upload failed"
+msgstr ""
+
+msgid "Error parsing note response from server"
+msgstr ""
+
+msgid "Error encoding string: {0}"
+msgstr ""
+
 msgid "(Code={0})"
 msgstr ""
 
@@ -12177,13 +12221,13 @@ msgstr ""
 msgid "Parsing changeset content ..."
 msgstr ""
 
-msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
-msgid "Illegal numeric value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
-msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal numeric value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
 msgid "Missing mandatory attribute ''{0}'' of XML element {1}."
@@ -12975,9 +13019,6 @@ msgstr ""
 msgid "Failed to scan file ''{0}'' for plugin information. Skipping."
 msgstr ""
 
-msgid "Processing plugin site cache icon files..."
-msgstr ""
-
 msgid "Processing plugin files..."
 msgstr ""
 
@@ -12996,12 +13037,6 @@ msgstr ""
 msgid "Details:"
 msgstr ""
 
-msgid "Plugin icons download error"
-msgstr ""
-
-msgid "JOSM failed to download plugin icons:"
-msgstr ""
-
 msgid ""
 "Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
 "plugin site ''{1}''."
@@ -13887,7 +13922,9 @@ msgid ""
 "Creating and handling address nodes and buildings within Czech Republic."
 msgstr ""
 
-msgid "Allows to import various file formats into JOSM directly."
+msgid ""
+"Allows to import various file formats into JOSM directly. Currently "
+"supported: TangoGPS, Garmin Trainings Center TCX."
 msgstr ""
 
 msgid "Download your GPX tracks from openstreetmap.org"
@@ -13984,6 +14021,11 @@ msgid "A helper for IRS satellite adjustment."
 msgstr ""
 
 msgid ""
+"Provides Java Native Access (JNA) library. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
+msgid ""
 "Provides Java Topology Suite (JTS) library and related utilities. Not meant "
 "to be installed directly by users, but rather as a dependency for other "
 "plugins."
@@ -14339,6 +14381,25 @@ msgstr ""
 msgid "Width (meters)"
 msgstr ""
 
+msgid "Sidewalk"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "both"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "left"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "right"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "no"
+msgstr ""
+
 msgid "Service type"
 msgstr ""
 
@@ -14703,15 +14764,19 @@ msgstr ""
 msgid "May-Sep 09:30-12:30,14:15-19:30"
 msgstr ""
 
+msgctxt "parking"
 msgid "multi-storey"
 msgstr ""
 
+msgctxt "parking"
 msgid "surface"
 msgstr ""
 
+msgctxt "parking"
 msgid "underground"
 msgstr ""
 
+msgctxt "parking"
 msgid "rooftop"
 msgstr ""
 
@@ -15169,15 +15234,26 @@ msgstr ""
 msgid "Overtaking"
 msgstr ""
 
+msgctxt "overtaking"
+msgid "yes"
+msgstr ""
+
+msgctxt "overtaking"
 msgid "both"
 msgstr ""
 
+msgctxt "overtaking"
 msgid "forward"
 msgstr ""
 
+msgctxt "overtaking"
 msgid "backward"
 msgstr ""
 
+msgctxt "overtaking"
+msgid "no"
+msgstr ""
+
 msgid "Roundabout"
 msgstr ""
 
@@ -15471,6 +15547,12 @@ msgstr ""
 msgid "tiger"
 msgstr ""
 
+msgid "Button operated"
+msgstr ""
+
+msgid "Sound signals"
+msgstr ""
+
 msgid "Crossing attendant"
 msgstr ""
 
@@ -15992,9 +16074,6 @@ msgstr ""
 msgid "Traffic lights"
 msgstr ""
 
-msgid "Sound signals"
-msgstr ""
-
 msgid "Barrier"
 msgstr ""
 
@@ -18054,6 +18133,9 @@ msgstr ""
 msgid "Gasometer"
 msgstr ""
 
+msgid "Bunker Silo"
+msgstr ""
+
 msgid "Pipeline"
 msgstr ""
 
@@ -18200,15 +18282,15 @@ msgstr ""
 msgid "Monitoring:"
 msgstr ""
 
-msgid "Weather"
-msgstr ""
-
 msgid "Water level"
 msgstr ""
 
 msgid "Tide Level"
 msgstr ""
 
+msgid "Groundwater"
+msgstr ""
+
 msgid "Traffic"
 msgstr ""
 
@@ -18227,6 +18309,9 @@ msgstr ""
 msgid "Galileo Signals"
 msgstr ""
 
+msgid "Weather"
+msgstr ""
+
 msgid "Radiation"
 msgstr ""
 
@@ -18407,6 +18492,9 @@ msgstr ""
 msgid "pivot_pier"
 msgstr ""
 
+msgid "Bridge outline"
+msgstr ""
+
 msgid "Power Plant"
 msgstr ""
 
@@ -19014,6 +19102,15 @@ msgstr ""
 msgid "Pole"
 msgstr ""
 
+msgid "Pole with Transformer"
+msgstr ""
+
+msgid "Pole Attributes:"
+msgstr ""
+
+msgid "Transformer Attributes:"
+msgstr ""
+
 msgid "Power Line"
 msgstr ""
 
@@ -19063,9 +19160,15 @@ msgstr ""
 msgid "Power Cable"
 msgstr ""
 
+msgctxt "power cable"
+msgid "underground"
+msgstr ""
+
+msgctxt "power cable"
 msgid "underwater"
 msgstr ""
 
+msgctxt "power cable"
 msgid "overground"
 msgstr ""
 
@@ -19093,6 +19196,33 @@ msgstr ""
 msgid "Memorial"
 msgstr ""
 
+msgctxt "memorial"
+msgid "statue"
+msgstr ""
+
+msgctxt "memorial"
+msgid "bust"
+msgstr ""
+
+msgctxt "memorial"
+msgid "plaque"
+msgstr ""
+
+msgctxt "memorial"
+msgid "stele"
+msgstr ""
+
+msgctxt "memorial"
+msgid "stone"
+msgstr ""
+
+msgctxt "memorial"
+msgid "war_memorial"
+msgstr ""
+
+msgid "Inscription"
+msgstr ""
+
 msgid "Wayside Cross"
 msgstr ""
 
@@ -19162,6 +19292,9 @@ msgstr ""
 msgid "Beverages"
 msgstr ""
 
+msgid "Wine"
+msgstr ""
+
 msgid "Boutique"
 msgstr ""
 
@@ -19207,6 +19340,9 @@ msgstr ""
 msgid "Video Games"
 msgstr ""
 
+msgid "Music"
+msgstr ""
+
 msgid "Cash"
 msgstr ""
 
@@ -19234,6 +19370,9 @@ msgstr ""
 msgid "Curtain"
 msgstr ""
 
+msgid "Art"
+msgstr ""
+
 msgid "Frame"
 msgstr ""
 
@@ -19279,6 +19418,9 @@ msgstr ""
 msgid "Beauty"
 msgstr ""
 
+msgid "Tattoo"
+msgstr ""
+
 msgid "Optician"
 msgstr ""
 
@@ -19330,6 +19472,9 @@ msgstr ""
 msgid "Pet"
 msgstr ""
 
+msgid "Funeral Directors"
+msgstr ""
+
 msgid "Vending Machine"
 msgstr ""
 
@@ -19429,6 +19574,15 @@ msgstr ""
 msgid "National Park"
 msgstr ""
 
+msgid "Protected Area"
+msgstr ""
+
+msgid "Protected Class"
+msgstr ""
+
+msgid "Title or type of protection"
+msgstr ""
+
 msgid "Places"
 msgstr ""
 
@@ -20505,7 +20659,13 @@ msgstr ""
 msgid "Estonia Ortho (Maaamet)"
 msgstr ""
 
-msgid "Estonia Multi (Maaamet)"
+msgid "Estonia Hillshade (Maaamet)"
+msgstr ""
+
+msgid "Estonia Cadastre (Maaamet)"
+msgstr ""
+
+msgid "Estonia Forestry (Maaamet)"
 msgstr ""
 
 msgid "Bordeaux - 2012"
@@ -20529,7 +20689,7 @@ msgstr ""
 msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
 msgstr ""
 
-msgid "CUGN Nancy - Orthophoto 2012"
+msgid "GrandNancy Orthophotographie 2012"
 msgstr ""
 
 msgid "Géobretagne - Brest 2010 - 10 cm"
@@ -20576,9 +20736,6 @@ msgid ""
 "- 1 m"
 msgstr ""
 
-msgid "Streets NRW Geofabrik.de"
-msgstr ""
-
 msgid "Hike & Bike"
 msgstr ""
 
@@ -20638,6 +20795,9 @@ msgstr ""
 msgid "NRW-Atlas: Topographische Karte 1:10000"
 msgstr ""
 
+msgid "Metropole Ruhr: Luftbilder (10 cm)"
+msgstr ""
+
 msgid "Drone Imagery (Haiti)"
 msgstr ""
 
@@ -20839,6 +20999,9 @@ msgstr ""
 msgid "Stadt Zürich Übersichtsplan (Strassen, Gebäude, Hausnummer)"
 msgstr ""
 
+msgid "Stadt Zürich Luftbild 2011"
+msgstr ""
+
 msgid "Orthofoto Kanton Solothurn RGB (SOGIS 2011/2012/2013)"
 msgstr ""
 
@@ -20857,7 +21020,7 @@ msgstr ""
 msgid "Canton de Fribourg 50cm (2005)"
 msgstr ""
 
-msgid "Stadt Bern 10cm/25cm (2008)"
+msgid "Stadt Bern 10cm/25cm (2012)"
 msgstr ""
 
 msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
@@ -20896,7 +21059,7 @@ msgstr ""
 msgid "OSM US TIGER 2012 Roads Overlay"
 msgstr ""
 
-msgid "New & Misaligned TIGER Roads (TIGER 2013)"
+msgid "New & Misaligned TIGER Roads (TIGER 2014)"
 msgstr ""
 
 msgid "MassGIS L3 Parcels"
@@ -20944,9 +21107,234 @@ msgstr ""
 msgid "NLS - Bartholomew Half Inch, 1897-1907"
 msgstr ""
 
+msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Annan 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgstr ""
+
 msgid "OS Town Plans, Cupar 1854 (NLS)"
 msgstr ""
 
+msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Elgin 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Forres 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Galashiels 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Girvan 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Greenock 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Haddington 1853 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Haddington 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Hamilton 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Irvine 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Jedburgh 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kelso 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Lanark 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Linlithgow 1856 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Musselburgh 1853 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Musselburgh 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Oban 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Peebles 1856 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Perth 1860 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Peterhead 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Selkirk 1865 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, St Andrews 1854 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, St Andrews 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stirling 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stonehaven 1864 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1847 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Strathaven 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wick 1872 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wigtown 1848 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wigtown 1894 (NLS)"
+msgstr ""
+
 msgid "Decreasing house numbers in addresses interpolation"
 msgstr ""
 
@@ -21000,17 +21388,37 @@ msgid "{0}={1} is deprecated. Please use instead a multipolygon."
 msgstr ""
 
 msgid ""
-"{0} is deprecated. Please specify ìnterval by using opening_hours syntax"
+"{0} is deprecated. Please specify interval by using opening_hours syntax"
 msgstr ""
 
 msgid ""
 "{0} is deprecated. Please delete this object and use a private layer instead"
 msgstr ""
 
-msgid "{0} on a node"
+msgid "{0}={1} is unspecific. Please replace ''{1}'' by a specific value."
 msgstr ""
 
-msgid "{0} on a node. Should be drawn as an area"
+msgid "{0} should be replaced with {1}"
+msgstr ""
+
+msgid ""
+"{0}={1} is unspecific. Please replace ''{1}'' by ''left'', ''right'' or "
+"''both''."
+msgstr ""
+
+msgid "{0} on a node. Should be used on a way."
+msgstr ""
+
+msgid "{0} on a node. Should be drawn as an area."
+msgstr ""
+
+msgid "{0}=* on a node. Should be used in a relation"
+msgstr ""
+
+msgid "{0} on a way. Should be used in a relation"
+msgstr ""
+
+msgid "{0} on a node"
 msgstr ""
 
 msgid "Building inside building"
@@ -25680,6 +26088,9 @@ msgstr ""
 msgid "Find"
 msgstr ""
 
+msgid "Show"
+msgstr ""
+
 msgid "Mark"
 msgstr ""
 
diff --git a/i18n/po/bs.po b/i18n/po/bs.po
index 14a6d5a..768d2ca 100644
--- a/i18n/po/bs.po
+++ b/i18n/po/bs.po
@@ -1,8 +1,13 @@
+# Bosnian translation for josm
+# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
+# This file is distributed under the same license as the josm package.
+# FIRST AUTHOR <EMAIL at ADDRESS>, 2009.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-21 03:38+0200\n"
+"POT-Creation-Date: 2014-12-10 03:42+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"
@@ -11,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-10-21 04:40+0000\n"
-"X-Generator: Launchpad (build 17203)\n"
+"X-Launchpad-Export-Date: 2014-12-10 04:38+0000\n"
+"X-Generator: Launchpad (build 17283)\n"
 "Language: bs\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -169,16 +174,6 @@ msgid "About JOSM..."
 msgstr "O JOSM-u..."
 
 msgid ""
-"Unexpected format of API base URL. Redirection to info or history page for "
-"OSM object will probably fail. API base URL is: ''{0}''"
-msgstr ""
-
-msgid ""
-"Unexpected format of API base URL. Redirection to user page for OSM user "
-"will probably fail. API base URL is: ''{0}''"
-msgstr ""
-
-msgid ""
 "You are about to launch {0} browser window.<br>This may both clutter your "
 "screen with browser windows<br>and take some time to finish."
 msgid_plural ""
@@ -1522,6 +1517,15 @@ msgstr ""
 msgid "Nothing to upload. Get some data first."
 msgstr ""
 
+msgid "Upload note changes to server"
+msgstr ""
+
+msgid "Upload notes"
+msgstr ""
+
+msgid "Uploading notes to server"
+msgstr ""
+
 msgid "Upload selection"
 msgstr ""
 
@@ -1794,10 +1798,16 @@ msgstr ""
 msgid "Click the location where you wish to create a new note"
 msgstr ""
 
-msgid "Enter a comment for a new note"
+msgid "Create new note"
 msgstr ""
 
-msgid "Create new note"
+msgid "Create note"
+msgstr ""
+
+msgid "Enter a detailed comment to create a note"
+msgstr ""
+
+msgid "You must enter a comment to create a new note"
 msgstr ""
 
 msgid "Delete Mode"
@@ -2668,6 +2678,15 @@ msgstr ""
 msgid "Cycling dependencies"
 msgstr ""
 
+msgid "Uploading modified notes"
+msgstr ""
+
+msgid "Note {0} failed: {1}"
+msgstr ""
+
+msgid "Notes failed to upload"
+msgstr ""
+
 msgid ""
 "The following are results of automatic validation. Try fixing these, but be "
 "careful (don''t destroy valid data). When in doubt ignore them.<br>When you "
@@ -4897,6 +4916,12 @@ msgstr ""
 msgid "Conflict foreground: keep all tags"
 msgstr ""
 
+msgid "Conflict background: sum all numeric tags"
+msgstr ""
+
+msgid "Conflict foreground: sum all numeric tags"
+msgstr ""
+
 msgid "Conflict background: keep member"
 msgstr ""
 
@@ -5315,12 +5340,19 @@ msgstr ""
 msgid "all"
 msgstr ""
 
+msgid "sum"
+msgstr ""
+
 msgid "Please decide which values to keep"
 msgstr ""
 
 msgid "Value ''{0}'' is going to be applied for key ''{1}''"
 msgstr ""
 
+msgid ""
+"All numeric values sumed as ''{0}'' are going to be applied for key ''{1}''"
+msgstr ""
+
 msgid "The key ''{0}'' and all its values are going to be removed"
 msgstr ""
 
@@ -5683,24 +5715,6 @@ msgstr[1] ""
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
 
-msgid "Display the history of all selected items."
-msgstr ""
-
-msgid "Object with history"
-msgstr ""
-
-msgid "Reload"
-msgstr "Ponovo učitaj"
-
-msgid "Reload all currently selected objects and refresh the list."
-msgstr ""
-
-msgid "Show"
-msgstr ""
-
-msgid "Display the history of the selected objects."
-msgstr ""
-
 msgid "Advanced object info"
 msgstr ""
 
@@ -6038,6 +6052,9 @@ msgstr ""
 msgid "Comment"
 msgstr ""
 
+msgid "Comment on note"
+msgstr ""
+
 msgid "Add comment to note:"
 msgstr ""
 
@@ -6047,9 +6064,6 @@ msgstr ""
 msgid "Close note with message:"
 msgstr ""
 
-msgid "Close Note"
-msgstr ""
-
 msgid "Create a new note"
 msgstr ""
 
@@ -6122,6 +6136,9 @@ msgstr ""
 msgid "Search for objects"
 msgstr ""
 
+msgid "Display the history of the selected objects."
+msgstr ""
+
 msgid "Zoom to selection"
 msgstr ""
 
@@ -6241,6 +6258,9 @@ msgstr ""
 msgid "Updating map ..."
 msgstr ""
 
+msgid "anonymous"
+msgstr ""
+
 msgid "Display the basic properties of the changeset"
 msgstr ""
 
@@ -6253,6 +6273,12 @@ msgstr ""
 msgid "Display the objects created, updated, and deleted by the changeset"
 msgstr ""
 
+msgid "Discussion"
+msgstr ""
+
+msgid "Display the public discussion around this changeset"
+msgstr ""
+
 msgid "Changeset Management Dialog"
 msgstr ""
 
@@ -6310,9 +6336,6 @@ msgctxt "changeset.state"
 msgid "Closed"
 msgstr ""
 
-msgid "anonymous"
-msgstr ""
-
 msgid "ID"
 msgstr ""
 
@@ -6328,6 +6351,9 @@ msgstr ""
 msgid "Closed at"
 msgstr ""
 
+msgid "Discussions"
+msgstr ""
+
 msgid "Downloading changeset content"
 msgstr ""
 
@@ -6439,6 +6465,15 @@ msgid ""
 "layer"
 msgstr ""
 
+msgid "Update changeset discussion"
+msgstr ""
+
+msgid "Update the changeset discussion from the OSM server"
+msgstr ""
+
+msgid "Date"
+msgstr ""
+
 msgid "Download changesets"
 msgstr ""
 
@@ -6856,7 +6891,7 @@ msgstr ""
 msgid "Set number of recently added tags"
 msgstr ""
 
-msgid "Remember last used tags"
+msgid "Remember last used tags after a restart"
 msgstr ""
 
 msgid "Please enter the number of recently added tags to display"
@@ -7202,6 +7237,9 @@ msgstr ""
 msgid "Load parent relations"
 msgstr ""
 
+msgid "Reload"
+msgstr "Ponovo učitaj"
+
 msgid "Loading parent relations"
 msgstr ""
 
@@ -7324,6 +7362,12 @@ msgstr ""
 msgid "Select to download GPS traces in the selected download area."
 msgstr ""
 
+msgid "Notes"
+msgstr ""
+
+msgid "Select to download notes in the selected download area."
+msgstr ""
+
 msgid "Download as new layer"
 msgstr ""
 
@@ -7629,9 +7673,6 @@ msgstr ""
 msgid "B"
 msgstr ""
 
-msgid "Date"
-msgstr ""
-
 msgid ""
 "Failed to update primitive with id {0} because current edit layer is null"
 msgstr ""
@@ -8486,9 +8527,6 @@ msgstr ""
 msgid "Save Layer"
 msgstr ""
 
-msgid "Notes"
-msgstr ""
-
 msgid "Notes layer"
 msgstr ""
 
@@ -8504,9 +8542,6 @@ msgstr ""
 msgid "outside downloaded area"
 msgstr ""
 
-msgid "version {0}"
-msgstr ""
-
 msgid "Merging layers"
 msgstr ""
 
@@ -12132,6 +12167,15 @@ msgstr ""
 msgid "Open changeset expected. Got closed changeset with id {0}."
 msgstr ""
 
+msgid "Note upload failed"
+msgstr ""
+
+msgid "Error parsing note response from server"
+msgstr ""
+
+msgid "Error encoding string: {0}"
+msgstr ""
+
 msgid "(Code={0})"
 msgstr ""
 
@@ -12180,13 +12224,13 @@ msgstr ""
 msgid "Parsing changeset content ..."
 msgstr ""
 
-msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
-msgid "Illegal numeric value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
-msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal numeric value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
 msgid "Missing mandatory attribute ''{0}'' of XML element {1}."
@@ -12978,9 +13022,6 @@ msgstr ""
 msgid "Failed to scan file ''{0}'' for plugin information. Skipping."
 msgstr ""
 
-msgid "Processing plugin site cache icon files..."
-msgstr ""
-
 msgid "Processing plugin files..."
 msgstr ""
 
@@ -12999,12 +13040,6 @@ msgstr ""
 msgid "Details:"
 msgstr ""
 
-msgid "Plugin icons download error"
-msgstr ""
-
-msgid "JOSM failed to download plugin icons:"
-msgstr ""
-
 msgid ""
 "Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
 "plugin site ''{1}''."
@@ -13890,7 +13925,9 @@ msgid ""
 "Creating and handling address nodes and buildings within Czech Republic."
 msgstr ""
 
-msgid "Allows to import various file formats into JOSM directly."
+msgid ""
+"Allows to import various file formats into JOSM directly. Currently "
+"supported: TangoGPS, Garmin Trainings Center TCX."
 msgstr ""
 
 msgid "Download your GPX tracks from openstreetmap.org"
@@ -13987,6 +14024,11 @@ msgid "A helper for IRS satellite adjustment."
 msgstr ""
 
 msgid ""
+"Provides Java Native Access (JNA) library. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
+msgid ""
 "Provides Java Topology Suite (JTS) library and related utilities. Not meant "
 "to be installed directly by users, but rather as a dependency for other "
 "plugins."
@@ -14342,6 +14384,25 @@ msgstr ""
 msgid "Width (meters)"
 msgstr ""
 
+msgid "Sidewalk"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "both"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "left"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "right"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "no"
+msgstr ""
+
 msgid "Service type"
 msgstr ""
 
@@ -14706,15 +14767,19 @@ msgstr ""
 msgid "May-Sep 09:30-12:30,14:15-19:30"
 msgstr ""
 
+msgctxt "parking"
 msgid "multi-storey"
 msgstr ""
 
+msgctxt "parking"
 msgid "surface"
 msgstr ""
 
+msgctxt "parking"
 msgid "underground"
 msgstr ""
 
+msgctxt "parking"
 msgid "rooftop"
 msgstr ""
 
@@ -15172,15 +15237,26 @@ msgstr ""
 msgid "Overtaking"
 msgstr ""
 
+msgctxt "overtaking"
+msgid "yes"
+msgstr ""
+
+msgctxt "overtaking"
 msgid "both"
 msgstr ""
 
+msgctxt "overtaking"
 msgid "forward"
 msgstr ""
 
+msgctxt "overtaking"
 msgid "backward"
 msgstr ""
 
+msgctxt "overtaking"
+msgid "no"
+msgstr ""
+
 msgid "Roundabout"
 msgstr ""
 
@@ -15474,6 +15550,12 @@ msgstr ""
 msgid "tiger"
 msgstr ""
 
+msgid "Button operated"
+msgstr ""
+
+msgid "Sound signals"
+msgstr ""
+
 msgid "Crossing attendant"
 msgstr ""
 
@@ -15995,9 +16077,6 @@ msgstr ""
 msgid "Traffic lights"
 msgstr ""
 
-msgid "Sound signals"
-msgstr ""
-
 msgid "Barrier"
 msgstr ""
 
@@ -18057,6 +18136,9 @@ msgstr ""
 msgid "Gasometer"
 msgstr ""
 
+msgid "Bunker Silo"
+msgstr ""
+
 msgid "Pipeline"
 msgstr ""
 
@@ -18203,15 +18285,15 @@ msgstr ""
 msgid "Monitoring:"
 msgstr ""
 
-msgid "Weather"
-msgstr ""
-
 msgid "Water level"
 msgstr ""
 
 msgid "Tide Level"
 msgstr ""
 
+msgid "Groundwater"
+msgstr ""
+
 msgid "Traffic"
 msgstr ""
 
@@ -18230,6 +18312,9 @@ msgstr ""
 msgid "Galileo Signals"
 msgstr ""
 
+msgid "Weather"
+msgstr ""
+
 msgid "Radiation"
 msgstr ""
 
@@ -18410,6 +18495,9 @@ msgstr ""
 msgid "pivot_pier"
 msgstr ""
 
+msgid "Bridge outline"
+msgstr ""
+
 msgid "Power Plant"
 msgstr ""
 
@@ -19017,6 +19105,15 @@ msgstr ""
 msgid "Pole"
 msgstr ""
 
+msgid "Pole with Transformer"
+msgstr ""
+
+msgid "Pole Attributes:"
+msgstr ""
+
+msgid "Transformer Attributes:"
+msgstr ""
+
 msgid "Power Line"
 msgstr ""
 
@@ -19066,9 +19163,15 @@ msgstr ""
 msgid "Power Cable"
 msgstr ""
 
+msgctxt "power cable"
+msgid "underground"
+msgstr ""
+
+msgctxt "power cable"
 msgid "underwater"
 msgstr ""
 
+msgctxt "power cable"
 msgid "overground"
 msgstr ""
 
@@ -19096,6 +19199,33 @@ msgstr ""
 msgid "Memorial"
 msgstr ""
 
+msgctxt "memorial"
+msgid "statue"
+msgstr ""
+
+msgctxt "memorial"
+msgid "bust"
+msgstr ""
+
+msgctxt "memorial"
+msgid "plaque"
+msgstr ""
+
+msgctxt "memorial"
+msgid "stele"
+msgstr ""
+
+msgctxt "memorial"
+msgid "stone"
+msgstr ""
+
+msgctxt "memorial"
+msgid "war_memorial"
+msgstr ""
+
+msgid "Inscription"
+msgstr ""
+
 msgid "Wayside Cross"
 msgstr ""
 
@@ -19165,6 +19295,9 @@ msgstr ""
 msgid "Beverages"
 msgstr ""
 
+msgid "Wine"
+msgstr ""
+
 msgid "Boutique"
 msgstr ""
 
@@ -19210,6 +19343,9 @@ msgstr ""
 msgid "Video Games"
 msgstr ""
 
+msgid "Music"
+msgstr ""
+
 msgid "Cash"
 msgstr ""
 
@@ -19237,6 +19373,9 @@ msgstr ""
 msgid "Curtain"
 msgstr ""
 
+msgid "Art"
+msgstr ""
+
 msgid "Frame"
 msgstr ""
 
@@ -19282,6 +19421,9 @@ msgstr ""
 msgid "Beauty"
 msgstr ""
 
+msgid "Tattoo"
+msgstr ""
+
 msgid "Optician"
 msgstr ""
 
@@ -19333,6 +19475,9 @@ msgstr ""
 msgid "Pet"
 msgstr ""
 
+msgid "Funeral Directors"
+msgstr ""
+
 msgid "Vending Machine"
 msgstr ""
 
@@ -19432,6 +19577,15 @@ msgstr ""
 msgid "National Park"
 msgstr ""
 
+msgid "Protected Area"
+msgstr ""
+
+msgid "Protected Class"
+msgstr ""
+
+msgid "Title or type of protection"
+msgstr ""
+
 msgid "Places"
 msgstr ""
 
@@ -20508,7 +20662,13 @@ msgstr ""
 msgid "Estonia Ortho (Maaamet)"
 msgstr ""
 
-msgid "Estonia Multi (Maaamet)"
+msgid "Estonia Hillshade (Maaamet)"
+msgstr ""
+
+msgid "Estonia Cadastre (Maaamet)"
+msgstr ""
+
+msgid "Estonia Forestry (Maaamet)"
 msgstr ""
 
 msgid "Bordeaux - 2012"
@@ -20532,7 +20692,7 @@ msgstr ""
 msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
 msgstr ""
 
-msgid "CUGN Nancy - Orthophoto 2012"
+msgid "GrandNancy Orthophotographie 2012"
 msgstr ""
 
 msgid "Géobretagne - Brest 2010 - 10 cm"
@@ -20579,9 +20739,6 @@ msgid ""
 "- 1 m"
 msgstr ""
 
-msgid "Streets NRW Geofabrik.de"
-msgstr ""
-
 msgid "Hike & Bike"
 msgstr ""
 
@@ -20641,6 +20798,9 @@ msgstr ""
 msgid "NRW-Atlas: Topographische Karte 1:10000"
 msgstr ""
 
+msgid "Metropole Ruhr: Luftbilder (10 cm)"
+msgstr ""
+
 msgid "Drone Imagery (Haiti)"
 msgstr ""
 
@@ -20842,6 +21002,9 @@ msgstr ""
 msgid "Stadt Zürich Übersichtsplan (Strassen, Gebäude, Hausnummer)"
 msgstr ""
 
+msgid "Stadt Zürich Luftbild 2011"
+msgstr ""
+
 msgid "Orthofoto Kanton Solothurn RGB (SOGIS 2011/2012/2013)"
 msgstr ""
 
@@ -20860,7 +21023,7 @@ msgstr ""
 msgid "Canton de Fribourg 50cm (2005)"
 msgstr ""
 
-msgid "Stadt Bern 10cm/25cm (2008)"
+msgid "Stadt Bern 10cm/25cm (2012)"
 msgstr ""
 
 msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
@@ -20899,7 +21062,7 @@ msgstr ""
 msgid "OSM US TIGER 2012 Roads Overlay"
 msgstr ""
 
-msgid "New & Misaligned TIGER Roads (TIGER 2013)"
+msgid "New & Misaligned TIGER Roads (TIGER 2014)"
 msgstr ""
 
 msgid "MassGIS L3 Parcels"
@@ -20947,9 +21110,234 @@ msgstr ""
 msgid "NLS - Bartholomew Half Inch, 1897-1907"
 msgstr ""
 
+msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Annan 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgstr ""
+
 msgid "OS Town Plans, Cupar 1854 (NLS)"
 msgstr ""
 
+msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Elgin 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Forres 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Galashiels 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Girvan 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Greenock 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Haddington 1853 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Haddington 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Hamilton 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Irvine 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Jedburgh 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kelso 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Lanark 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Linlithgow 1856 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Musselburgh 1853 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Musselburgh 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Oban 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Peebles 1856 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Perth 1860 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Peterhead 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Selkirk 1865 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, St Andrews 1854 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, St Andrews 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stirling 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stonehaven 1864 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1847 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Strathaven 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wick 1872 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wigtown 1848 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wigtown 1894 (NLS)"
+msgstr ""
+
 msgid "Decreasing house numbers in addresses interpolation"
 msgstr ""
 
@@ -21003,17 +21391,37 @@ msgid "{0}={1} is deprecated. Please use instead a multipolygon."
 msgstr ""
 
 msgid ""
-"{0} is deprecated. Please specify ìnterval by using opening_hours syntax"
+"{0} is deprecated. Please specify interval by using opening_hours syntax"
 msgstr ""
 
 msgid ""
 "{0} is deprecated. Please delete this object and use a private layer instead"
 msgstr ""
 
-msgid "{0} on a node"
+msgid "{0}={1} is unspecific. Please replace ''{1}'' by a specific value."
 msgstr ""
 
-msgid "{0} on a node. Should be drawn as an area"
+msgid "{0} should be replaced with {1}"
+msgstr ""
+
+msgid ""
+"{0}={1} is unspecific. Please replace ''{1}'' by ''left'', ''right'' or "
+"''both''."
+msgstr ""
+
+msgid "{0} on a node. Should be used on a way."
+msgstr ""
+
+msgid "{0} on a node. Should be drawn as an area."
+msgstr ""
+
+msgid "{0}=* on a node. Should be used in a relation"
+msgstr ""
+
+msgid "{0} on a way. Should be used in a relation"
+msgstr ""
+
+msgid "{0} on a node"
 msgstr ""
 
 msgid "Building inside building"
@@ -25683,6 +26091,9 @@ msgstr ""
 msgid "Find"
 msgstr ""
 
+msgid "Show"
+msgstr ""
+
 msgid "Mark"
 msgstr ""
 
diff --git a/i18n/po/ca.po b/i18n/po/ca.po
index 50ebb27..0b68f3b 100644
--- a/i18n/po/ca.po
+++ b/i18n/po/ca.po
@@ -1,17 +1,22 @@
+# Catalan translation for josm
+# Copyright (c) 2007 Rosetta Contributors and Canonical Ltd 2007
+# This file is distributed under the same license as the josm package.
+# FIRST AUTHOR <EMAIL at ADDRESS>, 2007.
+# el_libre - - www.catmidia.cat <el.libre at gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-21 03:38+0200\n"
-"PO-Revision-Date: 2014-10-20 18:29+0000\n"
-"Last-Translator: Don-vip <Unknown>\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"
 "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-10-21 04:43+0000\n"
-"X-Generator: Launchpad (build 17203)\n"
+"X-Launchpad-Export-Date: 2014-12-10 04:40+0000\n"
+"X-Generator: Launchpad (build 17283)\n"
 "Language: ca\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -174,21 +179,6 @@ msgid "About JOSM..."
 msgstr "Quant al JOSM..."
 
 msgid ""
-"Unexpected format of API base URL. Redirection to info or history page for "
-"OSM object will probably fail. API base URL is: ''{0}''"
-msgstr ""
-"Format inesperat per la URL de l''API. Probablement fallarà la redirecció "
-"vers la pàgina d''informació o de l''historial d''objectes OSM. La URL de "
-"l''API és: ''{0}''"
-
-msgid ""
-"Unexpected format of API base URL. Redirection to user page for OSM user "
-"will probably fail. API base URL is: ''{0}''"
-msgstr ""
-"Format inesperat per la URL de l''API. Probablement fallarà la redirecció "
-"vers la pàgina d''usuari OSM. La URL de l''API és: ''{0}''"
-
-msgid ""
 "You are about to launch {0} browser window.<br>This may both clutter your "
 "screen with browser windows<br>and take some time to finish."
 msgid_plural ""
@@ -1674,6 +1664,15 @@ msgstr "No hi ha canvis a pujar."
 msgid "Nothing to upload. Get some data first."
 msgstr "No hi ha res a enviar. Abans d''enviar has d''obtenir dades."
 
+msgid "Upload note changes to server"
+msgstr "Puja els canvis de la nota al servidor"
+
+msgid "Upload notes"
+msgstr "Puja les notes"
+
+msgid "Uploading notes to server"
+msgstr "Pujant les notes al servidor"
+
 msgid "Upload selection"
 msgstr "Pujar la selecció"
 
@@ -1966,12 +1965,18 @@ msgstr "Afegeix el mode de les notes"
 msgid "Click the location where you wish to create a new note"
 msgstr "Feu clic sobre el punt on voleu afegir una nota"
 
-msgid "Enter a comment for a new note"
-msgstr "Introduïu un comentari per la nova nota"
-
 msgid "Create new note"
 msgstr "Crea una nota nova"
 
+msgid "Create note"
+msgstr "Crea una nota"
+
+msgid "Enter a detailed comment to create a note"
+msgstr "Introduïu un comentari detallat per crear la nota"
+
+msgid "You must enter a comment to create a new note"
+msgstr "Heu d''introduir un comentari per crear una nota nova"
+
 msgid "Delete Mode"
 msgstr "Mode d''esborrar"
 
@@ -2947,6 +2952,15 @@ msgstr "... es refereix a la relació"
 msgid "Cycling dependencies"
 msgstr "Dependències del ciclisme"
 
+msgid "Uploading modified notes"
+msgstr "Pujant les notes modificades"
+
+msgid "Note {0} failed: {1}"
+msgstr "La nota {0} ha fallat: {1}"
+
+msgid "Notes failed to upload"
+msgstr "Ha fallat la pujada de les notes"
+
 msgid ""
 "The following are results of automatic validation. Try fixing these, but be "
 "careful (don''t destroy valid data). When in doubt ignore them.<br>When you "
@@ -5374,6 +5388,12 @@ msgstr "Conflicte al fons: conserva totes les etiquetes"
 msgid "Conflict foreground: keep all tags"
 msgstr "Conflicte al primer pla: conserva totes les etiquetes"
 
+msgid "Conflict background: sum all numeric tags"
+msgstr "Conflicte en segon pla: suma de totes les etiquetes numèriques"
+
+msgid "Conflict foreground: sum all numeric tags"
+msgstr "Conflicte en primer pla: suma de totes les etiquetes numèriques"
+
 msgid "Conflict background: keep member"
 msgstr "Conflicte al fons: conserva el membre"
 
@@ -5851,12 +5871,21 @@ msgstr "cap"
 msgid "all"
 msgstr "tot"
 
+msgid "sum"
+msgstr "suma"
+
 msgid "Please decide which values to keep"
 msgstr "Si us plau, decidiu els valors a conservar"
 
 msgid "Value ''{0}'' is going to be applied for key ''{1}''"
 msgstr "El valor ''{0}'' serà aplicat a la clau ''{1}''"
 
+msgid ""
+"All numeric values sumed as ''{0}'' are going to be applied for key ''{1}''"
+msgstr ""
+"La suma de tots els valors numèrics sumats com ''{0}'' serà aplicada a la "
+"clau ''{1}''"
+
 msgid "The key ''{0}'' and all its values are going to be removed"
 msgstr "La clau ''{0}'' i tots els seus valors seran suprimits"
 
@@ -6263,24 +6292,6 @@ msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
 "</p><p>Tancar la finestra de filtre per veure tots els objectes.<p></html>"
 
-msgid "Display the history of all selected items."
-msgstr "Mostrar l''historial dels objectes seleccionats"
-
-msgid "Object with history"
-msgstr "Objectes amb historial"
-
-msgid "Reload"
-msgstr "Recarrega"
-
-msgid "Reload all currently selected objects and refresh the list."
-msgstr "Reacarregar els objectes seleccionats i refrescar-ne la llista"
-
-msgid "Show"
-msgstr "Mostra"
-
-msgid "Display the history of the selected objects."
-msgstr "Mostra l''historial de l''bjecte"
-
 msgid "Advanced object info"
 msgstr "Informació vançada de l''objecte"
 
@@ -6646,6 +6657,9 @@ msgstr "Afegeix un comentari"
 msgid "Comment"
 msgstr "Comentari"
 
+msgid "Comment on note"
+msgstr "Comentari a la nota"
+
 msgid "Add comment to note:"
 msgstr "Afegeix un comentari a la nota:"
 
@@ -6655,9 +6669,6 @@ msgstr "Tanca la nota"
 msgid "Close note with message:"
 msgstr "Tanca la nota amb el missatge:"
 
-msgid "Close Note"
-msgstr "Tanca la nota"
-
 msgid "Create a new note"
 msgstr "Crea una nota nova"
 
@@ -6736,6 +6747,9 @@ msgstr "Selecció actual"
 msgid "Search for objects"
 msgstr "Cercar objectes"
 
+msgid "Display the history of the selected objects."
+msgstr "Mostra l''historial de l''bjecte"
+
 msgid "Zoom to selection"
 msgstr "Amplia la selecció"
 
@@ -6862,6 +6876,9 @@ msgstr "Corregint ({0}/{1}): ''{2}''"
 msgid "Updating map ..."
 msgstr "Actualitzant el mapa ..."
 
+msgid "anonymous"
+msgstr "anònim"
+
 msgid "Display the basic properties of the changeset"
 msgstr "Mostra les propietats bàsiques del conjunt de canvis"
 
@@ -6875,6 +6892,12 @@ msgid "Display the objects created, updated, and deleted by the changeset"
 msgstr ""
 "Mostra els objectes creats, modificats i suprimits pel conjunt de canvis"
 
+msgid "Discussion"
+msgstr "Discussió"
+
+msgid "Display the public discussion around this changeset"
+msgstr "Mostra la discussió pública sobre aquest conjunt de canvis"
+
 msgid "Changeset Management Dialog"
 msgstr "Finestra de gestió de conjunts de canvis"
 
@@ -6939,9 +6962,6 @@ msgctxt "changeset.state"
 msgid "Closed"
 msgstr "Tancat"
 
-msgid "anonymous"
-msgstr "anònim"
-
 msgid "ID"
 msgstr "ID"
 
@@ -6957,6 +6977,9 @@ msgstr "Creat el"
 msgid "Closed at"
 msgstr "Tancat el"
 
+msgid "Discussions"
+msgstr "Discussions"
+
 msgid "Downloading changeset content"
 msgstr "Descarregant el contingut del conjunt de canvis"
 
@@ -7082,6 +7105,15 @@ msgstr ""
 "Amplia els objectes en el contingut d''aquest conjunt de canvis a la capa "
 "actual"
 
+msgid "Update changeset discussion"
+msgstr "Actualitza la discussió del conjunt de canvis"
+
+msgid "Update the changeset discussion from the OSM server"
+msgstr "Actualitza la discussió del conjunt de canvis des del servidor OSM"
+
+msgid "Date"
+msgstr "Data"
+
 msgid "Download changesets"
 msgstr "Descarregar els conjunts de canvis"
 
@@ -7555,8 +7587,8 @@ msgstr "Si us plau seleccioneu un valor"
 msgid "Set number of recently added tags"
 msgstr "Estableix el nombre de les etiquetes afegides recentment"
 
-msgid "Remember last used tags"
-msgstr "Recorda les últimes etiquetes usades"
+msgid "Remember last used tags after a restart"
+msgstr "Recorda les darreres etiquetes utilitzades en reiniciar."
 
 msgid "Please enter the number of recently added tags to display"
 msgstr ""
@@ -7941,6 +7973,9 @@ msgstr "incloent els fills directes de la relació"
 msgid "Load parent relations"
 msgstr "Carrega les relacions parents"
 
+msgid "Reload"
+msgstr "Recarrega"
+
 msgid "Loading parent relations"
 msgstr "Carregant les relacions parents"
 
@@ -8071,6 +8106,12 @@ msgstr "Dades GPS"
 msgid "Select to download GPS traces in the selected download area."
 msgstr "Descarregar les traces GPS de la zona seleccionada"
 
+msgid "Notes"
+msgstr "Notes"
+
+msgid "Select to download notes in the selected download area."
+msgstr "Seleccioneu baixar notes de l''àrea descarregada."
+
 msgid "Download as new layer"
 msgstr "Descarregar com una capa nova"
 
@@ -8422,9 +8463,6 @@ msgstr "A"
 msgid "B"
 msgstr "B"
 
-msgid "Date"
-msgstr "Data"
-
 msgid ""
 "Failed to update primitive with id {0} because current edit layer is null"
 msgstr ""
@@ -9428,9 +9466,6 @@ msgstr ""
 msgid "Save Layer"
 msgstr "Desa la capa"
 
-msgid "Notes"
-msgstr "Notes"
-
 msgid "Notes layer"
 msgstr "Capa de notes"
 
@@ -9446,9 +9481,6 @@ msgstr "Capa de dades {0}"
 msgid "outside downloaded area"
 msgstr "fore de l''àrea descarregada"
 
-msgid "version {0}"
-msgstr "versió {0}"
-
 msgid "Merging layers"
 msgstr "Combinant capes"
 
@@ -13556,6 +13588,15 @@ msgid "Open changeset expected. Got closed changeset with id {0}."
 msgstr ""
 "S''esperava un conjunt de canvis obert. Hi ha un de tancat amb ID {0}."
 
+msgid "Note upload failed"
+msgstr "Ha fallat la pujada de la nota."
+
+msgid "Error parsing note response from server"
+msgstr "Error al servidor en processar la resposta de la nota."
+
+msgid "Error encoding string: {0}"
+msgstr "Error en codificar la cadena de text: {0}"
+
 msgid "(Code={0})"
 msgstr "(Codi={0})"
 
@@ -13614,15 +13655,15 @@ msgstr ""
 msgid "Parsing changeset content ..."
 msgstr "Processant el contingut del conjunt de canvis ..."
 
+msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
+msgstr "Valor erroni de l''atribut booleà ''{0}''. El seu valor és ''{1}''."
+
 msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
 msgstr "Valor erroni de l''atribut ''{0}''. el seu valor és ''{1}''"
 
 msgid "Illegal numeric value for attribute ''{0}''. Got ''{1}''."
 msgstr "Valor erroni de l''atribut numèric ''{0}''. El seu valor és ''{1}''."
 
-msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
-msgstr "Valor erroni de l''atribut booleà ''{0}''. El seu valor és ''{1}''."
-
 msgid "Missing mandatory attribute ''{0}'' of XML element {1}."
 msgstr "Manca l''atribut obligatori ''{0}'' de l''element XML {1}."
 
@@ -14524,11 +14565,6 @@ msgstr ""
 "Ha fallat l''escaneig del fitxer ''{0}'' per la informació del connector. "
 "Ometent."
 
-msgid "Processing plugin site cache icon files..."
-msgstr ""
-"Processant els fitxers de les icones a la memòria cau del lloc web dels "
-"connectors..."
-
 msgid "Processing plugin files..."
 msgstr "Processant els fitxers del connnector..."
 
@@ -14547,12 +14583,6 @@ msgstr "JOSM no ha aconseguit descarregar la llista de connectors:"
 msgid "Details:"
 msgstr "Detalls:"
 
-msgid "Plugin icons download error"
-msgstr "Error en la descàrrega de les icones dels connectos"
-
-msgid "JOSM failed to download plugin icons:"
-msgstr "JOSM no ha aconseguit descarregar les icones dels connectors:"
-
 msgid ""
 "Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
 "plugin site ''{1}''."
@@ -15656,8 +15686,12 @@ msgid ""
 "Creating and handling address nodes and buildings within Czech Republic."
 msgstr "Crea i manega adreces i edificis a la República Txeca."
 
-msgid "Allows to import various file formats into JOSM directly."
-msgstr "Permet la importació directa a JOSM de varis formats de fitxer."
+msgid ""
+"Allows to import various file formats into JOSM directly. Currently "
+"supported: TangoGPS, Garmin Trainings Center TCX."
+msgstr ""
+"Permet la importació directa de varis formats de fitxer a JOSM. Actualment "
+"són suportats: TangoGPS, Garmin Trainings Center TCX."
 
 msgid "Download your GPX tracks from openstreetmap.org"
 msgstr "Descarrega els vostres tracks d''openstreetmap.org"
@@ -15775,6 +15809,14 @@ msgid "A helper for IRS satellite adjustment."
 msgstr "Un ajudant pels ajustaments d''IRS de satèl·lit"
 
 msgid ""
+"Provides Java Native Access (JNA) library. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+"Ofereix una llibreria per a l''accés natiu Java (JNA) . No és per ser "
+"instal·lada directament pels usuaris sinó com una dependència d''altres "
+"connectors."
+
+msgid ""
 "Provides Java Topology Suite (JTS) library and related utilities. Not meant "
 "to be installed directly by users, but rather as a dependency for other "
 "plugins."
@@ -16199,6 +16241,25 @@ msgstr "Llum"
 msgid "Width (meters)"
 msgstr "Amplada (metres)"
 
+msgid "Sidewalk"
+msgstr "Vorera"
+
+msgctxt "sidewalk"
+msgid "both"
+msgstr "ambdós costats"
+
+msgctxt "sidewalk"
+msgid "left"
+msgstr "costat esquerre"
+
+msgctxt "sidewalk"
+msgid "right"
+msgstr "costat dret"
+
+msgctxt "sidewalk"
+msgid "no"
+msgstr "no"
+
 msgid "Service type"
 msgstr "Tipus de servei"
 
@@ -16567,17 +16628,21 @@ msgstr "dl-dv 09:00-18:00,Sa 08:00-14:00"
 msgid "May-Sep 09:30-12:30,14:15-19:30"
 msgstr "mai-set 09:30-12:30,14:15-19:30"
 
+msgctxt "parking"
 msgid "multi-storey"
-msgstr "diverses plantes"
+msgstr "amb diversos plantes"
 
+msgctxt "parking"
 msgid "surface"
-msgstr "superfície"
+msgstr "de superfície"
 
+msgctxt "parking"
 msgid "underground"
-msgstr "soterrat"
+msgstr "subterrani"
 
+msgctxt "parking"
 msgid "rooftop"
-msgstr "terrat"
+msgstr "al terrat"
 
 msgid "Reference number"
 msgstr "Número de referència"
@@ -16649,7 +16714,7 @@ msgid "leafless"
 msgstr "sense fulles"
 
 msgid "Cycle"
-msgstr "Bicicleta"
+msgstr "Cicle"
 
 msgid "deciduous"
 msgstr "caduc"
@@ -17033,14 +17098,25 @@ msgstr "Màx. longitud (m)"
 msgid "Overtaking"
 msgstr "Avançament"
 
+msgctxt "overtaking"
+msgid "yes"
+msgstr "si"
+
+msgctxt "overtaking"
 msgid "both"
 msgstr "ambdós"
 
+msgctxt "overtaking"
 msgid "forward"
 msgstr "endavant"
 
+msgctxt "overtaking"
 msgid "backward"
-msgstr "enrera"
+msgstr "enrere"
+
+msgctxt "overtaking"
+msgid "no"
+msgstr "no"
 
 msgid "Roundabout"
 msgstr "Rotonda"
@@ -17349,6 +17425,12 @@ msgstr "pegàs"
 msgid "tiger"
 msgstr "tigre"
 
+msgid "Button operated"
+msgstr "Comandat per polsador"
+
+msgid "Sound signals"
+msgstr "Senyals sonors"
+
 msgid "Crossing attendant"
 msgstr "Cruïlla assistida"
 
@@ -17878,9 +17960,6 @@ msgstr "Pas a nivell"
 msgid "Traffic lights"
 msgstr "Semàfors"
 
-msgid "Sound signals"
-msgstr "Senyals sonors"
-
 msgid "Barrier"
 msgstr "Barrera"
 
@@ -19944,6 +20023,9 @@ msgstr "Molí de vent"
 msgid "Gasometer"
 msgstr "Gasòmetre"
 
+msgid "Bunker Silo"
+msgstr "Sitja oberta"
+
 msgid "Pipeline"
 msgstr "Canonada"
 
@@ -20090,15 +20172,15 @@ msgstr "Estació de monitorització"
 msgid "Monitoring:"
 msgstr "Monitoritza:"
 
-msgid "Weather"
-msgstr "Meteorologia"
-
 msgid "Water level"
 msgstr "Nivell d''aigua"
 
 msgid "Tide Level"
 msgstr "NIvell de la marea"
 
+msgid "Groundwater"
+msgstr ""
+
 msgid "Traffic"
 msgstr "Trànsit"
 
@@ -20117,6 +20199,9 @@ msgstr "Senyals GLONASS"
 msgid "Galileo Signals"
 msgstr "Senyals Galileu"
 
+msgid "Weather"
+msgstr "Meteorologia"
+
 msgid "Radiation"
 msgstr "Radiació"
 
@@ -20297,6 +20382,9 @@ msgstr "pilar aixecat"
 msgid "pivot_pier"
 msgstr "pilar pivotable"
 
+msgid "Bridge outline"
+msgstr "Contorn del pont"
+
 msgid "Power Plant"
 msgstr "Central elèctrica"
 
@@ -20906,6 +20994,15 @@ msgstr "Torre incompleta"
 msgid "Pole"
 msgstr "Pal"
 
+msgid "Pole with Transformer"
+msgstr "Pal amb transformador"
+
+msgid "Pole Attributes:"
+msgstr "Atributs del pal:"
+
+msgid "Transformer Attributes:"
+msgstr "Atributs del transformador:"
+
 msgid "Power Line"
 msgstr "Línia elèctrica"
 
@@ -20955,11 +21052,17 @@ msgstr "Utilitzat per comunicació de dades"
 msgid "Power Cable"
 msgstr "Cable elèctric"
 
+msgctxt "power cable"
+msgid "underground"
+msgstr "subterrani"
+
+msgctxt "power cable"
 msgid "underwater"
-msgstr "subaquàtic"
+msgstr "submarí"
 
+msgctxt "power cable"
 msgid "overground"
-msgstr "soterrat"
+msgstr "de superfície"
 
 msgid "Historic Places"
 msgstr "Llocs Històrics"
@@ -20985,6 +21088,33 @@ msgstr "Monument"
 msgid "Memorial"
 msgstr "Memorial"
 
+msgctxt "memorial"
+msgid "statue"
+msgstr "estàtua"
+
+msgctxt "memorial"
+msgid "bust"
+msgstr "bust"
+
+msgctxt "memorial"
+msgid "plaque"
+msgstr "placa"
+
+msgctxt "memorial"
+msgid "stele"
+msgstr "estela"
+
+msgctxt "memorial"
+msgid "stone"
+msgstr "pedró"
+
+msgctxt "memorial"
+msgid "war_memorial"
+msgstr "monument als caiguts"
+
+msgid "Inscription"
+msgstr "inscripció"
+
 msgid "Wayside Cross"
 msgstr "Creu"
 
@@ -21054,6 +21184,9 @@ msgstr "Bodega"
 msgid "Beverages"
 msgstr "Begudes"
 
+msgid "Wine"
+msgstr "Vi"
+
 msgid "Boutique"
 msgstr "Boutique"
 
@@ -21099,6 +21232,9 @@ msgstr "Vídeo"
 msgid "Video Games"
 msgstr "Videojocs"
 
+msgid "Music"
+msgstr "Música"
+
 msgid "Cash"
 msgstr "en Efectiu"
 
@@ -21126,6 +21262,9 @@ msgstr "Cuines"
 msgid "Curtain"
 msgstr "Cortina"
 
+msgid "Art"
+msgstr "Art"
+
 msgid "Frame"
 msgstr "Marc"
 
@@ -21171,6 +21310,9 @@ msgstr "Perruqueria/Barberia"
 msgid "Beauty"
 msgstr "Bellesa"
 
+msgid "Tattoo"
+msgstr "Tatuatges"
+
 msgid "Optician"
 msgstr "Òptica"
 
@@ -21222,6 +21364,9 @@ msgstr "Bosses"
 msgid "Pet"
 msgstr "Animals domèstics"
 
+msgid "Funeral Directors"
+msgstr "Directors de funeràries"
+
 msgid "Vending Machine"
 msgstr "Màquina expenedora"
 
@@ -21321,6 +21466,15 @@ msgstr "Codi postal"
 msgid "National Park"
 msgstr "Parc nacional"
 
+msgid "Protected Area"
+msgstr "Àrea protegida"
+
+msgid "Protected Class"
+msgstr "Grup protegit"
+
+msgid "Title or type of protection"
+msgstr "Nom o tipus de protecció"
+
 msgid "Places"
 msgstr "Llocs"
 
@@ -22410,8 +22564,14 @@ msgstr "Mapa base d''Estònia  (Maaamet)"
 msgid "Estonia Ortho (Maaamet)"
 msgstr "Estònia Ortofoto (Maaamet)"
 
-msgid "Estonia Multi (Maaamet)"
-msgstr "Estnia Multi (Maaamet)"
+msgid "Estonia Hillshade (Maaamet)"
+msgstr ""
+
+msgid "Estonia Cadastre (Maaamet)"
+msgstr ""
+
+msgid "Estonia Forestry (Maaamet)"
+msgstr ""
 
 msgid "Bordeaux - 2012"
 msgstr "Bordeus - 2012"
@@ -22434,8 +22594,8 @@ msgstr "CRAIG - Le Puy 2010 - 15 cm"
 msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
 msgstr "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
 
-msgid "CUGN Nancy - Orthophoto 2012"
-msgstr "CUGN Nancy - Ortofoto 2012"
+msgid "GrandNancy Orthophotographie 2012"
+msgstr "GrandNancy Ortofotografia 2012"
 
 msgid "Géobretagne - Brest 2010 - 10 cm"
 msgstr "Géobretagne - Brest 2010 - 10 cm"
@@ -22483,9 +22643,6 @@ msgstr ""
 "Vercors - Réserve naturelle des Hauts-Plateaux du Vercors - Orthophotos 1999 "
 "- 1 m"
 
-msgid "Streets NRW Geofabrik.de"
-msgstr "Carrers NRW Geofabrik.de"
-
 msgid "Hike & Bike"
 msgstr "A peu i en bici"
 
@@ -22548,6 +22705,9 @@ msgstr "NRW-Atlas: Luftbilder"
 msgid "NRW-Atlas: Topographische Karte 1:10000"
 msgstr "NRW-Atlas: Topographische Karte 1:10000"
 
+msgid "Metropole Ruhr: Luftbilder (10 cm)"
+msgstr "Metròpoli del Ruhr: imatgeria aèria (10 cm)"
+
 msgid "Drone Imagery (Haiti)"
 msgstr "Imatgeria de drones (Haiti)"
 
@@ -22749,6 +22909,9 @@ msgstr "Plànol de Zürich"
 msgid "Stadt Zürich Übersichtsplan (Strassen, Gebäude, Hausnummer)"
 msgstr "Stadt Zürich Übersichtsplan (Strassen, Gebäude, Hausnummer)"
 
+msgid "Stadt Zürich Luftbild 2011"
+msgstr "Ciutat de Zuric Imatgeria aèria 2011"
+
 msgid "Orthofoto Kanton Solothurn RGB (SOGIS 2011/2012/2013)"
 msgstr "Orthofoto Kanton Solothurn RGB (SOGIS 2011/2012/2013)"
 
@@ -22767,8 +22930,8 @@ msgstr "Cantó de Jura 50cm (RCJU 1998)"
 msgid "Canton de Fribourg 50cm (2005)"
 msgstr "Cantó de Friburg 50cm (2005)"
 
-msgid "Stadt Bern 10cm/25cm (2008)"
-msgstr "Ciutat de Berna 10cm/25cm (2008)"
+msgid "Stadt Bern 10cm/25cm (2012)"
+msgstr "Ciutat de Berna 10cm/25cm (2012)"
 
 msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
 msgstr "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
@@ -22806,8 +22969,8 @@ msgstr "USGS Imatgeria a escala gran"
 msgid "OSM US TIGER 2012 Roads Overlay"
 msgstr "OSM US TIGER 2012 Roads Overlay"
 
-msgid "New & Misaligned TIGER Roads (TIGER 2013)"
-msgstr "New & Misaligned TIGER Roads (TIGER 2013)"
+msgid "New & Misaligned TIGER Roads (TIGER 2014)"
+msgstr ""
 
 msgid "MassGIS L3 Parcels"
 msgstr "MassGIS L3 Parcels"
@@ -22854,9 +23017,234 @@ msgstr "OS Scottish Popular historic"
 msgid "NLS - Bartholomew Half Inch, 1897-1907"
 msgstr "NLS - Bartholomew Half Inch, 1897-1907"
 
+msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgstr "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+
+msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgstr "OS Town Plans, Airdrie 1858 (NLS)"
+
+msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgstr "OS Town Plans, Alexandria 1859 (NLS)"
+
+msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgstr "OS Town Plans, Alloa 1861-1862 (NLS)"
+
+msgid "OS Town Plans, Annan 1859 (NLS)"
+msgstr "OS Town Plans, Annan 1859 (NLS)"
+
+msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgstr "OS Town Plans, Arbroath 1858 (NLS)"
+
+msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgstr "OS Town Plans, Ayr 1855 (NLS)"
+
+msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgstr "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+
+msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgstr "OS Town Plans, Brechin 1862 (NLS)"
+
+msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgstr "OS Town Plans, Burntisland 1894 (NLS)"
+
+msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgstr "OS Town Plans, Campbelton 1865 (NLS)"
+
+msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgstr "OS Town Plans, Coatbridge 1858 (NLS)"
+
 msgid "OS Town Plans, Cupar 1854 (NLS)"
 msgstr "OS Town Plans, Cupar 1854 (NLS)"
 
+msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgstr "OS Town Plans, Cupar 1893-1894 (NLS)"
+
+msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgstr "OS Town Plans, Dalkeith 1852 (NLS)"
+
+msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgstr "OS Town Plans, Dalkeith 1893 (NLS)"
+
+msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgstr "OS Town Plans, Dumbarton 1859 (NLS)"
+
+msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgstr "OS Town Plans, Dumfries 1850 (NLS)"
+
+msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgstr "OS Town Plans, Dumfries 1893 (NLS)"
+
+msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgstr "OS Town Plans, Dundee 1857-1858 (NLS)"
+
+msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgstr "OS Town Plans, Dundee 1870-1872 (NLS)"
+
+msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgstr "OS Town Plans, Dunfermline 1854 (NLS)"
+
+msgid "OS Town Plans, Dunfermline 1894 (NLS)"
+msgstr "OS Town Plans, Dunfermline 1894 (NLS)"
+
+msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
+msgstr "OS Town Plans, Edinburgh 1849-1851 (NLS)"
+
+msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
+msgstr "OS Town Plans, Edinburgh 1876-1877 (NLS)"
+
+msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
+msgstr "OS Town Plans, Edinburgh 1893-1894 (NLS)"
+
+msgid "OS Town Plans, Elgin 1868 (NLS)"
+msgstr "OS Town Plans, Elgin 1868 (NLS)"
+
+msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
+msgstr "OS Town Plans, Falkirk 1858-1859 (NLS)"
+
+msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
+msgstr "OS Town Plans, Forfar 1860-1861 (NLS)"
+
+msgid "OS Town Plans, Forres 1868 (NLS)"
+msgstr "OS Town Plans, Forres 1868 (NLS)"
+
+msgid "OS Town Plans, Galashiels 1858 (NLS)"
+msgstr "OS Town Plans, Galashiels 1858 (NLS)"
+
+msgid "OS Town Plans, Girvan 1857 (NLS)"
+msgstr "OS Town Plans, Girvan 1857 (NLS)"
+
+msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
+msgstr "OS Town Plans, Glasgow 1857-1858 (NLS)"
+
+msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
+msgstr "OS Town Plans, Glasgow 1892-1894 (NLS)"
+
+msgid "OS Town Plans, Greenock 1857 (NLS)"
+msgstr "OS Town Plans, Greenock 1857 (NLS)"
+
+msgid "OS Town Plans, Haddington 1853 (NLS)"
+msgstr "OS Town Plans, Haddington 1853 (NLS)"
+
+msgid "OS Town Plans, Haddington 1893 (NLS)"
+msgstr "OS Town Plans, Haddington 1893 (NLS)"
+
+msgid "OS Town Plans, Hamilton 1858 (NLS)"
+msgstr "OS Town Plans, Hamilton 1858 (NLS)"
+
+msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
+msgstr "OS Town Plans, Hawick 1857-1858 (NLS)"
+
+msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
+msgstr "OS Town Plans, Inverness 1867-1868 (NLS)"
+
+msgid "OS Town Plans, Irvine 1859 (NLS)"
+msgstr "OS Town Plans, Irvine 1859 (NLS)"
+
+msgid "OS Town Plans, Jedburgh 1858 (NLS)"
+msgstr "OS Town Plans, Jedburgh 1858 (NLS)"
+
+msgid "OS Town Plans, Kelso 1857 (NLS)"
+msgstr "OS Town Plans, Kelso 1857 (NLS)"
+
+msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
+msgstr "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
+
+msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
+msgstr "OS Town Plans, Kirkcaldy 1855 (NLS)"
+
+msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
+msgstr "OS Town Plans, Kirkcaldy 1894 (NLS)"
+
+msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
+msgstr "OS Town Plans, Kirkcudbright 1850 (NLS)"
+
+msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
+msgstr "OS Town Plans, Kirkcudbright 1893 (NLS)"
+
+msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
+msgstr "OS Town Plans, Kirkintilloch 1859 (NLS)"
+
+msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
+msgstr "OS Town Plans, Kirriemuir 1861 (NLS)"
+
+msgid "OS Town Plans, Lanark 1858 (NLS)"
+msgstr "OS Town Plans, Lanark 1858 (NLS)"
+
+msgid "OS Town Plans, Linlithgow 1856 (NLS)"
+msgstr "OS Town Plans, Linlithgow 1856 (NLS)"
+
+msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
+msgstr "OS Town Plans, Mayole 1856-1857 (NLS)"
+
+msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
+msgstr "OS Town Plans, Montrose 1861-1862 (NLS)"
+
+msgid "OS Town Plans, Musselburgh 1853 (NLS)"
+msgstr "OS Town Plans, Musselburgh 1853 (NLS)"
+
+msgid "OS Town Plans, Musselburgh 1893 (NLS)"
+msgstr "OS Town Plans, Musselburgh 1893 (NLS)"
+
+msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
+msgstr "OS Town Plans, Nairn 1867-1868 (NLS)"
+
+msgid "OS Town Plans, Oban 1867-1868 (NLS)"
+msgstr "OS Town Plans, Oban 1867-1868 (NLS)"
+
+msgid "OS Town Plans, Peebles 1856 (NLS)"
+msgstr "OS Town Plans, Peebles 1856 (NLS)"
+
+msgid "OS Town Plans, Perth 1860 (NLS)"
+msgstr "OS Town Plans, Perth 1860 (NLS)"
+
+msgid "OS Town Plans, Peterhead 1868 (NLS)"
+msgstr "OS Town Plans, Peterhead 1868 (NLS)"
+
+msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
+msgstr "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
+
+msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
+msgstr "OS Town Plans, Portobello 1893-1894 (NLS)"
+
+msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
+msgstr "OS Town Plans, Rothesay 1862-1863 (NLS)"
+
+msgid "OS Town Plans, Selkirk 1865 (NLS)"
+msgstr "OS Town Plans, Selkirk 1865 (NLS)"
+
+msgid "OS Town Plans, St Andrews 1854 (NLS)"
+msgstr "OS Town Plans, St Andrews 1854 (NLS)"
+
+msgid "OS Town Plans, St Andrews 1893 (NLS)"
+msgstr "OS Town Plans, St Andrews 1893 (NLS)"
+
+msgid "OS Town Plans, Stirling 1858 (NLS)"
+msgstr "OS Town Plans, Stirling 1858 (NLS)"
+
+msgid "OS Town Plans, Stonehaven 1864 (NLS)"
+msgstr "OS Town Plans, Stonehaven 1864 (NLS)"
+
+msgid "OS Town Plans, Stranraer 1847 (NLS)"
+msgstr "OS Town Plans, Stranraer 1847 (NLS)"
+
+msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
+msgstr "OS Town Plans, Stranraer 1863-1877 (NLS)"
+
+msgid "OS Town Plans, Stranraer 1893 (NLS)"
+msgstr "OS Town Plans, Stranraer 1893 (NLS)"
+
+msgid "OS Town Plans, Strathaven 1858 (NLS)"
+msgstr "OS Town Plans, Strathaven 1858 (NLS)"
+
+msgid "OS Town Plans, Wick 1872 (NLS)"
+msgstr "OS Town Plans, Wick 1872 (NLS)"
+
+msgid "OS Town Plans, Wigtown 1848 (NLS)"
+msgstr "OS Town Plans, Wigtown 1848 (NLS)"
+
+msgid "OS Town Plans, Wigtown 1894 (NLS)"
+msgstr "OS Town Plans, Wigtown 1894 (NLS)"
+
 msgid "Decreasing house numbers in addresses interpolation"
 msgstr "Nombres de carrer decreixents en interpolació d''adreces"
 
@@ -22917,10 +23305,10 @@ msgstr ""
 "{0}={1} és obsolet. Si us plau, utilitzeu un multiplolígon com a alternativa."
 
 msgid ""
-"{0} is deprecated. Please specify ìnterval by using opening_hours syntax"
+"{0} is deprecated. Please specify interval by using opening_hours syntax"
 msgstr ""
-"{0} és obsolet. Si us plau indiqueu l''horari d''obertura utilitzant la "
-"sintaxi correcta"
+"{0} és obsolet. Si us plau indiqueu un interval utilitzant la sintaxi "
+"\"opening_hours\" (hores d''obertura)"
 
 msgid ""
 "{0} is deprecated. Please delete this object and use a private layer instead"
@@ -22928,12 +23316,36 @@ msgstr ""
 "{0} és obsolet. Si us plau suprimiu aquest objecte i utilitzeu una capa "
 "privada com a alternativa"
 
+msgid "{0}={1} is unspecific. Please replace ''{1}'' by a specific value."
+msgstr ""
+"{0}={1} no és específic. Si us plau substituïu ''{1}'' per un valor "
+"específic."
+
+msgid "{0} should be replaced with {1}"
+msgstr "{0} ha de ser substituït per {1}"
+
+msgid ""
+"{0}={1} is unspecific. Please replace ''{1}'' by ''left'', ''right'' or "
+"''both''."
+msgstr ""
+"{0}={1} no és específic. Si us plau canvieu ''{1}''per ''costat esquerre "
+"(left)'', ''costat dret (right)'' o ''ambdós (both)''."
+
+msgid "{0} on a node. Should be used on a way."
+msgstr "{0} a un node. Ha de ser utilitzat a una via."
+
+msgid "{0} on a node. Should be drawn as an area."
+msgstr "{0} a un node. Ha de ser utilitzat a una àrea."
+
+msgid "{0}=* on a node. Should be used in a relation"
+msgstr "{0}=* a un node. S''ha d''utilitzar a una relació"
+
+msgid "{0} on a way. Should be used in a relation"
+msgstr "{0} a una via. S''ha d''utilitzar a una relació"
+
 msgid "{0} on a node"
 msgstr "{0} a un node"
 
-msgid "{0} on a node. Should be drawn as an area"
-msgstr "{0} a un node. Ha de ser dibuixat com un àrea"
-
 msgid "Building inside building"
 msgstr "Contrucció a l''interior d''una altra"
 
@@ -28064,6 +28476,9 @@ msgstr "Suggerir parades"
 msgid "Find"
 msgstr "Troba"
 
+msgid "Show"
+msgstr "Mostra"
+
 msgid "Mark"
 msgstr "Marca"
 
diff --git a/i18n/po/ca at valencia.po b/i18n/po/ca at valencia.po
index 8d7c9cb..5181790 100644
--- a/i18n/po/ca at valencia.po
+++ b/i18n/po/ca at valencia.po
@@ -1,8 +1,13 @@
+# Catalan translation for josm
+# Copyright (c) 2007 Rosetta Contributors and Canonical Ltd 2007
+# This file is distributed under the same license as the josm package.
+# FIRST AUTHOR <EMAIL at ADDRESS>, 2007.
+# el_libre - - www.catmidia.cat <el.libre at gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-21 03:38+0200\n"
+"POT-Creation-Date: 2014-12-10 03:42+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"
@@ -10,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-10-21 05:39+0000\n"
-"X-Generator: Launchpad (build 17203)\n"
+"X-Launchpad-Export-Date: 2014-12-10 05:24+0000\n"
+"X-Generator: Launchpad (build 17283)\n"
 "Language: ca at valencia\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -170,21 +175,6 @@ msgid "About JOSM..."
 msgstr "Quant al JOSM..."
 
 msgid ""
-"Unexpected format of API base URL. Redirection to info or history page for "
-"OSM object will probably fail. API base URL is: ''{0}''"
-msgstr ""
-"Format inesperat per la URL de l''API. Probablement fallarà la redirecció "
-"vers la pàgina d''informació o de l''historial d''objectes OSM. La URL de "
-"l''API és: ''{0}''"
-
-msgid ""
-"Unexpected format of API base URL. Redirection to user page for OSM user "
-"will probably fail. API base URL is: ''{0}''"
-msgstr ""
-"Format inesperat per la URL de l''API. Probablement fallarà la redirecció "
-"vers la pàgina d''usuari OSM. La URL de l''API és: ''{0}''"
-
-msgid ""
 "You are about to launch {0} browser window.<br>This may both clutter your "
 "screen with browser windows<br>and take some time to finish."
 msgid_plural ""
@@ -1663,6 +1653,15 @@ msgstr "No hi ha canvis a pujar."
 msgid "Nothing to upload. Get some data first."
 msgstr "No hi ha res a enviar. Abans d''enviar heu d''obtindre dades."
 
+msgid "Upload note changes to server"
+msgstr ""
+
+msgid "Upload notes"
+msgstr ""
+
+msgid "Uploading notes to server"
+msgstr ""
+
 msgid "Upload selection"
 msgstr "Puja la selecció"
 
@@ -1955,10 +1954,16 @@ msgstr ""
 msgid "Click the location where you wish to create a new note"
 msgstr ""
 
-msgid "Enter a comment for a new note"
+msgid "Create new note"
 msgstr ""
 
-msgid "Create new note"
+msgid "Create note"
+msgstr ""
+
+msgid "Enter a detailed comment to create a note"
+msgstr ""
+
+msgid "You must enter a comment to create a new note"
 msgstr ""
 
 msgid "Delete Mode"
@@ -2922,6 +2927,15 @@ msgstr "... es refereix a la relació"
 msgid "Cycling dependencies"
 msgstr "Dependències del ciclisme"
 
+msgid "Uploading modified notes"
+msgstr ""
+
+msgid "Note {0} failed: {1}"
+msgstr ""
+
+msgid "Notes failed to upload"
+msgstr ""
+
 msgid ""
 "The following are results of automatic validation. Try fixing these, but be "
 "careful (don''t destroy valid data). When in doubt ignore them.<br>When you "
@@ -5306,6 +5320,12 @@ msgstr ""
 msgid "Conflict foreground: keep all tags"
 msgstr ""
 
+msgid "Conflict background: sum all numeric tags"
+msgstr ""
+
+msgid "Conflict foreground: sum all numeric tags"
+msgstr ""
+
 msgid "Conflict background: keep member"
 msgstr ""
 
@@ -5763,12 +5783,19 @@ msgstr "cap"
 msgid "all"
 msgstr "tot"
 
+msgid "sum"
+msgstr ""
+
 msgid "Please decide which values to keep"
 msgstr "Per favor, decidiu els valors a conservar"
 
 msgid "Value ''{0}'' is going to be applied for key ''{1}''"
 msgstr "El valor ''{0}'' serà aplicat a la clau ''{1}''"
 
+msgid ""
+"All numeric values sumed as ''{0}'' are going to be applied for key ''{1}''"
+msgstr ""
+
 msgid "The key ''{0}'' and all its values are going to be removed"
 msgstr "La clau ''{0}'' i tots els seus valors seran suprimits"
 
@@ -6156,24 +6183,6 @@ msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
 "</p><p>Tancar la finestra de filtre per veure tots els objectes.<p></html>"
 
-msgid "Display the history of all selected items."
-msgstr "Mostrar l''historial dels objectes seleccionats"
-
-msgid "Object with history"
-msgstr "Objectes amb historial"
-
-msgid "Reload"
-msgstr "Recarrega"
-
-msgid "Reload all currently selected objects and refresh the list."
-msgstr "Reacarregar els objectes seleccionats i refrescar-ne la llista"
-
-msgid "Show"
-msgstr "Mostra"
-
-msgid "Display the history of the selected objects."
-msgstr "Mostra l''historial de l''bjecte"
-
 msgid "Advanced object info"
 msgstr "Informació vançada de l''objecte"
 
@@ -6528,6 +6537,9 @@ msgstr ""
 msgid "Comment"
 msgstr "Comentari"
 
+msgid "Comment on note"
+msgstr ""
+
 msgid "Add comment to note:"
 msgstr ""
 
@@ -6537,9 +6549,6 @@ msgstr ""
 msgid "Close note with message:"
 msgstr ""
 
-msgid "Close Note"
-msgstr ""
-
 msgid "Create a new note"
 msgstr ""
 
@@ -6612,6 +6621,9 @@ msgstr "Selecció actual"
 msgid "Search for objects"
 msgstr "Cercar objectes"
 
+msgid "Display the history of the selected objects."
+msgstr "Mostra l''historial de l''bjecte"
+
 msgid "Zoom to selection"
 msgstr "Amplia la selecció"
 
@@ -6738,6 +6750,9 @@ msgstr "Corregint ({0}/{1}): ''{2}''"
 msgid "Updating map ..."
 msgstr "Actualitzant el mapa ..."
 
+msgid "anonymous"
+msgstr "anònim"
+
 msgid "Display the basic properties of the changeset"
 msgstr "Mostra les propietats bàsiques del conjunt de canvis"
 
@@ -6751,6 +6766,12 @@ msgid "Display the objects created, updated, and deleted by the changeset"
 msgstr ""
 "Mostra els objectes creats, modificats i suprimits pel conjunt de canvis"
 
+msgid "Discussion"
+msgstr ""
+
+msgid "Display the public discussion around this changeset"
+msgstr ""
+
 msgid "Changeset Management Dialog"
 msgstr "Finestra de gestió de conjunts de canvis"
 
@@ -6815,9 +6836,6 @@ msgctxt "changeset.state"
 msgid "Closed"
 msgstr "Tancat"
 
-msgid "anonymous"
-msgstr "anònim"
-
 msgid "ID"
 msgstr "ID"
 
@@ -6833,6 +6851,9 @@ msgstr "Creat el"
 msgid "Closed at"
 msgstr "Tancat el"
 
+msgid "Discussions"
+msgstr ""
+
 msgid "Downloading changeset content"
 msgstr "Descarregant el contingut del conjunt de canvis"
 
@@ -6958,6 +6979,15 @@ msgstr ""
 "Amplia els objectes en el contingut d''este conjunt de canvis a la capa "
 "actual"
 
+msgid "Update changeset discussion"
+msgstr ""
+
+msgid "Update the changeset discussion from the OSM server"
+msgstr ""
+
+msgid "Date"
+msgstr "Data"
+
 msgid "Download changesets"
 msgstr "Descarregar els conjunts de canvis"
 
@@ -7428,8 +7458,8 @@ msgstr "Per favor seleccioneu un valor"
 msgid "Set number of recently added tags"
 msgstr "Estableix el nombre de les etiquetes afegides recentment"
 
-msgid "Remember last used tags"
-msgstr "Recorda les últimes etiquetes usades"
+msgid "Remember last used tags after a restart"
+msgstr ""
 
 msgid "Please enter the number of recently added tags to display"
 msgstr ""
@@ -7814,6 +7844,9 @@ msgstr "incloent els fills directes de la relació"
 msgid "Load parent relations"
 msgstr "Carrega les relacions parents"
 
+msgid "Reload"
+msgstr "Recarrega"
+
 msgid "Loading parent relations"
 msgstr "Carregant les relacions parents"
 
@@ -7944,6 +7977,12 @@ msgstr "Dades GPS"
 msgid "Select to download GPS traces in the selected download area."
 msgstr "Descarregar les traces GPS de la zona seleccionada"
 
+msgid "Notes"
+msgstr "Notes"
+
+msgid "Select to download notes in the selected download area."
+msgstr ""
+
 msgid "Download as new layer"
 msgstr "Descarregar com una capa nova"
 
@@ -8295,9 +8334,6 @@ msgstr "A"
 msgid "B"
 msgstr "B"
 
-msgid "Date"
-msgstr "Data"
-
 msgid ""
 "Failed to update primitive with id {0} because current edit layer is null"
 msgstr ""
@@ -9304,9 +9340,6 @@ msgstr ""
 msgid "Save Layer"
 msgstr "Guarda la capa"
 
-msgid "Notes"
-msgstr "Notes"
-
 msgid "Notes layer"
 msgstr ""
 
@@ -9322,9 +9355,6 @@ msgstr "Capa de dades {0}"
 msgid "outside downloaded area"
 msgstr "fore de l''àrea descarregada"
 
-msgid "version {0}"
-msgstr "versió {0}"
-
 msgid "Merging layers"
 msgstr "Combinant capes"
 
@@ -13403,6 +13433,15 @@ msgid "Open changeset expected. Got closed changeset with id {0}."
 msgstr ""
 "S''esperava un conjunt de canvis obert. Hi ha un de tancat amb ID {0}."
 
+msgid "Note upload failed"
+msgstr ""
+
+msgid "Error parsing note response from server"
+msgstr ""
+
+msgid "Error encoding string: {0}"
+msgstr ""
+
 msgid "(Code={0})"
 msgstr "(Codi={0})"
 
@@ -13461,15 +13500,15 @@ msgstr ""
 msgid "Parsing changeset content ..."
 msgstr "Processant el contingut del conjunt de canvis ..."
 
+msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
+msgstr "Valor erroni de l''atribut booleà ''{0}''. El seu valor és ''{1}''."
+
 msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
 msgstr "Valor erroni de l''atribut ''{0}''. el seu valor és ''{1}''"
 
 msgid "Illegal numeric value for attribute ''{0}''. Got ''{1}''."
 msgstr "Valor erroni de l''atribut numèric ''{0}''. El seu valor és ''{1}''."
 
-msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
-msgstr "Valor erroni de l''atribut booleà ''{0}''. El seu valor és ''{1}''."
-
 msgid "Missing mandatory attribute ''{0}'' of XML element {1}."
 msgstr "Manca l''atribut obligatori ''{0}'' de l''element XML {1}."
 
@@ -14367,11 +14406,6 @@ msgstr ""
 "Ha fallat l''escaneig del fitxer ''{0}'' per la informació del connector. "
 "Ometent."
 
-msgid "Processing plugin site cache icon files..."
-msgstr ""
-"Processant els fitxers de les icones a la memòria cau del lloc web dels "
-"connectors..."
-
 msgid "Processing plugin files..."
 msgstr "Processant els fitxers del connnector..."
 
@@ -14390,12 +14424,6 @@ msgstr "JOSM no ha aconseguit descarregar la llista de connectors:"
 msgid "Details:"
 msgstr "Detalls:"
 
-msgid "Plugin icons download error"
-msgstr "Error en la descàrrega de les icones dels connectos"
-
-msgid "JOSM failed to download plugin icons:"
-msgstr "JOSM no ha aconseguit descarregar les icones dels connectors:"
-
 msgid ""
 "Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
 "plugin site ''{1}''."
@@ -15481,8 +15509,10 @@ msgid ""
 "Creating and handling address nodes and buildings within Czech Republic."
 msgstr "Crea i manega adreces i edificis a la República Txeca."
 
-msgid "Allows to import various file formats into JOSM directly."
-msgstr "Permet la importació directa a JOSM de varis formats de fitxer."
+msgid ""
+"Allows to import various file formats into JOSM directly. Currently "
+"supported: TangoGPS, Garmin Trainings Center TCX."
+msgstr ""
 
 msgid "Download your GPX tracks from openstreetmap.org"
 msgstr "Descarrega els vostres tracks d''openstreetmap.org"
@@ -15600,6 +15630,11 @@ msgid "A helper for IRS satellite adjustment."
 msgstr "Un ajudant pels ajustaments d''IRS de satèl·lit"
 
 msgid ""
+"Provides Java Native Access (JNA) library. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
+msgid ""
 "Provides Java Topology Suite (JTS) library and related utilities. Not meant "
 "to be installed directly by users, but rather as a dependency for other "
 "plugins."
@@ -16015,6 +16050,25 @@ msgstr "Llum"
 msgid "Width (meters)"
 msgstr "Amplada (metres)"
 
+msgid "Sidewalk"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "both"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "left"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "right"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "no"
+msgstr ""
+
 msgid "Service type"
 msgstr "Tipus de servei"
 
@@ -16379,17 +16433,21 @@ msgstr ""
 msgid "May-Sep 09:30-12:30,14:15-19:30"
 msgstr ""
 
+msgctxt "parking"
 msgid "multi-storey"
-msgstr "diverses plantes"
+msgstr ""
 
+msgctxt "parking"
 msgid "surface"
-msgstr "superfície"
+msgstr ""
 
+msgctxt "parking"
 msgid "underground"
-msgstr "soterrat"
+msgstr ""
 
+msgctxt "parking"
 msgid "rooftop"
-msgstr "terrat"
+msgstr ""
 
 msgid "Reference number"
 msgstr "Número de referència"
@@ -16845,14 +16903,25 @@ msgstr "Màx. longitud (m)"
 msgid "Overtaking"
 msgstr "Avançament"
 
+msgctxt "overtaking"
+msgid "yes"
+msgstr ""
+
+msgctxt "overtaking"
 msgid "both"
-msgstr "ambdós"
+msgstr ""
 
+msgctxt "overtaking"
 msgid "forward"
-msgstr "avant"
+msgstr ""
 
+msgctxt "overtaking"
 msgid "backward"
-msgstr "enrera"
+msgstr ""
+
+msgctxt "overtaking"
+msgid "no"
+msgstr ""
 
 msgid "Roundabout"
 msgstr "Rotonda"
@@ -17161,6 +17230,12 @@ msgstr "pegàs"
 msgid "tiger"
 msgstr "tigre"
 
+msgid "Button operated"
+msgstr ""
+
+msgid "Sound signals"
+msgstr "Senyals sonors"
+
 msgid "Crossing attendant"
 msgstr "Cruïlla assistida"
 
@@ -17683,9 +17758,6 @@ msgstr "Pas a nivell"
 msgid "Traffic lights"
 msgstr "Semàfors"
 
-msgid "Sound signals"
-msgstr "Senyals sonors"
-
 msgid "Barrier"
 msgstr "Barrera"
 
@@ -19747,6 +19819,9 @@ msgstr "Molí de vent"
 msgid "Gasometer"
 msgstr "Gasòmetre"
 
+msgid "Bunker Silo"
+msgstr ""
+
 msgid "Pipeline"
 msgstr "Canonada"
 
@@ -19893,15 +19968,15 @@ msgstr ""
 msgid "Monitoring:"
 msgstr ""
 
-msgid "Weather"
-msgstr ""
-
 msgid "Water level"
 msgstr ""
 
 msgid "Tide Level"
 msgstr ""
 
+msgid "Groundwater"
+msgstr ""
+
 msgid "Traffic"
 msgstr ""
 
@@ -19920,6 +19995,9 @@ msgstr ""
 msgid "Galileo Signals"
 msgstr ""
 
+msgid "Weather"
+msgstr ""
+
 msgid "Radiation"
 msgstr ""
 
@@ -20100,6 +20178,9 @@ msgstr ""
 msgid "pivot_pier"
 msgstr ""
 
+msgid "Bridge outline"
+msgstr ""
+
 msgid "Power Plant"
 msgstr "Central elèctrica"
 
@@ -20707,6 +20788,15 @@ msgstr ""
 msgid "Pole"
 msgstr "Pal"
 
+msgid "Pole with Transformer"
+msgstr ""
+
+msgid "Pole Attributes:"
+msgstr ""
+
+msgid "Transformer Attributes:"
+msgstr ""
+
 msgid "Power Line"
 msgstr "Línia elèctrica"
 
@@ -20756,9 +20846,15 @@ msgstr ""
 msgid "Power Cable"
 msgstr ""
 
+msgctxt "power cable"
+msgid "underground"
+msgstr ""
+
+msgctxt "power cable"
 msgid "underwater"
 msgstr ""
 
+msgctxt "power cable"
 msgid "overground"
 msgstr ""
 
@@ -20786,6 +20882,33 @@ msgstr "Monument"
 msgid "Memorial"
 msgstr "Memorial"
 
+msgctxt "memorial"
+msgid "statue"
+msgstr ""
+
+msgctxt "memorial"
+msgid "bust"
+msgstr ""
+
+msgctxt "memorial"
+msgid "plaque"
+msgstr ""
+
+msgctxt "memorial"
+msgid "stele"
+msgstr ""
+
+msgctxt "memorial"
+msgid "stone"
+msgstr ""
+
+msgctxt "memorial"
+msgid "war_memorial"
+msgstr ""
+
+msgid "Inscription"
+msgstr ""
+
 msgid "Wayside Cross"
 msgstr "Creu"
 
@@ -20855,6 +20978,9 @@ msgstr "Bodega"
 msgid "Beverages"
 msgstr "Begudes"
 
+msgid "Wine"
+msgstr ""
+
 msgid "Boutique"
 msgstr "Boutique"
 
@@ -20900,6 +21026,9 @@ msgstr "Vídeo"
 msgid "Video Games"
 msgstr ""
 
+msgid "Music"
+msgstr ""
+
 msgid "Cash"
 msgstr "en Efectiu"
 
@@ -20927,6 +21056,9 @@ msgstr "Cuines"
 msgid "Curtain"
 msgstr "Cortina"
 
+msgid "Art"
+msgstr ""
+
 msgid "Frame"
 msgstr "Marc"
 
@@ -20972,6 +21104,9 @@ msgstr ""
 msgid "Beauty"
 msgstr ""
 
+msgid "Tattoo"
+msgstr ""
+
 msgid "Optician"
 msgstr "Òptica"
 
@@ -21023,6 +21158,9 @@ msgstr ""
 msgid "Pet"
 msgstr ""
 
+msgid "Funeral Directors"
+msgstr ""
+
 msgid "Vending Machine"
 msgstr ""
 
@@ -21122,6 +21260,15 @@ msgstr ""
 msgid "National Park"
 msgstr ""
 
+msgid "Protected Area"
+msgstr ""
+
+msgid "Protected Class"
+msgstr ""
+
+msgid "Title or type of protection"
+msgstr ""
+
 msgid "Places"
 msgstr "Llocs"
 
@@ -22198,7 +22345,13 @@ msgstr ""
 msgid "Estonia Ortho (Maaamet)"
 msgstr ""
 
-msgid "Estonia Multi (Maaamet)"
+msgid "Estonia Hillshade (Maaamet)"
+msgstr ""
+
+msgid "Estonia Cadastre (Maaamet)"
+msgstr ""
+
+msgid "Estonia Forestry (Maaamet)"
 msgstr ""
 
 msgid "Bordeaux - 2012"
@@ -22222,7 +22375,7 @@ msgstr ""
 msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
 msgstr ""
 
-msgid "CUGN Nancy - Orthophoto 2012"
+msgid "GrandNancy Orthophotographie 2012"
 msgstr ""
 
 msgid "Géobretagne - Brest 2010 - 10 cm"
@@ -22269,9 +22422,6 @@ msgid ""
 "- 1 m"
 msgstr ""
 
-msgid "Streets NRW Geofabrik.de"
-msgstr ""
-
 msgid "Hike & Bike"
 msgstr ""
 
@@ -22331,6 +22481,9 @@ msgstr ""
 msgid "NRW-Atlas: Topographische Karte 1:10000"
 msgstr ""
 
+msgid "Metropole Ruhr: Luftbilder (10 cm)"
+msgstr ""
+
 msgid "Drone Imagery (Haiti)"
 msgstr ""
 
@@ -22532,6 +22685,9 @@ msgstr ""
 msgid "Stadt Zürich Übersichtsplan (Strassen, Gebäude, Hausnummer)"
 msgstr ""
 
+msgid "Stadt Zürich Luftbild 2011"
+msgstr ""
+
 msgid "Orthofoto Kanton Solothurn RGB (SOGIS 2011/2012/2013)"
 msgstr ""
 
@@ -22550,7 +22706,7 @@ msgstr ""
 msgid "Canton de Fribourg 50cm (2005)"
 msgstr ""
 
-msgid "Stadt Bern 10cm/25cm (2008)"
+msgid "Stadt Bern 10cm/25cm (2012)"
 msgstr ""
 
 msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
@@ -22589,7 +22745,7 @@ msgstr ""
 msgid "OSM US TIGER 2012 Roads Overlay"
 msgstr ""
 
-msgid "New & Misaligned TIGER Roads (TIGER 2013)"
+msgid "New & Misaligned TIGER Roads (TIGER 2014)"
 msgstr ""
 
 msgid "MassGIS L3 Parcels"
@@ -22637,9 +22793,234 @@ msgstr ""
 msgid "NLS - Bartholomew Half Inch, 1897-1907"
 msgstr ""
 
+msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Annan 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgstr ""
+
 msgid "OS Town Plans, Cupar 1854 (NLS)"
 msgstr ""
 
+msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Elgin 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Forres 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Galashiels 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Girvan 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Greenock 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Haddington 1853 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Haddington 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Hamilton 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Irvine 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Jedburgh 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kelso 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Lanark 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Linlithgow 1856 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Musselburgh 1853 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Musselburgh 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Oban 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Peebles 1856 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Perth 1860 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Peterhead 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Selkirk 1865 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, St Andrews 1854 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, St Andrews 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stirling 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stonehaven 1864 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1847 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Strathaven 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wick 1872 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wigtown 1848 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wigtown 1894 (NLS)"
+msgstr ""
+
 msgid "Decreasing house numbers in addresses interpolation"
 msgstr ""
 
@@ -22693,17 +23074,37 @@ msgid "{0}={1} is deprecated. Please use instead a multipolygon."
 msgstr ""
 
 msgid ""
-"{0} is deprecated. Please specify ìnterval by using opening_hours syntax"
+"{0} is deprecated. Please specify interval by using opening_hours syntax"
 msgstr ""
 
 msgid ""
 "{0} is deprecated. Please delete this object and use a private layer instead"
 msgstr ""
 
-msgid "{0} on a node"
+msgid "{0}={1} is unspecific. Please replace ''{1}'' by a specific value."
 msgstr ""
 
-msgid "{0} on a node. Should be drawn as an area"
+msgid "{0} should be replaced with {1}"
+msgstr ""
+
+msgid ""
+"{0}={1} is unspecific. Please replace ''{1}'' by ''left'', ''right'' or "
+"''both''."
+msgstr ""
+
+msgid "{0} on a node. Should be used on a way."
+msgstr ""
+
+msgid "{0} on a node. Should be drawn as an area."
+msgstr ""
+
+msgid "{0}=* on a node. Should be used in a relation"
+msgstr ""
+
+msgid "{0} on a way. Should be used in a relation"
+msgstr ""
+
+msgid "{0} on a node"
 msgstr ""
 
 msgid "Building inside building"
@@ -27812,6 +28213,9 @@ msgstr "Suggerir parades"
 msgid "Find"
 msgstr "Troba"
 
+msgid "Show"
+msgstr "Mostra"
+
 msgid "Mark"
 msgstr "Marca"
 
diff --git a/i18n/po/cs.po b/i18n/po/cs.po
index 1b95699..079ea32 100644
--- a/i18n/po/cs.po
+++ b/i18n/po/cs.po
@@ -1,17 +1,22 @@
+# Czech translation for josm
+# Copyright (c) 2008 Rosetta Contributors and Canonical Ltd 2008
+# This file is distributed under the same license as the josm package.
+# FIRST AUTHOR <EMAIL at ADDRESS>, 2008.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-21 03:38+0200\n"
-"PO-Revision-Date: 2014-09-14 19:38+0000\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"
 "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-10-21 04:44+0000\n"
-"X-Generator: Launchpad (build 17203)\n"
+"X-Launchpad-Export-Date: 2014-12-10 04:41+0000\n"
+"X-Generator: Launchpad (build 17283)\n"
 "Language: cs\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -66,7 +71,7 @@ msgid "Cause: "
 msgstr "Přičina: "
 
 msgid "Executing platform startup hook"
-msgstr "Startovací činnosti specfické pro platformu"
+msgstr "Startovací činnosti specifické pro platformu"
 
 msgid "Building main menu"
 msgstr "Sestavování hlavního menu"
@@ -141,7 +146,7 @@ msgid "Last change at {0}"
 msgstr "Poslední změna {0}"
 
 msgid "Java Version {0}"
-msgstr "Verze Java: {0}"
+msgstr "Verze prostředí Java: {0}"
 
 msgid "Homepage"
 msgstr "Domovská stránka"
@@ -171,21 +176,6 @@ msgid "About JOSM..."
 msgstr "O JOSM…"
 
 msgid ""
-"Unexpected format of API base URL. Redirection to info or history page for "
-"OSM object will probably fail. API base URL is: ''{0}''"
-msgstr ""
-"Formát základního URL API nebyl rozpoznán. Přesměrování na stránku s "
-"informacemi nebo historií objektu OSM pravděpodobně selže. Základní URL API "
-"je: ''{0}''"
-
-msgid ""
-"Unexpected format of API base URL. Redirection to user page for OSM user "
-"will probably fail. API base URL is: ''{0}''"
-msgstr ""
-"Formát základního URL API nebyl rozpoznán. Přesměrování na stránku s "
-"informacemi o uživateli OSM pravděpodobně selže. Základní URL API je: ''{0}''"
-
-msgid ""
 "You are about to launch {0} browser window.<br>This may both clutter your "
 "screen with browser windows<br>and take some time to finish."
 msgid_plural ""
@@ -312,10 +302,10 @@ msgid "Intersection of three or more ways can not be solved. Abort."
 msgstr "Nelze vyřešit protnutí tří nebo více cest. Končím."
 
 msgid "Two parallels ways found. Abort."
-msgstr "Nelezeny dvě paralelní cesty. Končím."
+msgstr "Nalezeny dvě paralelní cesty. Končím."
 
 msgid "data"
-msgstr "Data"
+msgstr "data"
 
 msgid "layer"
 msgstr "vrstvu"
@@ -354,7 +344,7 @@ msgid "View: {0}"
 msgstr "Zobrazení: {0}"
 
 msgid "No conflicts to zoom to"
-msgstr "Není žádný konflikt, na který by se mohlo přiblížit"
+msgstr "Není žádný konflikt, na který by se dalo přiblížit"
 
 msgid "Changeset Manager"
 msgstr "Správce sad změn"
@@ -387,7 +377,7 @@ msgid "Combine several ways into one."
 msgstr "Spojit více cest do jedné"
 
 msgid "Change directions?"
-msgstr "Změnit směr ?"
+msgstr "Změnit směr?"
 
 msgid "Reverse and Combine"
 msgstr "Otočit a zkombinovat"
@@ -402,7 +392,7 @@ msgstr ""
 msgid ""
 "Could not combine ways<br>(They could not be merged into a single string of "
 "nodes)"
-msgstr "Nemohu spojit cesty.<br>(Nemohou být spojeny do jednoho uzlu)"
+msgstr "Nemohu spojit cesty.<br>(Nemohou být spojeny do jedné sady uzlů)"
 
 msgid "Combine {0} way"
 msgid_plural "Combine {0} ways"
@@ -629,7 +619,7 @@ msgid "Joins areas that overlap each other"
 msgstr "Spojí plochy, které se navzájem překrývají"
 
 msgid "Please select at least one closed way that should be joined."
-msgstr "Prosím vyberte jednu uzavřenou cestu která bude připojena."
+msgstr "Prosím vyberte jednu uzavřenou cestu, která bude připojena."
 
 msgid ""
 "One of the selected ways is not closed and therefore cannot be joined."
@@ -649,7 +639,7 @@ msgid "This can lead to nodes being deleted accidentally."
 msgstr "Toto může vést k náhodnému smazání uzlů."
 
 msgid "Are you really sure to continue?"
-msgstr "Opravdu pokračovat ?"
+msgstr "Opravdu pokračovat?"
 
 msgid "Please abort if you are not sure"
 msgstr "Prosíme přerušte, pokud si nejste jisti"
@@ -929,7 +919,7 @@ msgid "Move {0}"
 msgstr "Přesunout {0}"
 
 msgid "Moves Objects {0}"
-msgstr "Přesunutí objektů {0}"
+msgstr "Přesune objekty {0}"
 
 msgid "Cannot move objects outside of the world."
 msgstr "Nemohu přesouvat objekty mimo svět."
@@ -1217,7 +1207,7 @@ msgid "Report bug"
 msgstr "Nahlásit chybu"
 
 msgid "Report a ticket to JOSM bugtracker"
-msgstr ""
+msgstr "Nahlásit chybu do správce chyb JOSM"
 
 msgid "Restart"
 msgstr "Restartovat"
@@ -1250,13 +1240,13 @@ msgid "Save the current data."
 msgstr "Uložit aktuální data"
 
 msgid "File {0} exists. Overwrite?"
-msgstr "Soubor {0} již existuje. Přepsat ?"
+msgstr "Soubor {0} již existuje. Přepsat?"
 
 msgid "No Exporter found! Nothing saved."
 msgstr "Nenalezen žádný exportér! Nic nebylo uloženo."
 
 msgid "File exists. Overwrite?"
-msgstr "Soubor již existuje. Chcete jej přepsat ?"
+msgstr "Soubor již existuje. Chcete jej přepsat?"
 
 msgid "Save As..."
 msgstr "Uložit jako..."
@@ -1277,7 +1267,7 @@ msgid "Non-branching way sequences"
 msgstr "Nerozvětvující se úseky cesty"
 
 msgid "Select non-branching sequences of ways"
-msgstr "Vyberte nevětvící se posloupnost cest"
+msgstr "Vybrat nevětvící se posloupnost cest"
 
 msgid "Load Session"
 msgstr "Otevřít sezení"
@@ -1319,7 +1309,7 @@ msgstr "Uložit sezení"
 
 msgid "<html>Could not save session file ''{0}''.<br>Error is:<br>{1}</html>"
 msgstr ""
-"<html>Nemohu uložit soubor sezení ''{0}''.<br>Error je:<br>{1}</html>"
+"<html>Nemohu uložit soubor sezení ''{0}''.<br>Chyba je:<br>{1}</html>"
 
 msgid "Save Session"
 msgstr "Uložit sezení"
@@ -1661,6 +1651,15 @@ msgstr "Neprovedeny žádné změny."
 msgid "Nothing to upload. Get some data first."
 msgstr "Není nic k nahrání. Nejprve musíte mít nějaká data."
 
+msgid "Upload note changes to server"
+msgstr "Nahrát změny poznámek na server"
+
+msgid "Upload notes"
+msgstr "Nahrát poznámky na server"
+
+msgid "Uploading notes to server"
+msgstr "Nahrávám poznámky na server"
+
 msgid "Upload selection"
 msgstr "Nahrát vybrané"
 
@@ -1815,26 +1814,26 @@ msgid "Markers from {0}"
 msgstr "Značky z {0}"
 
 msgid "Downloading Notes"
-msgstr ""
+msgstr "Stahuji poznámky"
 
 msgid "Download Compressed OSM Change"
-msgstr "Stiahnuť komprimovanú OSM zmenu"
+msgstr "Stáhnout komprimovanou změnu OSM"
 
 msgid "Download OSM Change"
-msgstr "Stiahnuť OSM zmenu"
+msgstr "Stáhnout změnu OSM"
 
 msgid "Download Compressed OSM"
-msgstr "Stiahnuť komprimované OSM"
+msgstr "Stáhnout komprimované OSM"
 
 msgid "Download OSM"
-msgstr "Stiahnuť OSM"
+msgstr "Stáhnout OSM"
 
 msgid "Downloading data"
 msgstr "Stahování dat"
 
 msgid ""
 "Ignoring exception because download has been canceled. Exception was: {0}"
-msgstr "Ignoruji výjimku, protože stahování bylo přerušeno.Výjimka: {0}"
+msgstr "Ignoruji výjimku, protože stahování bylo přerušeno. Výjimka: {0}"
 
 msgid "No data found in this area."
 msgstr "V této oblasti nebyla nalezena žádná data."
@@ -1945,22 +1944,28 @@ msgid "Errors during download"
 msgstr "Chyby během stahování"
 
 msgid "Error during download"
-msgstr "Nastala chyba během stahování"
+msgstr "Chyba během stahování"
 
 msgid "Add a new Note"
-msgstr ""
+msgstr "Přidat novou poznámku"
 
 msgid "Add note mode"
-msgstr ""
+msgstr "Režim přidávání poznámek"
 
 msgid "Click the location where you wish to create a new note"
-msgstr ""
-
-msgid "Enter a comment for a new note"
-msgstr ""
+msgstr "Klikněte na pozici, kde chcete vytvořit novou poznámku"
 
 msgid "Create new note"
-msgstr ""
+msgstr "Vytvořit novou poznámku"
+
+msgid "Create note"
+msgstr "Vytvořit poznámku"
+
+msgid "Enter a detailed comment to create a note"
+msgstr "K vytvoření poznámky zadejte podrobný komentář"
+
+msgid "You must enter a comment to create a new note"
+msgstr "K nové poznámce musíte zadat komentář"
 
 msgid "Delete Mode"
 msgstr "Režim mazání"
@@ -2003,7 +2008,7 @@ msgid "Add node into way"
 msgstr "Přidat uzel do cesty"
 
 msgid "Connect existing way to node"
-msgstr "Spojit existující cestu do uzlu"
+msgstr "Připojit existující cestu k uzlu"
 
 msgid "Add a new node to an existing way"
 msgstr "Přidat nový uzel do již existující cesty"
@@ -2246,7 +2251,7 @@ msgstr[2] ""
 "Opravdu je chcete přesunout?"
 
 msgid "Release the mouse button to select the objects in the rectangle."
-msgstr "Pusťte myší tlačítko k vybrání obejktů v obdélníku"
+msgstr "Pusťte tlačítko myši k vybrání objektů v obdélníku"
 
 msgid "Ctrl to merge with nearest node."
 msgstr "Ctrl pro sloučení s nejbližším uzlem"
@@ -2258,7 +2263,7 @@ msgid "Release the mouse button to stop rotating."
 msgstr "Pusťte tlačítko myši pro zastavení otáčení."
 
 msgid "Release the mouse button to stop scaling."
-msgstr "Pusťe tlačítko myši pro ukončení změny velikosti"
+msgstr "Pusťte tlačítko myši pro dokončení změny velikosti."
 
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -2302,7 +2307,7 @@ msgstr[1] "Přidat výběr do {0} relací"
 msgstr[2] "Přidat výběr do {0} relací"
 
 msgid "Delete the selected relation"
-msgstr "Smazat vybrané relace"
+msgstr "Smazat vybranou relaci"
 
 msgid "Download all members of the selected relations"
 msgstr "Stáhnout všechny členy vybraných relací"
@@ -2408,7 +2413,7 @@ msgid "Search..."
 msgstr "Hledat..."
 
 msgid "Search for objects."
-msgstr "Hledat objekty"
+msgstr "Hledat objekty."
 
 msgid "{0}: "
 msgstr "{0}: "
@@ -2801,7 +2806,7 @@ msgid "Nothing found in selection by searching for ''{0}''"
 msgstr "Ve výběru se nic nenašlo při hledání ''{0}''"
 
 msgid "Found {0} matches"
-msgstr "Nalezeno {0} odpovídajích výrazů"
+msgstr "Nalezeno {0} odpovídajících výrazů"
 
 msgctxt "search"
 msgid "CS"
@@ -2916,7 +2921,7 @@ msgstr ""
 "nenahraje na server, dokud závislost neopravíte a neodstraníte cyklus.</html>"
 
 msgid "Relation ..."
-msgstr "Relace…"
+msgstr "Relace …"
 
 msgid "... refers to relation"
 msgstr "... odkazuje na relaci"
@@ -2924,6 +2929,15 @@ msgstr "... odkazuje na relaci"
 msgid "Cycling dependencies"
 msgstr "Kruhové závislosti"
 
+msgid "Uploading modified notes"
+msgstr "Nahrávám změněné poznámky"
+
+msgid "Note {0} failed: {1}"
+msgstr "Poznámka {0} selhalo: {1}"
+
+msgid "Notes failed to upload"
+msgstr "Nepodařilo se nahrát poznámky"
+
 msgid ""
 "The following are results of automatic validation. Try fixing these, but be "
 "careful (don''t destroy valid data). When in doubt ignore them.<br>When you "
@@ -3188,13 +3202,14 @@ msgstr "Přidání konfliktu k ''{0}''"
 
 msgid ""
 "Cannot undo command ''{0}'' because layer ''{1}'' is not present any more"
-msgstr "Nelze zrušit příkaz ''{0}'' protože vrstva ''{1}'' již není dostupná"
+msgstr ""
+"Nelze vrátit příkaz ''{0}'', protože vrstva ''{1}'' již není dostupná"
 
 msgid "Resolve conflicts in coordinates in {0}"
 msgstr "Vyřešení konfliktu v souřadnicích pro {0}"
 
 msgid "Cannot resolve undecided conflict."
-msgstr "nemohu vyřešit nerozhodnutý konflikt"
+msgstr "Nemohu vyřešit nerozhodnutý konflikt."
 
 msgid "Resolve conflicts in deleted state in {0}"
 msgstr "Vyřešení konfliktu ve stavu smazání pro {0}"
@@ -3650,24 +3665,24 @@ msgid ""
 "Can''t activate map renderer class ''{0}'', because it isn''t a subclass of "
 "''{1}''."
 msgstr ""
-"Nelze aktivovat třídu mapového renederu ''{0}'', protože chybí podtřída "
+"Nelze aktivovat třídu mapového rendereru ''{0}'', protože není podtřídou "
 "''{1}''."
 
 msgid ""
 "Can''t activate map renderer class ''{0}'', because it isn''t registered as "
 "map renderer."
 msgstr ""
-"Nelze aktivovat třídu mapového renederu ''{0}'', protože nejde o "
-"registrovaný reneder."
+"Nelze aktivovat třídu mapového rendereru ''{0}'', protože není "
+"zaregistrovaná jako mapový renderer."
 
 msgid "Wireframe Map Renderer"
-msgstr "Drátový mapový reneder"
+msgstr "Drátový mapový renderer"
 
 msgid "Renders the map as simple wire frame."
 msgstr "Renederuje mapu jako jednoduchý drátový model"
 
 msgid "Styled Map Renderer"
-msgstr "Stylovaný mapový reneder"
+msgstr "Stylovaný mapový renderer"
 
 msgid "Renders the map using style rules in a set of style sheets."
 msgstr "Renederuje mapu za pomoci sad pravidel a stylů."
@@ -3712,7 +3727,7 @@ msgid "areatext"
 msgstr "popisek ploch"
 
 msgid "Parameter must begin with a ''+'' character (found ''{0}'')"
-msgstr "Parameter musí začínat znakem ''+'' (nalezeno ''{0}'')"
+msgstr "Parametr musí začínat znakem ''+'' (nalezeno ''{0}'')"
 
 msgid "Unknown parameter: ''{0}''."
 msgstr "Neznámý parametr: ''{0}''."
@@ -3772,7 +3787,7 @@ msgid "Unknown parameter ''{0}''"
 msgstr "Neznámy parameter ''{0}''"
 
 msgid "Expected number argument for parameter ''{0}''"
-msgstr "Neočekávaný počet argumentů parametru ''{0}''"
+msgstr "Očekáván číselný argument pro parametr ''{0}''"
 
 msgid "Unable to parse value ''{1}'' of parameter ''{0}'' as number."
 msgstr "Hodnotu ''{1}'' parametru ''{0}'' se nepodařilo parsovat jako číslo."
@@ -3888,17 +3903,18 @@ msgid "House number too far from street"
 msgstr "Číslo domu je příliš daleko od ulice"
 
 msgid "API Capabilities"
-msgstr ""
+msgstr "Schopnosti API"
 
 msgid "Checks for errors against API capabilities"
-msgstr ""
+msgstr "Najít chyby vůči schopnostem API"
 
 msgid ""
 "Way contains more than {0} nodes. It should be replaced by a multipolygon"
 msgstr ""
+"Cesta obsahuje více než {0} uzlů. Měla by být nahrazena multipolygonem"
 
 msgid "Way contains more than {0} nodes. It should be split or simplified"
-msgstr ""
+msgstr "Cesta obsahuje více než {0} uzlů. Měla by být zjednodušena"
 
 msgid "Barriers and entrances"
 msgstr "Překážky a vchody"
@@ -4073,7 +4089,7 @@ msgid "Checks for errors in internet-related tags."
 msgstr "Kontroluje chyby v značkách sovisejících s Internetem."
 
 msgid "''{0}'': {1}"
-msgstr ""
+msgstr "''{0}'': {1}"
 
 msgid "Lane tags"
 msgstr "Značky jízdních pruhů"
@@ -4136,14 +4152,20 @@ msgid "Role for ''{0}'' should be ''{1}''"
 msgstr "Role u ''{0}'' by měla být ''{1}''"
 
 msgid "No area style for multipolygon"
-msgstr ""
+msgstr "Multipolychon nemá žádný styl plochy"
 
 msgid ""
 "Multipolygon relation should be tagged with area tags and not the outer way"
 msgid_plural ""
 "Multipolygon relation should be tagged with area tags and not the outer ways"
 msgstr[0] ""
+"Značky plochy by měly být na relaci multipolygonu, nikoliv na vnější cestě"
 msgstr[1] ""
+"Značky plochy by měly být na relaci multipolygonu, nikoliv na vnějších "
+"cestách"
+msgstr[2] ""
+"Značky plochy by měly být na relaci multipolygonu, nikoliv na vnějších "
+"cestách"
 
 msgid "Style for inner way equals multipolygon"
 msgstr "Styl vnitřní cesty je shodný s multipolygonem"
@@ -4152,10 +4174,10 @@ msgid "Style for outer way mismatches"
 msgstr "Styly pro vnější cesty jsou různé"
 
 msgid "Style for outer way mismatches polygon"
-msgstr ""
+msgstr "Styl vnější cesty neodpovídá multipolygonu"
 
 msgid "Area style on outer way"
-msgstr ""
+msgstr "Styl plochy na vnější cestě"
 
 msgid "Multipolygon is not closed"
 msgstr "Multipolygon není uzavřený"
@@ -4278,6 +4300,7 @@ msgstr "Kontrola chyb v relacích."
 msgid ""
 "Route scheme is unspecified. Add {0} ({1}=public_transport; {2}=legacy)"
 msgstr ""
+"Nebyl zadán typ trasy. Přidejte {0} ({1}=veřejná doprava; {2}=zastaralé)"
 
 msgid "Relation type is unknown"
 msgstr "Neznámý typ relace"
@@ -4703,13 +4726,13 @@ msgid "Precondition violation"
 msgstr "Porušení předpokladů"
 
 msgid "Security exception"
-msgstr "Bezpečnostní vyjímka"
+msgstr "Bezpečnostní výjimka"
 
 msgid "Network exception"
-msgstr "Síťová vyjímka"
+msgstr "Síťová výjimka"
 
 msgid "IO Exception"
-msgstr "IO výjimka"
+msgstr "Výjimka vstupu/výstupu"
 
 msgid "Illegal Data"
 msgstr "Neplatná data"
@@ -4745,7 +4768,7 @@ msgid "Bandwidth Limit Exceeded"
 msgstr "Omezení datového pásma překročeno"
 
 msgid "Communication with OSM server failed"
-msgstr "Komunikace s OSM serverem selhala"
+msgstr "Komunikace se serverem OSM selhala"
 
 msgid "Authentication failed"
 msgstr "Ověření totožnosti selhalo"
@@ -4832,7 +4855,7 @@ msgid "Changes preferences according to the XML file"
 msgstr "Změní nastavení podle souboru XML"
 
 msgid "Set preference key to value"
-msgstr "Nastavte prednastavený kľúč na hodnotu"
+msgstr "Upravte klíč v nastavení na hodnotu"
 
 msgid "Set the language"
 msgstr "Nastavit jazyk"
@@ -5320,6 +5343,12 @@ msgstr "Pozadí konfliktu: ponechat všechny značky"
 msgid "Conflict foreground: keep all tags"
 msgstr "Popředí konfliktu: ponechat všechny značky"
 
+msgid "Conflict background: sum all numeric tags"
+msgstr "Pozadí kofliktu: součet všech číslených značek"
+
+msgid "Conflict foreground: sum all numeric tags"
+msgstr "Popředí konfliktu: součet všech číslených značek"
+
 msgid "Conflict background: keep member"
 msgstr "Pozadí konfliktu: ponechat člen"
 
@@ -5797,12 +5826,20 @@ msgstr "nic"
 msgid "all"
 msgstr "všechny"
 
+msgid "sum"
+msgstr "součet"
+
 msgid "Please decide which values to keep"
 msgstr "Rozhodněte se, které hodnoty nechat"
 
 msgid "Value ''{0}'' is going to be applied for key ''{1}''"
 msgstr "Hodnota ''{0}'' bude použita pro klíč ''{1}''"
 
+msgid ""
+"All numeric values sumed as ''{0}'' are going to be applied for key ''{1}''"
+msgstr ""
+"Všechny číselné hodnoty sečtené jako ''{0}'' budou vloženy do klíče ''{1}''"
+
 msgid "The key ''{0}'' and all its values are going to be removed"
 msgstr "Klíč ''{0}'' a všechny jeho hodnoty budou odstraněny"
 
@@ -6088,12 +6125,12 @@ msgid ""
 "applied.</strong><br>Click <strong>{1}</strong> to return to resolving "
 "conflicts.</html>"
 msgstr ""
-"<html> Nemôžete ukončiť zlučovanie v tomto konflikte.<br>Vyriešenie "
-"konfliktu nemôže byť aplikované pokiaľ všetky rozdiely<br>nebudú "
-"vyriešené.<br>Kliknite <strong>{0}</strong> ak chcete aj tak "
-"ukončiť.<strong> Už<br> vyriešené rozdiely nebudú "
-"použité.</strong><br>Kliknite <strong>{1}</strong> pre návrat k riešeniu "
-"konfliktov.</html>"
+"<html> Nedokončili jste slučování rozdílů v tomto konfliktu.<br>Vyřešení "
+"konfliktu nelze aplikovat, dokud nebudou vyřešeny<br>všechny "
+"rozdíly.<br>Klikněte <strong>{0}</strong>, pokud chcete i přesto "
+"ukončit.<strong> Už<br> vyřešené rozdíly nebudou "
+"použity.</strong><br>Klikněte <strong>{1}</strong> pro návrat k řešení "
+"konfliktů.</html>"
 
 msgid "Conflict not resolved completely"
 msgstr "Konflikt není vyřešen kompletně"
@@ -6204,24 +6241,6 @@ msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
 "</p><p>Chcete-li zobrazit všechny objekty, uzavřete panel Filtr.<p></html>"
 
-msgid "Display the history of all selected items."
-msgstr "Zobrazit historii všech vybraných objektů."
-
-msgid "Object with history"
-msgstr "Objekt s historií"
-
-msgid "Reload"
-msgstr "Aktualizovat"
-
-msgid "Reload all currently selected objects and refresh the list."
-msgstr "Aktualizovat vybrané objekty a obnovit seznam."
-
-msgid "Show"
-msgstr "Zobrazit"
-
-msgid "Display the history of the selected objects."
-msgstr "Zobrazit historii vybraných objektů."
-
 msgid "Advanced object info"
 msgstr "Rozšířené informace o objektu"
 
@@ -6528,10 +6547,10 @@ msgid "Save a copy of this Style to file and add it to the list"
 msgstr "Uložit kopii tohoto stylu do souboru a přidat jej do seznamu"
 
 msgid "Map paint style file (*.mapcss, *.zip)"
-msgstr "Súbor farebného štýlu mapy (*.mapcss, *.zip)"
+msgstr "Soubor barevného stylu mapy (*.mapcss, *.zip)"
 
 msgid "Map paint style file (*.xml, *.zip)"
-msgstr "Súbor farebného štýlu mapy (*.xml, *.zip)"
+msgstr "Soubor barevného stylu mapy (*.xml, *.zip)"
 
 msgid "Reloading style sources"
 msgstr "Aktualizuji zdroje stylů"
@@ -6576,40 +6595,40 @@ msgid "Style settings"
 msgstr "Nastavení stylu"
 
 msgid "Customize the style"
-msgstr ""
+msgstr "Upravit styl"
 
 msgid "Add comment"
-msgstr ""
+msgstr "Přidat komentář"
 
 msgid "Comment"
 msgstr "Komentář"
 
+msgid "Comment on note"
+msgstr "Komentář k poznámce"
+
 msgid "Add comment to note:"
-msgstr ""
+msgstr "Přidat komentář k poznámce:"
 
 msgid "Close note"
-msgstr ""
+msgstr "Uzavřít poznámku"
 
 msgid "Close note with message:"
-msgstr ""
-
-msgid "Close Note"
-msgstr ""
+msgstr "Uzavřít poznámku se zprávou:"
 
 msgid "Create a new note"
-msgstr ""
+msgstr "Vytvořit novou poznámku"
 
 msgid "Create"
 msgstr "Vytvořit"
 
 msgid "Reopen note"
-msgstr ""
+msgstr "Znovu otevřít poznámku"
 
 msgid "Reopen"
-msgstr ""
+msgstr "Znovu otevřít"
 
 msgid "Reopen note with message:"
-msgstr ""
+msgstr "Znovu otevřít poznámku se zprávou:"
 
 msgid "Object type:"
 msgstr "Typ objektu:"
@@ -6673,6 +6692,9 @@ msgstr "Současný výběr"
 msgid "Search for objects"
 msgstr "Hledat objekty"
 
+msgid "Display the history of the selected objects."
+msgstr "Zobrazit historii vybraných objektů."
+
 msgid "Zoom to selection"
 msgstr "Zvětšit na výběr"
 
@@ -6799,6 +6821,9 @@ msgstr "Opravuji ({0}/{1}): ''{2}''"
 msgid "Updating map ..."
 msgstr "Aktualizuji mapu ..."
 
+msgid "anonymous"
+msgstr "anonymní"
+
 msgid "Display the basic properties of the changeset"
 msgstr "Zobrazit základní vlastnosti sady změn"
 
@@ -6811,6 +6836,12 @@ msgstr "Obsah"
 msgid "Display the objects created, updated, and deleted by the changeset"
 msgstr "Zobrazit objekty vytvořené, aktualizované a smazané sadou změn"
 
+msgid "Discussion"
+msgstr "Diskuse"
+
+msgid "Display the public discussion around this changeset"
+msgstr "Zobrazit veřejnou diskusi ohledně této sady změn"
+
 msgid "Changeset Management Dialog"
 msgstr "Dialog správy sady změn"
 
@@ -6864,20 +6895,17 @@ msgstr "prázdný"
 
 msgctxt "changeset.state"
 msgid "Open"
-msgstr "Otevřená"
+msgstr "Otevřený"
 
 msgctxt "changeset.state"
 msgid "Closed"
 msgstr "Zavřený"
 
-msgid "anonymous"
-msgstr "anonymní"
-
 msgid "ID"
 msgstr "id"
 
 msgid "Open"
-msgstr "Otevřená"
+msgstr "Otevřít"
 
 msgid "User"
 msgstr "Uživatel"
@@ -6888,6 +6916,9 @@ msgstr "Vytvořen v"
 msgid "Closed at"
 msgstr "Uzavřen v"
 
+msgid "Discussions"
+msgstr "Diskuse"
+
 msgid "Downloading changeset content"
 msgstr "Stahování obsahu sady změn"
 
@@ -7009,6 +7040,15 @@ msgid ""
 msgstr ""
 "Zvětšit na objekty obsažené v této sadě změn v aktuální datové vrstvě"
 
+msgid "Update changeset discussion"
+msgstr "Aktualizovat diskusi o sadě změn"
+
+msgid "Update the changeset discussion from the OSM server"
+msgstr "Aktualizuje diskusi o sadě změn ze serveru OSM"
+
+msgid "Date"
+msgstr "Datum"
+
 msgid "Download changesets"
 msgstr "Stáhnout sady změn"
 
@@ -7464,8 +7504,8 @@ msgstr "Vyberte hodnotu"
 msgid "Set number of recently added tags"
 msgstr "Nastavte počet novo pridaných značiek"
 
-msgid "Remember last used tags"
-msgstr "Zapamätať naposledy použité značky"
+msgid "Remember last used tags after a restart"
+msgstr "Pamatovat si napodle použité značky po restartu"
 
 msgid "Please enter the number of recently added tags to display"
 msgstr "Zadajte prosím počet nedávno pridaných značiek pre zobrazenie"
@@ -7838,6 +7878,9 @@ msgstr "včetně přímých potomků rodičovské relace"
 msgid "Load parent relations"
 msgstr "Načíst rodičovské relace"
 
+msgid "Reload"
+msgstr "Aktualizovat"
+
 msgid "Loading parent relations"
 msgstr "Nahrávám rodičovské relace"
 
@@ -7967,6 +8010,12 @@ msgstr ""
 "Zvolte, pokud ve vybrané oblasti chcete stáhnout dostupné záznamy prošlých "
 "tras GPS."
 
+msgid "Notes"
+msgstr "Bankovky"
+
+msgid "Select to download notes in the selected download area."
+msgstr "Zvolte pro stažení poznámek v oblasti vybrané pro stahování."
+
 msgid "Download as new layer"
 msgstr "Uložit jako novou vrstvu"
 
@@ -8078,13 +8127,13 @@ msgid "Querying name server ..."
 msgstr "Dotazuji se jmeného serveru ..."
 
 msgid "Error occured with query ''{0}'': ''{1}''"
-msgstr ""
+msgstr "Došlo k chybě při dotazu ''{0}'': ''{1}''"
 
 msgid "Name server returned invalid data. Please try again."
-msgstr ""
+msgstr "Jmenný server vrátil nepoužitelná data. Zkute to prosím znovu."
 
 msgid "Bad response"
-msgstr ""
+msgstr "Chybná odpověď"
 
 msgid "Type"
 msgstr "Typ"
@@ -8308,9 +8357,6 @@ msgstr "A"
 msgid "B"
 msgstr "B"
 
-msgid "Date"
-msgstr "Datum"
-
 msgid ""
 "Failed to update primitive with id {0} because current edit layer is null"
 msgstr ""
@@ -8384,17 +8430,18 @@ msgid "Prepare conflict resolution"
 msgstr "Příprava řešení konfliktů"
 
 msgid "Click to download all referring objects for {0}"
-msgstr "Kliknite na stiahnutie všetkých odkazujúcich objektov na {0}"
+msgstr "Klikněte pro stažení všech objektů, odkazujících na {0}"
 
 msgid "Click to cancel and to resume editing the map"
-msgstr "Kliknutím zrušte a pokračujte v editovaní mapy"
+msgstr "Kliknutím zrušte a pokračujte v editaci mapy"
 
 msgid ""
 "Click <strong>{0}</strong> to load them now.<br>If necessary JOSM will "
 "create conflicts which you can resolve in the Conflict Resolution Dialog."
 msgstr ""
-"Kliknite na tlačidlo <strong>{0}</strong> pre načítanie teraz. Ak JOSM bude "
-"vytvárať konflikty, môžete ich vyriešiť v Dialógu riešenie konfliktov."
+"Klikněte na tlačítko <strong>{0}</strong>, abyste je nyní načetli. V případě "
+"nutnosti JOSM vytvoří konflikty, které můžete vyřešit v Dialogu řešení "
+"konfliktů."
 
 msgid "Object still in use"
 msgstr "Objekt je stále používán"
@@ -8508,7 +8555,7 @@ msgid "Enter credentials for OSM API"
 msgstr "Zadejte přihlašovací údaje pro OSM API"
 
 msgid "Enter credentials for host"
-msgstr "Zadajte prihlasovacie údaje pre hostiteľa"
+msgstr "Zadajte přihlašovací údaje pro hostitele"
 
 msgid "Enter credentials for HTTP proxy"
 msgstr "Zadejte přihlašovací údaje pro HTTP proxy"
@@ -8672,7 +8719,7 @@ msgid "Click cell to change the file path."
 msgstr "Kliknutím na buňku změníte cestu k souboru."
 
 msgid "Launch a file chooser to select a file"
-msgstr "Založiť (Launch) súbor podľa vyberajúcej osoby pre výber súboru"
+msgstr "Spustit výběr souboru"
 
 msgid "Select filename"
 msgstr "Vyberte soubor"
@@ -8765,7 +8812,7 @@ msgstr[2] ""
 "zahoďte.<br>Vrstvy s nezapisovatelnými soubory:</html>"
 
 msgid "Unsaved data non-writable files"
-msgstr "Neuložené dáta nezapisovateľných súborov"
+msgstr "Neuložená data nezapisovatelných souborů"
 
 msgid "Close this dialog and resume editing in JOSM"
 msgstr "Zavřít tento dialog a pokračovat v editování v JOSM"
@@ -8831,7 +8878,7 @@ msgid ""
 msgstr "Vrstva ''{0}'' obsahuje změny, které by měly být nahrány na server."
 
 msgid "Layer ''{0}'' has modifications which are discouraged to be uploaded."
-msgstr "Vrstva ''{0}'' obsahuje zmeny, ktoré sa neodporúča nahrať."
+msgstr "Vrstva ''{0}'' obsahuje změny, které se nedoporučuje nahrát."
 
 msgid "Layer ''{0}'' has no modifications to be uploaded."
 msgstr "Vrstva ''{0}'' nemá žádné změny k nahrání na server."
@@ -9123,7 +9170,7 @@ msgstr[2] "Nahrávám {0} objektů..."
 msgid ""
 "Ignoring caught exception because upload is canceled. Exception is: {0}"
 msgstr ""
-"Ignorujem zachytenú výnimku pretože nahrávanie je zrušené. Výnimka je: {0}"
+"Ignoruji zachycenou výjimku, protože nahrávání je zrušeno. Výjimka je: {0}"
 
 msgid "Upload successful!"
 msgstr "Nahrání proběhlo úspěšně!"
@@ -9139,8 +9186,8 @@ msgid ""
 "<html>Mark <strong>locally deleted objects</strong> to be deleted on the "
 "server.</html>"
 msgstr ""
-"<html>Označené <strong>lokálne zmazané objekty</strong> budú vymazané na "
-"serveri.</html>"
+"<html>Označené <strong>lokálně smazané objekty</strong> budou vymazány na "
+"serveru.</html>"
 
 msgid "Select objects to upload"
 msgstr "Vybrat objekty k nahrání na server"
@@ -9294,13 +9341,13 @@ msgid "Save GPX file"
 msgstr "Uložit GPX soubor"
 
 msgid "Imagery fade"
-msgstr "Zoslabenie mapového podkladu"
+msgstr "Zeslabení mapového podkladu"
 
 msgid "ERROR"
 msgstr "CHYBA"
 
 msgid "Next marker"
-msgstr "Nasledujúca značka"
+msgstr "Následující značka"
 
 msgid "Jump to next marker"
 msgstr "Přejít na další značku"
@@ -9326,9 +9373,6 @@ msgstr ""
 msgid "Save Layer"
 msgstr "Ulož vrstvu"
 
-msgid "Notes"
-msgstr "Bankovky"
-
 msgid "Notes layer"
 msgstr "Vrstva poznámek"
 
@@ -9344,9 +9388,6 @@ msgstr "Datová vrstva {0}"
 msgid "outside downloaded area"
 msgstr "mimo staženou oblast"
 
-msgid "version {0}"
-msgstr "verze {0}"
-
 msgid "Merging layers"
 msgstr "Slučování vrstev"
 
@@ -9366,7 +9407,7 @@ msgid "API version: {0}"
 msgstr "Verze API: {0}"
 
 msgid "Upload is discouraged"
-msgstr "Nahratie sa neoporúča"
+msgstr "Nahrání se nedoporučuje"
 
 msgid "Convert to GPX layer"
 msgstr "Převést do GPX vrstvy"
@@ -9532,7 +9573,7 @@ msgid "Automatic downloading"
 msgstr "Automatické stahování"
 
 msgid "Zoom to native resolution"
-msgstr "Zvetšit do nativního rozlišení"
+msgstr "Zvětšit do nativního rozlišení"
 
 msgid "Supported projections are: {0}"
 msgstr "Podporované projekce jsou: {0}"
@@ -9541,7 +9582,7 @@ msgid "Unsupported WMS file version; found {0}, expected {1}"
 msgstr "Nepodporovaná verze WMS souboru; nalezeno {0}, očekáváno {1}"
 
 msgid "Save WMS file"
-msgstr "Uložiť WMS súbor"
+msgstr "Uložit WMS soubor"
 
 msgid "Correlate to GPX"
 msgstr "Korelovat vůči GPX"
@@ -9590,7 +9631,7 @@ msgid ""
 "Please use the requested format"
 msgstr ""
 "Chyba při čtení data.\n"
-"Prosíme, použijte požadvaný formát"
+"Prosíme, použijte požadovaný formát"
 
 msgid "Invalid date"
 msgstr "Neplatné datum"
@@ -9928,7 +9969,7 @@ msgid "Maximum area per request:"
 msgstr "Maximální plocha na požadavek:"
 
 msgid "sq km"
-msgstr ""
+msgstr "čtverečních km"
 
 msgid "Download near:"
 msgstr "Stáhnout poblíž:"
@@ -9995,8 +10036,8 @@ msgid ""
 "server.<br>Because its way points do not include a timestamp we cannot "
 "correlate them with audio data.</html>"
 msgstr ""
-"<html>Údaje v GPX vrstve ''{0}'' boli stiahnuté zo servera.<br>Pretože body "
-"cesty neobsahujú časovú značku nemôžme ich zladiť s audio dátami.</html>"
+"<html>Údaje v GPX vrstvě ''{0}'' byly stažené ze serveru.<br>Protože body "
+"cesty neobsahují časovou značku, nelze je sladit s audio daty.</html>"
 
 msgid "Import not possible"
 msgstr "Import není možný"
@@ -10008,7 +10049,7 @@ msgid "Audio markers from {0}"
 msgstr "Audio značky z {0}"
 
 msgid "No GPX track available in layer to associate audio with."
-msgstr "Není dostupná žádná GPX trasa pro kterou by šel asociovat zvuk."
+msgstr "Není dostupná žádná GPX trasa, pro kterou by šel asociovat zvuk."
 
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -10021,7 +10062,7 @@ msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
 "time were omitted."
 msgstr ""
-"Některé trasové body, které byly příliš daleko od trasy než aby šlo rozumně "
+"Některé trasové body, které byly příliš daleko od trasy, než aby šlo rozumně "
 "odhadnout jejich čas, byly vynechány."
 
 msgid "Import images"
@@ -10032,8 +10073,8 @@ msgid ""
 "server.<br>Because its way points do not include a timestamp we cannot "
 "correlate them with images.</html>"
 msgstr ""
-"<html>Údaje v GPX vrstve ''{0}'' boli stiahnuté zo servera.<br>Pretože body "
-"cesty neobsahujú časovú značku nemôžme ich zladiť s obrázkami.</html>"
+"<html>Údaje v GPX vrstvě ''{0}'' byly staženy ze serveru.<br>Protože body "
+"cesty neobsahují časovou značku, nelze je sladit s obrázky.</html>"
 
 msgid "Markers From Named Points"
 msgstr "Značky z pojmenovaných bodů"
@@ -10058,8 +10099,8 @@ msgstr[2] "{0} se skládá z  {1} značek"
 
 msgid "No existing audio markers in this layer to offset from."
 msgstr ""
-"Neexistujú zvukové značky v tejto vrstve, voči ktorým by bolo možné nastaviť "
-"posunutie."
+"Neexistují zvukové značky v této vrstvě, vůči kterým by bylo možné nastavit "
+"posunutí."
 
 msgid "Show Text/Icons"
 msgstr "Zobrazit text/ikony"
@@ -10076,19 +10117,19 @@ msgstr ""
 "Audio je třeba pozastavit v okamžiku, kdy uslyšíte synchronizační impuls."
 
 msgid "Audio synchronized at point {0}."
-msgstr "Zvuk zesynchronizován na bodu {0}."
+msgstr "Zvuk sesynchronizován na bodu {0}."
 
 msgid "Unable to synchronize in layer being played."
 msgstr "Není možno synchronizovat v již přehrávané vrstvě"
 
 msgid "Make Audio Marker at Play Head"
-msgstr "Vytvoriť Zvukovú značku v \"Play Head\""
+msgstr "Vytvořit Zvukovou značku v \"Play Head\""
 
 msgid ""
 "You need to have paused audio at the point on the track where you want the "
 "marker."
 msgstr ""
-"Potrebujete pozastaviť(pause) audio v bode na stope, kde chcete mať znažku."
+"Potřebujete pozastavit (pause) audio v bodě na stopě, kde chcete mít značku."
 
 msgid ""
 "You need to drag the play head near to the GPX track whose associated sound "
@@ -10114,7 +10155,7 @@ msgid "(URL was: "
 msgstr "(URL bylo: "
 
 msgid "Select the map painting styles"
-msgstr "Vybrať štýl kreslenia mapy"
+msgstr "Vybraẗ styl kreslení mapy"
 
 msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
 msgstr "Selhalo nahrání stylů kreslení mapy z ''{0}''. Došlo k výjimce: {1}"
@@ -10190,7 +10231,7 @@ msgid "Consumer Secret:"
 msgstr "Tajný klíč:"
 
 msgid "Request Token URL:"
-msgstr "URL požiadavky prístupu:"
+msgstr "URL požadavkového tokenu:"
 
 msgid "Access Token URL:"
 msgstr "URL přístupového tokenu:"
@@ -10218,7 +10259,7 @@ msgid "Fully automatic"
 msgstr "Plně automatická"
 
 msgid "Semi-automatic"
-msgstr "Polo-automatická"
+msgstr "Poloautomatická"
 
 msgid "Manual"
 msgstr "Manuální"
@@ -10250,7 +10291,7 @@ msgid ""
 "<html>Enter an Access Token manually if it was generated and retrieved "
 "outside<br>of JOSM.</html>"
 msgstr ""
-"<html>Vložit přístupový token manuálně pokud byl vygenerován a získán mimo "
+"<html>Vložit přístupový token manuálně, pokud byl vygenerován a získán mimo "
 "JOSM.</html>"
 
 msgid ""
@@ -10259,7 +10300,7 @@ msgid ""
 "will be submitted to the OSM server <strong>only once</strong>. Subsequent "
 "data upload requests don''t use your password any more."
 msgstr ""
-"Zadejte prosím vaše uživatelské jméno a heslo na OSM. Heslo "
+"Zadejte prosím své uživatelské jméno a heslo na OSM. Heslo "
 "<strong>nebude</strong> uloženo v čitelné podobě a na server OSM bude "
 "zasláno <strong>pouze jednou.</strong>"
 
@@ -10314,13 +10355,13 @@ msgstr "Prosím zadejte své uživatelské jméno pro OSM"
 
 msgid "The user name cannot be empty. Please enter your OSM user name"
 msgstr ""
-"Uživatelské jméno nemůže být prázdné. Zadejte vaše uživatelské jméno pro OSM"
+"Uživatelské jméno nemůže být prázdné. Zadejte své uživatelské jméno pro OSM"
 
 msgid "Please enter your OSM password"
 msgstr "Prosím zadejte své heslo pro OSM"
 
 msgid "The password cannot be empty. Please enter your OSM password"
-msgstr "Heslo nemůže být prázdné. Zadejte vaše heslo pro OSM"
+msgstr "Heslo nemůže být prázdné. Zadejte své heslo pro OSM"
 
 msgid "Authorize JOSM to access the OSM API"
 msgstr "Autorizovat JOSM pro přístup k OSM API"
@@ -10332,7 +10373,7 @@ msgid ""
 msgstr ""
 "<html>Proces automatického získaní přístupového tokenu OAuth <br>z OSM "
 "serveru selhal.<br><br>Prosím opakujte pokus nebo zvolte jiný typ "
-"autorizačního procesu,<br> např polo-automatický nebo manuální "
+"autorizačního procesu,<br> např poloautomatickou nebo manuální "
 "autorizaci.</html>"
 
 msgid "OAuth authorization failed"
@@ -10354,16 +10395,15 @@ msgid ""
 "OSM server failed. JOSM failed to log into {0}<br>for user "
 "{1}.<br><br>Please check username and password and try again.</html>"
 msgstr ""
-"<html>Automatický proces pre získanie OAuth autorizačného prístupu<br>z OSM "
-"servera prebehol neúspešne. JOSM neúspešne vstúpil do záznamu {0}<br>pre "
-"používateľa {1}.<br><br>Skontrolujte meno a heslo používateľa a skúste "
-"znovu.</html>"
+"<html>Automatický proces získávání přístupového tokenu OAuth<br>z OSM "
+"serveru selhal. JOSM se nepodařilo přihlásit do {0}<br>pro uživatele "
+"{1}.<br><br>Zkontrolujte jméno a heslo uživatele a zkuste znovu.</html>"
 
 msgid ""
 "Please enter an OAuth Access Token which is authorized to access the OSM "
 "server ''{0}''."
 msgstr ""
-"Zadajte prosím OAuth autorizačný prístup, ktorý je oprávnený k prístupu k "
+"Zadajte prosím OAuth autorizační přístup, který je oprávněný k přístupu k "
 "serveru OSM ''{0}''."
 
 msgid "Access Token"
@@ -10376,33 +10416,33 @@ msgid "Enter the OAuth Access Token"
 msgstr "Zadejte přístupový token OAuth"
 
 msgid "Enter advanced OAuth properties"
-msgstr "Zadejte pokročilé vlasnosti OAuth"
+msgstr "Zadejte pokročilé vlastnosti OAuth"
 
 msgid ""
 "<html><body>Please enter an OAuth Access Token which is authorized to access "
 "the OSM server ''{0}''.</body></html>"
 msgstr ""
-"<html><body>Zadajte prosím OAuth autorizačný prístup, ktorý je oprávnený k "
-"prístupu k serveru OSM ''{0}''.</body></html>"
+"<html><body>Zadejte prosím OAuth autorizační přístup, který je oprávněný k "
+"přístupu k serveru OSM ''{0}''.</body></html>"
 
 msgid "Please enter an Access Token Key"
-msgstr "Prosím, zadajte Kľúč autorizačného prístupu"
+msgstr "Prosím, zadejte Klíč autorizačního přístupu"
 
 msgid ""
 "The Access Token Key must not be empty. Please enter an Access Token Key"
 msgstr ""
-"Kľúč autorizačného prístupu nesmie byť prázdny. Prosím, zadajte kľúč "
-"autorizačného prístupu"
+"Klíč autorizačního přístupu nesmí být prázdný. Prosím, zadejte klíč "
+"autorizačního přístupu"
 
 msgid "Please enter an Access Token Secret"
-msgstr "Prosím, zadajte Heslo autorizačného prístupu"
+msgstr "Prosím, zadejte Heslo autorizačního přístupu"
 
 msgid ""
 "The Access Token Secret must not be empty. Please enter an Access Token "
 "Secret"
 msgstr ""
-"Heslo autorizačného prístupu nesmie byť prázdne. Prosím, zadajte heslo "
-"autorizačného prístupu"
+"Heslo autorizačního přístupu nesmí být prázdné. Prosím, zadejte heslo "
+"autorizačního přístupu"
 
 msgid "Click to test the Access Token"
 msgstr "Klikněte pro test přístupového tokenu"
@@ -10421,7 +10461,7 @@ msgid "Get an Access Token for ''{0}''"
 msgstr "Získání přístupového tokenu pro ''{0}''"
 
 msgid "Close the dialog and cancel authorization"
-msgstr "Zavžit zialog a zrušit přihlášení"
+msgstr "Zavřit dialog a zrušit přihlášení"
 
 msgid "Close the dialog and accept the Access Token"
 msgstr "Zavřít dialog a přijmout přístupový token"
@@ -10430,10 +10470,10 @@ msgid "Failed to cancel running OAuth operation"
 msgstr "Nepodařilo se přerušit probíhající operaci OAuth"
 
 msgid "Retrieving OAuth Request Token from ''{0}''"
-msgstr "Získavam OAuth žiadosť prístupu z ''{0}''"
+msgstr "Získávám požadavkový token OAuth z ''{0}''"
 
 msgid "Retrieving OAuth Access Token from ''{0}''"
-msgstr "Získavam OAuth autorizačný prístup z ''{0}''"
+msgstr "Získávám přístupový token OAuth z ''{0}''"
 
 msgid "OSM website did not return a session cookie in response to ''{0}'',"
 msgstr "Web OSM nevrátil session cookie v reakci na ''{0}'',"
@@ -10445,7 +10485,7 @@ msgstr ""
 "OAuth"
 
 msgid "Failed to authorize OAuth request  ''{0}''"
-msgstr "Nepodarilo sa povoliť OAuth žiadosť ''{0}''"
+msgstr "Nepodařilo se autorizovat žádost OAuth ''{0}''"
 
 msgid "Authorizing OAuth Request token ''{0}'' at the OSM website ..."
 msgstr "Autorizace žádosti o OAuth token ''{0}'' na webu OSM ..."
@@ -10457,10 +10497,10 @@ msgid "Authenticating the session for user ''{0}''..."
 msgstr "Autetizační sezení pro uživatele ''{0}''..."
 
 msgid "Authorizing request token ''{0}''..."
-msgstr "Povoľujem žiadosť prístupu ''{0}''..."
+msgstr "Autorizuji požadavkový token ''{0}''..."
 
 msgid "Logging out session ''{0}''..."
-msgstr "Odhlásujem sedenie ''{0}''..."
+msgstr "Odhlašuji sezení ''{0}''..."
 
 msgid "Allow to upload map data"
 msgstr "Povolit nahrávání mapových dat"
@@ -10498,26 +10538,25 @@ msgid "Select to grant JOSM the right to write your server preferences"
 msgstr "Zaškrtnutím povolíte JOSM, aby ukládal vaše nastavení na server"
 
 msgid "Allow modifications of notes"
-msgstr "Povoliť zmeny poznámok (notes)"
+msgstr "Povolit změny poznámek (notes)"
 
 msgid "Select to grant JOSM the right to modify notes on your behalf"
-msgstr "Povolenie umožní JOSM meniť poznámky podľa Vašich pokynov"
+msgstr "Povolení umožní JOSM měnit poznámky dle Vašich pokynů"
 
 msgid "Retrieving OAuth Access Token..."
 msgstr "Přijímání přístupového tokenu OAuth..."
 
 msgid "<html>Retrieving an OAuth Access Token from ''{0}'' failed.</html>"
-msgstr "<html>Přijímání přístupového tokenu OAuth od ''{0}'' selhalo.</html>"
+msgstr "<html>Přijímání přístupového tokenu OAuth z ''{0}'' selhalo.</html>"
 
 msgid "Request Failed"
 msgstr "Požadavek selhal"
 
 msgid "Retrieving OAuth Request Token..."
-msgstr "Přijímání žádosti o přístupový token OAuth..."
+msgstr "Získávám požadavkový token OAuth..."
 
 msgid "<html>Retrieving an OAuth Request Token from ''{0}'' failed.</html>"
-msgstr ""
-"<html>Přijímání žádosti o přístupový token OAuth od ''{0}'' selhalo.</html>"
+msgstr "<html>Získání požadavkového tokenu OAuth z ''{0}'' selhalo.</html>"
 
 msgid "Display Advanced OAuth Parameters"
 msgstr "Zobrazit rozšířené parametry OAuth"
@@ -10573,26 +10612,25 @@ msgstr ""
 "a autorizaci vůči serveru OSM.<br><br>Přístupový token je: </html>"
 
 msgid "Click to retrieve a Request Token"
-msgstr "Kliknite na tlačidlo pre načítanie žiadosti o prístup"
+msgstr "Klikněte pro získání požadavkového tokenu"
 
 msgid "Retrieve Access Token"
-msgstr "Načítať autorizačný prístup"
+msgstr "Načíst přístupový token"
 
 msgid "Click to retrieve an Access Token"
-msgstr "Kliknite na tlačidlo pre načítanie autorizačného prístupu"
+msgstr "Klikněte pro načtení přístupového tokenu"
 
 msgid "Testing OAuth Access Token"
 msgstr "Testuji přístupový token služby OAuth"
 
 msgid "Retrieving user details with Access Token Key ''{0}'' was rejected."
 msgstr ""
-"Získavam detaily používateľa s kľúčom autorizačného prístupu''{0}'', ktorý "
-"bol zamietnutý."
+"Pokus o načtení detailů uživatele s autorizačním tokenem ''{0}'' byl "
+"zamítnut."
 
 msgid "Retrieving user details with Access Token Key ''{0}'' was forbidden."
 msgstr ""
-"Získavam detaily používateľa s kľúčom autorizačného prístupu''{0}'', bol "
-"zakázaný."
+"Pokus o načtení detailů uživatele s autorizačním tokenem ''{0}'' byl zakázán."
 
 msgid ""
 "<html>Successfully used the Access Token ''{0}'' to<br>access the OSM server "
@@ -10612,9 +10650,9 @@ msgid ""
 "not<br>be able to access any protected resource on this server using this "
 "token.</html>"
 msgstr ""
-"<html>Nepodaril sa prístup na OSM server ''{0}''<br>s autorizačným prístupom "
-"''{1}''.<br>Server zamietol autorizačný prístup ako neautorizovaný. Nebudete "
-"môcť<br>pristupovať k žiadnemu chránenému obsahu na tomto serveri.</html>"
+"<html>Nepodařil se přístup na OSM server ''{0}''<br>s autorizačním tokenem "
+"''{1}''.<br>Server zamítnul autorizační token jako neautorizovaný. Nebudete "
+"moci<br>přistupovat ke chráněnému obsahu na tomto serveru.</html>"
 
 msgid "Test failed"
 msgstr "Test selhal"
@@ -10649,8 +10687,8 @@ msgid ""
 "<html>Failed to sign the request for the OSM server ''{0}'' with the token "
 "''{1}''.<br>The token ist probably invalid.</html>"
 msgstr ""
-"<html>Nepodarilo sa podpísať žiadosť pre OSMserver ''{0}'' s prístupom "
-"''{1}''.<br>Prístup je pravdepodobne neplatný.</html>"
+"<html>Nepodařilo se podepsat žádost pro OSM server ''{0}'' tokenem "
+"''{1}''.<br>Token je pravdepodobně neplatný.</html>"
 
 msgid ""
 "<html>The test failed because the server responded with an internal "
@@ -10658,7 +10696,7 @@ msgid ""
 "later.</html>"
 msgstr ""
 "<html>Test selhal, protože server odpověděl interní chybou.<br>JOSM nemůže "
-"zjistit zda je token validní. Zkuste to prosím později.</html>"
+"ověřit, zda je token validní. Zkuste to prosím později.</html>"
 
 msgid "Retrieving user info..."
 msgstr "Získávám informace o uživateli..."
@@ -10685,22 +10723,22 @@ msgid "Icon paths:"
 msgstr "Cesty pro ikony:"
 
 msgid "Short Description:"
-msgstr "Krátky popis:"
+msgstr "Krátký popis:"
 
 msgid "Author:"
 msgstr "Autor:"
 
 msgid "Webpage:"
-msgstr "web stránka:"
+msgstr "Webová stránka:"
 
 msgid "Description:"
 msgstr "Popis:"
 
 msgid "Version:"
-msgstr "Verzia:"
+msgstr "Verze:"
 
 msgid "Minimum JOSM Version:"
-msgstr "Minimálna JOSM verzia:"
+msgstr "Minimální verze JOSM:"
 
 msgid "by {0}"
 msgstr "{0}"
@@ -10715,10 +10753,10 @@ msgid "active"
 msgstr "aktivní"
 
 msgid "Map paint style file (*.xml, *.mapcss, *.zip)"
-msgstr "Súbory štýlu kreslenia mapy (*.xml, *.mapcss, *.zip)"
+msgstr "Soubory stylu vykreslování mapy (*.xml, *.mapcss, *.zip)"
 
 msgid "Preset definition file (*.xml, *.zip)"
-msgstr "Prednastavený definičný súbor (*. xml, *. zip)"
+msgstr "Přednastavený definiční soubor (*. xml, *. zip)"
 
 msgid "Tag checker rule (*.validator.mapcss, *.zip)"
 msgstr "Pravidlo kontroly značek (*.validator.mapcss, *.zip)"
@@ -10727,16 +10765,16 @@ msgid "Edit source entry:"
 msgstr "Upravit zdrojovou položku:"
 
 msgid "Entry ''{0}'' requires JOSM Version {1}. (Currently running: {2})"
-msgstr "Položka ''{0}'' vyžaduje JOSM verze {1}. (Momentálně běží: {2})"
+msgstr "Položka ''{0}'' vyžaduje verzi JOSM {1}. (Momentálně běží: {2})"
 
 msgid "Continue anyway"
-msgstr "Napriek tomu pokračovať"
+msgstr "I přesto pokračovat"
 
 msgid "Ignore warning and install style anyway"
-msgstr "Ignorovať varovanie a aj tak nainštalovať štýl"
+msgstr "Ignorovat varování a i přesto nainstalovat styl"
 
 msgid "Some entries have unmet dependencies:"
-msgstr "Niektoré položky majú neúplné závislosti:"
+msgstr "Některé položky mají nesplněné závislosti:"
 
 msgid "Reset"
 msgstr "Reset"
@@ -10849,7 +10887,7 @@ msgid "Append preferences from file to existing values"
 msgstr "Přidat nastavení ze souboru k existujícím hodnotám"
 
 msgid "Replace existing values"
-msgstr "Nahradiť existujúce hodnoty"
+msgstr "Nahradit stávající hodnoty"
 
 msgid "Open JOSM customization file"
 msgstr "Otevřít soubor přizpůsobení JOSM"
@@ -10870,7 +10908,7 @@ msgid "shortcut"
 msgstr "zkratka"
 
 msgid "color"
-msgstr "farba"
+msgstr "barva"
 
 msgid "toolbar"
 msgstr "nástrojová lišta"
@@ -10892,10 +10930,10 @@ msgstr ""
 "pokračovat?"
 
 msgid "Load profile"
-msgstr "Načítať profil"
+msgstr "Načíst profil"
 
 msgid "Save {0} profile"
-msgstr "Uložiť profil {0}"
+msgstr "Uložit profil {0}"
 
 msgid "All the preferences of this group are default, nothing to save"
 msgstr ""
@@ -10957,10 +10995,10 @@ msgid "Advanced Background: NonDefault"
 msgstr "Rozšířené pozadí: Nevýchozí hodnota"
 
 msgid "Current value is default."
-msgstr "Aktuálna hodnota je predvolená."
+msgstr "Aktuální hodnota je výchozí."
 
 msgid "Default value is ''{0}''."
-msgstr "Predvolená hodnota je ''{0}''."
+msgstr "Výchozí hodnota je ''{0}''."
 
 msgid "Default value currently unknown (setting has not been used yet)."
 msgstr "Výchozí hodnota není známa (nastavení nebylo dosud použito)."
@@ -10998,10 +11036,10 @@ msgid "Named trackpoints."
 msgstr "Pojmenované trasové body"
 
 msgid "Modified times (time stamps) of audio files."
-msgstr "Zmenené časy (časových značiek) zvukových súborov."
+msgstr "Změněné časy (časové značky) zvukových souborů."
 
 msgid "Start of track (will always do this if no other markers available)."
-msgstr "Začiatok stopy (bude použité vždy ak nie sú dostupné iné značky)"
+msgstr "Začátek stopy (bude použito vždy, nejsou-li dostupné jiné značky)"
 
 msgid "Show or hide the audio menu entry on the main menu bar."
 msgstr "Zobrazit nebo skrýt menu Zvuk v menu hlavní nabídky."
@@ -11017,8 +11055,7 @@ msgid ""
 "Put text labels against audio (and image and web) markers as well as their "
 "button icons."
 msgstr ""
-"Umiestniť text vedľa zvukovej značky (a obrázok a web) takisto ako jeho "
-"ikony."
+"Umístit text vedle zvukové (a obrázkové a webové) značky spolu s ikonou."
 
 msgid "When importing audio, make markers from..."
 msgstr "Při importu zvuku udělat značky z..."
@@ -11038,14 +11075,14 @@ msgid ""
 "Create audio markers at the position on the track corresponding to the "
 "modified time of each audio WAV file imported."
 msgstr ""
-"Vytvorenie zvukových značiek na mieste, kde čas stopy zodpovedá času "
-"uloženia každého zvukové WAV súboru."
+"Vytvořit zvukové značky na místě, kde čas stopy odpovídá času uložení "
+"každého zvukového WAV souboru."
 
 msgid ""
 "The number of seconds to jump forward or back when the relevant button is "
 "pressed"
 msgstr ""
-"Počet sekund o který bude záznam posunut vpřed/vzad po použití "
+"Počet sekund, o který bude záznam posunut vpřed/vzad po použití "
 "odpovídajících prvků ovládání"
 
 msgid "Forward/back time (seconds)"
@@ -11069,7 +11106,7 @@ msgstr "Posun zahájení (sekund)"
 
 msgid "The ratio of voice recorder elapsed time to true elapsed time"
 msgstr ""
-"Časový posun medzi spustením nahrávania a skutočným začiatkom nahrávania."
+"Časový posun mezi spuštěním nahrávání a skutečným začátkem nahrávání."
 
 msgid "Voice recorder calibration"
 msgstr "Kalibrace nahrávání zvuku"
@@ -11182,14 +11219,14 @@ msgid ""
 "This option suppresses the filling of areas, overriding anything specified "
 "in the selected style."
 msgstr ""
-"Táto možnosť potlačí vypĺňanie oblastí, prevažujúce čokoľvek uvedené vo "
-"vybranom štýle."
+"Tato možnost potlačí vyplňování oblastí - potlačí specifikaci ve vybraném "
+"stylu."
 
 msgid ""
 "Display keys which have been deemed uninteresting to the point that they can "
 "be silently removed."
 msgstr ""
-"Zobrazuje i klíče, které jsou považovány za tak málo užitečné, že by mohly "
+"Zobrazit i klíče, které jsou považovány za tak málo užitečné, že by mohly "
 "být klidně vymazány (např. created_by)."
 
 msgid "Options that affect drawing performance"
@@ -11418,6 +11455,7 @@ msgstr "Zobrazit ISO datumy"
 
 msgid "Use native file choosers (nicer, but do not support file filters)"
 msgstr ""
+"Použít systémový výběr souborů (hezčí, ale nepodporují souborové filtry)"
 
 msgid "Show localized name in selection lists, if available"
 msgstr "Zobrazovat lokalizované názvy v seznamu prvků, pokud jsou dostupné"
@@ -11443,6 +11481,8 @@ msgid ""
 "Use file choosers that behave more like native ones. They look nicer but do "
 "not support some features like file filters"
 msgstr ""
+"Použije dialogy výběru souborů vypadajících jako ty z operačního systému. "
+"Vypadají lépe, ale nepodporují některé funkce jako třeba filtry souborů."
 
 msgid "Look and Feel"
 msgstr "Vzhled a chování"
@@ -12287,9 +12327,9 @@ msgid ""
 "is likely that ''{0}'' is not an OSM API server.<br>Please check the "
 "spelling of ''{0}'' and validate again.</html>"
 msgstr ""
-"<html>OSM API server v ''{0}'' neposlal platnú odpoveď.<br>Môže byť že "
-"''{0}'' nie je OSM API server.<br>Prosím, skontrolujte pravopis z ''{0}'' a "
-"potvrďte znovu.</html>"
+"<html>OSM API server v ''{0}'' neposlal platnou odpověď.<br>Je "
+"pravděpodobné, že ''{0}'' není server OSM API.<br>Prosím, zkontrolujte "
+"pravopis ''{0}'' a zkuste znovu.</html>"
 
 msgid "Authentication"
 msgstr "Ověřování totožnosti"
@@ -12330,7 +12370,7 @@ msgstr ""
 "Selhalo získání přihlašovacích údajů do OSM ze správce přihlašovacích údajů."
 
 msgid "Current credential manager is of type ''{0}''"
-msgstr "Aktuálny správca prihlasovacích údajov je typu ''{0}''"
+msgstr "Současný správce přihlašovacích údajů je typu ''{0}''"
 
 msgid "Failed to save OSM credentials to credential manager."
 msgstr ""
@@ -12380,7 +12420,7 @@ msgstr ""
 
 msgid "Click test access to the OSM server with the current access token"
 msgstr ""
-"Kliknite na test prístup k serveru OSM so súčasným autorizačným prístupom"
+"Klikněte pro test přístupu k serveru OSM se současným přístupovým tokenem"
 
 msgid "<html>Use the default OSM server URL (<strong>{0}</strong>)</html>"
 msgstr ""
@@ -13252,13 +13292,13 @@ msgid "Zero coordinates: {0}"
 msgstr "Nulové souřadnice: {0}"
 
 msgid "NMEA import success:"
-msgstr "Import NMEA úspešný:"
+msgstr "Import NMEA úspěšný:"
 
 msgid "NMEA import failure!"
 msgstr "NMEA import selhal!"
 
 msgid "Note Files"
-msgstr ""
+msgstr "Soubory poznámek"
 
 msgid "OSM API"
 msgstr "OSM API"
@@ -13338,6 +13378,15 @@ msgstr "ID aktuální sady změn musí být větší než 0. Aktuální ID je {0
 msgid "Open changeset expected. Got closed changeset with id {0}."
 msgstr "Očekávána otevřená sada změn. Nalezena uzavřená sada změn s id {0}."
 
+msgid "Note upload failed"
+msgstr "Nahrání poznámky se nezdařilo"
+
+msgid "Error parsing note response from server"
+msgstr "Chyba ve zpracování odpovědi serveru"
+
+msgid "Error encoding string: {0}"
+msgstr "Řetězec se zakódovanou chybou: {0}"
+
 msgid "(Code={0})"
 msgstr "(Kód={0})"
 
@@ -13381,8 +13430,8 @@ msgid ""
 "Illegal document structure. Found node, way, or relation outside of "
 "''create'', ''modify'', or ''delete''."
 msgstr ""
-"Chybná štruktúra dokumentu. Vytvorená bod, cesta, alebo relácia sa nedá "
-"''vytvoriť'','' zmeniť'', alebo odstrániť''."
+"Chybná struktura dokumentu. Nalezen bod, cesta, nebo relace mimo "
+"''create'','' modify'', nebo ''delete''."
 
 msgid ""
 "Unsupported end element ''{0}'' in changeset content at position ({1},{2}). "
@@ -13394,15 +13443,15 @@ msgstr ""
 msgid "Parsing changeset content ..."
 msgstr "Procházení obsahu sady změn…"
 
+msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
+msgstr "Neplatná booleovská hodnota pro atribut ''{0}''. Nalezeno ''{1}''."
+
 msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
 msgstr "Neplatná hodnota pro atribut ''{0}''. Nalezeno ''{1}''."
 
 msgid "Illegal numeric value for attribute ''{0}''. Got ''{1}''."
 msgstr "Chybná číselná hodnota atributu ''{0}''. Nalezeno ''{1}''."
 
-msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
-msgstr "Neplatná booleovská hodnota pro atribut ''{0}''. Nalezeno ''{1}''."
-
 msgid "Missing mandatory attribute ''{0}'' of XML element {1}."
 msgstr "Chybí povinný atribut ''{0}'' XML elementu {1}."
 
@@ -13753,10 +13802,10 @@ msgid "Remote Control has been asked to create a new way."
 msgstr "Vzdálené ovládání bylo požádáno o vytvoření nové cesty."
 
 msgid "Invalid coordinates: {0}"
-msgstr "Neplatné súradnice: {0}"
+msgstr "Neplatné souřadnice: {0}"
 
 msgid "There is no layer opened to add way"
-msgstr "Pre pridanie cesty nie je otvorená žiadna vrstva"
+msgstr "Pro přidání cesty není otevřená žádná cesta"
 
 msgid "Add way"
 msgstr "Přidat cestu"
@@ -13766,7 +13815,7 @@ msgid ""
 "web sites to guess a running JOSM version"
 msgstr ""
 "Vzdálené ovládání bylo požádáno, aby oznámilo jaké funkce podporuje. To "
-"umožní, aby weby  odhadly verzi spuštěného JOSM."
+"umožní, aby weby odhadly verzi spuštěného JOSM."
 
 msgid ""
 "Remote Control has been asked to load an imagery layer from the following "
@@ -13776,7 +13825,7 @@ msgstr ""
 "následující adresy:"
 
 msgid "Remote imagery"
-msgstr "Diaľkové mapové podklady"
+msgstr "Vzdálené mapové podklady"
 
 msgid "Remote Control has been asked to import data from the following URL:"
 msgstr "Vzdálené ovládání bylo požádáno o import dat z následujícího URL:"
@@ -13794,10 +13843,10 @@ msgid "The minima must be less than the maxima"
 msgstr "Minimum musí být menší než maximum"
 
 msgid "Remote Control has been asked to load the following data:"
-msgstr ""
+msgstr "Vzdálené ovládání bylo požádáno o stažení těchto dat:"
 
 msgid "Loading data"
-msgstr ""
+msgstr "Načítají se data"
 
 msgid ""
 "Remote Control has been asked to load objects (specified by their id) from "
@@ -13834,7 +13883,7 @@ msgid "local file"
 msgstr "lokální soubor"
 
 msgid "Link to a GPX file on your local disk."
-msgstr "Okdaz na soubor GPX z vašeho místního disku."
+msgstr "Odkaz na soubor GPX z vašeho místního disku."
 
 msgid "include"
 msgstr "zahrnout"
@@ -13843,7 +13892,7 @@ msgid "Include GPX data in the .joz session file."
 msgstr "Zahrnout data GPX do souboru sezení .joz."
 
 msgid "No file association"
-msgstr "Žiadna asociácia súboru"
+msgstr "Žádná asociace souboru"
 
 msgid "GPX data will be included in the session file."
 msgstr "Data GPX budou zahrnuta do souboru sezení."
@@ -13888,8 +13937,7 @@ msgid ""
 "Version ''{0}'' of meta data for osm data layer is not supported. Expected: "
 "0.1"
 msgstr ""
-"Verzia ''{0}'' metaúdajov pre vrstvu OSM dát nie je podporovaná. Očakávala "
-"sa: 0.1"
+"Verze ''{0}'' metadat pro vrstvu OSM dat je nepodporovaná. Očekáváno: 0.1"
 
 msgid "Session file (*.jos, *.joz)"
 msgstr "Soubor s uloženým sezením (*.jos, *.joz)"
@@ -14238,7 +14286,7 @@ msgstr ""
 "Nastavení -> Doplňky)"
 
 msgid "Invalid jar file ''{0}''"
-msgstr "Chybný jar súbor \"{0}\""
+msgstr "Chybný jar soubor \"{0}\""
 
 msgid "The plugin file ''{0}'' does not include a Manifest."
 msgstr "Soubor doplňku ''{0}'' neobsahuje manifest."
@@ -14280,9 +14328,6 @@ msgid "Failed to scan file ''{0}'' for plugin information. Skipping."
 msgstr ""
 "Načtení informací o doplňku ze souboru ''{0}'' se nepodařilo. Přeskakuji."
 
-msgid "Processing plugin site cache icon files..."
-msgstr "Zpracovávám soubory ikonek keše webu s doplňky..."
-
 msgid "Processing plugin files..."
 msgstr "Zpracovávám soubory doplňků..."
 
@@ -14301,12 +14346,6 @@ msgstr "JOSM se nepodařilo stáhnout seznam doplňků:"
 msgid "Details:"
 msgstr "Podrobnosti:"
 
-msgid "Plugin icons download error"
-msgstr "Chyba při stahování ikonek doplňků"
-
-msgid "JOSM failed to download plugin icons:"
-msgstr "JOSM se nepodařilo stáhnout ikonky doplňků:"
-
 msgid ""
 "Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
 "plugin site ''{1}''."
@@ -14402,8 +14441,8 @@ msgid ""
 "Alternatively, if that does not work you can manually fill in the "
 "information below at this URL:"
 msgstr ""
-"Prípadne, ak to nebude fungovať, môžete ručne vyplniť údaje nižšie na tejto "
-"URL:"
+"Případně, pokud to nebude fungovať, můžete ručně vyplnit níže uvedené údaje "
+"na této URL:"
 
 msgid "(The text has already been copied to your clipboard.)"
 msgstr "(Text již byl zkopírován do schránky.)"
@@ -14668,11 +14707,11 @@ msgid ""
 "<html>Communication with the OSM server ''{0}'' timed out. Please retry "
 "later.</html>"
 msgstr ""
-"<html>Spojenie s OSM serverom ''{0}'' vypršalo. Prosím, skúste to znova "
-"neskôr.</Html>"
+"<html>Spojení s OSM serverem ''{0}'' vypršelo. Prosím, zkuste to znovu "
+"později.</Html>"
 
 msgid "no error message available"
-msgstr "není k dizpozici žádké chybové hlášení"
+msgstr "není k dizpozici žádné chybové hlášení"
 
 msgid ""
 "<html>Communication with the OSM server ''{0}''failed. The server "
@@ -14680,10 +14719,9 @@ msgid ""
 "message:<br><strong>Error code:<strong> {1}<br><strong>Error message "
 "(untranslated)</strong>: {2}</html>"
 msgstr ""
-"<html>Spojenie s OSM serverom ''{0}'' zlyhalo. Server "
-"odpovedal<br>nasledujúcim kódom chyby a nasledujúcim chybovým "
-"hlásením:<br><strong> Kód chyby: <strong> {1}<br><strong>Chybové hlásenie "
-"(nepreložené)</strong>: {2}</HTML>"
+"<html>Spojení se serverem OSM ''{0}'' selhalo. Server "
+"odpověděl<br>nasledujícím chybovým kódem a hlášením:<br><strong> Kód chyby: "
+"<strong> {1}<br><strong>Chybové hlášení (nepřeložené)</strong>: {2}</HTML>"
 
 msgid ""
 "<html>Closing of changeset <strong>{0}</strong> failed <br>because it has "
@@ -14798,10 +14836,10 @@ msgid ""
 "<strong>Downloading failed</strong> if you tried to download this "
 "object.<br><br>The error message is:<br>{0}</html>"
 msgstr ""
-"<html>Server hlási, že objekt je zmazaný.<br><strong>Nahrávanie je "
-"neúspešné</strong> Ak ste sa snažili nahrať, alebo vymazať tento objekt.<br> "
-"<strong>Nahrávanie neúspešné</strong> ak ste sa snažili nahrať tento "
-"objekt.<br><br>Chybová správa je:<br>{0}</html>"
+"<html>Server hlási, že objekt je smazaný.<br><strong>Nahrávání "
+"selhalo</strong> pokud jste se snažili upravit nebo smazat tento objekt.<br> "
+"<strong>Stahování selhalo</strong>, pokud jste se snažili nahrát tento "
+"objekt.<br><br>Chybová zpráva je:<br>{0}</html>"
 
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
 msgstr "Nelze najít překlad do jazyka {0}. Vracím se k {1}."
@@ -14810,8 +14848,8 @@ msgid ""
 "Fatal: failed to locate image ''{0}''. This is a serious configuration "
 "problem. JOSM will stop working."
 msgstr ""
-"Fatálne: neúspešná lokalizácia obrázka ''{0}''. Toto je vážny konfiguračný "
-"problém. JOSM prestane pracovať."
+"Fatální: neúspěšná lokalizace obrázku ''{0}''. Toto je vážný konfigurační "
+"problém. JOSM přestane pracovat."
 
 msgid "Failed to locate image ''{0}''"
 msgstr "Nepodařilo se nalézt obrázek ''{0}''"
@@ -14993,78 +15031,78 @@ msgid ""
 "Preference with key ''{0}'' does not include ''{1}''. Cannot restore window "
 "geometry from preferences."
 msgstr ""
-"nastavenie s kľúčom ''{0}'' neobsahuje ''{1}''. Nemôžem obnoviť geometriu "
-"okna z nastavení."
+"Nastavenie s klíčem ''{0}'' neobsahuje ''{1}''. Nelze obnovit geometrii okna "
+"z nastavení."
 
 msgid ""
 "Preference with key ''{0}'' does not provide an int value for ''{1}''. Got "
 "{2}. Cannot restore window geometry from preferences."
 msgstr ""
-"nastavenie s kľúčom ''{0}'' nemôžem dodať vnútornú hodnotu pre ''{1}''. "
-"Dodaná {2}. Nemôžem obnoviť geometriu okna z nastavení."
+"nastavení s klíčem ''{0}'' nemá celočíselnou hodnotu pro ''{1}''. Získáno: "
+"{2}. Nelze obnovit geometrii okna z nastavení."
 
 msgid ""
 "Failed to parse field ''{1}'' in preference with key ''{0}''. Exception was: "
 "{2}. Cannot restore window geometry from preferences."
 msgstr ""
-"neúspešné rozloženie poľa ''{1}'' v nastavení s kľúčom ''{0}''. Odchýlka "
-"bola: {2}. Nemôžem obnoviť geometriu okna z nastavení."
+"Selhalo zpracování pole ''{1}'' v nastavení s klíčem ''{0}''. Výjimka byla: "
+"{2}. Nelze obnovit geometrii okna z nastavení."
 
 msgid ""
 "Preference with key ''{0}'' does not exist. Cannot restore window geometry "
 "from preferences."
 msgstr ""
-"nastavenie s kľúčom ''{0}'' neexistuje. Nemôžem obnoviť geometriu okna z "
+"Nastavenie s klíčem ''{0}'' neexistuje. Nelze obnovit geometrii okna z "
 "nastavení."
 
 msgid "Ignoring malformed geometry: {0}"
 msgstr "Ignoruji zdeformovanou geometrii: {0}"
 
 msgid "Failed to load XML schema."
-msgstr "Nepodařilo se načíst XML schema."
+msgstr "Nepodařilo se načíst XML schéma."
 
 msgid ""
 "Error in search expression on position {0} - right side of or(|) expression "
 "must return set of primitives"
 msgstr ""
-"Chyba pri hľadaní výrazu na pozícii {0} - pravá strana, alebo (|) výraz musí "
-"vrátiť sadu elementov"
+"Chyba ve vyhledávacím výrazu na pozici {0} - pravá strana logického "
+"součtu(|) musí vrátit sadu elementů"
 
 msgid ""
 "Error in search expression on position {0} - left side of or(|) expression "
 "must return set of primitives"
 msgstr ""
-"Chyba pri hľadaní výrazu na pozícii {0} - ľavá strana, alebo (|) výraz musí "
-"vrátiť sadu elementov"
+"Chyba ve vyhledávacím výrazu na pozici {0} - levá strana logického součtu(|) "
+"musí vrátit sadu elementů"
 
 msgid ""
 "Error in search expression on position {0} - not(-) cannot be used in this "
 "context"
 msgstr ""
-"Chyba pri hľadaní výrazu na pozícii {0} - nie (-) nemožno použiť v tomto "
-"kontexte"
+"Chyba ve vyhledávacím výrazu na pozici {0} - negaci(-) nelze použít v tomto "
+"kontextu"
 
 msgid ""
 "Error in search expression on position {0} - expression must return "
 "different then current primitive"
 msgstr ""
-"Chyba pri hľadaní výrazu na pozícii {0} - výraz musí vrátiť iné aktuálne "
-"elementy"
+"Chyba ve vyhledávacím výrazu na pozici {0} - výraz musí vrátit elementy "
+"odlišné od stávajících"
 
 msgid "Unexpected token ({0}) on position {1}"
-msgstr "Neočakávaný znak ({0}) na pozícii {1}"
+msgstr "Neočekávaný znak ({0}) na pozici {1}"
 
 msgid "Unexpected token on position {0}. Expected {1}, found {2}"
-msgstr "Neočakávaný znak na pozícii {0}. Očakávané {1}, našiel {2}"
+msgstr "Neočekávaný znak na pozici {0}. Očekáváno {1}, nalezeno {2}"
 
 msgid "Error while parsing search expression on position {0}"
-msgstr "Chyba pri analýze hľadaného výrazu na pozícii {0}"
+msgstr "Chyba při zpracování vyhledávacího výrazu na pozici {0}"
 
 msgid "Unexpected char on {0}. Expected {1} found {2}"
-msgstr "Neočakávaný znak na {0}. Očakávané {1} najdené {2}"
+msgstr "Neočekávaný znak na {0}. Očekáváno {1} nalezeno {2}"
 
 msgid "Expected search expression"
-msgstr "Očakávaný hľadaný výraz"
+msgstr "Očekáván vyhledávací výraz"
 
 msgid ""
 "You requested too many nodes (limit is 50,000). Either request a smaller "
@@ -15077,7 +15115,7 @@ msgid "Database offline for maintenance"
 msgstr "Databáze je mimo provoz kvůli údržbě"
 
 msgid "You have downloaded too much data. Please try again later."
-msgstr "Stiahli ste si príliš veľké množstvo dát. Skúste to prosím neskôr."
+msgstr "Stáhli jste si příliš mnoho dat. Zkuste to prosím později."
 
 msgid ""
 "The maximum bbox size is 0.25, and your request was too large. Either "
@@ -15090,13 +15128,13 @@ msgid "JOSM-Trac login at josm.openstreetmap.de"
 msgstr "JOSM-Trac login na josm.openstreetmap.de"
 
 msgid "could not get audio input stream from input URL"
-msgstr "nemôžem získať zvuk zo vstupu URL"
+msgstr "nelze získat zvukový vstupní proud ze zadaného URL"
 
 msgid "Audio Device Unavailable"
 msgstr "Audio zařízení je nedostupné"
 
 msgid "You must make your edits public to upload new data"
-msgstr "Musíte vaše editace označit jako veřejné pro nahrávání nových dat"
+msgstr "Musíte své editace označit jako veřejné pro nahrávání nových dat"
 
 msgid "town"
 msgstr "město"
@@ -15107,7 +15145,7 @@ msgstr "les"
 
 msgctxt "landuse"
 msgid "meadow"
-msgstr ""
+msgstr "louka"
 
 msgctxt "landuse"
 msgid "farmland"
@@ -15228,10 +15266,10 @@ msgid "Attributes"
 msgstr "Atributy"
 
 msgid "Abort file chooser dialog"
-msgstr "Zrušiť dialóg pre výber súboru"
+msgstr "Zrušit dialog pro výběr souboru"
 
 msgid "Abort file chooser dialog."
-msgstr "Zrušit dialog na vybrání souboru."
+msgstr "Zrušit dialog pro výběr souboru."
 
 msgid "Create New Folder"
 msgstr "Vytvořit nový adresář"
@@ -15429,8 +15467,12 @@ msgid ""
 "Creating and handling address nodes and buildings within Czech Republic."
 msgstr "Vytváření a správa adresních bodů a budov v rámci  České Republiky."
 
-msgid "Allows to import various file formats into JOSM directly."
-msgstr "Umožňuje importovat rozličné formáty souborů přímo do JOSM."
+msgid ""
+"Allows to import various file formats into JOSM directly. Currently "
+"supported: TangoGPS, Garmin Trainings Center TCX."
+msgstr ""
+"Dovoluje do JOSM přímo importovat různé souborové formáty. V současné době "
+"podporuje: TangoGPS, Garmin Trainings Center TCX."
 
 msgid "Download your GPX tracks from openstreetmap.org"
 msgstr "Stažení vašich GPX záznamů z openstreetmap.org"
@@ -15548,6 +15590,13 @@ msgid "A helper for IRS satellite adjustment."
 msgstr "Pomocník pro nastavení posuvu satelitních snímků IRS."
 
 msgid ""
+"Provides Java Native Access (JNA) library. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+"Poskytuje knihovnu Java Native Access (JNA). Nemělo by být instalováno přímo "
+"uživatelem, ale pouze na základě požadavku jiného doplňku."
+
+msgid ""
 "Provides Java Topology Suite (JTS) library and related utilities. Not meant "
 "to be installed directly by users, but rather as a dependency for other "
 "plugins."
@@ -15651,7 +15700,7 @@ msgstr ""
 "rámečku JOSM"
 
 msgid "Import/export OSM data in PBF format"
-msgstr ""
+msgstr "Import/export OSM dat ve formátu PBF"
 
 msgid "Import PDF file and convert to ways."
 msgstr "Import PDF souboru a konverze na cesty."
@@ -15788,7 +15837,7 @@ msgid "Plugin to digital sign OSM-Data"
 msgstr "Doplněk pro digitální podepisování dat OSM"
 
 msgid "${plugin.description}"
-msgstr ""
+msgstr "${plugin.description}"
 
 msgid ""
 "Provides a straightforward GUI for adding, editing and deleting turn lanes."
@@ -15964,6 +16013,25 @@ msgstr "Osvětlení"
 msgid "Width (meters)"
 msgstr "Šířka (metrů)"
 
+msgid "Sidewalk"
+msgstr "Chodník"
+
+msgctxt "sidewalk"
+msgid "both"
+msgstr "na obou stranách"
+
+msgctxt "sidewalk"
+msgid "left"
+msgstr "vlevo"
+
+msgctxt "sidewalk"
+msgid "right"
+msgstr "vpravo"
+
+msgctxt "sidewalk"
+msgid "no"
+msgstr "žádný"
+
 msgid "Service type"
 msgstr "Druh obslužné koleje"
 
@@ -16324,25 +16392,29 @@ msgid "Fee"
 msgstr "Poplatek"
 
 msgid "06:00-20:00"
-msgstr ""
+msgstr "06:00-20:00"
 
 msgid "Mo-Fr 09:00-18:00,Sa 08:00-14:00"
-msgstr ""
+msgstr "Mo-Fr 09:00-18:00,Sa 08:00-14:00"
 
 msgid "May-Sep 09:30-12:30,14:15-19:30"
-msgstr ""
+msgstr "May-Sep 09:30-12:30,14:15-19:30"
 
+msgctxt "parking"
 msgid "multi-storey"
-msgstr "vícepodlažní"
+msgstr "vícepatrové"
 
+msgctxt "parking"
 msgid "surface"
 msgstr "povrchové"
 
+msgctxt "parking"
 msgid "underground"
 msgstr "podzemní"
 
+msgctxt "parking"
 msgid "rooftop"
-msgstr "zastrešené"
+msgstr "na střeše"
 
 msgid "Reference number"
 msgstr "Identifikační číslo"
@@ -16757,7 +16829,7 @@ msgid "All vehicles"
 msgstr "Všechna vozidla"
 
 msgid "use_sidepath"
-msgstr ""
+msgstr "použít cyklostezku"
 
 msgid "Motor vehicles"
 msgstr "Motorová vozidla"
@@ -16798,15 +16870,26 @@ msgstr "Max. délka (m)"
 msgid "Overtaking"
 msgstr "Předjížení"
 
+msgctxt "overtaking"
+msgid "yes"
+msgstr "ano"
+
+msgctxt "overtaking"
 msgid "both"
 msgstr "oba směry"
 
+msgctxt "overtaking"
 msgid "forward"
 msgstr "vpřed"
 
+msgctxt "overtaking"
 msgid "backward"
 msgstr "vzad"
 
+msgctxt "overtaking"
+msgid "no"
+msgstr "ne"
+
 msgid "Roundabout"
 msgstr "Kruhový objezd"
 
@@ -16893,8 +16976,7 @@ msgstr "T1 - turistická cesta"
 
 msgid "Trail well cleared. Area flat or slightly sloped, no fall hazard"
 msgstr ""
-"Chodník dobre vyčistený. Oblasť rovinatá, prípadne mierne svahovitá, žiadne "
-"nebezpečenstvo pádu"
+"Dobře průchozí stezka. Oblast rovinatá nebo mírně zvlněná, bez nebezpečí pádu"
 
 msgid "T2 - mountain hiking trail"
 msgstr "T2 - horská turistická cesta"
@@ -16903,8 +16985,8 @@ msgid ""
 "Trail with continuous line and balanced ascent. Terrain partially steep, "
 "fall hazard possible"
 msgstr ""
-"Chodník so súvislou líniu a vyvážené stúpanie. Terén čiastočne strmí, "
-"nebezpečenstvo možného pádu"
+"Souvislá stezka s vyváženým stoupáním. Terén částečně strmý, možné nebezpečí "
+"pádu"
 
 msgid "T3 - difficult, exposed hiking trail"
 msgstr "T3 - obtížná, nekrytá turistická cesta"
@@ -16925,8 +17007,9 @@ msgid ""
 "sometimes need for hand use to get ahead. Terrain quite exposed, precarious "
 "grassy acclivities, jagged rocks, facile snow-free glaciers"
 msgstr ""
-"niekedy môže byť treba pomoc rúk na postup dopredu. Terén dosť exponovaný, "
-"neisté trávnaté svahy, rozoklané skaly, ľahký sneh bez ľadovca"
+"místy může být potřeba si k postupu pomoci rukama. Terén dosti exponovaný, "
+"nepevné travnaté svahy, rozeklané skaly, snadno překonatelné ledovce bez "
+"sněhu"
 
 msgid "T5 - difficult alpine trail with climbing"
 msgstr "T5 - obtížná horská cesta s lezením"
@@ -16935,8 +17018,8 @@ msgid ""
 "single plainly climbing up to second grade. Exposed, demanding terrain, "
 "jagged rocks, few dangerous glacier and snow"
 msgstr ""
-"lezenie v druhom stupni obtiažnosti. Exponované, náročné terény, zubaté "
-"skaly, málo nebezpečný ľadovec a sneh"
+"lezení až na druhém stupni obtížnosti. Exponované, náročné terény, zubaté "
+"skály, místy nebezpečný ledovec a sníh"
 
 msgid "T6 - hazardous alpine trail with climbing"
 msgstr "T6 - nebezpečná horská cesta s lezením"
@@ -16945,8 +17028,8 @@ msgid ""
 "climbing up to second grade. Often very exposed, precarious jagged rocks, "
 "glacier with danger to slip and fall"
 msgstr ""
-"lezenie v druhom stupni obtiažnosti. Často veľmi exponované, neisté "
-"rozoklané skaly, ľadovec s nebezpečenstvom pošmyknutia a pádu"
+"lezeníe až na druhém stupni obtížnosti. Často velmi exponované, nejisté "
+"rozeklané skály, ledovec s nebezpečím uklouznutí a pádu"
 
 msgid "Visibility"
 msgstr "Viditelnost"
@@ -16991,7 +17074,7 @@ msgid "Cycleway"
 msgstr "Cyklostezka"
 
 msgid "lane"
-msgstr "prúd"
+msgstr "pruh"
 
 msgid "track"
 msgstr "stopa (dráha)"
@@ -17114,6 +17197,12 @@ msgstr ""
 msgid "tiger"
 msgstr "tygr"
 
+msgid "Button operated"
+msgstr "Ovládaný tlačítkem"
+
+msgid "Sound signals"
+msgstr "Zvukový signál"
+
 msgid "Crossing attendant"
 msgstr "Přechod s obsluhou"
 
@@ -17208,13 +17297,13 @@ msgid "Bollard"
 msgstr "Sloupek"
 
 msgid "Bollard type"
-msgstr "Typ stĺpika"
+msgstr "Typ sloupku"
 
 msgid "rising"
-msgstr "vysúvateľný"
+msgstr "vysouvatelný"
 
 msgid "removable"
-msgstr "odstrániteľný"
+msgstr "odstranitelný"
 
 msgid "plastic"
 msgstr "plast"
@@ -17262,13 +17351,13 @@ msgid "electric"
 msgstr "elektřina"
 
 msgid "pole"
-msgstr "stožár"
+msgstr "tyčkový"
 
 msgid "split_rail"
-msgstr "rozchod železnice"
+msgstr "laťkový"
 
 msgid "wire"
-msgstr "drát"
+msgstr "drátěný"
 
 msgid "Guard Rail"
 msgstr "Zvodidlá"
@@ -17322,7 +17411,7 @@ msgid "Kissing Gate"
 msgstr "Průchod v ohrazení s ostrou zatáčkou"
 
 msgid "Chain"
-msgstr "Reťaz"
+msgstr "Řetěz"
 
 msgid "Stile"
 msgstr "Schůdky přes ohrazení"
@@ -17638,9 +17727,6 @@ msgstr "Železniční přejezd"
 msgid "Traffic lights"
 msgstr "Semafor"
 
-msgid "Sound signals"
-msgstr "Zvukový signál"
-
 msgid "Barrier"
 msgstr "Závory"
 
@@ -17692,13 +17778,13 @@ msgid "Number of people per chair"
 msgstr "Počet ľudí na sedadlo"
 
 msgid "Typical journey time in minutes"
-msgstr "Typický čas trasy v minútach"
+msgstr "Typický čas trasy v minutách"
 
 msgid "Has bubble?"
 msgstr "Má kryt?"
 
 msgid "Has heating?"
-msgstr "Má vyhrievanie?"
+msgstr "Vyhřívaná?"
 
 msgid "Drag Lift"
 msgstr "Lyžařský vlek"
@@ -18641,7 +18727,7 @@ msgid "charcoal"
 msgstr "uhlí"
 
 msgid "Firepit"
-msgstr ""
+msgstr "Ohniště"
 
 msgid "Fishing"
 msgstr "Rybaření"
@@ -18990,7 +19076,7 @@ msgid "urinal"
 msgstr "pisoár"
 
 msgid "Shower"
-msgstr ""
+msgstr "Sprcha"
 
 msgid "Post Box"
 msgstr "Poštovní schránka"
@@ -19136,11 +19222,11 @@ msgstr "Typ přístřešku"
 
 msgctxt "shelter"
 msgid "basic_hut"
-msgstr ""
+msgstr "jednoduchá bouda"
 
 msgctxt "shelter"
 msgid "lean_to"
-msgstr ""
+msgstr "z jedné strany otevřený přístřešek"
 
 msgctxt "shelter"
 msgid "picnic_shelter"
@@ -19337,13 +19423,13 @@ msgid "Swimming"
 msgstr "Plavání"
 
 msgid "swimming_pool"
-msgstr "kúpalisko"
+msgstr "Koupaliště"
 
 msgid "water_park"
-msgstr "aquapark"
+msgstr "Akvapark"
 
 msgid "Scuba Diving"
-msgstr ""
+msgstr "Potápění"
 
 msgid "Piste type"
 msgstr "Typ trasy"
@@ -19607,7 +19693,7 @@ msgstr "kůlna"
 
 msgctxt "building"
 msgid "cowshed"
-msgstr ""
+msgstr "kravín"
 
 msgctxt "building"
 msgid "construction"
@@ -19700,6 +19786,9 @@ msgstr "Větrný mlýn"
 msgid "Gasometer"
 msgstr "Plynojem"
 
+msgid "Bunker Silo"
+msgstr "silážní jáma"
+
 msgid "Pipeline"
 msgstr "Potrubí"
 
@@ -19846,15 +19935,15 @@ msgstr "Monitorovací stanice"
 msgid "Monitoring:"
 msgstr "Monitoruje:"
 
-msgid "Weather"
-msgstr "Počasí"
-
 msgid "Water level"
 msgstr "Hladinu vody"
 
 msgid "Tide Level"
 msgstr "Výšku přílivu"
 
+msgid "Groundwater"
+msgstr ""
+
 msgid "Traffic"
 msgstr "Dopravu"
 
@@ -19873,6 +19962,9 @@ msgstr "Signály systému GLONASS"
 msgid "Galileo Signals"
 msgstr "Signály systému Galileo"
 
+msgid "Weather"
+msgstr "Počasí"
+
 msgid "Radiation"
 msgstr "Radiaci"
 
@@ -19973,7 +20065,7 @@ msgid "aqueduct"
 msgstr "akvadukt"
 
 msgid "boardwalk"
-msgstr ""
+msgstr "dřevěný chodník"
 
 msgid "cantilever"
 msgstr "konzolový"
@@ -19997,10 +20089,10 @@ msgid "arch"
 msgstr "oblouk"
 
 msgid "beam"
-msgstr ""
+msgstr "trámová"
 
 msgid "truss"
-msgstr ""
+msgstr "příhradové nosníky"
 
 msgid "floating"
 msgstr "plovoucí"
@@ -20012,16 +20104,16 @@ msgid "cable-stayed"
 msgstr "lanový"
 
 msgid "simple-suspension"
-msgstr ""
+msgstr "jednoduchý visutý"
 
 msgid "humpback"
-msgstr ""
+msgstr "klenutý obloukový most"
 
 msgid "Movable Bridge"
 msgstr "Pohyblivý most"
 
 msgid "bascule"
-msgstr ""
+msgstr "sklopný"
 
 msgid "drawbridge"
 msgstr "padací"
@@ -20036,22 +20128,25 @@ msgid "swing"
 msgstr "otočný"
 
 msgid "transporter"
-msgstr ""
+msgstr "gondolový most"
 
 msgid "Bridge Support"
 msgstr "Mostní podpěra"
 
 msgid "pier"
-msgstr ""
+msgstr "pilíře"
 
 msgid "abutment"
-msgstr ""
+msgstr "podpěry"
 
 msgid "lift_pier"
-msgstr ""
+msgstr "zvedací pilíř"
 
 msgid "pivot_pier"
-msgstr ""
+msgstr "otáčecí pilíř"
+
+msgid "Bridge outline"
+msgstr "Půdorys mostu"
 
 msgid "Power Plant"
 msgstr "Elektrárna"
@@ -20662,6 +20757,15 @@ msgstr "Neúplný"
 msgid "Pole"
 msgstr "Sloup"
 
+msgid "Pole with Transformer"
+msgstr "Sloup s transformátorem"
+
+msgid "Pole Attributes:"
+msgstr "Vlastnosti sloupu:"
+
+msgid "Transformer Attributes:"
+msgstr "Vlastnosti transformátoru:"
+
 msgid "Power Line"
 msgstr "Elektrické vedení"
 
@@ -20711,9 +20815,15 @@ msgstr "Slouží k datové komunikaci"
 msgid "Power Cable"
 msgstr "Elektrický kabel"
 
+msgctxt "power cable"
+msgid "underground"
+msgstr "podzemní"
+
+msgctxt "power cable"
 msgid "underwater"
 msgstr "podvodní"
 
+msgctxt "power cable"
 msgid "overground"
 msgstr "nadzemní"
 
@@ -20741,6 +20851,33 @@ msgstr "Monument"
 msgid "Memorial"
 msgstr "Památník"
 
+msgctxt "memorial"
+msgid "statue"
+msgstr "socha"
+
+msgctxt "memorial"
+msgid "bust"
+msgstr "busta"
+
+msgctxt "memorial"
+msgid "plaque"
+msgstr "plaketa"
+
+msgctxt "memorial"
+msgid "stele"
+msgstr "stéla"
+
+msgctxt "memorial"
+msgid "stone"
+msgstr "kámen"
+
+msgctxt "memorial"
+msgid "war_memorial"
+msgstr "válečný památník"
+
+msgid "Inscription"
+msgstr "Nápis"
+
 msgid "Wayside Cross"
 msgstr "Kříž"
 
@@ -20810,6 +20947,9 @@ msgstr "Alkohol"
 msgid "Beverages"
 msgstr "Nápoje"
 
+msgid "Wine"
+msgstr "Víno"
+
 msgid "Boutique"
 msgstr "Butik"
 
@@ -20855,6 +20995,9 @@ msgstr "Videopůjčovna/prodejna"
 msgid "Video Games"
 msgstr "Videohry"
 
+msgid "Music"
+msgstr "Hudba"
+
 msgid "Cash"
 msgstr "Finance"
 
@@ -20882,6 +21025,9 @@ msgstr "Kuchyňské studio"
 msgid "Curtain"
 msgstr "Obchod se závěsy"
 
+msgid "Art"
+msgstr "Umění"
+
 msgid "Frame"
 msgstr "Rámařství"
 
@@ -20892,7 +21038,7 @@ msgid "Interior Decoration"
 msgstr "Bytové dekorace"
 
 msgid "Antiques"
-msgstr ""
+msgstr "Starožitnosti"
 
 msgid "Printed Material"
 msgstr "Tiskoviny"
@@ -20927,6 +21073,9 @@ msgstr "Kadeřnictví/Holičství"
 msgid "Beauty"
 msgstr "Kosmetický salón"
 
+msgid "Tattoo"
+msgstr "Tetovací salón"
+
 msgid "Optician"
 msgstr "Oční optik"
 
@@ -20978,6 +21127,9 @@ msgstr "Kabelky"
 msgid "Pet"
 msgstr "Zverimex"
 
+msgid "Funeral Directors"
+msgstr "Pohřební služba"
+
 msgid "Vending Machine"
 msgstr "Prodejní automat"
 
@@ -21077,6 +21229,15 @@ msgstr "PSČ"
 msgid "National Park"
 msgstr "Národní park"
 
+msgid "Protected Area"
+msgstr "Chráněná oblast"
+
+msgid "Protected Class"
+msgstr "Třída ochrany"
+
+msgid "Title or type of protection"
+msgstr "Titul nebo typ ochrany"
+
 msgid "Places"
 msgstr "Místa"
 
@@ -21170,7 +21331,7 @@ msgid "shield"
 msgstr "štítová"
 
 msgid "scoria"
-msgstr ""
+msgstr "struskový kužel"
 
 msgid "Cave Entrance"
 msgstr "Vstup do jeskyně"
@@ -21449,7 +21610,7 @@ msgid "Subdistrict"
 msgstr "Podokres (subdistrict)"
 
 msgid "District"
-msgstr ""
+msgstr "District"
 
 msgid "Province"
 msgstr "Provincie"
@@ -21650,7 +21811,7 @@ msgid "Image"
 msgstr "Obrázek"
 
 msgid "Contact (Schema with ''contact:*'' Prefix)"
-msgstr ""
+msgstr "Kontakt (schéma s předponou ''contact:*'')"
 
 msgid "outer segment"
 msgstr "vnější část"
@@ -21677,7 +21838,7 @@ msgid "political"
 msgstr "politická"
 
 msgid "Administrative level"
-msgstr "Administratívna úroveň"
+msgstr "Administratívní úroveň"
 
 msgid "Sub area"
 msgstr "Podoblasť"
@@ -21686,7 +21847,7 @@ msgid "Administration centre"
 msgstr "Administrativní centrum"
 
 msgid "Label point"
-msgstr "Miesto pre menovku"
+msgstr "Místo pro jmenovku"
 
 msgid "Site"
 msgstr "Areál (site)"
@@ -21761,7 +21922,7 @@ msgid "mindistance"
 msgstr "min vzdialenosť"
 
 msgid "check "
-msgstr "cestná kontrola "
+msgstr "silniční kontrola "
 
 msgid "Max. height (meters, only if enforcement=maxheight)"
 msgstr "Max. výška (metry, pouze pokud enforcement=maxheight)"
@@ -21884,7 +22045,7 @@ msgid "Street"
 msgstr "Ulice"
 
 msgid "ways being part of street"
-msgstr "cestvy tvořící ulici"
+msgstr "cestv tvořící ulici"
 
 msgid "addresses belonging to the street"
 msgstr "adresy patřící do ulice"
@@ -21893,7 +22054,7 @@ msgid "houses belonging to the street"
 msgstr "domy stojící na ulici"
 
 msgid "anything related to the street"
-msgstr "niečo vzťahujúce sa k ulici"
+msgstr "něco vztahující se k ulici"
 
 msgid "Destination Sign"
 msgstr "Směrová tabule"
@@ -21902,34 +22063,34 @@ msgid "Destination written on sign (w/o distance)"
 msgstr "Cíl vyznačený na směrové tabuli (bez vzdálenosti)"
 
 msgid "Time (hh:mm, for trekking)"
-msgstr "Čas (hh:mm, pre chôdzu)"
+msgstr "Čas (hh:mm, pro chůzi)"
 
 msgid "Colour of background"
-msgstr "Farba pozadia"
+msgstr "Barva pozadí"
 
 msgid "Colour of text"
-msgstr "Farba textu"
+msgstr "Barva textu"
 
 msgid "Colour of border/arrow"
-msgstr "Farba ohraničenia/šípka"
+msgstr "Barva ohraničení/šipka"
 
 msgid "last way before junction"
-msgstr "posledný úsek pred križovatkou"
+msgstr "poslední úsek před křižovatkou"
 
 msgid "node of the intersection"
-msgstr "uzel križovatky"
+msgstr "uzel křižovatky"
 
 msgid "first way after junction"
-msgstr "prvý úsek po križovatke"
+msgstr "první úsek po křižovatce"
 
 msgid "position of sign"
 msgstr "umístění směrové tabule"
 
 msgid "Waterway"
-msgstr "Vodné cesty"
+msgstr "Vodní cesty"
 
 msgid "Subtype of waterway (largest one of members)"
-msgstr "Podtyp vodných ciest (najväčší z členov)"
+msgstr "Podtyp vodných cest (největší z členů)"
 
 msgid "stream"
 msgstr "potok"
@@ -21938,10 +22099,10 @@ msgid "drain"
 msgstr "kanál"
 
 msgid "ditch"
-msgstr "jarok"
+msgstr "příkop"
 
 msgid "Name of river/lake/sea/ocean it runs into"
-msgstr ""
+msgstr "Název řeky/jezera/moře/oceánu, do kterého se vlévá"
 
 msgid "Reference Sandre (FR)"
 msgstr "Reference Sandre (FR)"
@@ -21959,22 +22120,22 @@ msgid "Reference GNBC (CA)"
 msgstr "Reference GNBC (CA)"
 
 msgid "waterways (no riverbank)"
-msgstr "vodná cesta (bez nábrežia)"
+msgstr "vodní cesta (bez nábřeží)"
 
 msgid "branch waterways (no riverbank)"
-msgstr "vetva vodnej cesty (bez nábrežia)"
+msgstr "větev vodní cesty (bez nábřeží)"
 
 msgid "spring of waterway"
-msgstr "prameň vodného toku"
+msgstr "pramnň vodního toku"
 
 msgid "Length (meters)"
 msgstr "Délka (v metrech)"
 
 msgid "ways supported by (on top of) the bridge"
-msgstr "cesty nesené mostom"
+msgstr "cesty nesené mostem"
 
 msgid "ways passing under the bridge"
-msgstr "cesty prechádzajúce pod mostom"
+msgstr "cesty procházející pod mostem"
 
 msgid "way forming the outline footprint"
 msgstr "cesta popisující okraj půdorysu"
@@ -21983,7 +22144,7 @@ msgid "edge ways parallel to ''across''"
 msgstr "hraniční cesty ve směru \"napříč\""
 
 msgid "ways passing through the tunnel"
-msgstr "cesty prechádzajúce tunelom"
+msgstr "cesty procházející tunelem"
 
 msgid "edge ways parallel to ''through''"
 msgstr "hraniční cesty ve směru \"skrz\""
@@ -22013,596 +22174,834 @@ 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 (Humanitární tým OpenStreetMap)"
 
 msgid "MapBox Satellite"
-msgstr ""
+msgstr "MapBox Satellite"
 
 msgid "MapQuest Open Aerial"
-msgstr ""
+msgstr "MapQuest Open Aerial"
 
 msgid "OpenStreetMap GPS Traces"
-msgstr ""
+msgstr "OpenStreetMap trasy GPS"
 
 msgid "OpenStreetMap (Mapnik)"
-msgstr ""
+msgstr "OpenStreetMap (Mapnik)"
 
 msgid "OpenStreetMap (Mapnik Black & White)"
-msgstr ""
+msgstr "OpenStreetMap (Mapnik černobíle)"
 
 msgid "OpenStreetMap (Mapnik, no labels)"
-msgstr ""
+msgstr "OpenStreetMap (Mapnik, bez popisek)"
 
 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 "Veřejná doprava (ÖPNV)"
 
 msgid "OpenStreetMap (German Style)"
-msgstr ""
+msgstr "OpenStreetMap (německý styl)"
 
 msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
-msgstr ""
+msgstr "Cambodia, Laos, Thailand, Vietnam dvojjazyčně"
 
 msgid "osmfr"
-msgstr ""
+msgstr "osmfr"
 
 msgid "OpenPT Map (overlay)"
-msgstr ""
+msgstr "OpenPT Map (překryv)"
 
 msgid "Strava cycling heatmap"
-msgstr ""
+msgstr "Strava heatmap - jízda na kole"
 
 msgid "Strava running heatmap"
-msgstr ""
+msgstr "Strava heatmap - běh"
 
 msgid "AGRI black-and-white 2.5m"
-msgstr ""
+msgstr "AGRI černobíle 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 (základní mapa)"
 
 msgid "Tiris: DGM (Terrain model)"
-msgstr ""
+msgstr "Tiris: DGM (model terénu)"
 
 msgid "Tiris: DOM (Surface model)"
-msgstr ""
+msgstr "Tiris: DOM (model povrchu)"
 
 msgid "Vienna: Mehrzweckkarte (general purpose)"
-msgstr ""
+msgstr "Vienna: Mehrzweckkarte (obecná)"
 
 msgid "Vienna: Beschriftungen (annotations)"
-msgstr ""
+msgstr "Vienna: Beschriftungen (poznámky)"
 
 msgid "Vienna: Orthofoto (aerial image)"
-msgstr ""
+msgstr "Vienna: Orthofoto (letecká)"
 
 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 (model terénu)"
 
 msgid "VoGIS: DOM (Surface model)"
-msgstr ""
+msgstr "VoGIS: DOM (model povrchu)"
 
 msgid "IBGE Mapa de Setores Urbanos"
-msgstr ""
+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 Silnice"
 
 msgid "Canvec"
-msgstr ""
+msgstr "Canvec"
 
 msgid "British Columbia Mosaic"
-msgstr ""
+msgstr "British Columbia Mosaic"
 
 msgid "Czech CUZK:KM"
-msgstr ""
+msgstr "Český CUZK:KM"
 
 msgid "Czech RUIAN budovy"
-msgstr ""
+msgstr "Český RÚIAN budovy"
 
 msgid "Czech RUIAN parcely"
-msgstr ""
+msgstr "Český RÚIAN parcely"
 
 msgid "Czech pLPIS"
-msgstr ""
+msgstr "Český pLPIS"
 
 msgid "Fugro (Denmark)"
-msgstr ""
+msgstr "Fugro (Dánsko)"
 
 msgid "Geodatastyrelsen (Denmark)"
-msgstr ""
+msgstr "Geodatastyrelsen (Dánsko)"
 
 msgid "Stevns (Denmark)"
-msgstr ""
+msgstr "Stevns (Dánsko)"
 
 msgid "Vejmidte (Denmark)"
-msgstr ""
+msgstr "Vejmidte (Dánsko)"
 
 msgid "Estonia Basemap (Maaamet)"
-msgstr ""
+msgstr "Estonsko základní (Maaamet)"
 
 msgid "Estonia Ortho (Maaamet)"
+msgstr "Estonsko ortho (Maaamet)"
+
+msgid "Estonia Hillshade (Maaamet)"
 msgstr ""
 
-msgid "Estonia Multi (Maaamet)"
+msgid "Estonia Cadastre (Maaamet)"
 msgstr ""
 
-msgid "Bordeaux - 2012"
+msgid "Estonia Forestry (Maaamet)"
 msgstr ""
 
+msgid "Bordeaux - 2012"
+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 "CUGN Nancy - Orthophoto 2012"
-msgstr ""
+msgid "GrandNancy Orthophotographie 2012"
+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 ""
-
-msgid "Streets NRW Geofabrik.de"
-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 ""
+msgstr "Hamburg (40 cm)"
 
 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 "Stará mapa Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
 
 msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
-msgstr ""
+msgstr "Stará mapa 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 "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 (letecké snímky)"
 
 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 (letecké snímky)"
 
 msgid "Będzin: Budynki (buildings)"
-msgstr ""
+msgstr "Będzin: Budynki (budovy)"
 
 msgid "Bytom: Ortofotomapa 2012 (aerial image)"
-msgstr ""
+msgstr "Bytom: Ortofotomapa 2012 (letecké snímky)"
 
 msgid "Bytom: Budynki (buildings)"
-msgstr ""
+msgstr "Bytom: Budynki (budovy)"
 
 msgid "Chorzów: Budynki (buildings)"
-msgstr ""
+msgstr "Chorzów: Budynki (budovy)"
 
 msgid "Częstochowa: Ortofotomapa 2011 (aerial image)"
-msgstr ""
+msgstr "Częstochowa: Ortofotomapa 2011 (letecké snímky)"
 
 msgid "Gliwice: Ortofotomapa 2013 (aerial image)"
-msgstr ""
+msgstr "Gliwice: Ortofotomapa 2013 (letecké snímky)"
 
 msgid "Gliwice: Budynki (buildings)"
-msgstr ""
+msgstr "Gliwice: Budynki (budovy)"
 
 msgid "Katowice: Ortofotomapa (aerial image)"
-msgstr ""
+msgstr "Katowice: Ortofotomapa (letecké snímky)"
 
 msgid "Łódź: Ortofotomapa (aerial image)"
-msgstr ""
+msgstr "Łódź: Ortofotomapa (letecké snímky)"
 
 msgid "Ruda Śląska: Ortofotomapa (aerial image)"
-msgstr ""
+msgstr "Ruda Śląska: Ortofotomapa (letecké snímky)"
 
 msgid "Rzeszów: Ortofotomapa (aerial image)"
-msgstr ""
+msgstr "Rzeszów: Ortofotomapa (letecké snímky)"
 
 msgid "Rzeszów: Budynki (buildings)"
-msgstr ""
+msgstr "Rzeszów: Budynki (budovy)"
 
 msgid "Siemianowice Śląskie: Ortofotomapa (aerial image)"
-msgstr ""
+msgstr "Siemianowice Śląskie: Ortofotomapa (letecké snímky)"
 
 msgid "Świętochłowice: Ortofotomapa 2009 (aerial image)"
-msgstr ""
+msgstr "Świętochłowice: Ortofotomapa 2009 (letecké snímky)"
 
 msgid "Zabrze: Ortofotomapa 2011 (aerial image)"
-msgstr ""
+msgstr "Zabrze: Ortofotomapa 2011 (letecké snímky)"
 
 msgid "trail.pl: Szlaki (paths)"
-msgstr ""
+msgstr "trail.pl: Szlaki (stezky)"
 
 msgid "ScanEx IRS"
-msgstr ""
+msgstr "ScanEx IRS"
 
 msgid "ScanEx SPOT"
-msgstr ""
+msgstr "ScanEx SPOT"
 
 msgid "Freemap.sk Car"
-msgstr ""
+msgstr "Freemap.sk Auto"
 
 msgid "Freemap.sk Hiking"
-msgstr ""
+msgstr "Freemap.sk Turistika"
 
 msgid "Freemap.sk Cyclo"
-msgstr ""
+msgstr "Freemap.sk Cyklo"
 
 msgid "Freemap.sk Ski"
-msgstr ""
+msgstr "Freemap.sk Lyže"
 
 msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
-msgstr ""
+msgstr "Katastrální mapa Slovenska (KaPor, 2010-04)"
 
 msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
-msgstr ""
+msgstr "Katastrální mapa Slovenska (KaPor, 2011-05)"
 
 msgid "Slovakia EEA GMES Urban Atlas"
-msgstr ""
+msgstr "Slovensko EEA GMES městská mapa"
 
 msgid "Slovakia EEA CORINE 2006"
-msgstr ""
+msgstr "Slovensko EEA CORINE 2006"
 
 msgid "Slovakia Historic Maps"
-msgstr ""
+msgstr "Slovensko historické mapy"
 
 msgid "South Africa CD:NGI Aerial"
-msgstr ""
+msgstr "Jižní Afrika CD:NGI Letecká"
 
 msgid "Catastro Spain"
-msgstr ""
+msgstr "Catastro Španělsko"
 
 msgid "PNOA Spain"
-msgstr ""
+msgstr "Catastro Španělsko"
 
 msgid "SIGPAC Spain"
-msgstr ""
+msgstr "SIGPAC Španělsko"
 
 msgid "GRAFCAN - Canary Islands"
-msgstr ""
+msgstr "GRAFCAN - Kanárské ostrovy"
 
 msgid "ITACyL - Castile and León"
-msgstr ""
+msgstr "ITACyL - Kastilie a León"
 
 msgid "IDEIB - Balearic Islands"
-msgstr ""
+msgstr "IDEIB - Baleáry"
 
 msgid "GRAFCAN Express - Canary Islands"
-msgstr ""
+msgstr "GRAFCAN Express - Kanárské ostrovy"
 
 msgid "Kanton Aargau 25cm (AGIS 2011)"
-msgstr ""
+msgstr "Kanton Aargau 25cm (AGIS 2011)"
 
 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 "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 (2008)"
-msgstr ""
+msgid "Stadt Bern 10cm/25cm (2012)"
+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 2013)"
+msgid "New & Misaligned TIGER Roads (TIGER 2014)"
 msgstr ""
 
 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 "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+
+msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgstr "OS Town Plans, Airdrie 1858 (NLS)"
+
+msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgstr "OS Town Plans, Alexandria 1859 (NLS)"
+
+msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgstr "OS Town Plans, Alloa 1861-1862 (NLS)"
+
+msgid "OS Town Plans, Annan 1859 (NLS)"
+msgstr "OS Town Plans, Annan 1859 (NLS)"
+
+msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgstr "OS Town Plans, Arbroath 1858 (NLS)"
+
+msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgstr "OS Town Plans, Ayr 1855 (NLS)"
+
+msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgstr "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+
+msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgstr "OS Town Plans, Brechin 1862 (NLS)"
+
+msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgstr "OS Town Plans, Burntisland 1894 (NLS)"
+
+msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgstr "OS Town Plans, Campbelton 1865 (NLS)"
+
+msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+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 "OS Town Plans, Cupar 1893-1894 (NLS)"
+
+msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgstr "OS Town Plans, Dalkeith 1852 (NLS"
+
+msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgstr "OS Town Plans, Dalkeith 1893 (NLS)"
+
+msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgstr "OS Town Plans, Dumbarton 1859 (NLS)"
+
+msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgstr "OS Town Plans, Dumfries 1850 (NLS)"
+
+msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgstr "OS Town Plans, Dumfries 1893 (NLS)"
+
+msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgstr "OS Town Plans, Dundee 1857-1858 (NLS)"
+
+msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgstr "OS Town Plans, Dundee 1870-1872 (NLS)"
+
+msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgstr "OS Town Plans, Dunfermline 1854 (NLS)"
+
+msgid "OS Town Plans, Dunfermline 1894 (NLS)"
+msgstr "OS Town Plans, Dunfermline 1894 (NLS)"
+
+msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
+msgstr "OS Town Plans, Edinburgh 1849-1851 (NLS)"
+
+msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
+msgstr "OS Town Plans, Edinburgh 1876-1877 (NLS)"
+
+msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
+msgstr "OS Town Plans, Edinburgh 1893-1894 (NLS)"
+
+msgid "OS Town Plans, Elgin 1868 (NLS)"
+msgstr "OS Town Plans, Elgin 1868 (NLS"
+
+msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
+msgstr "OS Town Plans, Falkirk 1858-1859 (NLS)"
+
+msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
+msgstr "OS Town Plans, Forfar 1860-1861 (NLS)"
+
+msgid "OS Town Plans, Forres 1868 (NLS)"
+msgstr "OS Town Plans, Forres 1868 (NLS)"
+
+msgid "OS Town Plans, Galashiels 1858 (NLS)"
+msgstr "OS Town Plans, Galashiels 1858 (NLS)"
+
+msgid "OS Town Plans, Girvan 1857 (NLS)"
+msgstr "OS Town Plans, Girvan 1857 (NLS)"
+
+msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
+msgstr "OS Town Plans, Glasgow 1857-1858 (NLS)"
+
+msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
+msgstr "OS Town Plans, Glasgow 1892-1894 (NLS)"
+
+msgid "OS Town Plans, Greenock 1857 (NLS)"
+msgstr "OS Town Plans, Greenock 1857 (NLS)"
+
+msgid "OS Town Plans, Haddington 1853 (NLS)"
+msgstr "OS Town Plans, Haddington 1853 (NLS)"
+
+msgid "OS Town Plans, Haddington 1893 (NLS)"
+msgstr "OS Town Plans, Haddington 1893 (NLS)"
+
+msgid "OS Town Plans, Hamilton 1858 (NLS)"
+msgstr "OS Town Plans, Hamilton 1858 (NLS)"
+
+msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
+msgstr "OS Town Plans, Hawick 1857-1858 (NLS)"
+
+msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
+msgstr "OS Town Plans, Inverness 1867-1868 (NLS)"
+
+msgid "OS Town Plans, Irvine 1859 (NLS)"
+msgstr "OS Town Plans, Irvine 1859 (NLS"
+
+msgid "OS Town Plans, Jedburgh 1858 (NLS)"
+msgstr "OS Town Plans, Jedburgh 1858 (NLS)"
+
+msgid "OS Town Plans, Kelso 1857 (NLS)"
+msgstr "OS Town Plans, Kelso 1857 (NLS)"
+
+msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
+msgstr "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
+
+msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
+msgstr "OS Town Plans, Kirkcaldy 1855 (NLS)"
+
+msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
+msgstr "OS Town Plans, Kirkcaldy 1894 (NLS)"
+
+msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
+msgstr "OS Town Plans, Kirkcudbright 1850 (NLS)"
+
+msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
+msgstr "OS Town Plans, Kirkcudbright 1893 (NLS)"
+
+msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
+msgstr "OS Town Plans, Kirkintilloch 1859 (NLS)"
+
+msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
+msgstr "OS Town Plans, Kirriemuir 1861 (NLS)"
+
+msgid "OS Town Plans, Lanark 1858 (NLS)"
+msgstr "OS Town Plans, Lanark 1858 (NLS)"
+
+msgid "OS Town Plans, Linlithgow 1856 (NLS)"
+msgstr "OS Town Plans, Linlithgow 1856 (NLS)"
+
+msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
+msgstr "OS Town Plans, Mayole 1856-1857 (NLS)"
+
+msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
+msgstr "OS Town Plans, Montrose 1861-1862 (NLS)"
+
+msgid "OS Town Plans, Musselburgh 1853 (NLS)"
+msgstr "OS Town Plans, Musselburgh 1853 (NLS)"
+
+msgid "OS Town Plans, Musselburgh 1893 (NLS)"
+msgstr "OS Town Plans, Musselburgh 1893 (NLS)"
+
+msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
+msgstr "OS Town Plans, Nairn 1867-1868 (NLS)"
+
+msgid "OS Town Plans, Oban 1867-1868 (NLS)"
+msgstr "OS Town Plans, Oban 1867-1868 (NLS)"
+
+msgid "OS Town Plans, Peebles 1856 (NLS)"
+msgstr "OS Town Plans, Peebles 1856 (NLS)"
+
+msgid "OS Town Plans, Perth 1860 (NLS)"
+msgstr "OS Town Plans, Perth 1860 (NLS)"
+
+msgid "OS Town Plans, Peterhead 1868 (NLS)"
+msgstr "OS Town Plans, Peterhead 1868 (NLS)"
+
+msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
+msgstr "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
+
+msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
+msgstr "OS Town Plans, Portobello 1893-1894 (NLS)"
+
+msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
+msgstr "OS Town Plans, Rothesay 1862-1863 (NLS)"
+
+msgid "OS Town Plans, Selkirk 1865 (NLS)"
+msgstr "OS Town Plans, Selkirk 1865 (NLS)"
+
+msgid "OS Town Plans, St Andrews 1854 (NLS)"
+msgstr "OS Town Plans, St Andrews 1854 (NLS)"
+
+msgid "OS Town Plans, St Andrews 1893 (NLS)"
+msgstr "OS Town Plans, St Andrews 1893 (NLS)"
+
+msgid "OS Town Plans, Stirling 1858 (NLS)"
+msgstr "OS Town Plans, Stirling 1858 (NLS)"
+
+msgid "OS Town Plans, Stonehaven 1864 (NLS)"
+msgstr "OS Town Plans, Stonehaven 1864 (NLS)"
+
+msgid "OS Town Plans, Stranraer 1847 (NLS)"
+msgstr "OS Town Plans, Stranraer 1847 (NLS)"
+
+msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
+msgstr "OS Town Plans, Stranraer 1863-1877 (NLS)"
+
+msgid "OS Town Plans, Stranraer 1893 (NLS)"
+msgstr "OS Town Plans, Stranraer 1893 (NLS)"
+
+msgid "OS Town Plans, Strathaven 1858 (NLS)"
+msgstr "OS Town Plans, Strathaven 1858 (NLS)"
+
+msgid "OS Town Plans, Wick 1872 (NLS)"
+msgstr "OS Town Plans, Wick 1872 (NLS)"
+
+msgid "OS Town Plans, Wigtown 1848 (NLS)"
+msgstr "OS Town Plans, Wigtown 1848 (NLS)"
+
+msgid "OS Town Plans, Wigtown 1894 (NLS)"
+msgstr "OS Town Plans, Wigtown 1894 (NLS)"
 
 msgid "Decreasing house numbers in addresses interpolation"
 msgstr "V interpolaci adres se čísla domů snižují"
@@ -22620,19 +23019,19 @@ msgid "{0} on suspicious object"
 msgstr "{0} u podezřelého objektu"
 
 msgid "restaurant without name"
-msgstr "reštaurácia bez názvu (\"name\")"
+msgstr "restaurace bez názvu (\"name\")"
 
 msgid "{0} used with {1}"
 msgstr "{0} použito s {1}"
 
 msgid "natural water used for swimming pool"
-msgstr "značka \"natural=water\" použitá pre plavecký bazén"
+msgstr "značka \"natural=water\" použitá pro plavecký bazén"
 
 msgid "sport without physical feature"
 msgstr "sport bez reálného objektu"
 
 msgid "{0} should be on the node where {1} and {2} intersect"
-msgstr ""
+msgstr "{0} by měl být na uzlu, kde se protínají {1} a {2}"
 
 msgid "{0}={1} is deprecated"
 msgstr "{0}={1} je zastaralé"
@@ -22654,26 +23053,51 @@ msgid ""
 "{0}={1} is unspecific. Instead of ''{1}'' please give more information about "
 "what exactly should be fixed."
 msgstr ""
-"{0}={1} je nejasné. Namísto \"{1}\" uveďte více informácií o tom, co přesně "
+"{0}={1} je nejasné. Namísto \"{1}\" uveďte více informací o tom, co přesně "
 "by mělo být opraveno."
 
 msgid "{0}={1} is deprecated. Please use instead a multipolygon."
 msgstr "{0}={1} je zastaralé. Prosím použijte multipolygon."
 
 msgid ""
-"{0} is deprecated. Please specify ìnterval by using opening_hours syntax"
+"{0} is deprecated. Please specify interval by using opening_hours syntax"
 msgstr ""
+"{0} je zastaralé. Zadejte, prosím, interval pomocí syntaxe opening_hours"
 
 msgid ""
 "{0} is deprecated. Please delete this object and use a private layer instead"
 msgstr ""
+"{0} je zastaralé. Smažte, prosím, tento objekt a použijte radši soukromou "
+"vrstvu"
+
+msgid "{0}={1} is unspecific. Please replace ''{1}'' by a specific value."
+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} is unspecific. Please replace ''{1}'' by ''left'', ''right'' or "
+"''both''."
+msgstr ""
+"{0}={1} je neurčité. Prosím, nahraďte ''{1}'' textem ''left'', ''right'' "
+"nebo ''both''."
+
+msgid "{0} on a node. Should be used on a way."
+msgstr "{0} na uzlu. Mělo by být použito na cestě."
+
+msgid "{0} on a node. Should be drawn as an area."
+msgstr "{0} na uzlu. Mělo by být nakresleno jako plocha."
+
+msgid "{0}=* on a node. Should be used in a relation"
+msgstr "{0}=* na uzlu. Mělo by být použito v relaci"
+
+msgid "{0} on a way. Should be used in a relation"
+msgstr "{0} na cestě. Mělo by být použito v relaci"
 
 msgid "{0} on a node"
 msgstr "{0} na uzlu"
 
-msgid "{0} on a node. Should be drawn as an area"
-msgstr "{0} na bodu. Mělo by se vykreslovat jako území."
-
 msgid "Building inside building"
 msgstr "Budova uvnitř budovy"
 
@@ -22711,7 +23135,7 @@ msgid "temporary highway type"
 msgstr "dočasný typ cesty"
 
 msgid "street name contains ss"
-msgstr "název ulice obsajuje ss"
+msgstr "název ulice obsahuje ss"
 
 msgid "{0} with multiple values"
 msgstr "{0} s vícenásobnou hodnotou"
@@ -22746,7 +23170,7 @@ msgstr "neobvyklá specifikace {0}"
 
 msgid "unusual train track gauge; use mm with no separator"
 msgstr ""
-"neobvyklý rozchod kolejí (gauge); použijte hodntu v mm bez jakéhokoliv "
+"neobvyklý rozchod kolejí (gauge); použijte hodnotu v mm bez jakéhokoliv "
 "oddělovače"
 
 msgid "unusual incline; use percentages/degrees or up/down"
@@ -22758,7 +23182,7 @@ msgid "{0} must be a numeric value"
 msgstr "{0} musí být číselná hodnota"
 
 msgid "relation without type"
-msgstr "relácia bez \"type\""
+msgstr "relace bez \"type\""
 
 msgid "{0} relation without {0} tag"
 msgstr "{0} relace bez {0} značky"
@@ -22794,7 +23218,7 @@ msgstr ""
 "stránky''"
 
 msgid "unknown language prefix in wikipedia tag"
-msgstr "neznámý prefix jazyka ve značčce ''wikipedia''"
+msgstr "neznámý prefix jazyka ve značce ''wikipedia''"
 
 msgid "deprecated format for wikipedia tag"
 msgstr "zastaralý formát značky wikipedia"
@@ -22803,13 +23227,13 @@ msgid "''wikipedia''=''language:page title''"
 msgstr "''wikipedia''=''jazyk:název stránky''"
 
 msgid "Hide icons at low zoom"
-msgstr ""
+msgstr "Skrýt ikony v malém přiblížení"
 
 msgid "Less obtrusive node symbols at low zoom"
-msgstr ""
+msgstr "Méně výrazné symboly uzlů v malém zvětšení"
 
 msgid "Display street labels (at high zoom)"
-msgstr ""
+msgstr "Zobrazit popisky ulic (ve vysokém přiblížení)"
 
 msgid "OSM Export"
 msgstr "OSM Export"
@@ -22845,7 +23269,7 @@ msgid "Columbus V-900 CSV Files"
 msgstr "CSV soubory Columbus V-900"
 
 msgid "Importing CSV file ''%s''..."
-msgstr "Import CSV súboru ''%s''..."
+msgstr "Import CSV souboru ''%s''..."
 
 msgid "Markers of "
 msgstr "Značky "
@@ -22878,18 +23302,22 @@ msgid ""
 "No command has been found. Would you like to download and install default "
 "commands now?"
 msgstr ""
+"Nenalezen žádný příkaz. Chcete teď stáhnout a nainstalovat výchozí příkazy?"
 
 msgid "No command found"
-msgstr ""
+msgstr "Nenalezen žádný příkaz"
 
 msgid "Default commands have been successfully installed"
-msgstr ""
+msgstr "Výchozí příkazy byly úspěšně nainstalovány"
 
 msgid ""
 "Failed to download and install default commands.\n"
 "\n"
 "Error: {0}"
 msgstr ""
+"Selhalo stažení a instalace výchozích příkazů.\n"
+"\n"
+"Chyba: {0}"
 
 msgid "Processing..."
 msgstr "Zpracovávám..."
@@ -22904,7 +23332,7 @@ msgid "Command line"
 msgstr "Příkazový řádek"
 
 msgid "Set input focus to the command line."
-msgstr "Nastavte vstupný fokus na príkazovom riadku."
+msgstr "Nastavte vstupní fokus na příkazovou řádku."
 
 msgid "Point on the start"
 msgstr "Uzel na začiatku"
@@ -22913,10 +23341,10 @@ msgid "Point on the end"
 msgstr "Uzel na konci"
 
 msgid "Missing definition of new object with id {0}."
-msgstr "Chýbajú definície nového objektu s id {0}."
+msgstr "Chybí definice nového objektu s id {0}."
 
 msgid "Missing mandatory attribute ''{0}'' on <member> of relation {1}."
-msgstr "Chýba povinný atribút ''{0}'' na členovi (<member>) relácie {1}."
+msgstr "Chybí povinný atribut ''{0}'' na členu (<member>) relace {1}."
 
 msgid "Illegal value for attribute ''uid''. Got ''{0}''."
 msgstr "Neplatná hodnota pro atribut ''uid''. Nalezeno ''{0}''"
@@ -22943,8 +23371,8 @@ msgid ""
 "Forms a grid of ways in base to two existing that have various nodes and one "
 "in common"
 msgstr ""
-"Tvar cestnej siete na základe dvoch existujúcich, ktoré majú rôzne uzly a "
-"jeden spoločný"
+"Vytvoří síť cest na základě dvou existujících, které mají různé uzly a jeden "
+"společný"
 
 msgid "Select two ways with a node in common"
 msgstr "Vybrat svě cesty se společným bodem."
@@ -23109,7 +23537,7 @@ msgid "(No elevation data)"
 msgstr "(žádné údaje o nadmořské výšce)"
 
 msgid "Can not save preferences"
-msgstr "Nemožno uložiť predvoľby"
+msgstr "Nelze uložit předvoľby"
 
 msgid "Epsilon multiplier"
 msgstr "Násobitel epsilon"
@@ -23426,13 +23854,13 @@ msgid "NanoLog of {0} lines, {1} of them with coordinates."
 msgstr "NanoLog má {0} řádek, z toho {1} se souřadnicemi."
 
 msgid "Correlate with GPX..."
-msgstr ""
+msgstr "Dát do vztahu s GPX..."
 
 msgid "Put on GPX..."
-msgstr ""
+msgstr "Dát na GPX..."
 
 msgid "Correlate entries with GPS trace"
-msgstr ""
+msgstr "Dát do vzájemného vtahu položky a trasu GPS"
 
 msgid "Save layer..."
 msgstr "Uložit vrstvu..."
@@ -23471,7 +23899,7 @@ msgid "apply {0}"
 msgstr "použít {0}"
 
 msgid "There is something wrong in the value near:"
-msgstr "Je nejaká chyba v hodnote:"
+msgstr "Je nejaká chyba v hodnotě poblíž:"
 
 msgid "Info: {0}"
 msgstr "Info: {0}"
@@ -23483,7 +23911,7 @@ msgid "Error in timeformat"
 msgstr "Chyba ve formátu času"
 
 msgid "open end"
-msgstr "otvorené zatvorené"
+msgstr "otevřeno zavřeno"
 
 msgid "Import Osm Inspector Bugs..."
 msgstr "Importovat chyby z Osm Inspector..."
@@ -23498,7 +23926,7 @@ msgid "OsmBugInfo"
 msgstr "OsmBugInfo"
 
 msgid "Open a OSM Inspector selection list window."
-msgstr "Ovevřít okno se seznamem OSM inspektoru"
+msgstr "Otevřít okno se seznamem OSM inspektoru"
 
 msgid "Current Selected Bug Info"
 msgstr "Údaje o aktuálně vybrané chybě"
@@ -23570,7 +23998,7 @@ msgid "Convert way to individual house numbers."
 msgstr "Změnit cestu na samostatná čísla domů."
 
 msgid "Will associate {0} additional house number nodes"
-msgstr "Přidružím {0} dodatečných uzlů s domovními čísly"
+msgstr "Přidruží {0} dodatečných uzlů s domovními čísly"
 
 msgid "City:"
 msgstr "Město:"
@@ -23734,7 +24162,7 @@ msgid "AlignWays Tips"
 msgstr "AlignWays Tipy"
 
 msgid "AlignWays: What''s New..."
-msgstr "AlignWays: Čo je nové..."
+msgstr "AlignWays: Co je nového..."
 
 msgid "Align Ways mode"
 msgstr "Režim zarovnání cest"
@@ -23954,7 +24382,7 @@ msgid "Don''t show this again"
 msgstr "Toto již víckrát neukazovat"
 
 msgid "What''s new..."
-msgstr "Čo je nové..."
+msgstr "Co je nového..."
 
 msgid "Added <b>angle preserving</b> aligning mode"
 msgstr "Přidán režim zarovnávání se <b>zachováním úhlů</b>"
@@ -23972,16 +24400,16 @@ msgid "Building address"
 msgstr "Adresa budovy"
 
 msgid "empty"
-msgstr ""
+msgstr "prázdné"
 
 msgid "skip"
-msgstr ""
+msgstr "přeskočit"
 
 msgid "House number:"
 msgstr "Číslo domu:"
 
 msgid "Street:"
-msgstr "Ulica:"
+msgstr "Ulice:"
 
 msgid "Post code:"
 msgstr "PSČ:"
@@ -23996,7 +24424,7 @@ msgid "Name:"
 msgstr "Název:"
 
 msgid "updated building info"
-msgstr ""
+msgstr "aktualizované údaje o budově"
 
 msgid "Tag Element"
 msgstr "Označkovat prvek"
@@ -24014,7 +24442,7 @@ msgid "Area Selection"
 msgstr "Výběr plochy"
 
 msgid "Select an area (e.g. building) from an underlying image."
-msgstr ""
+msgstr "Zvolte oblast (např. budovu) podkladového obrázku."
 
 msgid "Area Selector"
 msgstr "Výběr plochy"
@@ -24026,21 +24454,23 @@ msgid "Unable to detect a polygon where you clicked."
 msgstr "V místě vašeho kliknutí nenacházím polygon"
 
 msgid "Error Report"
-msgstr ""
+msgstr "Hlášení chyby"
 
 msgid "Something went wrong!"
-msgstr ""
+msgstr "Něco se nepodařilo!"
 
 msgid "Please file a bug report on the github project page under"
-msgstr ""
+msgstr "Založte, prosím, hlášení chyby na stránce projektu github pod"
 
 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 ""
+"Dejte nám vědět, co jste dělal a co se stalo a připojte následující text ke "
+"hlášení chyby, abychom mohli najít příčinu problému."
 
 msgid "Area detection algorithm settings."
-msgstr ""
+msgstr "Nastavení algoritmu detekce ploch."
 
 msgid "Algorithm Settings"
 msgstr "Nastavení algoritmu"
@@ -24049,38 +24479,42 @@ msgid ""
 "The color threshold defines how far the color can be of the original color "
 "to be selected (Default: {0})."
 msgstr ""
+"Práh barvy určuje, jak daleko může barva být od originální barvy, aby byla "
+"ještě vybrána (výchozí hodnota: {0})."
 
 msgid "Color Threshold"
-msgstr ""
+msgstr "Práh barvy"
 
 msgid ""
 "Maximum distance away each point in the sequence can be from a line, in "
 "pixels (Default: {0})."
 msgstr ""
+"Maximální vzdálenost, o kterou může být každý bod mimo přímku v pixelech "
+"(výchozí: {0})."
 
 msgid "Tolerance Distance"
-msgstr ""
+msgstr "Tolerance vzdálenosti"
 
 msgid "Tolerance for fitting angles, in radians (Default {0})."
-msgstr ""
+msgstr "Tolerance přichytávání úhlů v radiánech (výchozí hodnota {0})."
 
 msgid "Tolerance Angle"
-msgstr ""
+msgstr "Tolerance úhlu"
 
 msgid "Plugin Settings"
-msgstr ""
+msgstr "Nastavení doplňku"
 
 msgid "Show Address Dialog after mapping an area"
-msgstr ""
+msgstr "Po zmapování oblasti zobrazit dialog s adresami"
 
 msgid "show address dialog"
-msgstr ""
+msgstr "zobrazit dialog a adresami"
 
 msgid "Merge nodes with neighbors"
-msgstr ""
+msgstr "Sloučit uzly se sousedy"
 
 msgid "merge nodes"
-msgstr ""
+msgstr "sloučit uzly"
 
 msgid "Street Name:"
 msgstr "Jméno ulice:"
@@ -24396,10 +24830,10 @@ msgid "Bicubic (slow)"
 msgstr "Bikubický (pomalé)"
 
 msgid "Vector images grab multiplier:"
-msgstr "Zachytávač vektorových obrázkov multiplikátor:"
+msgstr "Multiplikátor zachytávače vektorových obrázků:"
 
 msgid "Grab one image full screen"
-msgstr "Zachytiť obrázok celej obrazovky"
+msgstr "Zachytit jeden obrázek na celou obrazovku"
 
 msgid "Grab smaller images (higher quality but use more memory)"
 msgstr "Stahovat menší obrázky (lepší kvalita, ale používá více paměti)"
@@ -24420,7 +24854,7 @@ msgid "Buildings, covers, underground constructions."
 msgstr "Budovy, kryty, podzemní stavby."
 
 msgid "Symbols like cristian cross."
-msgstr "Symboly, jako křesťanské kríže."
+msgstr "Symboly, např. křesťanské kříže."
 
 msgid "Parcels."
 msgstr "Parcely."
@@ -24441,7 +24875,7 @@ msgid "Municipality administrative borders."
 msgstr "Administrativní hranice samospráv."
 
 msgid "Raster images grab multiplier:"
-msgstr "Zachytávač rastrových obrázkov multiplikátor:"
+msgstr "Multiplikátor achytávače rastrových obrázků:"
 
 msgid ""
 "Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
@@ -24453,7 +24887,7 @@ msgid "Replace greyscale by white color (smaller files and memory usage)."
 msgstr "Nahradit škály šedé bílou barvou (menší soubory a spotřeba paměti)."
 
 msgid "Display crosspieces:"
-msgstr "Zobraziť kríže:"
+msgstr "Zobrazit kříže:"
 
 msgid "Allows an automatic caching"
 msgstr "Povolit automatické kešování"
@@ -24466,8 +24900,8 @@ msgid ""
 "Automatically selects the first WMS layer if multiple layers exist when "
 "grabbing."
 msgstr ""
-"Automaticky vyberie prvú WMS vrstvu, ak existuje viac vrstiev pri "
-"zachytávaní(grabovaní)."
+"Automaticky vyberie první WMS vrstvu, existuje-li více vrstev při "
+"zachytávání (grabování)."
 
 msgid "Enable this to use the tag \"add:street\" on nodes."
 msgstr "Tohle povolte, aby se používala značka ''addr:street'' na uzlech."
@@ -24501,7 +24935,7 @@ msgid "Extract SVG ViewBox..."
 msgstr "Extrahovat SVG ViewBox..."
 
 msgid "Extract best fitting boundary..."
-msgstr "Vyberte najvhodnejšie rozhranie(hranice)..."
+msgstr "Vyberte nejvhodnejší rozhraní(hranice)..."
 
 msgid "Create boundary"
 msgstr "Vytvořit hranice"
@@ -24527,7 +24961,7 @@ msgstr ""
 "Použijte prosím jinou položku menu, abyste mohli určit polohu \"Plan image\""
 
 msgid "Extract commune boundary"
-msgstr "Vybrať hranice obce(samosprávy)"
+msgstr "Vybrat hranice obce(samosprávy)"
 
 msgid "Only on vectorized layers"
 msgstr "Pouze na vektorizovaných vrstvách"
@@ -24542,7 +24976,7 @@ msgid "Cadastre grab"
 msgstr "Zachycení katastru"
 
 msgid "Download Image from French Cadastre WMS"
-msgstr "Stáhnout obráze z Francouzkého katastrálního WMS"
+msgstr "Stáhnout obrázek z Francouzkého katastrálního WMS"
 
 msgid "Cadastre: {0}"
 msgstr "Katastr: {0}"
@@ -24657,8 +25091,8 @@ msgid ""
 "Click first Lambert crosspiece for georeferencing\n"
 "(two points required)"
 msgstr ""
-"Kliknite na prvý Lambertov priečnik (crosspiece) pre georeferencing\n"
-"(povinné sú dva uzly)"
+"Klikněte na první Lambertův příčník (crosspiece) pro georeferencing\n"
+"(povinné jsou dva uzly)"
 
 msgid "Image georeferencing"
 msgstr "Určovanie zemepisnej polohy obrázkov"
@@ -24678,7 +25112,7 @@ msgstr ""
 "všechny souřadnice. Zkuste to znovu, prosím."
 
 msgid "Enter cadastre east,north position"
-msgstr "Vstúpiť do cadastre na východ, sever pozícii"
+msgstr "Vstúpiť do cadastre na východ, sever pozici"
 
 msgid "(Warning: verify north with arrow !!)"
 msgstr "(Varovanie: potvrdte sever so šípkou !!)"
@@ -24787,8 +25221,9 @@ msgstr "Sloučit dva objekty"
 
 msgid "Added {0} object to subject layer"
 msgid_plural "Added {0} objects to subject layer"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Přidán {0} objekt do cílové vrsty"
+msgstr[1] "Přidány {0} objekty do cílové vrsty"
+msgstr[2] "Přidáno {0} objektů do cílové vrsty"
 
 msgid "Conflation"
 msgstr "Sloučení"
@@ -24800,31 +25235,31 @@ msgid "Matches"
 msgstr "Shody"
 
 msgid "Reference only"
-msgstr ""
+msgstr "Pouze referenční"
 
 msgid "Subject only"
-msgstr ""
+msgstr "Pouze cílová"
 
 msgid "Matches ({0})"
 msgstr "Shody ({0})"
 
 msgid "Reference only ({0})"
-msgstr ""
+msgstr "Pouze referenční ({0})"
 
 msgid "Subject only ({0})"
-msgstr ""
+msgstr "Pouze cílová ({0})"
 
 msgid "Configure conflation options"
-msgstr ""
+msgstr "Nastavit možnosti sloučení"
 
 msgid "Delete {0} conflation matches"
-msgstr ""
+msgstr "Smazat {0} shod sloučení"
 
 msgid "Remove {0} unmatched objects"
-msgstr ""
+msgstr "Odstranit {0} neshodných objektů"
 
 msgid "Remove selected matches"
-msgstr ""
+msgstr "Odebrat vybrané shody"
 
 msgid "Conflate"
 msgstr "Sloučit"
@@ -24836,73 +25271,73 @@ msgid "Conflation: {0}"
 msgstr "Sloučení: {0}"
 
 msgid "Cannot replace geometry."
-msgstr ""
+msgstr "Nelze nahradit geometrii"
 
 msgid "Zoom to selected primitive(s)"
-msgstr ""
+msgstr "Přiblížit na vybraný prvek"
 
 msgid "Select selected primitive(s)"
-msgstr ""
+msgstr "Vybrat vybraný prvek"
 
 msgid "Select the primitives currently selected in the list"
-msgstr ""
+msgstr "Vybrat prvky, které jsou v seznamu právě vybrané"
 
 msgid "Match finder settings"
-msgstr ""
+msgstr "Nastevní hledání shod"
 
 msgid "Match finder method"
-msgstr ""
+msgstr "Způsob hledání shod"
 
 msgid "Threshold distance"
-msgstr ""
+msgstr "Práh vzdálenosti"
 
 msgid "Distances greater than this will result in a score of zero."
-msgstr ""
+msgstr "Vzdálenost větší než tato bude vyhodnocena s nulovým skóre"
 
 msgid "Centroid distance"
-msgstr ""
+msgstr "Vzdálenost centroidu"
 
 msgid "Hausdorff distance"
-msgstr ""
+msgstr "Hausdorffova vzdálenost"
 
 msgid "Configure conflation settings"
-msgstr ""
+msgstr "Nastavení slučování"
 
 msgid "Generate matches"
-msgstr ""
+msgstr "Vytvořit shody"
 
 msgid "Subject"
-msgstr ""
+msgstr "Cíl"
 
 msgid "Selections must be made for both reference and subject."
-msgstr ""
+msgstr "Musíte vybrat obojí cíl i referenci."
 
 msgid "Incomplete selections"
-msgstr ""
+msgstr "Neúplný výběr"
 
 msgid "Restore subject selection"
-msgstr ""
+msgstr "Obnovit výběr cíle"
 
 msgid "Restore reference selection"
-msgstr ""
+msgstr "Obnovit výběr reference"
 
 msgid "Freeze subject selection"
-msgstr ""
+msgstr "Zmrazit výběr cíle"
 
 msgid "No valid OSM data layer present."
-msgstr ""
+msgstr "Nejsou žádná platná data OSM."
 
 msgid "Error freezing selection"
-msgstr ""
+msgstr "Chyba při zmrazení výběru"
 
 msgid "Nothing is selected, please try again."
-msgstr ""
+msgstr "Není nic vybráno, zkuste to znovu."
 
 msgid "Empty selection"
-msgstr ""
+msgstr "Prázdný výběr"
 
 msgid "Invalid reference or subject"
-msgstr ""
+msgstr "Nepoužitelná reference nebo cíl"
 
 msgid "Address"
 msgstr "Adresa"
@@ -25066,7 +25501,7 @@ msgid "not logged in"
 msgstr "nepřihlášen"
 
 msgid "Failed to log in to GeoChat:"
-msgstr ""
+msgstr "Nepodařilo se přihlásit ke GeoChatu:"
 
 msgid "Failed to send message:"
 msgstr "Selhalo odeslání zprávy:"
@@ -25242,7 +25677,7 @@ msgid "Invalid closing xml tag </{0}> in state {1}"
 msgstr "Neplatná uzavírací značka XML </{0}> ve stavu {1}"
 
 msgid "Some tags have not been closed; now in state {0}"
-msgstr ""
+msgstr "Některé značky nebyly uzavřeny; nyní ve stavu {0}"
 
 msgid "Key element without attribute k"
 msgstr "Prvek klíče bez atributu k"
@@ -25254,7 +25689,7 @@ msgid "Unknown tag for condition: {0}"
 msgstr "Neznámá značka podmínky: {0}"
 
 msgid "Element must not have children: {0}"
-msgstr ""
+msgstr "Prvek nesmí mít potomky: {0}"
 
 msgid "Condition is already finished at </{0}>"
 msgstr "Podmínka je už dokončena u <{0}>"
@@ -25966,7 +26401,7 @@ msgid "Check "
 msgstr "Zkontrolovat "
 
 msgid "check the subust for junction properties"
-msgstr ""
+msgstr "zkontrolovat v podmnožině vlastnosti křižovatky"
 
 msgid "Search "
 msgstr "Hledat "
@@ -25978,9 +26413,12 @@ msgid ""
 "The marked channels contains a junctioncandidate (white). To test this "
 "candidat mark these channel and press the \"Check\" button again."
 msgstr ""
+"Označený tok obsahuje kandidáta na křižovatku (bíle). Chcete-li tohoto "
+"kandidáta otestovat, označte tok a klikněte znovu na tlačítko "
+"\"Zkontrolovat\""
 
 msgid "The marked channels are a {0}-ways junction"
-msgstr ""
+msgstr "Označené toky jsou {0}-cestné křižovatky"
 
 msgid "The marked channels are not a junction:"
 msgstr "Označené toky nejsou křižovatky:"
@@ -25989,7 +26427,7 @@ msgid "construct channel digraph and search for junctions"
 msgstr "zkonstruovat orientovaný graf toků a hledat křižovatky"
 
 msgid "Number of {0}-ways junctions found: {1}"
-msgstr ""
+msgstr "Počet nalezených {0}-cestných křižovatek: {1}"
 
 msgid "generate all combinations from entrie/exit candidates"
 msgstr "vytvořit všechny kombinace možných vjedzů/výjezdů"
@@ -26167,7 +26605,7 @@ msgstr ""
 "hodnota je water."
 
 msgid "Which WMS layer to use for tracing against. Default is IR1."
-msgstr "Která WMS vrstva má být vybrána k trasování ? Výchozí: IR1."
+msgstr "Která WMS vrstva má být vybrána k trasování? Výchozí: IR1."
 
 msgid "Maximum size of each cache directory in bytes. Default is 300MB"
 msgstr ""
@@ -26324,7 +26762,7 @@ msgid "Please select 4 or 5 ways to assign no left turns."
 msgstr "Prosím vybrať 4 alebo 5 ciest na priradenie zákazu zabočenia v ľavo."
 
 msgid "Please select 4 ways that form a closed relation."
-msgstr "Prosím označte 4 cesty, ktoré tvoria uzavretú reláciu."
+msgstr "Prosím označte 4 cesty, které tvoří uzavřenou relaci."
 
 msgid "Unable to order the ways. Please verify their directions"
 msgstr "Pre neschopnosť usporiadať cesty. Prosím skontrolovať ich smery"
@@ -26333,8 +26771,7 @@ msgid "Create Michigan left turn restriction"
 msgstr "Vytvořit zákaz Michiganského odbočení vlevo"
 
 msgid "Unable to find via nodes. Please check your selection"
-msgstr ""
-"Nie som schopný nájsť sprostredkujúce uzly. Prosím skontrolujte váš výber."
+msgstr "Nenalezeny průjezdní uzly (via). Prosím zkontrolujte svůj výběr."
 
 msgid ""
 "XAPI query, e.g., '''' (to download all data), ''[highway=*]'', or "
@@ -26703,7 +27140,7 @@ msgid "Reading 7Zip file..."
 msgstr "Načítání souboru 7zip..."
 
 msgid "Zip Files"
-msgstr "zip súbory"
+msgstr "zip soubory"
 
 msgid "Reading Zip file..."
 msgstr "Načítání souboru Zip..."
@@ -26726,23 +27163,23 @@ msgid "Try lenient method"
 msgstr "Zkusit shovívavou metodu"
 
 msgid "GML files"
-msgstr "GML súbory"
+msgstr "GML soubory"
 
 msgid "KML/KMZ files"
-msgstr "KML/KMZ súbory"
+msgstr "KML/KMZ soubory"
 
 msgid "MapInfo files"
-msgstr "MapInfo súbory"
+msgstr "MapInfo soubory"
 
 msgid "Shapefiles"
-msgstr "shp súbory"
+msgstr "shp soubory"
 
 msgid ""
 "Unable to detect Coordinate Reference System.\n"
 "Would you like to fallback to ESPG:4326 (WGS 84) ?"
 msgstr ""
 "Nejsem schopen zjistit systém souřadnic.\n"
-"Chcete radši přepnout na ESPG:4326 (WGS 84) ?"
+"Chcete radši přepnout na ESPG:4326 (WGS 84)?"
 
 msgid "Warning: CRS not found"
 msgstr "Varování: nenalezen systém souřadnic"
@@ -26757,10 +27194,10 @@ msgid "Loading shapefile ({0} features)"
 msgstr "Načítám shapefile ({0} prvků)"
 
 msgid "CSV files"
-msgstr "CSV súbory"
+msgstr "CSV soubory"
 
 msgid "ODS files"
-msgstr "ODS súbory"
+msgstr "ODS soubory"
 
 msgid "No valid coordinates have been found."
 msgstr "Nebyly nalezeny použitelné souřadnice."
@@ -26771,7 +27208,7 @@ msgstr ""
 "nalezl {2}."
 
 msgid "XLS files"
-msgstr "XLS súbory"
+msgstr "XLS soubory"
 
 msgid "View OSM Wiki page"
 msgstr "Zobrazit stránky OSM Wiki"
@@ -27024,7 +27461,7 @@ msgid "Firefox executable"
 msgstr "Spustitelný soubor Firefoxu"
 
 msgid "OSM Server Files pbf compressed"
-msgstr "Súbory OSM servera skomprimované v pbf"
+msgstr "soubory OSM servera skomprimované v pbf"
 
 msgid "Download PBF"
 msgstr "Stáhnout PBF"
@@ -27036,7 +27473,7 @@ msgid "Invalid timestamp: {0}"
 msgstr "Neplatný časový údaj: {0}"
 
 msgid "Invalid DenseNodes key/values table"
-msgstr ""
+msgstr "Nepoužitelná tabulka klíče/hodnot DenseNodes"
 
 msgid "Reading OSM data..."
 msgstr "Načítaní dat OSM..."
@@ -27096,25 +27533,25 @@ msgid "Take only first X paths"
 msgstr "Vzít pouze prvních X cest"
 
 msgid "Color/width change"
-msgstr ""
+msgstr "Změna barvy/šířky"
 
 msgid "Shape closed"
-msgstr ""
+msgstr "Útvar uzavřen"
 
 msgid "Single segments"
 msgstr "Jednotlivé úseky"
 
 msgid "Orthogonal shapes"
-msgstr ""
+msgstr "Pravoúhlé útvary"
 
 msgid "Import settings"
 msgstr "Nastavení importu"
 
 msgid "Introduce separate layers for:"
-msgstr ""
+msgstr "Vložit oddělené vrstvy pro:"
 
 msgid "Bind to coordinates"
-msgstr ""
+msgstr "Svázat k souřadnicím"
 
 msgid "Projection:"
 msgstr "Projekce:"
@@ -27135,7 +27572,7 @@ msgid "Projection Preferences"
 msgstr "Nastavení projekce"
 
 msgid "Close the dialog and apply projection preferences"
-msgstr ""
+msgstr "Zavřít dialog a použít předvolby projekce"
 
 msgid "Close the dialog, discard projection preference changes"
 msgstr "Uzavřít dialog, zahodit změny nastavení projekce"
@@ -27259,7 +27696,7 @@ msgstr "Zapsat souřadnice do hlavičky obrázku"
 
 msgid ""
 "Write position information into the exif header of the following files:"
-msgstr "Zapíše informáciu o polohe do hlavičky EXIF nasledujúcich súborov:"
+msgstr "Zapíše informaci o poloze do hlavičky EXIF u nasledujících souborů:"
 
 msgid "settings"
 msgstr "nastavení"
@@ -27295,10 +27732,10 @@ msgid "Could not rename file!"
 msgstr "Nepovedlo se přejmenování souboru!"
 
 msgid "Could not rename file {0} to {1}!"
-msgstr ""
+msgstr "Nelze přejmenovat soubor {0} na {1}!"
 
 msgid "<html><h3>There are old backup files in the image directory!</h3>"
-msgstr "<html><h3>Existujú staré zálohy súborov v adresári obrázkov!</h3>"
+msgstr "<html><h3>Existují staré zálohy souborů v adresáři obrázků!</h3>"
 
 msgid "Override old backup files?"
 msgstr "Přepsat staré záložní soubory?"
@@ -27371,10 +27808,10 @@ msgid "Save Picture Calibration..."
 msgstr "Ukladám kalibráciu obrázka ..."
 
 msgid "Saves calibration data to a file"
-msgstr "Kalibračné údaje uložené do súboru"
+msgstr "Kalibračné údaje uložené do souboru"
 
 msgid "Saving file failed: {0}"
-msgstr "Uloženie súboru zlyhalo: {0}"
+msgstr "Uloženie souboru zlyhalo: {0}"
 
 msgid "New picture layer from clipboard"
 msgstr "Nová vrstva s obrázkem ze schránky"
@@ -27480,7 +27917,7 @@ msgid "PicLayer: {0}"
 msgstr "PicLayer: {0}"
 
 msgid "Calibration Files"
-msgstr "Kalibrační súbory"
+msgstr "Kalibrační soubory"
 
 msgid "Could not find the map object."
 msgstr "Nepodarilo sa nájsť objekt na mape."
@@ -27496,7 +27933,7 @@ msgstr "Data ve schránce nejsou obrázek"
 
 msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
 msgstr ""
-"Varovanie: Nepodarilo sa spracovať zip súbor ''{0}''. Výnimka bola: {1}"
+"Varovanie: Nepodarilo sa spracovať zip soubor ''{0}''. Výnimka bola: {1}"
 
 msgid "A calibration file associated to the picture file was found: {0}\n"
 msgstr "Byl nalezen kalibrační soubor k souboru s obrázkem: {0}\n"
@@ -27546,22 +27983,22 @@ msgid "New address point added."
 msgstr "Přidán nový uzel s adresou."
 
 msgid "Download Osmosis poly"
-msgstr ""
+msgstr "Stáhnout Osmosis poly"
 
 msgid "Reading polygon filter file..."
-msgstr ""
+msgstr "Načítám soubor polygon filter..."
 
 msgid "Error reading poly file: {0}"
-msgstr ""
+msgstr "Chyba při načítání poly souboru: {0}"
 
 msgid "The file must begin with a polygon name"
-msgstr ""
+msgstr "Soubor musí začínat názvem polygonu"
 
 msgid "There are less than 2 points in an area"
-msgstr ""
+msgstr "Ploch má méně než dva body"
 
 msgid "A polygon coordinate line must contain exactly 2 numbers"
-msgstr ""
+msgstr "Řádek souřadnice polygonu musí obsahovat přesně dvě čísla"
 
 msgid "Unable to parse {0} as a number"
 msgstr "Nelze přečíst {0} jako číslo"
@@ -27573,7 +28010,7 @@ msgid "{0} points were outside world bounds and were moved"
 msgstr "{0} bodů leželo za hranicemi světa a byly posunuty"
 
 msgid "Osmosis polygon filter files"
-msgstr ""
+msgstr "Soubory Osmosis polygon filter"
 
 msgid "Print..."
 msgstr "Vytisknout..."
@@ -27714,6 +28151,9 @@ msgstr "Navrhnout zastávky"
 msgid "Find"
 msgstr "Najít"
 
+msgid "Show"
+msgstr "Zobrazit"
+
 msgid "Mark"
 msgstr "Označit"
 
@@ -27727,13 +28167,13 @@ msgid "Enable"
 msgstr "Povolit"
 
 msgid "Can''t parse a time from this string."
-msgstr ""
+msgstr "Z tohoto řetězce nemohu načíst čas"
 
 msgid "Invalid value"
 msgstr "Neplatná hodnota"
 
 msgid "moved"
-msgstr ""
+msgstr "posunuto"
 
 msgid "Public Transport: Join GTFS stops"
 msgstr "Hromadná doprava: Propojit GTFS zastávky"
@@ -27742,16 +28182,16 @@ msgid "Id"
 msgstr "Id"
 
 msgid "pending"
-msgstr ""
+msgstr "čekající"
 
 msgid "outside"
-msgstr ""
+msgstr "venkovní"
 
 msgid "[incomplete]"
-msgstr ""
+msgstr "[nekompletní]"
 
 msgid "[empty way]"
-msgstr ""
+msgstr "[prázdná cesta]"
 
 msgid "[ID] {0}"
 msgstr "[id] {0}"
@@ -27820,7 +28260,7 @@ msgid "Maximum distance from route"
 msgstr "Maximální vzdálenost od trasy"
 
 msgid "Public Transport: Change stop type"
-msgstr ""
+msgstr "Hromadná doprava: Změnit typ zastávky"
 
 msgid "Create Stops from GPX ..."
 msgstr "Vytvořit zastávky z GPX ..."
@@ -27829,7 +28269,7 @@ msgid "Create Stops from a GPX file"
 msgstr "Vytvořit zastávky z GPX souboru"
 
 msgid "Select GPX file"
-msgstr ""
+msgstr "Zvolit soubor GPX"
 
 msgid "The GPX file contained no tracks or waypoints."
 msgstr "Tento soubor GPX neobsahoval žádné trasy ani uzly tras."
@@ -27844,42 +28284,44 @@ msgid "Detach"
 msgstr "Odpojit"
 
 msgid "implicit"
-msgstr ""
+msgstr "implicitní"
 
 msgid ""
 "The GPX file doesn''t contain valid trackpoints. Please use a GPX file that "
 "has trackpoints."
 msgstr ""
+"Soubor GPX neobsahuje použitelné trasové body. Zvolte, prosím, soubor GPS, "
+"který má trasové body."
 
 msgid "GPX File Trouble"
-msgstr ""
+msgstr "Problém s GPX souborem"
 
 msgid "unnamed"
 msgstr "nepojmenováno"
 
 msgid "Public Transport: Add track stop"
-msgstr ""
+msgstr "Hromadná doprava: Přidat zastávku"
 
 msgid "Public Transport: Delete track stop"
-msgstr ""
+msgstr "Hromadná doprava: Vymazat zastávku"
 
 msgid "Public Transport: Detach track stop list"
 msgstr "Veřejná doprava: Odpojit seznam zastávek"
 
 msgid "Public Transport: Edit track stop list"
-msgstr ""
+msgstr "Hromadná doprava: Upravit seznam zastávek"
 
 msgid "Public Transport: Relocate nodes in track stoplist"
-msgstr ""
+msgstr "Hromadná doprava: Přesunout uzly v seznamu zastávek"
 
 msgid "Public Transport: sort track stop list"
-msgstr ""
+msgstr "Hromadná doprava: seřadit seznam zastávek"
 
 msgid "Public Transport: Suggest stops"
-msgstr ""
+msgstr "Hromadná doprava: Navrhnout zastávky"
 
 msgid "Stopname"
-msgstr ""
+msgstr "Jméno zastávky"
 
 msgid "Public Transport: Detach waypoints"
 msgstr "Veřejná doprava: Odpojit body trasy"
@@ -27891,52 +28333,52 @@ msgid "Public Transport: Enable waypoints"
 msgstr "Veřejná doprava: Povolit body trasy"
 
 msgid "Public Transport: Edit waypoint name"
-msgstr ""
+msgstr "Hromadná doprava: Upravit název bodu trasy"
 
 msgid "Relation Toolbox"
-msgstr ""
+msgstr "Panel nástrojů relace"
 
 msgid "Open relation/multipolygon editor panel"
 msgstr "Otevřít panel editoru relací a multipolygonů"
 
 msgid "Specify role"
-msgstr ""
+msgstr "Určit roli"
 
 msgid "Change relation member roles to {0}"
-msgstr ""
+msgstr "Změnit role členů relace na {0}"
 
 msgid "Create administrative boundary relations"
-msgstr ""
+msgstr "Vytvořit relace administrativních hranic"
 
 msgid "Add tags boundary and admin_level to boundary relation ways"
-msgstr ""
+msgstr "Přidat značky boundary a admin_level na hraniční cesty relace"
 
 msgid "Move area tags from contour to relation"
-msgstr ""
+msgstr "Přesunout značky plochy z obrysových cest do relace"
 
 msgid "When moving tags, consider even non-repeating ones"
-msgstr ""
+msgstr "Při přesouvání značek brát v úvahu i ty neopakující se"
 
 msgid "Always split ways of neighbouring multipolygons"
 msgstr "Vždy rozdělit cesty sousedících multipolygonů"
 
 msgid "Change role"
-msgstr ""
+msgstr "Změnit roli"
 
 msgid "Enter role for selected members"
-msgstr ""
+msgstr "Zadejte roli pro zvolené členy"
 
 msgid "Relation Toolbox: {0}"
-msgstr ""
+msgstr "Panel nástrojů relací: {0}"
 
 msgid "another..."
-msgstr ""
+msgstr "jiné..."
 
 msgid "Add/remove members from the chosen relation"
-msgstr ""
+msgstr "Přidat/odebrat členy ze zvolené relace"
 
 msgid "Clear the chosen relation"
-msgstr ""
+msgstr "Vymazat zvolenou relaci"
 
 msgid "Create a multipolygon from selected objects"
 msgstr "Vytvořit multipolygon z vybraných objektů"
@@ -27945,19 +28387,19 @@ msgid "Create multipolygons from rings"
 msgstr "Vytvořit multipolygon z kruhů"
 
 msgid "Move tags from ways to relation"
-msgstr ""
+msgstr "Přesunout značky z cest na relaci"
 
 msgid "Enter admin level and name for the border relation:"
-msgstr ""
+msgstr "Zadejte administrativní úroveň level a název pro relaci hranice:"
 
 msgid "Admin level"
-msgstr ""
+msgstr "Administrativní úroveň"
 
 msgid "Create a relation from selected objects"
 msgstr "Vytvoriť reláciu z vybraných objektov"
 
 msgid "Choose a type for the relation:"
-msgstr ""
+msgstr "Zvolte typ relace:"
 
 msgid "Delete relation"
 msgstr "Smazat relaci"
@@ -27975,13 +28417,13 @@ msgid "Duplicate relation"
 msgstr "Duplikovat relaci"
 
 msgid "Open relation editor for the chosen relation"
-msgstr ""
+msgstr "Otevřít editor relace se zvolenou relací"
 
 msgid "Find a relation"
-msgstr ""
+msgstr "Najít relaci"
 
 msgid "Reconstruct polygon"
-msgstr ""
+msgstr "Rekonstruovat polygon"
 
 msgid "Multipolygon must consist only of ways"
 msgstr "Multipolygon musí obsahovat pouze cesty"
@@ -27990,7 +28432,7 @@ msgid "Reconstruction of polygons can be done only from outer ways"
 msgstr "Rekonstrukce polygonů je možná pouze z vnějších cest"
 
 msgid "Reconstruct polygons from relation {0}"
-msgstr ""
+msgstr "Reconstruovat polygony z relace {0}"
 
 msgid "Open relation wiki page"
 msgstr "Otevřít Wiki stránku o relaci"
@@ -28005,31 +28447,31 @@ msgid "Complete multipolygon for way {0}"
 msgstr "Dokončit multipolygon u cesty {0}"
 
 msgid "Node without ''house'' role found"
-msgstr ""
+msgstr "Nalezen uzel bez role ''house''"
 
 msgid "Way without ''house'' or ''street'' role found"
-msgstr ""
+msgstr "Nalezena cesta bez role ''house'' nebo ''street''"
 
 msgid "Relation without ''house'' role found"
-msgstr ""
+msgstr "Nalezena relace bez role ''house''"
 
 msgid "Relation does not have name"
-msgstr ""
+msgstr "Relace není pojmenována"
 
 msgid "Relation has streets with different names"
-msgstr ""
+msgstr "Relace obsahuje ulice s různými názvy"
 
 msgid "fix associatedStreet relation"
 msgstr "opravit relaci Přiřazená ulice (associatedStreet)"
 
 msgid "Relation without ''subarea'' role found"
-msgstr ""
+msgstr "Nalezena relace bez role ''subarea''"
 
 msgid "Node without ''label'' or ''admin_centre'' role found"
-msgstr ""
+msgstr "Nalezen uzel bez role ''label'' nebo ''admin_centre''"
 
 msgid "Way without ''inner'' or ''outer'' role found"
-msgstr ""
+msgstr "Nalezena cesta bez role ''inner'' nebo ''outer''"
 
 msgid "Revert changeset fully"
 msgstr "Vrátit zpět celou sadu změn"
@@ -28062,7 +28504,7 @@ msgid "Objects history"
 msgstr "Historie objektů"
 
 msgid "History reverter"
-msgstr ""
+msgstr "Navracení historie"
 
 msgid "Preparing history data..."
 msgstr "Pripravujem dáta histórie..."
@@ -28071,7 +28513,7 @@ msgid "Remote Control has been asked to revert a changeset."
 msgstr "Dálkové ovládání bylo požádáno o vrácení zpět sady změn"
 
 msgid "Reverting..."
-msgstr ""
+msgstr "Navracím..."
 
 msgid ""
 "This changeset has objects that are not present in current dataset.\n"
@@ -28081,16 +28523,16 @@ msgstr ""
 "Před vracením změn je potřeba je stáhnout. Chcete pokračovat?"
 
 msgid "Confirm"
-msgstr ""
+msgstr "Potvrdit"
 
 msgid "Fetching missing primitives"
-msgstr ""
+msgstr "Načítám chybějící prvky"
 
 msgid "Downloading changeset"
 msgstr "Stahuji sadu změn"
 
 msgid "See {0}"
-msgstr ""
+msgstr "Viz {0}"
 
 msgid "Revert changeset #{0}"
 msgstr "Vrátit zpět sadu změn #{0}"
@@ -28161,7 +28603,7 @@ msgid "Sign {0}"
 msgstr "Dopravní značka {0}"
 
 msgid "Additional sign {0}"
-msgstr "Doplňujúca dopravná značka {0}"
+msgstr "Doplňková dopravní značka {0}"
 
 msgid "Edit relation"
 msgstr "Upravit relaci"
@@ -28182,10 +28624,10 @@ msgid "Remove relation ''{0}'' at position {1} from relation ''{2}''"
 msgstr "Odstranit relaci ''{0}'' na pozici {1} z relace ''{2}''"
 
 msgid "routing active route"
-msgstr ""
+msgstr "naviguji aktivní trasou"
 
 msgid "routing inactive route"
-msgstr ""
+msgstr "naviguji neaktivní trasou"
 
 msgid "Routing"
 msgstr "Navigace"
@@ -28224,7 +28666,7 @@ msgid "Clear route"
 msgstr "Vymazat trasu"
 
 msgid "Reconstruct Graph"
-msgstr ""
+msgstr "Rekonstruovat graf"
 
 msgid "Routing Plugin Preferences"
 msgstr "Nastavení doplňku Routing"
@@ -28245,7 +28687,7 @@ msgid "New value for {0}"
 msgstr "Nová hodnota pro {0}"
 
 msgid "Preference ''{0}'' missing. Cannot initialize SdsApi."
-msgstr ""
+msgstr "Chybí předvolba ''{0}''. Nelze inicializovat SdsApi."
 
 msgid ""
 "<html><body><p class=\"warning-body\"><strong>Warning:</strong> The password "
@@ -28255,48 +28697,50 @@ msgstr ""
 "uloženo nešifrovaně v souboru nastavení pro JOSM. </p></body></html>"
 
 msgid "Enter credentials for Separate Data Store API"
-msgstr ""
+msgstr "Zadejte přihlašovací údaje pro Separate Data Store API"
 
 msgid "Please enter the user name of your SDS account"
-msgstr ""
+msgstr "Zajdete, prosím, uživatelské jméno vašeho účtu SDS"
 
 msgid "Please enter the password of your SDS account"
-msgstr ""
+msgstr "Zajdete, prosím, heslo vašeho účtu SDS"
 
 msgid ""
 "Authenticating at the SDS API ''{0}'' failed. Please enter a valid username "
 "and a valid password."
 msgstr ""
+"Přihlášení k SDS API ''{0}'' selhalo. Zadejte, prosím, platné uživatelské "
+"jméno a heslo."
 
 msgid "SDS data file"
-msgstr ""
+msgstr "Datový soubor SDS"
 
 msgid "Load..."
 msgstr "Načítať..."
 
 msgid "Load separate data store data from a file."
-msgstr ""
+msgstr "Nahrát data o SDS ze souboru."
 
 msgid "Loading files"
-msgstr "Načítajú sa súbory"
+msgstr "Načítají se soubory"
 
 msgid "SDS"
-msgstr ""
+msgstr "SDS"
 
 msgid "Information about SDS."
-msgstr ""
+msgstr "Informace o SDS."
 
 msgid "About SDS..."
-msgstr ""
+msgstr "O SDS..."
 
 msgid "Open a preferences dialog for SDS."
-msgstr ""
+msgstr "Otevřít okno předvoleb SDS."
 
 msgid "Separate Data Store"
-msgstr ""
+msgstr "Separate Data Store"
 
 msgid "Configures access to the Separate Data Store."
-msgstr ""
+msgstr "Nastavit přístup k Separate Data Store."
 
 msgid "Server"
 msgstr "Server"
@@ -28308,11 +28752,14 @@ msgid ""
 "The user name at the SDS server. You need to create an account with the SDS "
 "admin first."
 msgstr ""
+"Uživatelské jméno na serveru SDS. Musíte nejdříve vytvořit administrátorský "
+"účet SDS."
 
 msgid ""
 "The password at the SDS server. You need to create an account with the SDS "
 "admin first."
 msgstr ""
+"Heslo na serveru SDS. Musíte nejdříve vytvořit administrátorský účet SDS."
 
 msgid ""
 "Tags beginning with this prefix are never saved to OSM, but to the SDS "
@@ -28374,7 +28821,7 @@ msgid "Delete nodes outside of data regions?"
 msgstr "Smazat uzly mimo oblast s daty?"
 
 msgid "average nearby nodes"
-msgstr ""
+msgstr "zprůměrovat blízké uzly"
 
 msgid ""
 "Node of the way (area) is removed if all of <u>Angle Weight</u>, <u>Area "
@@ -28390,30 +28837,43 @@ msgid ""
 "another step of the simplification that merges adjanced nodes that are "
 "closer than <u>Threshold</u> meters."
 msgstr ""
+"Uzel je z cesty (plochy) odstraněn, pokud všechny hodnoty <u>Váha úhlu</u>, "
+"<u>Váha plochy</u> a <u>Váha vzdálenosti</u> jsou větší než jedna. "
+"<u>Váha</u> je vypočítávána jako <u>Hodnota</u> / <u>Práh</u>, kde "
+"<u>Hodnota</u> je jedna z <u>Úhel</u>, <u>Plocha</u> a <u>Vzdálenost</u> "
+"vypočtena pro každé tři sousedící body cesty.<ul><li><u>Hodnota</u> "
+"<u>Úhlu</u> je úhel druhého uzlu ve stupních</li><li><u>Hodnota</u> "
+"<u>Plochy</u> je plocha obsažená trojúhelníkem</li><li><u>Hodnota</u> "
+"<u>Vzdálenosti</u> je vzdálenost Cross Track Error</li></ul>Všechny tři "
+"<u>Váhy</u>jsou vynásobeny jim odpovídajícími <u>Faktory</u> a sečteny. Uzel "
+"s nejnižším součtem je odstraněn jako první. Odstraňování pokračuje až "
+"nezůstane žádný uzel k odstranění. Sloučení blízkých uzlů je dalším krokem "
+"ve zjednodušovaní, který slučuje sousední uzly, které jsou blíže než "
+"<u>Práh</u> metrů."
 
 msgid "Angle Threshold"
-msgstr ""
+msgstr "Práh úhlu"
 
 msgid "Angle Factor"
-msgstr ""
+msgstr "Práh úhlu"
 
 msgid "Area Threshold"
-msgstr ""
+msgstr "Práh plochy"
 
 msgid "Area Factor"
-msgstr ""
+msgstr "Faktor plochy"
 
 msgid "Distance Threshold"
-msgstr ""
+msgstr "Práh vzdálenosti"
 
 msgid "Distance Factor"
-msgstr ""
+msgstr "Faktor vzdálenosti"
 
 msgid "Merge Nearby Nodes Threshold"
-msgstr ""
+msgstr "Práh sloučení blízkých uzlů"
 
 msgid "SeaMap Editor"
-msgstr ""
+msgstr "SeaMap Editor"
 
 msgid "AutoSave LiveData"
 msgstr "Automatické ukládání LiveData"
@@ -28812,9 +29272,12 @@ msgid ""
 "Use default (and maybe existing) GnuPG directory ({0}) to store new keys and "
 "configs."
 msgstr ""
+"Použít výchozí (a možná již existující) adresář GnuPG ({0}) k uložení nových "
+"klíčů a nastavení."
 
 msgid "Use separate GnuPG directory ({0}) to store new keys and configs."
 msgstr ""
+"Použít samostatný adresář GnuPG ({0}) k uložení nových klíčů a nastavení."
 
 msgid "Trust OSM Settings"
 msgstr "Nastavení Trust OSM"
@@ -29311,7 +29774,7 @@ msgid "Bicycles"
 msgstr "Kola"
 
 msgid "Mopeds"
-msgstr ""
+msgstr "Mopedy"
 
 msgid "Use standard exceptions"
 msgstr "Použít standardní vyjímky"
@@ -29350,10 +29813,10 @@ msgid "To:"
 msgstr "Do:"
 
 msgid "no participating way with role ''from''"
-msgstr "nezúčastňujúca sa cesta s funkciou ''z (from)''"
+msgstr "v relaci není cesta s rolí ''odkud (from)''"
 
 msgid "no participating way with role ''to''"
-msgstr "nezúčastňujúca sa cesta s funkciou ''do (to)''"
+msgstr "v relaci není cesta s rolí ''kam (to)''"
 
 msgid "Only participating in selection"
 msgstr "Pouze k vybraným objektům"
@@ -29435,8 +29898,8 @@ msgid ""
 "Warning: the preference with key ''{0}'' has an unsupported value ''{1}''. "
 "Assuming the default value ''set-a''."
 msgstr ""
-"Upozornenie: nastavený kľúč ''{0}'' má nepodporovanú hodnotu ''{1}''. Za "
-"predpokladu, že sú východiskové hodnoty ''sady-a''."
+"Upozornění: klíč v nastavení ''{0}'' má nepodporovanou hodnotu ''{1}''. "
+"Používám výchozí hodnotu ''set-a''."
 
 msgid ""
 "This turn restriction uses the way <span class=\"object-name\">{0}</span> "
@@ -29737,7 +30200,7 @@ msgid ""
 "The selected way is not a split way, please select split points or split way "
 "too."
 msgstr ""
-"Vybraná cesta nerozdeľuje objekt, prosím zvoľte rozdeľujúce uzly a cestu."
+"Vybraná cesta nerozděluje objekt, prosím zvolte rozdělující uzly nebo cestu."
 
 msgid "The selected nodes can not be consecutive nodes in the object."
 msgstr "Zvolené uzly nemohou být po sobě těsně následující uzly v objektu."
@@ -29752,8 +30215,8 @@ msgid ""
 "There are several ways containing one of the splitting nodes. Select ways "
 "participating in this operation."
 msgstr ""
-"Existuje viacero ciest obsahujúcich jeden z rozdeľujúcich bodov. Vyberte "
-"cesty požadované pre túto operáciu."
+"Existuje více cest obsahujících jeden z rozdělujících bodů. Vyberte cesty "
+"požadované pro tuto operaci."
 
 msgid "Symmetry"
 msgstr "Symetrie"
@@ -29819,7 +30282,7 @@ msgid "Opens specified URL browser"
 msgstr "Otevřít zvolené URL v porhlížeči."
 
 msgid "Utilsplugin2 settings"
-msgstr ""
+msgstr "Utilsplugin2 nastavení"
 
 msgid "Here you can change some preferences of Utilsplugin2 functions"
 msgstr "Zde můžete měnit některá nastavení funkcí doplňku Utilsplugin2"
@@ -29933,7 +30396,7 @@ msgid "Find primitives with these tags"
 msgstr "Najít prvky s těmito značkami"
 
 msgid "Multitag Background: highlight"
-msgstr ""
+msgstr "Víceznačka pozadí: zvýrazněno"
 
 msgid "Replace Geometry"
 msgstr "Nahradit geometrii"
diff --git a/i18n/po/cy.po b/i18n/po/cy.po
index 5aadb15..2e816ac 100644
--- a/i18n/po/cy.po
+++ b/i18n/po/cy.po
@@ -1,8 +1,13 @@
+# Welsh translation for josm
+# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
+# This file is distributed under the same license as the josm package.
+# FIRST AUTHOR <EMAIL at ADDRESS>, 2009.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-21 03:38+0200\n"
+"POT-Creation-Date: 2014-12-10 03:42+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"
@@ -11,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-10-21 05:31+0000\n"
-"X-Generator: Launchpad (build 17203)\n"
+"X-Launchpad-Export-Date: 2014-12-10 05:18+0000\n"
+"X-Generator: Launchpad (build 17283)\n"
 "Language: cy\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -169,16 +174,6 @@ msgid "About JOSM..."
 msgstr "Ynglyn JOSM..."
 
 msgid ""
-"Unexpected format of API base URL. Redirection to info or history page for "
-"OSM object will probably fail. API base URL is: ''{0}''"
-msgstr ""
-
-msgid ""
-"Unexpected format of API base URL. Redirection to user page for OSM user "
-"will probably fail. API base URL is: ''{0}''"
-msgstr ""
-
-msgid ""
 "You are about to launch {0} browser window.<br>This may both clutter your "
 "screen with browser windows<br>and take some time to finish."
 msgid_plural ""
@@ -1520,6 +1515,15 @@ msgstr ""
 msgid "Nothing to upload. Get some data first."
 msgstr ""
 
+msgid "Upload note changes to server"
+msgstr ""
+
+msgid "Upload notes"
+msgstr ""
+
+msgid "Uploading notes to server"
+msgstr ""
+
 msgid "Upload selection"
 msgstr ""
 
@@ -1792,10 +1796,16 @@ msgstr ""
 msgid "Click the location where you wish to create a new note"
 msgstr ""
 
-msgid "Enter a comment for a new note"
+msgid "Create new note"
 msgstr ""
 
-msgid "Create new note"
+msgid "Create note"
+msgstr ""
+
+msgid "Enter a detailed comment to create a note"
+msgstr ""
+
+msgid "You must enter a comment to create a new note"
 msgstr ""
 
 msgid "Delete Mode"
@@ -2666,6 +2676,15 @@ msgstr ""
 msgid "Cycling dependencies"
 msgstr ""
 
+msgid "Uploading modified notes"
+msgstr ""
+
+msgid "Note {0} failed: {1}"
+msgstr ""
+
+msgid "Notes failed to upload"
+msgstr ""
+
 msgid ""
 "The following are results of automatic validation. Try fixing these, but be "
 "careful (don''t destroy valid data). When in doubt ignore them.<br>When you "
@@ -4895,6 +4914,12 @@ msgstr ""
 msgid "Conflict foreground: keep all tags"
 msgstr ""
 
+msgid "Conflict background: sum all numeric tags"
+msgstr ""
+
+msgid "Conflict foreground: sum all numeric tags"
+msgstr ""
+
 msgid "Conflict background: keep member"
 msgstr ""
 
@@ -5313,12 +5338,19 @@ msgstr ""
 msgid "all"
 msgstr ""
 
+msgid "sum"
+msgstr ""
+
 msgid "Please decide which values to keep"
 msgstr ""
 
 msgid "Value ''{0}'' is going to be applied for key ''{1}''"
 msgstr ""
 
+msgid ""
+"All numeric values sumed as ''{0}'' are going to be applied for key ''{1}''"
+msgstr ""
+
 msgid "The key ''{0}'' and all its values are going to be removed"
 msgstr ""
 
@@ -5681,24 +5713,6 @@ msgstr[1] ""
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
 
-msgid "Display the history of all selected items."
-msgstr ""
-
-msgid "Object with history"
-msgstr ""
-
-msgid "Reload"
-msgstr ""
-
-msgid "Reload all currently selected objects and refresh the list."
-msgstr ""
-
-msgid "Show"
-msgstr ""
-
-msgid "Display the history of the selected objects."
-msgstr ""
-
 msgid "Advanced object info"
 msgstr ""
 
@@ -6036,6 +6050,9 @@ msgstr ""
 msgid "Comment"
 msgstr ""
 
+msgid "Comment on note"
+msgstr ""
+
 msgid "Add comment to note:"
 msgstr ""
 
@@ -6045,9 +6062,6 @@ msgstr ""
 msgid "Close note with message:"
 msgstr ""
 
-msgid "Close Note"
-msgstr ""
-
 msgid "Create a new note"
 msgstr ""
 
@@ -6120,6 +6134,9 @@ msgstr ""
 msgid "Search for objects"
 msgstr ""
 
+msgid "Display the history of the selected objects."
+msgstr ""
+
 msgid "Zoom to selection"
 msgstr ""
 
@@ -6239,6 +6256,9 @@ msgstr ""
 msgid "Updating map ..."
 msgstr ""
 
+msgid "anonymous"
+msgstr ""
+
 msgid "Display the basic properties of the changeset"
 msgstr ""
 
@@ -6251,6 +6271,12 @@ msgstr ""
 msgid "Display the objects created, updated, and deleted by the changeset"
 msgstr ""
 
+msgid "Discussion"
+msgstr ""
+
+msgid "Display the public discussion around this changeset"
+msgstr ""
+
 msgid "Changeset Management Dialog"
 msgstr ""
 
@@ -6308,9 +6334,6 @@ msgctxt "changeset.state"
 msgid "Closed"
 msgstr ""
 
-msgid "anonymous"
-msgstr ""
-
 msgid "ID"
 msgstr ""
 
@@ -6326,6 +6349,9 @@ msgstr ""
 msgid "Closed at"
 msgstr ""
 
+msgid "Discussions"
+msgstr ""
+
 msgid "Downloading changeset content"
 msgstr ""
 
@@ -6437,6 +6463,15 @@ msgid ""
 "layer"
 msgstr ""
 
+msgid "Update changeset discussion"
+msgstr ""
+
+msgid "Update the changeset discussion from the OSM server"
+msgstr ""
+
+msgid "Date"
+msgstr ""
+
 msgid "Download changesets"
 msgstr ""
 
@@ -6854,7 +6889,7 @@ msgstr ""
 msgid "Set number of recently added tags"
 msgstr ""
 
-msgid "Remember last used tags"
+msgid "Remember last used tags after a restart"
 msgstr ""
 
 msgid "Please enter the number of recently added tags to display"
@@ -7200,6 +7235,9 @@ msgstr ""
 msgid "Load parent relations"
 msgstr ""
 
+msgid "Reload"
+msgstr ""
+
 msgid "Loading parent relations"
 msgstr ""
 
@@ -7322,6 +7360,12 @@ msgstr ""
 msgid "Select to download GPS traces in the selected download area."
 msgstr ""
 
+msgid "Notes"
+msgstr ""
+
+msgid "Select to download notes in the selected download area."
+msgstr ""
+
 msgid "Download as new layer"
 msgstr ""
 
@@ -7627,9 +7671,6 @@ msgstr ""
 msgid "B"
 msgstr ""
 
-msgid "Date"
-msgstr ""
-
 msgid ""
 "Failed to update primitive with id {0} because current edit layer is null"
 msgstr ""
@@ -8484,9 +8525,6 @@ msgstr ""
 msgid "Save Layer"
 msgstr ""
 
-msgid "Notes"
-msgstr ""
-
 msgid "Notes layer"
 msgstr ""
 
@@ -8502,9 +8540,6 @@ msgstr ""
 msgid "outside downloaded area"
 msgstr ""
 
-msgid "version {0}"
-msgstr ""
-
 msgid "Merging layers"
 msgstr ""
 
@@ -12130,6 +12165,15 @@ msgstr ""
 msgid "Open changeset expected. Got closed changeset with id {0}."
 msgstr ""
 
+msgid "Note upload failed"
+msgstr ""
+
+msgid "Error parsing note response from server"
+msgstr ""
+
+msgid "Error encoding string: {0}"
+msgstr ""
+
 msgid "(Code={0})"
 msgstr ""
 
@@ -12178,13 +12222,13 @@ msgstr ""
 msgid "Parsing changeset content ..."
 msgstr ""
 
-msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
-msgid "Illegal numeric value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
-msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal numeric value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
 msgid "Missing mandatory attribute ''{0}'' of XML element {1}."
@@ -12976,9 +13020,6 @@ msgstr ""
 msgid "Failed to scan file ''{0}'' for plugin information. Skipping."
 msgstr ""
 
-msgid "Processing plugin site cache icon files..."
-msgstr ""
-
 msgid "Processing plugin files..."
 msgstr ""
 
@@ -12997,12 +13038,6 @@ msgstr ""
 msgid "Details:"
 msgstr ""
 
-msgid "Plugin icons download error"
-msgstr ""
-
-msgid "JOSM failed to download plugin icons:"
-msgstr ""
-
 msgid ""
 "Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
 "plugin site ''{1}''."
@@ -13888,7 +13923,9 @@ msgid ""
 "Creating and handling address nodes and buildings within Czech Republic."
 msgstr ""
 
-msgid "Allows to import various file formats into JOSM directly."
+msgid ""
+"Allows to import various file formats into JOSM directly. Currently "
+"supported: TangoGPS, Garmin Trainings Center TCX."
 msgstr ""
 
 msgid "Download your GPX tracks from openstreetmap.org"
@@ -13985,6 +14022,11 @@ msgid "A helper for IRS satellite adjustment."
 msgstr ""
 
 msgid ""
+"Provides Java Native Access (JNA) library. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
+msgid ""
 "Provides Java Topology Suite (JTS) library and related utilities. Not meant "
 "to be installed directly by users, but rather as a dependency for other "
 "plugins."
@@ -14340,6 +14382,25 @@ msgstr ""
 msgid "Width (meters)"
 msgstr ""
 
+msgid "Sidewalk"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "both"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "left"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "right"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "no"
+msgstr ""
+
 msgid "Service type"
 msgstr ""
 
@@ -14704,15 +14765,19 @@ msgstr ""
 msgid "May-Sep 09:30-12:30,14:15-19:30"
 msgstr ""
 
+msgctxt "parking"
 msgid "multi-storey"
 msgstr ""
 
+msgctxt "parking"
 msgid "surface"
 msgstr ""
 
+msgctxt "parking"
 msgid "underground"
 msgstr ""
 
+msgctxt "parking"
 msgid "rooftop"
 msgstr ""
 
@@ -15170,15 +15235,26 @@ msgstr ""
 msgid "Overtaking"
 msgstr ""
 
+msgctxt "overtaking"
+msgid "yes"
+msgstr ""
+
+msgctxt "overtaking"
 msgid "both"
 msgstr ""
 
+msgctxt "overtaking"
 msgid "forward"
 msgstr ""
 
+msgctxt "overtaking"
 msgid "backward"
 msgstr ""
 
+msgctxt "overtaking"
+msgid "no"
+msgstr ""
+
 msgid "Roundabout"
 msgstr ""
 
@@ -15472,6 +15548,12 @@ msgstr ""
 msgid "tiger"
 msgstr ""
 
+msgid "Button operated"
+msgstr ""
+
+msgid "Sound signals"
+msgstr ""
+
 msgid "Crossing attendant"
 msgstr ""
 
@@ -15993,9 +16075,6 @@ msgstr ""
 msgid "Traffic lights"
 msgstr ""
 
-msgid "Sound signals"
-msgstr ""
-
 msgid "Barrier"
 msgstr ""
 
@@ -18055,6 +18134,9 @@ msgstr ""
 msgid "Gasometer"
 msgstr ""
 
+msgid "Bunker Silo"
+msgstr ""
+
 msgid "Pipeline"
 msgstr ""
 
@@ -18201,15 +18283,15 @@ msgstr ""
 msgid "Monitoring:"
 msgstr ""
 
-msgid "Weather"
-msgstr ""
-
 msgid "Water level"
 msgstr ""
 
 msgid "Tide Level"
 msgstr ""
 
+msgid "Groundwater"
+msgstr ""
+
 msgid "Traffic"
 msgstr ""
 
@@ -18228,6 +18310,9 @@ msgstr ""
 msgid "Galileo Signals"
 msgstr ""
 
+msgid "Weather"
+msgstr ""
+
 msgid "Radiation"
 msgstr ""
 
@@ -18408,6 +18493,9 @@ msgstr ""
 msgid "pivot_pier"
 msgstr ""
 
+msgid "Bridge outline"
+msgstr ""
+
 msgid "Power Plant"
 msgstr ""
 
@@ -19015,6 +19103,15 @@ msgstr ""
 msgid "Pole"
 msgstr ""
 
+msgid "Pole with Transformer"
+msgstr ""
+
+msgid "Pole Attributes:"
+msgstr ""
+
+msgid "Transformer Attributes:"
+msgstr ""
+
 msgid "Power Line"
 msgstr ""
 
@@ -19064,9 +19161,15 @@ msgstr ""
 msgid "Power Cable"
 msgstr ""
 
+msgctxt "power cable"
+msgid "underground"
+msgstr ""
+
+msgctxt "power cable"
 msgid "underwater"
 msgstr ""
 
+msgctxt "power cable"
 msgid "overground"
 msgstr ""
 
@@ -19094,6 +19197,33 @@ msgstr ""
 msgid "Memorial"
 msgstr ""
 
+msgctxt "memorial"
+msgid "statue"
+msgstr ""
+
+msgctxt "memorial"
+msgid "bust"
+msgstr ""
+
+msgctxt "memorial"
+msgid "plaque"
+msgstr ""
+
+msgctxt "memorial"
+msgid "stele"
+msgstr ""
+
+msgctxt "memorial"
+msgid "stone"
+msgstr ""
+
+msgctxt "memorial"
+msgid "war_memorial"
+msgstr ""
+
+msgid "Inscription"
+msgstr ""
+
 msgid "Wayside Cross"
 msgstr ""
 
@@ -19163,6 +19293,9 @@ msgstr ""
 msgid "Beverages"
 msgstr ""
 
+msgid "Wine"
+msgstr ""
+
 msgid "Boutique"
 msgstr ""
 
@@ -19208,6 +19341,9 @@ msgstr ""
 msgid "Video Games"
 msgstr ""
 
+msgid "Music"
+msgstr ""
+
 msgid "Cash"
 msgstr ""
 
@@ -19235,6 +19371,9 @@ msgstr ""
 msgid "Curtain"
 msgstr ""
 
+msgid "Art"
+msgstr ""
+
 msgid "Frame"
 msgstr ""
 
@@ -19280,6 +19419,9 @@ msgstr ""
 msgid "Beauty"
 msgstr ""
 
+msgid "Tattoo"
+msgstr ""
+
 msgid "Optician"
 msgstr ""
 
@@ -19331,6 +19473,9 @@ msgstr ""
 msgid "Pet"
 msgstr ""
 
+msgid "Funeral Directors"
+msgstr ""
+
 msgid "Vending Machine"
 msgstr ""
 
@@ -19430,6 +19575,15 @@ msgstr ""
 msgid "National Park"
 msgstr ""
 
+msgid "Protected Area"
+msgstr ""
+
+msgid "Protected Class"
+msgstr ""
+
+msgid "Title or type of protection"
+msgstr ""
+
 msgid "Places"
 msgstr ""
 
@@ -20506,7 +20660,13 @@ msgstr ""
 msgid "Estonia Ortho (Maaamet)"
 msgstr ""
 
-msgid "Estonia Multi (Maaamet)"
+msgid "Estonia Hillshade (Maaamet)"
+msgstr ""
+
+msgid "Estonia Cadastre (Maaamet)"
+msgstr ""
+
+msgid "Estonia Forestry (Maaamet)"
 msgstr ""
 
 msgid "Bordeaux - 2012"
@@ -20530,7 +20690,7 @@ msgstr ""
 msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
 msgstr ""
 
-msgid "CUGN Nancy - Orthophoto 2012"
+msgid "GrandNancy Orthophotographie 2012"
 msgstr ""
 
 msgid "Géobretagne - Brest 2010 - 10 cm"
@@ -20577,9 +20737,6 @@ msgid ""
 "- 1 m"
 msgstr ""
 
-msgid "Streets NRW Geofabrik.de"
-msgstr ""
-
 msgid "Hike & Bike"
 msgstr ""
 
@@ -20639,6 +20796,9 @@ msgstr ""
 msgid "NRW-Atlas: Topographische Karte 1:10000"
 msgstr ""
 
+msgid "Metropole Ruhr: Luftbilder (10 cm)"
+msgstr ""
+
 msgid "Drone Imagery (Haiti)"
 msgstr ""
 
@@ -20840,6 +21000,9 @@ msgstr ""
 msgid "Stadt Zürich Übersichtsplan (Strassen, Gebäude, Hausnummer)"
 msgstr ""
 
+msgid "Stadt Zürich Luftbild 2011"
+msgstr ""
+
 msgid "Orthofoto Kanton Solothurn RGB (SOGIS 2011/2012/2013)"
 msgstr ""
 
@@ -20858,7 +21021,7 @@ msgstr ""
 msgid "Canton de Fribourg 50cm (2005)"
 msgstr ""
 
-msgid "Stadt Bern 10cm/25cm (2008)"
+msgid "Stadt Bern 10cm/25cm (2012)"
 msgstr ""
 
 msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
@@ -20897,7 +21060,7 @@ msgstr ""
 msgid "OSM US TIGER 2012 Roads Overlay"
 msgstr ""
 
-msgid "New & Misaligned TIGER Roads (TIGER 2013)"
+msgid "New & Misaligned TIGER Roads (TIGER 2014)"
 msgstr ""
 
 msgid "MassGIS L3 Parcels"
@@ -20945,9 +21108,234 @@ msgstr ""
 msgid "NLS - Bartholomew Half Inch, 1897-1907"
 msgstr ""
 
+msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Annan 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgstr ""
+
 msgid "OS Town Plans, Cupar 1854 (NLS)"
 msgstr ""
 
+msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Elgin 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Forres 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Galashiels 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Girvan 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Greenock 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Haddington 1853 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Haddington 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Hamilton 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Irvine 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Jedburgh 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kelso 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Lanark 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Linlithgow 1856 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Musselburgh 1853 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Musselburgh 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Oban 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Peebles 1856 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Perth 1860 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Peterhead 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Selkirk 1865 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, St Andrews 1854 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, St Andrews 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stirling 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stonehaven 1864 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1847 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Strathaven 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wick 1872 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wigtown 1848 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wigtown 1894 (NLS)"
+msgstr ""
+
 msgid "Decreasing house numbers in addresses interpolation"
 msgstr ""
 
@@ -21001,17 +21389,37 @@ msgid "{0}={1} is deprecated. Please use instead a multipolygon."
 msgstr ""
 
 msgid ""
-"{0} is deprecated. Please specify ìnterval by using opening_hours syntax"
+"{0} is deprecated. Please specify interval by using opening_hours syntax"
 msgstr ""
 
 msgid ""
 "{0} is deprecated. Please delete this object and use a private layer instead"
 msgstr ""
 
-msgid "{0} on a node"
+msgid "{0}={1} is unspecific. Please replace ''{1}'' by a specific value."
 msgstr ""
 
-msgid "{0} on a node. Should be drawn as an area"
+msgid "{0} should be replaced with {1}"
+msgstr ""
+
+msgid ""
+"{0}={1} is unspecific. Please replace ''{1}'' by ''left'', ''right'' or "
+"''both''."
+msgstr ""
+
+msgid "{0} on a node. Should be used on a way."
+msgstr ""
+
+msgid "{0} on a node. Should be drawn as an area."
+msgstr ""
+
+msgid "{0}=* on a node. Should be used in a relation"
+msgstr ""
+
+msgid "{0} on a way. Should be used in a relation"
+msgstr ""
+
+msgid "{0} on a node"
 msgstr ""
 
 msgid "Building inside building"
@@ -25681,6 +26089,9 @@ msgstr ""
 msgid "Find"
 msgstr ""
 
+msgid "Show"
+msgstr ""
+
 msgid "Mark"
 msgstr ""
 
diff --git a/i18n/po/da.po b/i18n/po/da.po
index e804cf9..3e43085 100644
--- a/i18n/po/da.po
+++ b/i18n/po/da.po
@@ -1,17 +1,23 @@
+# Danish translation for josm
+# Copyright (c) 2008 Rosetta Contributors and Canonical Ltd 2008
+# This file is distributed under the same license as the josm package.
+#
+# FIRST AUTHOR <EMAIL at ADDRESS>, 2008.
+# Michael Andersen <redkite at milvus.dk>, 2009.
 msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-21 03:38+0200\n"
-"PO-Revision-Date: 2014-10-20 22:01+0000\n"
+"POT-Creation-Date: 2014-12-10 03:42+0100\n"
+"PO-Revision-Date: 2014-12-06 23:01+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-10-21 04:45+0000\n"
-"X-Generator: Launchpad (build 17203)\n"
+"X-Launchpad-Export-Date: 2014-12-10 04:42+0000\n"
+"X-Generator: Launchpad (build 17283)\n"
 "Language: da_DK\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
@@ -172,20 +178,6 @@ msgid "About JOSM..."
 msgstr "Om JOSM..."
 
 msgid ""
-"Unexpected format of API base URL. Redirection to info or history page for "
-"OSM object will probably fail. API base URL is: ''{0}''"
-msgstr ""
-"Ukendt format af API basis URL. Omdirigering til info eller historikside for "
-"OSM objekt vil sandsynligvis mislykkes. API basis URL er: ''{0}''"
-
-msgid ""
-"Unexpected format of API base URL. Redirection to user page for OSM user "
-"will probably fail. API base URL is: ''{0}''"
-msgstr ""
-"Ukendt format af API basis URL. Omdirigering til brugerside for OSM bruger "
-"vil sandsynligvis mislykkes. API basis URL er: ''{0}''"
-
-msgid ""
 "You are about to launch {0} browser window.<br>This may both clutter your "
 "screen with browser windows<br>and take some time to finish."
 msgid_plural ""
@@ -479,7 +471,7 @@ msgid ""
 "<html>This action will require {0} individual<br>download requests. Do you "
 "wish<br>to continue?</html>"
 msgstr ""
-"<html>This handling kræver {0} individuelle<br>download-anmodninger. Ønsker "
+"<html>Denne handling kræver {0} individuelle<br>download-anmodninger. Ønsker "
 "du<br>at fortsætte?</html>"
 
 msgid "Download data"
@@ -866,8 +858,8 @@ msgstr ""
 
 msgid "Merge {0} node"
 msgid_plural "Merge {0} nodes"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Læg {0} punkt sammen"
+msgstr[1] "Læg {0} punkter sammen"
 
 msgid "Merge selection"
 msgstr "Saml markering"
@@ -1426,8 +1418,8 @@ msgstr ""
 
 msgid "Split way {0} into {1} part"
 msgid_plural "Split way {0} into {1} parts"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Del vej {0} i {1} del"
+msgstr[1] "Del vej {0} i {1} dele"
 
 msgid "Toggle GPX Lines"
 msgstr "Slå GPX linjer til/fra"
@@ -1499,8 +1491,8 @@ msgstr "Skilte punkt i to"
 
 msgid "Dupe into {0} node"
 msgid_plural "Dupe into {0} nodes"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Dupliker til {0} punkt"
+msgstr[1] "Dupliker til {0} punkter"
 
 msgid "Dupe {0} node into {1} nodes"
 msgid_plural "Dupe {0} nodes into {1} nodes"
@@ -1638,6 +1630,15 @@ msgstr "Ingen ændringer at uploade."
 msgid "Nothing to upload. Get some data first."
 msgstr "Intet at uploade. Få nogle data først."
 
+msgid "Upload note changes to server"
+msgstr ""
+
+msgid "Upload notes"
+msgstr ""
+
+msgid "Uploading notes to server"
+msgstr ""
+
 msgid "Upload selection"
 msgstr "Upload markering"
 
@@ -1922,10 +1923,16 @@ msgstr ""
 msgid "Click the location where you wish to create a new note"
 msgstr ""
 
-msgid "Enter a comment for a new note"
+msgid "Create new note"
 msgstr ""
 
-msgid "Create new note"
+msgid "Create note"
+msgstr ""
+
+msgid "Enter a detailed comment to create a note"
+msgstr ""
+
+msgid "You must enter a comment to create a new note"
 msgstr ""
 
 msgid "Delete Mode"
@@ -2126,8 +2133,8 @@ msgstr "Kan ikke placere et punkt uden for verdenen."
 
 msgid "Add a new node to way"
 msgid_plural "Add a new node to {0} ways"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Tilføj et nyt punkt til vej"
+msgstr[1] "Tilføj et nyt punkt til {0} veje"
 
 msgid "Cannot delete node that is referenced by multiple objects"
 msgstr "Kan ikke slette et punkt der henvises til af flere objekter"
@@ -2142,7 +2149,7 @@ msgid "Make parallel copies of ways"
 msgstr "Lav paralelle kopier af veje"
 
 msgid "make parallel helper line"
-msgstr "lav paralel hjælpelinje"
+msgstr "lav parallel hjælpelinje"
 
 msgid ""
 "Select ways as in Select mode. Drag selected ways or a single way to create "
@@ -2292,7 +2299,11 @@ msgid_plural ""
 "You are about to open <b>{0}</b> different relation editors "
 "simultaneously.<br/>Do you want to continue?"
 msgstr[0] ""
+"Du er ved at åbne <b>{0}</b> anden relationseditor på samme tid.<br/>Ønsker "
+"du at fortsætte?"
 msgstr[1] ""
+"Du er ved at åbne <b>{0}</b> andre relationseditorer på samme "
+"tid.<br/>Ønsker du at fortsætte?"
 
 msgid "Confirmation"
 msgstr "Bekræftelse"
@@ -2513,13 +2524,13 @@ msgid ""
 "<b>timestamp:</b>timestamp - objects with this last modification timestamp "
 "(2009-11-12T14:51:09Z, 2009-11-12 or T14:51 ...)"
 msgstr ""
-"<b>tidsstempel:</b>tidsstempel - objekter med sidste ændrings tidsstempel "
+"<b>timestamp:</b>tidsstempel - objekter med sidste ændrings tidsstempel "
 "(2009-11-12T14:51:09Z, 2009-11-12 eller T14:51 ...)"
 
 msgid ""
 "<b>timestamp:</b>min/max - objects with last modification within range"
 msgstr ""
-"<b>tidsstempel:</b>min/maks - objekter med sidste ændring inden for område"
+"<b>timestamp:</b>min/maks - objekter med sidste ændring inden for område"
 
 msgid ""
 "<b>areasize:</b>... - closed ways with given area in m² (<b>areasize:</b>min-"
@@ -2625,6 +2636,7 @@ msgstr "passer hvis \"nøgle\" eksisterer"
 
 msgid "matches if ''key'' is greater than ''value'' (analogously, less than)"
 msgstr ""
+"passer hvis ''nøgle'' er større end ''værdi'' (tilsvarende, mindre end)"
 
 msgid "combinators"
 msgstr "kombinationer"
@@ -2818,7 +2830,7 @@ msgstr ""
 "Ukendt primitiv type: {0}. Tilladte værdier er node, way eller relation"
 
 msgid "Positive integer expected"
-msgstr ""
+msgstr "Positivt heltal forventet"
 
 msgid "Range of numbers expected"
 msgstr "Forventet talområde"
@@ -2885,6 +2897,15 @@ msgstr "... refererer til relation"
 msgid "Cycling dependencies"
 msgstr "Cykler afhængigheder"
 
+msgid "Uploading modified notes"
+msgstr ""
+
+msgid "Note {0} failed: {1}"
+msgstr ""
+
+msgid "Notes failed to upload"
+msgstr ""
+
 msgid ""
 "The following are results of automatic validation. Try fixing these, but be "
 "careful (don''t destroy valid data). When in doubt ignore them.<br>When you "
@@ -2935,16 +2956,16 @@ msgstr[0] "Tilføjede {0} objekt"
 msgstr[1] "Tilføjede {0} objekter"
 
 msgid "New way {0} has 0 nodes"
-msgstr ""
+msgstr "Ny vej {0} har 0 punkter"
 
 msgid "Change node {0}"
 msgstr "Ændr punkt {0}"
 
 msgid "Change way {0}"
-msgstr "Ændr vej {0}"
+msgstr "Ændre vej {0}"
 
 msgid "Change relation {0}"
-msgstr "Ændr relation {0}"
+msgstr "Ændre relation {0}"
 
 msgid "Changed nodes of {0}"
 msgstr "Rettede punkter for {0}"
@@ -2969,23 +2990,23 @@ msgstr "Sæt {0}={1} for relation ''{2}''"
 
 msgid "Remove \"{0}\" for {1} object"
 msgid_plural "Remove \"{0}\" for {1} objects"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Fjern \"{0}\" for {1} objekt"
+msgstr[1] "Fjern \"{0}\" for {1} objekter"
 
 msgid "Set {0}={1} for {2} object"
 msgid_plural "Set {0}={1} for {2} objects"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Set {0}={1} for {2} objekt"
+msgstr[1] "Set {0}={1} for {2} objekter"
 
 msgid "Deleted {0} tags for {1} object"
 msgid_plural "Deleted {0} tags for {1} objects"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Slet {0} tags for {1} objekt"
+msgstr[1] "Slet {0} tags for {1} objekter"
 
 msgid "Set {0} tags for {1} object"
 msgid_plural "Set {0} tags for {1} objects"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Set {0} tags for {1} objekt"
+msgstr[1] "Set {0} tags for {1} objekter"
 
 msgid "Replace \"{0}\" by \"{1}\" for"
 msgstr "Erstat \"{0}\" med \"{1}\" for"
@@ -3097,8 +3118,8 @@ msgstr[1] "Skalér {0} punkter"
 
 msgid "Selected {0} object"
 msgid_plural "Selected {0} objects"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Valgt {0} objekt"
+msgstr[1] "Valgte {0} objekter"
 
 msgid "Sequence: {0}"
 msgstr "Sekvens: {0}"
@@ -3157,18 +3178,18 @@ msgstr "Løs konflikter i relation {0}’s medlemsliste"
 
 msgid "Resolve {0} tag conflict in node {1}"
 msgid_plural "Resolve {0} tag conflicts in node {1}"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Løs {0} tag konflikt i punkt {1}"
+msgstr[1] "Løs {0} tag konflikter i punkt {1}"
 
 msgid "Resolve {0} tag conflict in way {1}"
 msgid_plural "Resolve {0} tag conflicts in way {1}"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Løs {0} tag konflik i vej {1}"
+msgstr[1] "Løs {0} tag konflikter i vej {1}"
 
 msgid "Resolve {0} tag conflict in relation {1}"
 msgid_plural "Resolve {0} tag conflicts in relation {1}"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Løs {0} tag konflikt i relation {1}"
+msgstr[1] "Løs {0} tag konflikter i relation {1}"
 
 msgid "Resolve version conflict for node {0}"
 msgstr "Løs versionskonflikt for punkt {0}"
@@ -3241,7 +3262,7 @@ msgid "Do not apply changes"
 msgstr "Undlad at udføre ændringer"
 
 msgid "Please select which changes you want to apply."
-msgstr ""
+msgstr "Vælg hvilke ændringer du vil anvende."
 
 msgid "Tags of "
 msgstr ""
@@ -3494,7 +3515,7 @@ msgid "Merging data..."
 msgstr "Sammenlægger data..."
 
 msgid "Test ''{0}'' completed in {1}"
-msgstr ""
+msgstr "Test ''{0}'' fuldført i {1}"
 
 msgid "Cannot add a way with only {0} nodes."
 msgstr "Kan ikke tilføje en vej med kun {0} punkter."
@@ -3650,7 +3671,7 @@ msgid "Parameter must begin with a ''+'' character (found ''{0}'')"
 msgstr "Parameteren skal begynde med et ''+'' tegn (fandt ''{0}'')"
 
 msgid "Unknown parameter: ''{0}''."
-msgstr ""
+msgstr "Ukendt parameter: ''{0}''."
 
 msgid "Value expected for parameter ''{0}''."
 msgstr "Værdi forventet for parameteren \"{0}\"."
@@ -3822,10 +3843,10 @@ msgid "House number too far from street"
 msgstr "Husnummer for langt fra vejen"
 
 msgid "API Capabilities"
-msgstr ""
+msgstr "API-egenskaber"
 
 msgid "Checks for errors against API capabilities"
-msgstr ""
+msgstr "Kontrollerer for fejl mod API-egenskaber"
 
 msgid ""
 "Way contains more than {0} nodes. It should be replaced by a multipolygon"
@@ -3859,10 +3880,10 @@ msgid "Reversed coastline"
 msgstr "Omvendt kystlinje"
 
 msgid "Conditional Keys"
-msgstr ""
+msgstr "Betingede nøgler"
 
 msgid "Tests for the correct usage of ''*:conditional'' tags."
-msgstr ""
+msgstr "Tester for korrekt brug af ''*:conditional'' tags."
 
 msgid "Does not match pattern ''restriction value @ condition''"
 msgstr ""
@@ -3871,16 +3892,16 @@ msgid "{0} is not a valid restriction value"
 msgstr ""
 
 msgid "Wrong syntax in {0} key"
-msgstr ""
+msgstr "Forkert syntaks i {0} nøgle"
 
 msgid "Error in {0} value: {1}"
-msgstr ""
+msgstr "Fejl i {0} værdi: {1}"
 
 msgid "Crossing ways"
 msgstr "Krydsende veje"
 
 msgid "Crossing buildings"
-msgstr ""
+msgstr "Krydsende bygninger"
 
 msgid "Crossing waterways"
 msgstr "Krydsende vandveje"
@@ -3889,10 +3910,10 @@ msgid "Crossing waterway/highway"
 msgstr "Krydsende veje til lands/vands"
 
 msgid "Crossing boundaries"
-msgstr ""
+msgstr "Krydsende grænser"
 
 msgid "Crossing barriers"
-msgstr ""
+msgstr "Krydsende barrierer"
 
 msgid ""
 "This test checks if two roads, railways, waterways or buildings crosses in "
@@ -4002,40 +4023,40 @@ msgid "Unknown source:maxspeed context: {0}"
 msgstr ""
 
 msgid "Internet tags"
-msgstr ""
+msgstr "Internet tags"
 
 msgid "Checks for errors in internet-related tags."
-msgstr ""
+msgstr "Kontrollerer for fejl i internet relaterede tags."
 
 msgid "''{0}'': {1}"
-msgstr ""
+msgstr "''{0}'': {1}"
 
 msgid "Lane tags"
-msgstr ""
+msgstr "Vognbane tags"
 
 msgid "Test that validates ''lane:'' tags."
-msgstr ""
+msgstr "Test som validerer ''lane:'' tags."
 
 msgid "Number of {0} greater than {1}"
-msgstr ""
+msgstr "Antal {0} større end {1}"
 
 msgid "{0}+{1}"
-msgstr ""
+msgstr "{0}+{1}"
 
 msgid "Number of lane dependent values inconsistent"
-msgstr ""
+msgstr "Antal lane afhængige værdier inkonsekvente"
 
 msgid "Number of lane dependent values inconsistent in forward direction"
-msgstr ""
+msgstr "Antal lane afhængige værdier inkonsekvent i fremadgående retning"
 
 msgid "Number of lane dependent values inconsistent in backward direction"
-msgstr ""
+msgstr "Antal lane afhængige værdier inkonsekvent i baglæns retning"
 
 msgid "Tag checker (MapCSS based)"
-msgstr ""
+msgstr "Tag kontrol (MapCSS baseret)"
 
 msgid "This test checks for errors in tag keys and values."
-msgstr ""
+msgstr "Denne test kontrollerer for fejl i tag nøgler og værdier."
 
 msgid "Unable to replace argument {0} in {1}: {2}"
 msgstr ""
@@ -4047,13 +4068,13 @@ msgid " or "
 msgstr " eller "
 
 msgid "{0}, use {1} instead"
-msgstr ""
+msgstr "{0}, brug {1} i stedet"
 
 msgid "Adding {0} to tag checker"
-msgstr ""
+msgstr "Tilføjer {0} til tag kontrol"
 
 msgid "Failed to add {0} to tag checker"
-msgstr ""
+msgstr "Kunne ikke tilføje {0} til tag kontrol"
 
 msgid "Multipolygon"
 msgstr "Multipolygon"
@@ -4126,13 +4147,13 @@ msgid "A name is missing, even though name:* exists."
 msgstr "Et navn mangler, selvom name:* eksisterer."
 
 msgid "Opening hours syntax"
-msgstr ""
+msgstr "Åbningstider syntaks"
 
 msgid "This test checks the correct usage of the opening hours syntax."
-msgstr ""
+msgstr "Denne test kontrollerer for korrekt brug af åbningstider syntaks."
 
 msgid "opening_hours value can be prettified"
-msgstr ""
+msgstr "opening_hours værdi kan gøres pænere"
 
 msgid "Unexpected token:"
 msgstr ""
@@ -4262,10 +4283,10 @@ msgstr ""
 "stavet forkert."
 
 msgid "Tag checker"
-msgstr ""
+msgstr "Tag kontrol"
 
 msgid "Adding {0} to ignore tags"
-msgstr ""
+msgstr "Tilføjer {0} til  ignorerede  tags"
 
 msgid "Invalid tagchecker line - {0}: {1}"
 msgstr "Ugyldig tagtjekker-linje - {0}: {1}"
@@ -4274,7 +4295,7 @@ msgid "Invalid spellcheck line: {0}"
 msgstr "Ugyldig stavekontrol-linje: {0}"
 
 msgid "Adding {0} to spellchecker"
-msgstr ""
+msgstr "Tilføjer {0} til stavekontrollen"
 
 msgid ""
 "Could not access data file(s):\n"
@@ -4299,7 +4320,7 @@ msgid "Tag value longer than allowed"
 msgstr "Tag værdien længere end tilladt"
 
 msgid "Tag key longer than allowed"
-msgstr "Tag nøgle længere ned tilladt"
+msgstr "Tag nøgle længere end tilladt"
 
 msgid "Tags with empty values"
 msgstr "Tags med tomme værdier"
@@ -4348,7 +4369,7 @@ msgid "TagChecker source"
 msgstr "TagChecker-kilde"
 
 msgid "Data sources ({0})"
-msgstr ""
+msgstr "Data kilder ({0})"
 
 msgid "Check property values."
 msgstr "Tjek egenskabsværdier."
@@ -4385,7 +4406,7 @@ msgid "Turnrestrictions"
 msgstr "Svingbegrænsninger"
 
 msgid "This test checks if turnrestrictions are valid."
-msgstr ""
+msgstr "Denne test kontrollerer om svingbegrænsninger er gyldige."
 
 msgid "Unknown role"
 msgstr "Ukendt rolle"
@@ -4415,13 +4436,13 @@ msgid "No \"via\" node or way found"
 msgstr "Intet \"via\" punkt eller vej fundet"
 
 msgid "The \"from\" way does not start or end at a \"via\" node."
-msgstr ""
+msgstr "\"Fra\" vej starter eller slutter ikke ved et \"via\" punkt."
 
 msgid "Superfluous turnrestriction as \"to\" way is oneway"
 msgstr "Unødvendig svingbegrænsning da \"til\" vejen er ensrettet"
 
 msgid "The \"to\" way does not start or end at a \"via\" node."
-msgstr ""
+msgstr "\"Til\" vej starter eller slutter ikke ved et \"via\" punkt."
 
 msgid "The \"from\" and the first \"via\" way are not connected."
 msgstr "\"Fra\" vejen og den første \"via\" vej er ikke forbundet."
@@ -4466,7 +4487,7 @@ msgid "waterway type {0}"
 msgstr "vandvejs-type {0}"
 
 msgid "boundary type {0}"
-msgstr ""
+msgstr "grænse type {0}"
 
 msgid "building"
 msgstr "bygning"
@@ -4771,7 +4792,7 @@ msgid "Displays the JOSM version and exits"
 msgstr "Viser JOSM versionen og afslutter"
 
 msgid "Print debugging messages to console"
-msgstr ""
+msgstr "Skriv debug besked til skærm"
 
 msgid "Disable access to the given resource(s), separated by comma"
 msgstr ""
@@ -4810,10 +4831,10 @@ msgid "Make sure you load some data if you use --selection."
 msgstr "Vær sikker på at du indlæser nogle data hvis du bruger --selection."
 
 msgid "Printing debugging messages to console"
-msgstr ""
+msgstr "Skriver debug beskeder til skærm"
 
 msgid "Enabled detailed debug level (trace)"
-msgstr ""
+msgstr "Aktivere detaljeret debug niveau (trace)"
 
 msgid "Initializing"
 msgstr "Initialiserer"
@@ -4846,7 +4867,9 @@ msgid ""
 msgid_plural ""
 "JOSM is running in offline mode. These resources will not be available: {0}"
 msgstr[0] ""
+"JOSM er i offline tilstand. Denne ressource vil ikke være tilgængelig: {0}"
 msgstr[1] ""
+"JOSM er i offline tilstand. Disse ressourcer vil ikke være tilgængelige: {0}"
 
 msgid "Unsaved osm data"
 msgstr "Ugemt OSM-data"
@@ -4867,10 +4890,10 @@ msgid ""
 msgstr "Det ser ud som om JOSM fejlede sidste gang. Vil du gendanne data?"
 
 msgid "Change proxy settings"
-msgstr ""
+msgstr "Ændre proxy indstillinger"
 
 msgid "Proxy errors occurred"
-msgstr ""
+msgstr "Proxy fejl opstod"
 
 msgid ""
 "JOSM tried to access the following resources:<br>{0}but <b>failed</b> to do "
@@ -4879,7 +4902,7 @@ msgid ""
 msgstr ""
 
 msgid "Network errors occurred"
-msgstr ""
+msgstr "Netværksfejl opstod"
 
 msgid ""
 "JOSM tried to access the following resources:<br>{0}but <b>failed</b> to do "
@@ -4989,16 +5012,16 @@ msgid "scale"
 msgstr "skalér"
 
 msgid "Status bar background"
-msgstr ""
+msgstr "Statuslinje baggrund"
 
 msgid "Status bar background: active"
-msgstr ""
+msgstr "Statuslinje baggrund: aktiv"
 
 msgid "Status bar foreground"
-msgstr ""
+msgstr "Statuslinje forgrund"
 
 msgid "Status bar foreground: active"
-msgstr ""
+msgstr "Statuslinje forgrund: aktiv"
 
 msgid "{0} ({1})"
 msgstr "{0} ({1})"
@@ -5038,7 +5061,7 @@ msgid "Do not hide status bar"
 msgstr "Skjul ikke statuslinje"
 
 msgid "System of measurement changed to {0}"
-msgstr ""
+msgstr "Målesystem ændret til {0}"
 
 msgid "Layer not in list."
 msgstr "lag er ikke i listen"
@@ -5238,6 +5261,12 @@ msgstr "Konflikt baggrund: behold alle tags"
 msgid "Conflict foreground: keep all tags"
 msgstr "Konflikt forgrund: behold alle tags"
 
+msgid "Conflict background: sum all numeric tags"
+msgstr ""
+
+msgid "Conflict foreground: sum all numeric tags"
+msgstr ""
+
 msgid "Conflict background: keep member"
 msgstr "Konflikt baggrund: behold medlem"
 
@@ -5464,13 +5493,13 @@ msgid "Up"
 msgstr "Op"
 
 msgid "Move up the selected entries by one position."
-msgstr ""
+msgstr "Flyt de valgte elementer et trin op."
 
 msgid "Down"
 msgstr "Ned"
 
 msgid "Move down the selected entries by one position."
-msgstr "Flyt de valgte elementer ét trin ned"
+msgstr "Flyt de valgte elementer et trin ned."
 
 msgid "Remove"
 msgstr "Fjern"
@@ -5558,7 +5587,7 @@ msgid "not deleted"
 msgstr "ikke slettet"
 
 msgid "Keep my coordinates"
-msgstr "Beholmd mine koordinater"
+msgstr "Behold mine koordinater"
 
 msgid "Keep their coordinates"
 msgstr "Behold deres koordinater"
@@ -5688,12 +5717,19 @@ msgstr "intet"
 msgid "all"
 msgstr "alle"
 
+msgid "sum"
+msgstr "sum"
+
 msgid "Please decide which values to keep"
 msgstr "Beslut venligst hvilke værdier der skal beholdes"
 
 msgid "Value ''{0}'' is going to be applied for key ''{1}''"
 msgstr "Værdi \"{0}\" vil blive anvendt for nøgle \"{1}\""
 
+msgid ""
+"All numeric values sumed as ''{0}'' are going to be applied for key ''{1}''"
+msgstr ""
+
 msgid "The key ''{0}'' and all its values are going to be removed"
 msgstr "Nøglen ''{0}'' og alle dens værdier vil blive fjernet"
 
@@ -5910,11 +5946,11 @@ msgstr "Løs konfilkter."
 
 msgid "Conflict: {0} unresolved"
 msgid_plural "Conflicts: {0} unresolved"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Konflikt: {0} uløst"
+msgstr[1] "Konflikter: {0} uløste"
 
 msgid "Rel.:{0} / Ways:{1} / Nodes:{2}"
-msgstr ""
+msgstr "Rel.:{0} / Veje:{1} / Punkter:{2}"
 
 msgid "Resolve"
 msgstr "Løs"
@@ -6066,35 +6102,17 @@ msgstr "<h2>Filter er aktivt</h2>"
 
 msgid "<p><b>{0}</b> object hidden"
 msgid_plural "<p><b>{0}</b> objects hidden"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "<p><b>{0}</b> skjult objekt"
+msgstr[1] "<p><b>{0}</b> skjulte objekter"
 
 msgid "<b>{0}</b> object disabled"
 msgid_plural "<b>{0}</b> objects disabled"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "<b>{0}</b> deaktiveret objekt"
+msgstr[1] "<b>{0}</b> deaktiverede objekter"
 
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr "</p><p>Luk filter-dialogen for at se alle objekter.<p></html>"
 
-msgid "Display the history of all selected items."
-msgstr "Vis historikken for alle valgte elementer."
-
-msgid "Object with history"
-msgstr "Objekt med historik"
-
-msgid "Reload"
-msgstr "Genindlæs"
-
-msgid "Reload all currently selected objects and refresh the list."
-msgstr "Genindlæs alle markerede objekter og genopfrisk listen."
-
-msgid "Show"
-msgstr "Vis"
-
-msgid "Display the history of the selected objects."
-msgstr "Vis de markerede objekters historik"
-
 msgid "Advanced object info"
 msgstr "Udvidet objekt-information"
 
@@ -6457,6 +6475,9 @@ msgstr ""
 msgid "Comment"
 msgstr "Kommentar"
 
+msgid "Comment on note"
+msgstr ""
+
 msgid "Add comment to note:"
 msgstr ""
 
@@ -6466,9 +6487,6 @@ msgstr ""
 msgid "Close note with message:"
 msgstr ""
 
-msgid "Close Note"
-msgstr ""
-
 msgid "Create a new note"
 msgstr ""
 
@@ -6541,6 +6559,9 @@ msgstr "Aktuel markering"
 msgid "Search for objects"
 msgstr "Søg efter objekter"
 
+msgid "Display the history of the selected objects."
+msgstr "Vis de markerede objekters historik"
+
 msgid "Zoom to selection"
 msgstr "Zoom til markering"
 
@@ -6608,7 +6629,7 @@ msgid ""
 "<html>Failed to create an URL because the encoding ''{0}''<br>was missing on "
 "this system.</html>"
 msgstr ""
-"Kunne ikke oprette en URL fordi kodningen \"{0}\"<br>manglede på dette "
+"<html>Kunne ikke oprette en URL fordi kodningen \"{0}\"<br>manglede på dette "
 "system.</html>"
 
 msgid "Missing encoding"
@@ -6662,6 +6683,9 @@ msgstr "Retter ({0}/{1}): ''{2}''"
 msgid "Updating map ..."
 msgstr "Opdaterer kort..."
 
+msgid "anonymous"
+msgstr "anonym"
+
 msgid "Display the basic properties of the changeset"
 msgstr "Vis rettesættets basale egenskaber"
 
@@ -6674,6 +6698,12 @@ msgstr "Indhold"
 msgid "Display the objects created, updated, and deleted by the changeset"
 msgstr "Vis objekterne oprettet,opdateret og slettet af rettesættet"
 
+msgid "Discussion"
+msgstr ""
+
+msgid "Display the public discussion around this changeset"
+msgstr ""
+
 msgid "Changeset Management Dialog"
 msgstr "Rettesætshåndteringsdialog"
 
@@ -6734,9 +6764,6 @@ msgctxt "changeset.state"
 msgid "Closed"
 msgstr "Lukket"
 
-msgid "anonymous"
-msgstr "anonym"
-
 msgid "ID"
 msgstr "ID"
 
@@ -6752,6 +6779,9 @@ msgstr "Oprettet ved"
 msgid "Closed at"
 msgstr "Lukket"
 
+msgid "Discussions"
+msgstr ""
+
 msgid "Downloading changeset content"
 msgstr "Downloader indhold af rettesæt"
 
@@ -6871,6 +6901,15 @@ msgid ""
 msgstr ""
 "Zoom til objekterne i indholdet af dette rettesæt i det aktuelle datalag"
 
+msgid "Update changeset discussion"
+msgstr ""
+
+msgid "Update the changeset discussion from the OSM server"
+msgstr ""
+
+msgid "Date"
+msgstr "Dato"
+
 msgid "Download changesets"
 msgstr "Download rettesæt"
 
@@ -7173,16 +7212,16 @@ msgid "This changeset query URL is invalid"
 msgstr "Denne rettesætsforespørgselsURL er ugyldig"
 
 msgid "Discardable key: selection Foreground"
-msgstr ""
+msgstr "Kasserbar nøgle: markering forgrund"
 
 msgid "Discardable key: selection Background"
-msgstr ""
+msgstr "Kasserbar nøgle: markering baggrund"
 
 msgid "Discardable key: foreground"
-msgstr ""
+msgstr "Kasserbar nøgle: forgrund"
 
 msgid "Discardable key: background"
-msgstr ""
+msgstr "Kasserbar nøgle: baggrund"
 
 msgid "<different>"
 msgstr "<forskellige>"
@@ -7212,7 +7251,7 @@ msgid "Delete the selected key in all objects"
 msgstr "Fjern den valgte nøgle i alle objekter"
 
 msgid "Delete Tags"
-msgstr ""
+msgstr "Slet tags"
 
 msgid "Change relation"
 msgstr "Skift relation"
@@ -7233,7 +7272,7 @@ msgid "Edit the value of the selected key for all objects"
 msgstr "Rediger værdien for den valgte nøgle for alle objekter"
 
 msgid "Edit Tags"
-msgstr ""
+msgstr "Redigere tags"
 
 msgid "Go to OSM wiki for tag help (F1)"
 msgstr "Gå til OSM wiki’en for tag-hjælp (F1)"
@@ -7254,7 +7293,7 @@ msgid "Copy the value of the selected tag to clipboard"
 msgstr "Kopier værdien fra det markerede tag til udklipsholderen"
 
 msgid "Copy selected Key(s)/Value(s)"
-msgstr ""
+msgstr "Kopier valgte nøgle(r)/Værdi(er)"
 
 msgid "Copy the key and value of the selected tag(s) to clipboard"
 msgstr ""
@@ -7272,7 +7311,7 @@ msgid ""
 "Search with the key and value of the selected tag, restrict to type (i.e., "
 "node/way/relation)"
 msgstr ""
-"Søg men nøglen og værdien for det markerede tag, begræns til typen (f.eks "
+"Søg med nøglen og værdien for det markerede tag, begræns til typen (f.eks "
 "punkt/vej/relation)"
 
 msgid "Search Key/Value"
@@ -7288,7 +7327,7 @@ msgid "Replace"
 msgstr "Erstat"
 
 msgid "The new key is already used, overwrite values?"
-msgstr ""
+msgstr "Den nye nøgle er allerede i brug, overskriv værdi?"
 
 msgid "Change value?"
 msgid_plural "Change values?"
@@ -7304,7 +7343,7 @@ msgid "An empty value deletes the tag."
 msgstr "En tom værdi sletter taggen."
 
 msgid "You changed the key from ''{0}'' to ''{1}''."
-msgstr ""
+msgstr "Du ændrede nøglen fra ''{0}'' til ''{1}''."
 
 msgid "Change properties of up to {0} object"
 msgid_plural "Change properties of up to {0} objects"
@@ -7331,8 +7370,8 @@ msgstr "Vælg venligst en værdi"
 msgid "Set number of recently added tags"
 msgstr "Indstil antallet af nyligt tilføjede tags"
 
-msgid "Remember last used tags"
-msgstr "Husk sidst brugte tags"
+msgid "Remember last used tags after a restart"
+msgstr "Husk seneste brugte tags efter en genstart"
 
 msgid "Please enter the number of recently added tags to display"
 msgstr "Indtast venligst antallet af nyligt tilføjede tags der skal vises"
@@ -7356,7 +7395,7 @@ msgid "The key ''{0}'' is already used"
 msgstr "Nøglen \"{0}\" er allerede brugt"
 
 msgid "You changed the value of ''{0}'' from ''{1}'' to ''{2}''."
-msgstr ""
+msgstr "Du ændrede værdien på ''{0}'' fra ''{1}'' til ''{2}''."
 
 msgid "Edit the relation the currently selected relation member refers to."
 msgstr "Rediger relationen det nu markerede relationsmedlem refererer til."
@@ -7508,7 +7547,7 @@ msgstr "Fjern alle medlemmer der refererer til et af de valgte objekter"
 msgid ""
 "Select relation members which refer to objects in the current selection"
 msgstr ""
-"Vælg relations-medlemmer der refererer til objekter i den aktuelle markering"
+"Vælg relationsmedlemmer der refererer til objekter i den aktuelle markering"
 
 msgid ""
 "Select relation members which refer to {0} objects in the current selection"
@@ -7711,6 +7750,9 @@ msgstr "Inkluderer umiddelbare børn af forældrerelationer"
 msgid "Load parent relations"
 msgstr "Hent forældrerelationer"
 
+msgid "Reload"
+msgstr "Genindlæs"
+
 msgid "Loading parent relations"
 msgstr "Henter forældrerelationer"
 
@@ -7745,7 +7787,7 @@ msgid "way is not connected to previous or next relation member"
 msgstr "vej er ikke forbundet til foregående eller næste relationsmedlem"
 
 msgid "{0} - {1} ({2})"
-msgstr ""
+msgstr "{0} - {1} ({2})"
 
 msgid "Wrong number of arguments for bookmark"
 msgstr "Forkert antal argumenter til bogmærket"
@@ -7839,6 +7881,12 @@ msgstr "Rå GPS-data"
 msgid "Select to download GPS traces in the selected download area."
 msgstr "Markér for at downloade GPS-spor i det markerede område."
 
+msgid "Notes"
+msgstr "Sedler"
+
+msgid "Select to download notes in the selected download area."
+msgstr ""
+
 msgid "Download as new layer"
 msgstr "Download som nyt lag"
 
@@ -8134,13 +8182,13 @@ msgid "Changeset:"
 msgstr "Rettesæt:"
 
 msgid "Changeset comment"
-msgstr ""
+msgstr "Rettesæt kommentar"
 
 msgid "Changeset source"
-msgstr ""
+msgstr "Rettesæt kilde"
 
 msgid "<b>Source</b>:"
-msgstr ""
+msgstr "<b>Kilde</b>:"
 
 msgid ""
 "<html>Version <strong>{0}</strong> currently edited in layer ''{1}''</html>"
@@ -8161,13 +8209,13 @@ msgid "Show changeset {0}"
 msgstr "Vis rettesæt {0}"
 
 msgid "User info"
-msgstr ""
+msgstr "Brugerinfo"
 
 msgid "Launch browser with information about the user"
-msgstr ""
+msgstr "Start browser med information om brugeren"
 
 msgid "Show user {0}"
-msgstr ""
+msgstr "Vis bruger {0}"
 
 msgid "Ver"
 msgstr "Ver"
@@ -8178,9 +8226,6 @@ msgstr "A"
 msgid "B"
 msgstr "B"
 
-msgid "Date"
-msgstr "Dato"
-
 msgid ""
 "Failed to update primitive with id {0} because current edit layer is null"
 msgstr ""
@@ -8234,7 +8279,7 @@ msgstr ""
 "<html>Upload <strong>fejlede</strong> fordi serveren har en nyere version af "
 "en<br>af dine punkter, veje eller relationer.<br><br>Klik "
 "<strong>{0}</strong> for at synkronisere hele det lokale datasæt med "
-"serveren..<br>Klik <strong>{1}</strong> for at afbryde og fortsætte "
+"serveren.<br>Klik <strong>{1}</strong> for at afbryde og fortsætte "
 "redigering.<br></html>"
 
 msgid ""
@@ -8292,7 +8337,7 @@ msgid "Enter an upload comment"
 msgstr "Indtast en upload-kommentar"
 
 msgid "Specify the data source for the changes"
-msgstr ""
+msgstr "Angiv datakilden for ændringerne"
 
 msgid "obtain from current layers"
 msgstr ""
@@ -8752,7 +8797,7 @@ msgstr ""
 "lettere for mange andre brugere."
 
 msgid "Please specify a changeset source"
-msgstr ""
+msgstr "Angiv rettesætskilde"
 
 msgid ""
 "You did not specify a source for your changes.<br />It is technically "
@@ -8760,6 +8805,10 @@ msgid ""
 "origins of the data.<br /><br />If you spend a minute now to explain your "
 "change, you will make life<br />easier for many other mappers."
 msgstr ""
+"Du har ikke angivet en kilde til dine ændringer.<br />Teknisk set er dette i "
+"orden, men denne information hjælper<br /> andre brugere til at forstå "
+"oprindelsen af data.<br /><br />Hvis du bruger et øjeblik nu på at forklare "
+"dine ændringer,<br />gør du livet lettere for mange andre brugere."
 
 msgid "Revise"
 msgstr "Tilpas"
@@ -8781,7 +8830,7 @@ msgid "Illegal chunk size"
 msgstr "Ulovlig størrelse af bidder"
 
 msgid "{0}={1}"
-msgstr ""
+msgstr "{0}={1}"
 
 msgid ""
 "<html>The following changeset tag contains an empty "
@@ -8790,10 +8839,14 @@ msgid_plural ""
 "<html>The following changeset tags contain an empty "
 "key/value:<br>{0}<br>Continue?</html>"
 msgstr[0] ""
+"<html>Følgende rettesæt tag indeholder en tom "
+"nøgle/værdi:<br>{0}<br>Fortsæt?</html>"
 msgstr[1] ""
+"<html>Følgende rettesæt tags indeholder en tom "
+"nøgle/værdi:<br>{0}<br>Fortsæt?</html>"
 
 msgid "Empty metadata"
-msgstr ""
+msgstr "Tom metadata"
 
 msgid "Cancel the upload and resume editing"
 msgstr "Annullér uploaden og genoptag redigeringen"
@@ -9144,9 +9197,6 @@ msgstr ""
 msgid "Save Layer"
 msgstr "Gem lag"
 
-msgid "Notes"
-msgstr "Sedler"
-
 msgid "Notes layer"
 msgstr ""
 
@@ -9162,9 +9212,6 @@ msgstr "Datalag {0}"
 msgid "outside downloaded area"
 msgstr "Uden for det downloadede område"
 
-msgid "version {0}"
-msgstr "version {0}"
-
 msgid "Merging layers"
 msgstr "Sammenlægger lag"
 
@@ -9287,16 +9334,16 @@ msgid "No tiles at this zoom level"
 msgstr "Ingen tern på dette zoom niveau"
 
 msgid "Current zoom: {0}"
-msgstr ""
+msgstr "Nuværende zoom: {0}"
 
 msgid "Display zoom: {0}"
-msgstr ""
+msgstr "Skærm zoom: {0}"
 
 msgid "Pixel scale: {0}"
-msgstr ""
+msgstr "Pixel skala: {0}"
 
 msgid "Best zoom: {0}"
-msgstr ""
+msgstr "Bedste zoom: {0}"
 
 msgid "TMS layer ({0}), downloading in zoom {1}"
 msgstr "TMS lag ({0}), downloader i zoom {1}"
@@ -9328,7 +9375,7 @@ msgstr "Download synlige tern"
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
 msgstr ""
-"Det anmodede område er for stort. Zoom venligst en smule ind eller ændr "
+"Det anmodede område er for stort. Zoom venligst lidt ind eller skift "
 "opløsningen."
 
 msgid "Change resolution"
@@ -9566,7 +9613,7 @@ msgid "Error while getting files from directory {0}\n"
 msgstr "Fejl ved hentning af filer fra mappen {0}\n"
 
 msgid "One of the selected files was null"
-msgstr "En af de markerede filer var havde en null-værdi"
+msgstr "En af de markerede filer havde en null-værdi"
 
 msgid "Geotagged Images"
 msgstr "Geotaggede billeder"
@@ -9588,11 +9635,11 @@ msgid ""
 "<html><h3>Delete the file {0} from disk?<p>The image file will be "
 "permanently lost!</h3></html>"
 msgstr ""
-"<html><h3>Slet filen {0} fra disk?<p>Billedfilen vil gå permanent "
-"tabt!</h3></html>"
+"<html><h3>Slet filen {0} fra disk?<p>Billedfilen vil være tabt "
+"permanent!</h3></html>"
 
 msgid "Image file could not be deleted."
-msgstr "Billedfilen kunne ikke slettes"
+msgstr "Billedfilen kunne ikke slettes."
 
 msgid "No image"
 msgstr "Intet billede"
@@ -9628,10 +9675,10 @@ msgid "Show next Image"
 msgstr "Vis næste billede"
 
 msgid "Show first Image"
-msgstr ""
+msgstr "Vis første billede"
 
 msgid "Show last Image"
-msgstr ""
+msgstr "Vis sidste billede"
 
 msgid "Center view"
 msgstr "Centrer synsfelt"
@@ -9743,7 +9790,7 @@ msgid "Maximum area per request:"
 msgstr "Maksimum område per anmodning:"
 
 msgid "sq km"
-msgstr ""
+msgstr "km2"
 
 msgid "Download near:"
 msgstr "Hent nær:"
@@ -9788,10 +9835,10 @@ msgid "No imagery layers"
 msgstr "Ingen billedlag"
 
 msgid "Velocity, km/h"
-msgstr ""
+msgstr "Hastighed, km/t"
 
 msgid "HDOP, m"
-msgstr ""
+msgstr "HDOP, m"
 
 msgid "Time"
 msgstr "Tid"
@@ -9957,6 +10004,8 @@ msgid ""
 "Detected deprecated ''{0}'' in ''{1}'' which will be removed shortly. Use "
 "''{2}'' instead."
 msgstr ""
+"Fandt forældet ''{0}'' i ''{1}'' som vil blive fjernet snarest. Brug ''{2}'' "
+"i stedet."
 
 msgid "Illegal dash pattern, values must be positive"
 msgstr "Ulovligt streg-mønster. Værdierne skal være positive."
@@ -10529,7 +10578,7 @@ msgid "Preset definition file (*.xml, *.zip)"
 msgstr "Prædefinitionsfil (*.xml, *.zip)"
 
 msgid "Tag checker rule (*.validator.mapcss, *.zip)"
-msgstr ""
+msgstr "Tag kontrolregel (*.validator.mapcss, *.zip)"
 
 msgid "Edit source entry:"
 msgstr "Rediger kildeindgang:"
@@ -10760,7 +10809,7 @@ msgid "Advanced Background: Changed"
 msgstr "Avanceret baggrund: Ændret"
 
 msgid "Advanced Background: NonDefault"
-msgstr ""
+msgstr "Avanceret baggrund: Ikke standard"
 
 msgid "Current value is default."
 msgstr "Den aktuelle værdi er standard."
@@ -10932,7 +10981,7 @@ msgid "Draw inactive layers in other color"
 msgstr "Tegn inaktive lag i anden farve"
 
 msgid "Display discardable keys"
-msgstr ""
+msgstr "Vis kasserbare nøgler"
 
 msgid "Highlight target ways and nodes"
 msgstr "Fremhæv destinations vej og punkter"
@@ -11197,13 +11246,13 @@ msgid "Audio waypoint labelling"
 msgstr "Lyd waypoint mærkning"
 
 msgid "Incorrect waypoint label pattern: {0}"
-msgstr ""
+msgstr "Ugyldigt waypoint label mønster: {0}"
 
 msgid "Incorrect pattern"
 msgstr "Ugyldigt mønster"
 
 msgid "Incorrect audio waypoint label pattern: {0}"
-msgstr ""
+msgstr "Ugyldigt lyd waypoint label mønster: {0}"
 
 msgid "Show splash screen at startup"
 msgstr "Vis startbillede ved opstart"
@@ -11221,10 +11270,10 @@ msgid "Dynamic buttons in side menus"
 msgstr "Dynamiske knapper i sidemenuer"
 
 msgid "Display ISO dates"
-msgstr ""
+msgstr "Vis ISO datoer"
 
 msgid "Use native file choosers (nicer, but do not support file filters)"
-msgstr ""
+msgstr "Brug oprindelig filvælger (pænere, men understøtter ikke fil filtre)"
 
 msgid "Show localized name in selection lists, if available"
 msgstr "Vis lokaliseret navn i markeringslister, hvis tilgængeligt"
@@ -11237,17 +11286,20 @@ msgid ""
 msgstr "Vis kun knapper i højre sidemenuer når markøren er inde i elementet"
 
 msgid "ISO 8601"
-msgstr ""
+msgstr "ISO 8601"
 
 msgid ""
 "Format dates according to {0}. Today''s date will be displayed as {1} "
 "instead of {2}"
 msgstr ""
+"Format datoer ifølge {0}. Dags dato vil blive vist som {1} i stedet for {2}"
 
 msgid ""
 "Use file choosers that behave more like native ones. They look nicer but do "
 "not support some features like file filters"
 msgstr ""
+"Brug filvælger som opfører sig mere som de oprindelige. De ser pænere ud, "
+"men understøtter nogle funktioner som fil filtre."
 
 msgid "Look and Feel"
 msgstr "Udseende"
@@ -11378,7 +11430,7 @@ msgid "Available default entries:"
 msgstr "Tilgængelige standardemner:"
 
 msgid "Selected entries:"
-msgstr "Valgte elementer"
+msgstr "Valgte elementer:"
 
 msgid "Add a new {0} entry by entering the URL"
 msgstr "Opret et nyt {0} enme ved at indtaste dens URL"
@@ -11552,10 +11604,10 @@ msgid "Warning: illegal format of entry in style list ''{0}''. Got ''{1}''"
 msgstr "Advarsel: Ulovligt format for linje i stilliste ''{0}''. Fik ''{1}''"
 
 msgid "JOSM default (XML; old version)"
-msgstr ""
+msgstr "JOSM standard (XML; gammel version)"
 
 msgid "JOSM default (MapCSS)"
-msgstr ""
+msgstr "JOSM standard (MapCSS)"
 
 msgid ""
 "Internal style to be used as base for runtime switchable overlay styles"
@@ -11855,7 +11907,7 @@ msgid "Projection bounds (in degrees)"
 msgstr "Projektionsgrænser (i grader)"
 
 msgid "WMS SRS (EPSG code)"
-msgstr ""
+msgstr "WMS SRS (EPSG kode)"
 
 msgid "Gauß-Krüger"
 msgstr "Gauß-Krüger"
@@ -11870,16 +11922,16 @@ msgid "{0} ({1} to {2} degrees)"
 msgstr "{0} ({1} til {2} grader)"
 
 msgid "Lambert CC9 Zone (France)"
-msgstr "Lambert CC9 Zone (France)"
+msgstr "Lambert CC9 Zone (Frankrig)"
 
 msgid "Lambert CC Zone"
 msgstr "Lambert CC Zone"
 
 msgid "{0} (Corsica)"
-msgstr "{0} (Corsica)"
+msgstr "{0} (Korsika)"
 
 msgid "Lambert 4 Zones (France)"
-msgstr "Lambert 4 Zones (France)"
+msgstr "Lambert 4 Zones (Frankrig)"
 
 msgid "WGS84 Geographic"
 msgstr "WGS84 Geografisk"
@@ -11921,19 +11973,19 @@ msgid "The projection {0} could not be activated. Using Mercator"
 msgstr "Projektionen {0} kunne ikke aktiveres. Bruger Mercator."
 
 msgid "PUWG 1992 (Poland)"
-msgstr "PUWG 1992 (Poland)"
+msgstr "PUWG 1992 (Polen)"
 
 msgid "PUWG 2000 Zone {0} (Poland)"
-msgstr "PUWG 2000 Zone {0} (Poland)"
+msgstr "PUWG 2000 Zone {0} (Polen)"
 
 msgid "PUWG (Poland)"
-msgstr "PUWG (Poland)"
+msgstr "PUWG (Polen)"
 
 msgid "PUWG Zone"
 msgstr "PUWG Zone"
 
 msgid "Swiss Grid (Switzerland)"
-msgstr "Swiss Grid (Switzerland)"
+msgstr "Swiss Grid (Schweiz)"
 
 msgid "<i>CH1903 / LV03 (without local corrections)</i>"
 msgstr "<i>CH1903 / LV03 (uden lokale korrigeringer)</i>"
@@ -12382,10 +12434,10 @@ msgid "Checks for wrong wikipedia tags"
 msgstr ""
 
 msgid "Tag checker rules"
-msgstr ""
+msgstr "Tag kontrolregler"
 
 msgid "Choose Tag checker rules to enable"
-msgstr ""
+msgstr "Vælg Tag kontrolregler der skal aktiveres"
 
 msgid "Use ignore list."
 msgstr "Brug ignorerings-listen."
@@ -12418,10 +12470,10 @@ msgid "On upload"
 msgstr "Ved upload"
 
 msgid "Tests"
-msgstr ""
+msgstr "Test"
 
 msgid "Choose tests to enable"
-msgstr ""
+msgstr "Vælg tests der skal aktiveres"
 
 msgid "multiple"
 msgstr "flere"
@@ -12941,11 +12993,11 @@ msgstr ""
 
 msgid "You have {0} unread message."
 msgid_plural "You have {0} unread messages."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Du har {0} ulæst besked."
+msgstr[1] "Du har {0} ulæste beskeder."
 
 msgid "Click here to see your inbox."
-msgstr ""
+msgstr "Klik her for at se din indbakke."
 
 msgid "Message notifier"
 msgstr ""
@@ -13101,6 +13153,15 @@ msgstr "Rettesæt med ID > 0 krævet. Nuværende ID er {0}."
 msgid "Open changeset expected. Got closed changeset with id {0}."
 msgstr "Åbent rettesæt forventet. Fik lukket rettesæt med ID {0}."
 
+msgid "Note upload failed"
+msgstr ""
+
+msgid "Error parsing note response from server"
+msgstr ""
+
+msgid "Error encoding string: {0}"
+msgstr ""
+
 msgid "(Code={0})"
 msgstr "(Kode={0})"
 
@@ -13153,15 +13214,15 @@ msgstr ""
 msgid "Parsing changeset content ..."
 msgstr "Fortolker indhold af rettesæt ..."
 
+msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
+msgstr "Ulovlig boolesk værdi af attribut ''{0}''. Fik ''{1}''."
+
 msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
 msgstr "Ulovlig værdi af attribut ''{0}''. Fik ''{1}''."
 
 msgid "Illegal numeric value for attribute ''{0}''. Got ''{1}''."
 msgstr "Ugyldig numerisk værdi for attributten \"{0}\". Fik \"{1}\"."
 
-msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
-msgstr "Ulovlig boolesk værdi af attribut ''{0}''. Fik ''{1}''."
-
 msgid "Missing mandatory attribute ''{0}'' of XML element {1}."
 msgstr "Manglende påkrævet attribut \"{0}\" i XML elementet {1}."
 
@@ -14021,9 +14082,6 @@ msgstr "Behandler filen \"{0}\""
 msgid "Failed to scan file ''{0}'' for plugin information. Skipping."
 msgstr ""
 
-msgid "Processing plugin site cache icon files..."
-msgstr "Behandler udvidelsesstedets ikon cachefiler..."
-
 msgid "Processing plugin files..."
 msgstr "Behandler udvidelsesfiler..."
 
@@ -14042,12 +14100,6 @@ msgstr ""
 msgid "Details:"
 msgstr ""
 
-msgid "Plugin icons download error"
-msgstr ""
-
-msgid "JOSM failed to download plugin icons:"
-msgstr ""
-
 msgid ""
 "Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
 "plugin site ''{1}''."
@@ -14101,6 +14153,10 @@ msgid ""
 "(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
 "bug report."
 msgstr ""
+"Der opstod en uventet undtagelse. Dette er altid en kodefejl.<br>Men, du "
+"bruger en ældre version af JOSM ({0}),<br> i stedet for den aktuelle testede "
+"version (<b>{1}</b>).<br><br><b>Venligst opdaterer JOSM</b> før indsendelse "
+"af en fejlrapport."
 
 msgid "Unexpected Exception"
 msgstr "Uventet handling"
@@ -14640,21 +14696,21 @@ msgid "Invalid bz2 file."
 msgstr "Ugyldig bz2-fil."
 
 msgid "ms"
-msgstr ""
+msgstr "ms"
 
 msgid "s"
-msgstr ""
+msgstr "s"
 
 msgid "min"
-msgstr ""
+msgstr "min"
 
 msgid "h"
-msgstr ""
+msgstr "t"
 
 msgid "day"
 msgid_plural "days"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "dag"
+msgstr[1] "dage"
 
 msgid ""
 "Preference with key ''{0}'' does not include ''{1}''. Cannot restore window "
@@ -15066,8 +15122,10 @@ msgstr ""
 "Opretter og håndterer adressepunkter og bygninger inden for den tjekiske "
 "republik."
 
-msgid "Allows to import various file formats into JOSM directly."
-msgstr "Tillader import at forskellige filformater til JOSM."
+msgid ""
+"Allows to import various file formats into JOSM directly. Currently "
+"supported: TangoGPS, Garmin Trainings Center TCX."
+msgstr ""
 
 msgid "Download your GPX tracks from openstreetmap.org"
 msgstr "Download dine GPX spor fra openstreetmap.org"
@@ -15176,6 +15234,11 @@ msgid "A helper for IRS satellite adjustment."
 msgstr ""
 
 msgid ""
+"Provides Java Native Access (JNA) library. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
+msgid ""
 "Provides Java Topology Suite (JTS) library and related utilities. Not meant "
 "to be installed directly by users, but rather as a dependency for other "
 "plugins."
@@ -15564,16 +15627,35 @@ msgstr "Oplyst"
 msgid "Width (meters)"
 msgstr "Bredde (meter)"
 
-msgid "Service type"
+msgid "Sidewalk"
 msgstr ""
 
-msgid "yard"
-msgstr "Banegård"
+msgctxt "sidewalk"
+msgid "both"
+msgstr ""
 
-msgid "siding"
-msgstr "sidespor"
+msgctxt "sidewalk"
+msgid "left"
+msgstr ""
 
-msgid "spur"
+msgctxt "sidewalk"
+msgid "right"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "no"
+msgstr ""
+
+msgid "Service type"
+msgstr ""
+
+msgid "yard"
+msgstr "Banegård"
+
+msgid "siding"
+msgstr "sidespor"
+
+msgid "spur"
 msgstr "sidespor"
 
 msgid "Electrified"
@@ -15928,17 +16010,21 @@ msgstr ""
 msgid "May-Sep 09:30-12:30,14:15-19:30"
 msgstr ""
 
+msgctxt "parking"
 msgid "multi-storey"
-msgstr "fleretages"
+msgstr ""
 
+msgctxt "parking"
 msgid "surface"
-msgstr "overflade"
+msgstr ""
 
+msgctxt "parking"
 msgid "underground"
-msgstr "underjordisk"
+msgstr ""
 
+msgctxt "parking"
 msgid "rooftop"
-msgstr "taget"
+msgstr ""
 
 msgid "Reference number"
 msgstr "Referensenummer"
@@ -16159,7 +16245,7 @@ msgid "kiosk"
 msgstr ""
 
 msgid "Start date"
-msgstr ""
+msgstr "Start dato"
 
 msgid "Output forms of energy:"
 msgstr ""
@@ -16394,14 +16480,25 @@ msgstr "Maks længde (meter)"
 msgid "Overtaking"
 msgstr "Overhaling"
 
+msgctxt "overtaking"
+msgid "yes"
+msgstr ""
+
+msgctxt "overtaking"
 msgid "both"
-msgstr "begge"
+msgstr ""
 
+msgctxt "overtaking"
 msgid "forward"
-msgstr "fremad"
+msgstr ""
 
+msgctxt "overtaking"
 msgid "backward"
-msgstr "baglæns"
+msgstr ""
+
+msgctxt "overtaking"
+msgid "no"
+msgstr ""
 
 msgid "Roundabout"
 msgstr "Rundkørsel"
@@ -16696,6 +16793,12 @@ msgstr "pegasus"
 msgid "tiger"
 msgstr "tiger"
 
+msgid "Button operated"
+msgstr ""
+
+msgid "Sound signals"
+msgstr "Lydsignaler"
+
 msgid "Crossing attendant"
 msgstr ""
 
@@ -16875,7 +16978,7 @@ msgid "limited"
 msgstr "begrænset"
 
 msgid "Entrance (Barrier Opening)"
-msgstr ""
+msgstr "Indgang (Hul i barrierer)"
 
 msgid "Gate"
 msgstr "Låge/led"
@@ -16884,7 +16987,7 @@ msgid "Lift Gate"
 msgstr "Bom"
 
 msgid "Swing Gate"
-msgstr ""
+msgstr "Svingbom"
 
 msgctxt "swing_gate"
 msgid "single"
@@ -16901,7 +17004,7 @@ msgid "Bump Gate"
 msgstr "Skubbelåge"
 
 msgid "Kissing Gate"
-msgstr ""
+msgstr "Sluselåge"
 
 msgid "Chain"
 msgstr "Kæde"
@@ -17217,9 +17320,6 @@ msgstr "Jernbaneoverskæring"
 msgid "Traffic lights"
 msgstr "Trafiklys"
 
-msgid "Sound signals"
-msgstr "Lydsignaler"
-
 msgid "Barrier"
 msgstr "Afgrænsning"
 
@@ -17316,7 +17416,7 @@ msgid "Magic Carpet"
 msgstr "Flyvende tæppe"
 
 msgid "Goods"
-msgstr ""
+msgstr "Varer"
 
 msgctxt "aerialway"
 msgid "Station"
@@ -17362,7 +17462,7 @@ msgid "See the Wiki for other capacity:[types]=*."
 msgstr ""
 
 msgid "Parking Space"
-msgstr ""
+msgstr "Parkeringsbås"
 
 msgid "Capacity"
 msgstr "Kapacitet"
@@ -17371,7 +17471,7 @@ msgid "Covered (with roof)"
 msgstr "Overdækket (med tag)"
 
 msgid "Parking Entrance"
-msgstr ""
+msgstr "Parkeringsindgang"
 
 msgid "Fuel"
 msgstr "Brændstof"
@@ -17524,7 +17624,7 @@ msgid "Parts"
 msgstr "Dele"
 
 msgid "Tires"
-msgstr ""
+msgstr "Dæk"
 
 msgid "Rental"
 msgstr "Udlejning"
@@ -17778,7 +17878,7 @@ msgid "Shelter"
 msgstr "Læskur"
 
 msgid "Wheelchair"
-msgstr "kørestol"
+msgstr "Kørestol"
 
 msgid "Highway platform (legacy)"
 msgstr ""
@@ -17912,7 +18012,7 @@ msgid "Motel"
 msgstr "Motel"
 
 msgid "Guest House/Bed & Breakfast"
-msgstr ""
+msgstr "Pensionat/Bed & Breakfast"
 
 msgid "Chalet"
 msgstr "Feriehytte"
@@ -18142,6 +18242,8 @@ msgstr "Guide post"
 msgid ""
 "A Signpost/Guidepost to indicate the directions to different destinations."
 msgstr ""
+"Et vejskilt / vejledningsskilt til at angive retninger til forskellige "
+"destinationer."
 
 msgid "Information Terminal"
 msgstr "Informations terminal"
@@ -18153,10 +18255,10 @@ msgid "Closer description"
 msgstr "Nærmere beskrivelse"
 
 msgid "Audio Guide"
-msgstr ""
+msgstr "Lydguide"
 
 msgid "Information using headphones or a mobile phone."
-msgstr ""
+msgstr "Information via hovedtelefon eller mobiltelefon."
 
 msgid "Audioguide via mobile phone?"
 msgstr "Lydguide via mobiltelefon?"
@@ -18165,13 +18267,13 @@ msgid "Phone number"
 msgstr "Telefonnummer"
 
 msgid "Other Information Point"
-msgstr ""
+msgstr "Anden informationssted"
 
 msgid "Leisure"
 msgstr "Rekreation"
 
 msgid "Movie Theater/Cinema"
-msgstr ""
+msgstr "Biograf"
 
 msgid "Zoo"
 msgstr "Zoo"
@@ -18186,7 +18288,7 @@ msgid "wall"
 msgstr "væg"
 
 msgid "Amusement/Theme Park"
-msgstr ""
+msgstr "Forlystelsespark"
 
 msgid "Water Park"
 msgstr "Badeland"
@@ -18195,7 +18297,7 @@ msgid "Sauna"
 msgstr "Sauna"
 
 msgid "Horse Riding"
-msgstr ""
+msgstr "Rideskole"
 
 msgid "Brothel"
 msgstr "Bordel"
@@ -18293,19 +18395,19 @@ msgstr ""
 
 msgctxt "christian"
 msgid "anglican"
-msgstr ""
+msgstr "anglikansk"
 
 msgctxt "christian"
 msgid "baptist"
-msgstr ""
+msgstr "baptistisk"
 
 msgctxt "christian"
 msgid "catholic"
-msgstr ""
+msgstr "katolsk"
 
 msgctxt "christian"
 msgid "evangelical"
-msgstr ""
+msgstr "evangelisk"
 
 msgctxt "christian"
 msgid "greek_catholic"
@@ -18317,19 +18419,19 @@ msgstr ""
 
 msgctxt "christian"
 msgid "jehovahs_witness"
-msgstr ""
+msgstr "Jehovas Vidner"
 
 msgctxt "christian"
 msgid "lutheran"
-msgstr ""
+msgstr "luthersk"
 
 msgctxt "christian"
 msgid "methodist"
-msgstr ""
+msgstr "metodistisk"
 
 msgctxt "christian"
 msgid "mormon"
-msgstr ""
+msgstr "mormonsk"
 
 msgctxt "christian"
 msgid "new_apostolic"
@@ -18337,23 +18439,23 @@ msgstr ""
 
 msgctxt "christian"
 msgid "orthodox"
-msgstr ""
+msgstr "ortodoks"
 
 msgctxt "christian"
 msgid "pentecostal"
-msgstr ""
+msgstr "pinsebevægelsen"
 
 msgctxt "christian"
 msgid "presbyterian"
-msgstr ""
+msgstr "prebyteriansk"
 
 msgctxt "christian"
 msgid "protestant"
-msgstr ""
+msgstr "protestantisk"
 
 msgctxt "christian"
 msgid "quaker"
-msgstr ""
+msgstr "kvæker"
 
 msgctxt "christian"
 msgid "roman_catholic"
@@ -18384,7 +18486,7 @@ msgstr ""
 
 msgctxt "jewish"
 msgid "orthodox"
-msgstr ""
+msgstr "ortodoks"
 
 msgctxt "jewish"
 msgid "conservative"
@@ -18431,7 +18533,7 @@ msgid "Public Building"
 msgstr "Offentlig bygning"
 
 msgid "Town Hall"
-msgstr ""
+msgstr "Rådhus"
 
 msgid "Community Centre"
 msgstr "Medborgerhus"
@@ -18473,13 +18575,13 @@ msgid "Driving School"
 msgstr "Køreskole"
 
 msgid "License Classes"
-msgstr ""
+msgstr "Kørekortkategorier"
 
 msgid "A;A1;B;BE;C"
-msgstr ""
+msgstr "AM;A1;A2;A;B;C1;C;D1;D"
 
 msgid "A;A1;B;B1;C;C1;D;D1;BE;CE;C1E;DE;D1E"
-msgstr ""
+msgstr "AM;A1;A2;A;B;C1;C;D1;D;BE;C1E;CE;D1E;DE"
 
 msgid "Health"
 msgstr "Sundhed"
@@ -18488,10 +18590,10 @@ msgid "Hospital"
 msgstr "Hospital"
 
 msgid "Clinic"
-msgstr "Klinik"
+msgstr "Lægehus"
 
 msgid "Doctor''s Office"
-msgstr ""
+msgstr "Læge"
 
 msgid "Dentist"
 msgstr "Tandlæge"
@@ -18530,7 +18632,7 @@ msgid "Veterinary"
 msgstr "Dyrlæge"
 
 msgid "Toilets/Restrooms"
-msgstr ""
+msgstr "Toiletter"
 
 msgid "Access rights"
 msgstr ""
@@ -18575,19 +18677,19 @@ msgid "Post Box"
 msgstr "Postkasse"
 
 msgid "Collection times"
-msgstr ""
+msgstr "Tømningstidspunkt"
 
 msgid "11:30"
-msgstr ""
+msgstr "11:30"
 
 msgid "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
-msgstr ""
+msgstr "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
 
 msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; Su,PH off"
-msgstr ""
+msgstr "Mo-Fr 09:00-12:00,17:15; Sa 14:00; Su,PH off"
 
 msgid "Drive through"
-msgstr ""
+msgstr "Køre igennem"
 
 msgid "Telephone"
 msgstr "Telefon"
@@ -18599,19 +18701,19 @@ msgid "Emergency Phone"
 msgstr "Nødtelefon"
 
 msgid "Internet Access"
-msgstr ""
+msgstr "Internet adgang"
 
 msgid "Automated Defibrillator"
 msgstr "Hjertestarter"
 
 msgid "Located inside a building?"
-msgstr ""
+msgstr "Placeret inde i en bygning?"
 
 msgid "Last check date (YYYY-MM-DD)"
-msgstr ""
+msgstr "Seneste kontrol dato (ÅÅÅÅ-MM-DD)"
 
 msgid "Last check note"
-msgstr ""
+msgstr "Seneste kontrol note"
 
 msgid "Clock"
 msgstr "Ur"
@@ -18620,35 +18722,35 @@ msgid "Display"
 msgstr "Display"
 
 msgid "analog"
-msgstr ""
+msgstr "analog"
 
 msgid "digital"
-msgstr ""
+msgstr "digital"
 
 msgid "sundial"
-msgstr ""
+msgstr "solur"
 
 msgid "unorthodox"
-msgstr ""
+msgstr "utraditionelt"
 
 msgid "Support"
-msgstr ""
+msgstr "Montering"
 
 msgctxt "mounting/support"
 msgid "pole"
-msgstr ""
+msgstr "stang"
 
 msgctxt "mounting/support"
 msgid "wall_mounted"
-msgstr ""
+msgstr "vægmonteret"
 
 msgctxt "mounting/support"
 msgid "billboard"
-msgstr ""
+msgstr "skilt"
 
 msgctxt "mounting/support"
 msgid "ground"
-msgstr ""
+msgstr "jord"
 
 msgid "Visibility/readability"
 msgstr "Synlighed/læsbarhed"
@@ -18745,15 +18847,15 @@ msgstr "Højde"
 
 msgctxt "height"
 msgid "low"
-msgstr ""
+msgstr "lav"
 
 msgctxt "height"
 msgid "half"
-msgstr ""
+msgstr "halv"
 
 msgctxt "height"
 msgid "full"
-msgstr ""
+msgstr "fuld"
 
 msgid "Hide"
 msgstr "Skjul"
@@ -18787,7 +18889,7 @@ msgid "Diameter (in mm)"
 msgstr "Diameter (i mm)"
 
 msgid "Hydrant Position"
-msgstr ""
+msgstr "Brandhane placering"
 
 msgctxt "hydrant position"
 msgid "lane"
@@ -18795,7 +18897,7 @@ msgstr "bane"
 
 msgctxt "hydrant position"
 msgid "parking_lot"
-msgstr ""
+msgstr "parkeringsplads"
 
 msgctxt "hydrant position"
 msgid "sidewalk"
@@ -18843,15 +18945,15 @@ msgstr "Multi"
 
 msgctxt "running"
 msgid "pitch"
-msgstr ""
+msgstr "bane"
 
 msgctxt "running"
 msgid "sports_centre"
-msgstr ""
+msgstr "sportshal"
 
 msgctxt "running"
 msgid "stadium"
-msgstr ""
+msgstr "stadion"
 
 msgctxt "running"
 msgid "track"
@@ -18873,7 +18975,7 @@ msgid "Climbing"
 msgstr "Klatring"
 
 msgid "Canoeing/Kayaking"
-msgstr ""
+msgstr "Kano/Kajak"
 
 msgctxt "racing"
 msgid "pitch"
@@ -18907,7 +19009,7 @@ msgid "Skating"
 msgstr "Skøjteløb"
 
 msgid "ice_rink"
-msgstr ""
+msgstr "skøjtebane"
 
 msgid "Skateboard"
 msgstr "Skateboard"
@@ -18922,7 +19024,7 @@ msgid "water_park"
 msgstr "badeland"
 
 msgid "Scuba Diving"
-msgstr ""
+msgstr "Dykning"
 
 msgid "Piste type"
 msgstr "Piste type"
@@ -19006,7 +19108,7 @@ msgid "Australian Football"
 msgstr "Australsk fodbold"
 
 msgid "American Football"
-msgstr "Amerikansk Fodbold"
+msgstr "Amerikansk fodbold"
 
 msgid "Canadian Football"
 msgstr "Canadisk fodbold"
@@ -19042,7 +19144,7 @@ msgid "Volleyball"
 msgstr "Volleyball"
 
 msgid "Beach Volleyball"
-msgstr ""
+msgstr "Beachvolley"
 
 msgid "Golf"
 msgstr "Golf"
@@ -19075,7 +19177,7 @@ msgid "Racquetball"
 msgstr ""
 
 msgid "Table Tennis/Ping-Pong"
-msgstr ""
+msgstr "Bordtennis"
 
 msgid "Tennis"
 msgstr "Tennis"
@@ -19084,7 +19186,7 @@ msgid "Motorsport"
 msgstr "Motorsport"
 
 msgid "Kart Racing"
-msgstr ""
+msgstr "Gokart"
 
 msgid "Motocross"
 msgstr "Motocross"
@@ -19279,6 +19381,9 @@ msgstr "Vindmølle (gammeldags)"
 msgid "Gasometer"
 msgstr "Gasbeholder"
 
+msgid "Bunker Silo"
+msgstr "Plansilo"
+
 msgid "Pipeline"
 msgstr "Rørledning"
 
@@ -19396,7 +19501,7 @@ msgid "Water Works"
 msgstr "Vandværk"
 
 msgid "Wastewater Treatment Plant"
-msgstr ""
+msgstr "Rensningsanlæg"
 
 msgid "Watermill"
 msgstr "Vandmølle"
@@ -19420,64 +19525,67 @@ msgid "Mo-Fr 22:00-05:00"
 msgstr "Mo-Fr 22:00-05:00"
 
 msgid "Monitoring Station"
-msgstr ""
+msgstr "Målestation"
 
 msgid "Monitoring:"
-msgstr ""
-
-msgid "Weather"
-msgstr ""
+msgstr "Overvågning:"
 
 msgid "Water level"
-msgstr ""
+msgstr "Vandniveau"
 
 msgid "Tide Level"
+msgstr "Tidevandsniveau"
+
+msgid "Groundwater"
 msgstr ""
 
 msgid "Traffic"
-msgstr ""
+msgstr "Trafik"
 
 msgid "Air Quality"
-msgstr ""
+msgstr "Luftkvalitet"
 
 msgid "Noise"
-msgstr ""
+msgstr "Støj"
 
 msgid "GPS Signals"
-msgstr ""
+msgstr "GPS signaler"
 
 msgid "GLONASS Signals"
-msgstr ""
+msgstr "GLONASS signaler"
 
 msgid "Galileo Signals"
-msgstr ""
+msgstr "Galileo signaler"
+
+msgid "Weather"
+msgstr "Vejr"
 
 msgid "Radiation"
-msgstr ""
+msgstr "Stråling"
 
 msgid "Seismic Activity"
-msgstr ""
+msgstr "Seismisk aktivitet"
 
 msgid "Recording:"
-msgstr ""
+msgstr "Optagelse:"
 
 msgid "Automated"
-msgstr ""
+msgstr "Automatiseret"
 
 msgid "Manually"
-msgstr ""
+msgstr "Manuelt"
 
 msgid "Remote"
-msgstr ""
+msgstr "Fjernbetjent"
 
 msgid "Display:"
-msgstr ""
+msgstr "Skærm:"
 
 msgid "Analog"
-msgstr ""
+msgstr "Analog"
 
 msgid "Digital"
-msgstr ""
+msgstr "Digital"
 
 msgid "Survey Point"
 msgstr "Målepunkt"
@@ -19597,7 +19705,7 @@ msgid "humpback"
 msgstr ""
 
 msgid "Movable Bridge"
-msgstr ""
+msgstr "Bevægelig bro"
 
 msgid "bascule"
 msgstr ""
@@ -19618,7 +19726,7 @@ msgid "transporter"
 msgstr ""
 
 msgid "Bridge Support"
-msgstr ""
+msgstr "Bropille"
 
 msgid "pier"
 msgstr ""
@@ -19632,6 +19740,9 @@ msgstr ""
 msgid "pivot_pier"
 msgstr ""
 
+msgid "Bridge outline"
+msgstr ""
+
 msgid "Power Plant"
 msgstr ""
 
@@ -20239,6 +20350,15 @@ msgstr ""
 msgid "Pole"
 msgstr "Pæl"
 
+msgid "Pole with Transformer"
+msgstr ""
+
+msgid "Pole Attributes:"
+msgstr ""
+
+msgid "Transformer Attributes:"
+msgstr ""
+
 msgid "Power Line"
 msgstr "Strømkabel"
 
@@ -20288,9 +20408,15 @@ msgstr ""
 msgid "Power Cable"
 msgstr ""
 
+msgctxt "power cable"
+msgid "underground"
+msgstr ""
+
+msgctxt "power cable"
 msgid "underwater"
 msgstr ""
 
+msgctxt "power cable"
 msgid "overground"
 msgstr ""
 
@@ -20318,6 +20444,33 @@ msgstr "Monument"
 msgid "Memorial"
 msgstr "Mindesmærke"
 
+msgctxt "memorial"
+msgid "statue"
+msgstr ""
+
+msgctxt "memorial"
+msgid "bust"
+msgstr ""
+
+msgctxt "memorial"
+msgid "plaque"
+msgstr ""
+
+msgctxt "memorial"
+msgid "stele"
+msgstr ""
+
+msgctxt "memorial"
+msgid "stone"
+msgstr ""
+
+msgctxt "memorial"
+msgid "war_memorial"
+msgstr ""
+
+msgid "Inscription"
+msgstr ""
+
 msgid "Wayside Cross"
 msgstr "Vejkantskors"
 
@@ -20355,16 +20508,16 @@ msgid "Deli (Fine Food)"
 msgstr "Delikatesse"
 
 msgid "Candy Store"
-msgstr ""
+msgstr "Slikbutik"
 
 msgid "Tea"
-msgstr ""
+msgstr "Tebutik"
 
 msgid "Coffee"
-msgstr ""
+msgstr "Kaffebutik"
 
 msgid "Public Market"
-msgstr ""
+msgstr "Markedsplads"
 
 msgid "Organic"
 msgstr "Økologisk"
@@ -20387,6 +20540,9 @@ msgstr "Sprit"
 msgid "Beverages"
 msgstr "Drikkevarer"
 
+msgid "Wine"
+msgstr "Vinhandel"
+
 msgid "Boutique"
 msgstr ""
 
@@ -20430,7 +20586,10 @@ msgid "Video"
 msgstr "Video"
 
 msgid "Video Games"
-msgstr ""
+msgstr "Videospil"
+
+msgid "Music"
+msgstr "Musik"
 
 msgid "Cash"
 msgstr "Penge"
@@ -20448,7 +20607,7 @@ msgid "Pawnbroker"
 msgstr "Pantelåner"
 
 msgid "Home decoration"
-msgstr ""
+msgstr "Boligmontering"
 
 msgid "Furniture"
 msgstr "Møbelforretning"
@@ -20459,35 +20618,38 @@ msgstr "Køkken"
 msgid "Curtain"
 msgstr "Gardin"
 
+msgid "Art"
+msgstr "Kunsthandel"
+
 msgid "Frame"
 msgstr "Ramme"
 
 msgid "Bed"
-msgstr ""
+msgstr "Sengebutik"
 
 msgid "Interior Decoration"
-msgstr ""
+msgstr "Boligindretning"
 
 msgid "Antiques"
-msgstr ""
+msgstr "Antikviteter"
 
 msgid "Printed Material"
-msgstr ""
+msgstr "Trykt materiale"
 
 msgid "Stationery"
 msgstr "Kontorforsyning"
 
 msgid "Copy Shop"
-msgstr ""
+msgstr "Kopibutik"
 
 msgid "Book Store"
 msgstr "Boghandler"
 
 msgid "Newspaper Stand"
-msgstr ""
+msgstr "Aviskiosk"
 
 msgid "Ticket"
-msgstr ""
+msgstr "Billetter"
 
 msgid "Department Store"
 msgstr "Varehus"
@@ -20499,19 +20661,22 @@ msgid "Chemist"
 msgstr "Apotek"
 
 msgid "Hairdresser/Barber"
-msgstr ""
+msgstr "Frisør/Barber"
 
 msgid "Beauty"
-msgstr ""
+msgstr "Skønhedsklinik"
+
+msgid "Tattoo"
+msgstr "Tatovør"
 
 msgid "Optician"
 msgstr "Optiker"
 
 msgid "Jewellery"
-msgstr ""
+msgstr "Guldsmed"
 
 msgid "Gift/Souvenir"
-msgstr ""
+msgstr "Gave/Souvenir"
 
 msgid "Erotic"
 msgstr "Erotisk"
@@ -20523,7 +20688,7 @@ msgid "Garden Centre"
 msgstr "Havecenter"
 
 msgid "Do-It-Yourself Store"
-msgstr ""
+msgstr "Byggemarked"
 
 msgid "Hardware"
 msgstr "Isenkræmmer"
@@ -20541,7 +20706,7 @@ msgid "Toys"
 msgstr "Legetøjsbutik"
 
 msgid "Variety Store"
-msgstr ""
+msgstr "Småtingsbutik"
 
 msgid "Bookmaker"
 msgstr "Spilleudbyder"
@@ -20550,13 +20715,16 @@ msgid "Lottery"
 msgstr "Spillebutik"
 
 msgid "Bag"
-msgstr ""
+msgstr "Taskebutik"
 
 msgid "Pet"
-msgstr ""
+msgstr "Dyrehandler"
+
+msgid "Funeral Directors"
+msgstr "Bedemand"
 
 msgid "Vending Machine"
-msgstr ""
+msgstr "Selvbetjeningsautomat"
 
 msgid "Vending products"
 msgstr "Varer i automat"
@@ -20649,11 +20817,20 @@ msgid "ward"
 msgstr ""
 
 msgid "Postal Code"
-msgstr ""
+msgstr "Postnummer"
 
 msgid "National Park"
 msgstr ""
 
+msgid "Protected Area"
+msgstr "Beskyttet område"
+
+msgid "Protected Class"
+msgstr "Beskyttelsesklasse"
+
+msgid "Title or type of protection"
+msgstr "Titel eller type af beskyttelse"
+
 msgid "Places"
 msgstr "Steder"
 
@@ -20860,7 +21037,7 @@ msgid "Large area covered with sand."
 msgstr ""
 
 msgid "Bare Rock"
-msgstr ""
+msgstr "Klippe"
 
 msgid ""
 "For areas of solid visible rock that is sparsely vegetated or not vegetated "
@@ -20868,7 +21045,7 @@ msgid ""
 msgstr ""
 
 msgid "Stone"
-msgstr ""
+msgstr "Fritliggende sten"
 
 msgid ""
 "A single notable free-standing rock, which may differ from the composition "
@@ -21023,166 +21200,166 @@ msgid "Province"
 msgstr ""
 
 msgid "AL"
-msgstr ""
+msgstr "AL"
 
 msgid "AK"
-msgstr ""
+msgstr "AK"
 
 msgid "AZ"
-msgstr ""
+msgstr "AZ"
 
 msgid "AR"
-msgstr ""
+msgstr "AR"
 
 msgid "CA"
-msgstr ""
+msgstr "CA"
 
 msgid "CO"
-msgstr ""
+msgstr "CO"
 
 msgid "CT"
-msgstr ""
+msgstr "CT"
 
 msgid "DE"
-msgstr ""
+msgstr "DE"
 
 msgid "FL"
-msgstr ""
+msgstr "FL"
 
 msgid "GA"
-msgstr ""
+msgstr "GA"
 
 msgid "HI"
-msgstr ""
+msgstr "HI"
 
 msgid "IL"
-msgstr ""
+msgstr "IL"
 
 msgid "IN"
-msgstr ""
+msgstr "IN"
 
 msgid "IA"
-msgstr ""
+msgstr "IA"
 
 msgid "KS"
-msgstr ""
+msgstr "KS"
 
 msgid "KY"
-msgstr ""
+msgstr "KY"
 
 msgid "LA"
-msgstr ""
+msgstr "LA"
 
 msgid "ME"
-msgstr ""
+msgstr "ME"
 
 msgid "MD"
-msgstr ""
+msgstr "MD"
 
 msgid "MA"
-msgstr ""
+msgstr "MA"
 
 msgid "MI"
-msgstr ""
+msgstr "MI"
 
 msgid "MN"
-msgstr ""
+msgstr "MN"
 
 msgid "MS"
-msgstr ""
+msgstr "MS"
 
 msgid "MO"
-msgstr ""
+msgstr "MO"
 
 msgid "MT"
-msgstr ""
+msgstr "MT"
 
 msgid "NE"
-msgstr ""
+msgstr "NE"
 
 msgid "NV"
-msgstr ""
+msgstr "NV"
 
 msgid "NH"
-msgstr ""
+msgstr "NH"
 
 msgid "NJ"
-msgstr ""
+msgstr "NJ"
 
 msgid "NM"
-msgstr ""
+msgstr "NM"
 
 msgid "NY"
-msgstr ""
+msgstr "NY"
 
 msgid "NC"
-msgstr ""
+msgstr "NC"
 
 msgid "ND"
-msgstr ""
+msgstr "ND"
 
 msgid "OH"
-msgstr ""
+msgstr "OH"
 
 msgid "OR"
-msgstr ""
+msgstr "OR"
 
 msgid "PA"
-msgstr ""
+msgstr "PA"
 
 msgid "RI"
-msgstr ""
+msgstr "RI"
 
 msgid "SC"
-msgstr ""
+msgstr "SC"
 
 msgid "SD"
-msgstr ""
+msgstr "SD"
 
 msgid "TN"
-msgstr ""
+msgstr "TN"
 
 msgid "TX"
-msgstr ""
+msgstr "TX"
 
 msgid "UT"
-msgstr ""
+msgstr "UT"
 
 msgid "VT"
-msgstr ""
+msgstr "VT"
 
 msgid "VA"
-msgstr ""
+msgstr "VA"
 
 msgid "WA"
-msgstr ""
+msgstr "WA"
 
 msgid "WV"
-msgstr ""
+msgstr "WV"
 
 msgid "WI"
-msgstr ""
+msgstr "WI"
 
 msgid "DC"
-msgstr ""
+msgstr "DC"
 
 msgid "AS"
-msgstr ""
+msgstr "AS"
 
 msgid "GU"
-msgstr ""
+msgstr "GU"
 
 msgid "MP"
-msgstr ""
+msgstr "MP"
 
 msgid "PR"
-msgstr ""
+msgstr "PR"
 
 msgid "UM"
-msgstr ""
+msgstr "UM"
 
 msgid "VI"
-msgstr ""
+msgstr "VI"
 
 msgid "Address Interpolation"
 msgstr "Adresse-interpolering"
@@ -21275,7 +21452,7 @@ msgid "members of site"
 msgstr ""
 
 msgid "Turn Restriction"
-msgstr ""
+msgstr "Svingbegrænsning"
 
 msgid "Restriction"
 msgstr "Begrænsning"
@@ -21730,7 +21907,13 @@ msgstr ""
 msgid "Estonia Ortho (Maaamet)"
 msgstr ""
 
-msgid "Estonia Multi (Maaamet)"
+msgid "Estonia Hillshade (Maaamet)"
+msgstr ""
+
+msgid "Estonia Cadastre (Maaamet)"
+msgstr ""
+
+msgid "Estonia Forestry (Maaamet)"
 msgstr ""
 
 msgid "Bordeaux - 2012"
@@ -21754,7 +21937,7 @@ msgstr ""
 msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
 msgstr ""
 
-msgid "CUGN Nancy - Orthophoto 2012"
+msgid "GrandNancy Orthophotographie 2012"
 msgstr ""
 
 msgid "Géobretagne - Brest 2010 - 10 cm"
@@ -21801,9 +21984,6 @@ msgid ""
 "- 1 m"
 msgstr ""
 
-msgid "Streets NRW Geofabrik.de"
-msgstr ""
-
 msgid "Hike & Bike"
 msgstr ""
 
@@ -21863,6 +22043,9 @@ msgstr ""
 msgid "NRW-Atlas: Topographische Karte 1:10000"
 msgstr ""
 
+msgid "Metropole Ruhr: Luftbilder (10 cm)"
+msgstr ""
+
 msgid "Drone Imagery (Haiti)"
 msgstr ""
 
@@ -22064,6 +22247,9 @@ msgstr ""
 msgid "Stadt Zürich Übersichtsplan (Strassen, Gebäude, Hausnummer)"
 msgstr ""
 
+msgid "Stadt Zürich Luftbild 2011"
+msgstr ""
+
 msgid "Orthofoto Kanton Solothurn RGB (SOGIS 2011/2012/2013)"
 msgstr ""
 
@@ -22082,7 +22268,7 @@ msgstr ""
 msgid "Canton de Fribourg 50cm (2005)"
 msgstr ""
 
-msgid "Stadt Bern 10cm/25cm (2008)"
+msgid "Stadt Bern 10cm/25cm (2012)"
 msgstr ""
 
 msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
@@ -22121,7 +22307,7 @@ msgstr ""
 msgid "OSM US TIGER 2012 Roads Overlay"
 msgstr ""
 
-msgid "New & Misaligned TIGER Roads (TIGER 2013)"
+msgid "New & Misaligned TIGER Roads (TIGER 2014)"
 msgstr ""
 
 msgid "MassGIS L3 Parcels"
@@ -22169,9 +22355,234 @@ msgstr ""
 msgid "NLS - Bartholomew Half Inch, 1897-1907"
 msgstr ""
 
+msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Annan 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgstr ""
+
 msgid "OS Town Plans, Cupar 1854 (NLS)"
 msgstr ""
 
+msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Elgin 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Forres 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Galashiels 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Girvan 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Greenock 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Haddington 1853 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Haddington 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Hamilton 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Irvine 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Jedburgh 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kelso 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Lanark 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Linlithgow 1856 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Musselburgh 1853 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Musselburgh 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Oban 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Peebles 1856 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Perth 1860 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Peterhead 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Selkirk 1865 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, St Andrews 1854 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, St Andrews 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stirling 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stonehaven 1864 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1847 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Strathaven 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wick 1872 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wigtown 1848 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wigtown 1894 (NLS)"
+msgstr ""
+
 msgid "Decreasing house numbers in addresses interpolation"
 msgstr ""
 
@@ -22225,17 +22636,37 @@ msgid "{0}={1} is deprecated. Please use instead a multipolygon."
 msgstr ""
 
 msgid ""
-"{0} is deprecated. Please specify ìnterval by using opening_hours syntax"
+"{0} is deprecated. Please specify interval by using opening_hours syntax"
 msgstr ""
 
 msgid ""
 "{0} is deprecated. Please delete this object and use a private layer instead"
 msgstr ""
 
-msgid "{0} on a node"
+msgid "{0}={1} is unspecific. Please replace ''{1}'' by a specific value."
+msgstr ""
+
+msgid "{0} should be replaced with {1}"
+msgstr ""
+
+msgid ""
+"{0}={1} is unspecific. Please replace ''{1}'' by ''left'', ''right'' or "
+"''both''."
+msgstr ""
+
+msgid "{0} on a node. Should be used on a way."
+msgstr ""
+
+msgid "{0} on a node. Should be drawn as an area."
+msgstr ""
+
+msgid "{0}=* on a node. Should be used in a relation"
 msgstr ""
 
-msgid "{0} on a node. Should be drawn as an area"
+msgid "{0} on a way. Should be used in a relation"
+msgstr ""
+
+msgid "{0} on a node"
 msgstr ""
 
 msgid "Building inside building"
@@ -24166,8 +24597,8 @@ msgstr ""
 
 msgid "Added {0} object to subject layer"
 msgid_plural "Added {0} objects to subject layer"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Tilføjede {0} objekt til emnets lag"
+msgstr[1] "Tilføjede {0} objekter til emnets lag"
 
 msgid "Conflation"
 msgstr ""
@@ -24332,7 +24763,7 @@ msgid "Please select 1 or more ways to download along"
 msgstr "Vælg venligst 1 eller flere veje der skal downloades omkring"
 
 msgid "Download from OSM along selected ways"
-msgstr ""
+msgstr "Download fra OSM langs valgte veje"
 
 msgid "{0} intermediate nodes to download."
 msgstr ""
@@ -26553,19 +26984,19 @@ msgid "Could not delete temporary file!"
 msgstr ""
 
 msgid "Test failed: Could not read mtime."
-msgstr ""
+msgstr "Testen fejlede: Kunne ikke læse mtime."
 
 msgid "Test failed: Could not write mtime."
-msgstr ""
+msgstr "Testen fejlede: Kunne ikke skrive mtime."
 
 msgid "Adjust photos"
-msgstr ""
+msgstr "Juster billeder"
 
 msgid "Move and position photos"
-msgstr ""
+msgstr "Flyt og placerer billeder"
 
 msgid "Click+drag photo or shift+click to position photo."
-msgstr ""
+msgstr "Klik+træk billede eller shift+klik for at placerer billede."
 
 msgid "Please load some photos."
 msgstr ""
@@ -26950,6 +27381,9 @@ msgstr "Foreslå stoppesteder"
 msgid "Find"
 msgstr "Find"
 
+msgid "Show"
+msgstr "Vis"
+
 msgid "Mark"
 msgstr "Marker"
 
@@ -28275,11 +28709,15 @@ msgid ""
 "In the following table you can edit the <strong>raw tags</strong> of the OSM "
 "relation representing this turn restriction."
 msgstr ""
+"I den følgende tabel kan du redigere <strong>rå tags</strong> fra OSM "
+"relationen som repræsenterer denne svingbegrænsning."
 
 msgid ""
 "In the following table you can edit the <strong>raw members</strong> of the "
 "OSM relation representing this turn restriction."
 msgstr ""
+"I den følgende tabel kan du redigere <strong>rå medlemmer</strong> fra OSM "
+"relationen som repræsenterer denne svingbegrænsning."
 
 msgid "Type:"
 msgstr "Type:"
@@ -28317,10 +28755,10 @@ msgid "Move the selected relation members up by one position"
 msgstr ""
 
 msgid "Edit basic attributes of a turn restriction"
-msgstr ""
+msgstr "Ret basale attributter i en svingbegrænsning"
 
 msgid "Edit the raw tags and members of this turn restriction"
-msgstr ""
+msgstr "Ret de rå tags og medlemmer i denne svingbegrænsning"
 
 msgid "Errors/Warnings"
 msgstr "Fejl/Advarsler"
@@ -28335,7 +28773,7 @@ msgid "Edit a new turn restriction in layer ''{0}''"
 msgstr ""
 
 msgid "Edit turn restriction ''{0}'' in layer ''{1}''"
-msgstr ""
+msgstr "Ret svingbegrænsning ''{0}'' i lag ''{1}''"
 
 msgid ""
 "There is still an unresolved error or warning identified for this turn "
@@ -28409,7 +28847,7 @@ msgid "Select this turn restriction"
 msgstr "Vælg denne svingbegrænsning"
 
 msgid "Activate the layer this turn restriction belongs to and zoom to it"
-msgstr ""
+msgstr "Aktiver laget denne svingbegrænsning tilhører og zoom til den"
 
 msgid "{0} warning"
 msgid_plural "{0} warnings"
@@ -28600,7 +29038,7 @@ msgid "Road signs - Set B"
 msgstr "Vejskilte - Sæt B"
 
 msgid "Please select the set of road sign icons to be used in the plugin."
-msgstr ""
+msgstr "Vælg det sæt af vejskilte ikoner, der skal bruges i plugin."
 
 msgid ""
 "Warning: the preference with key ''{0}'' has an unsupported value ''{1}''. "
@@ -28627,7 +29065,7 @@ msgid "Removes the member with role ''to''"
 msgstr ""
 
 msgid "Fix in editor"
-msgstr ""
+msgstr "Ret i editor"
 
 msgid ""
 "Go to Basic Editor and manually choose members with roles ''from'' and ''to''"
@@ -28893,7 +29331,7 @@ msgid "Pastes tags of previously selected object(s)"
 msgstr ""
 
 msgid "Add Source Tag"
-msgstr ""
+msgstr "Tilføj kilde tag"
 
 msgid "Add remembered source tag"
 msgstr ""
diff --git a/i18n/po/de.po b/i18n/po/de.po
index c0dcb87..d01391b 100644
--- a/i18n/po/de.po
+++ b/i18n/po/de.po
@@ -1,17 +1,22 @@
+# translation of de.po to
+# Sven Anders <sven at anders-hamburg.de>, 2006, 2007.
+# Matthias Merz <openstreetmap at merz.inka.de>, 2008.
+# Dirk Stöcker <openstreetmap at dstoecker.de>, 2008, 2009, 2010, 2013.
+# Simon Legner <Simon.Legner at gmail.com>, 2014.
 msgid ""
 msgstr ""
 "Project-Id-Version: de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-21 03:38+0200\n"
-"PO-Revision-Date: 2014-10-20 17:02+0000\n"
-"Last-Translator: Simon Legner <Unknown>\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"
 "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-10-21 04:52+0000\n"
-"X-Generator: Launchpad (build 17203)\n"
+"X-Launchpad-Export-Date: 2014-12-10 04:48+0000\n"
+"X-Generator: Launchpad (build 17283)\n"
 "Language: de\n"
 "X-Poedit-SearchPath-0: .\n"
 "X-Poedit-Basepath: /home/simon/src/josm.all/i18n\n"
@@ -35,16 +40,16 @@ msgid "{0}: unrecognized option ''{1}{2}''"
 msgstr "{0}: nicht erkannte Option »{1}{2}«"
 
 msgid "{0}: illegal option -- {1}"
-msgstr "{0}: nicht gültige Option -- {1}"
+msgstr "{0}: unerlaubte Option -- {1}"
 
 msgid "{0}: invalid option -- {1}"
-msgstr "{0}: nicht gültige Option -- {1}"
+msgstr "{0}: ungültige Option -- {1}"
 
 msgid "{0}: option requires an argument -- {1}"
 msgstr "{0}: Option verlangt nach einem Argument -- {1}"
 
 msgid "Invalid value {0} for parameter ''has_arg''"
-msgstr "Nicht gültiger Wert {0} für Parameter »has_arg«"
+msgstr "Ungültiger Wert {0} für Parameter »has_arg«"
 
 msgid "Background Terms of Use"
 msgstr "Nutzungsbedingungen Hintergrund"
@@ -177,21 +182,6 @@ msgid "About JOSM..."
 msgstr "Über JOSM …"
 
 msgid ""
-"Unexpected format of API base URL. Redirection to info or history page for "
-"OSM object will probably fail. API base URL is: ''{0}''"
-msgstr ""
-"Unerwartetes Format der API-Basis-URL. Weiterleitung zur Info- oder "
-"Chronikseite wird wahrscheinlich scheitern. API-Basis-URL ist: ''{0}''"
-
-msgid ""
-"Unexpected format of API base URL. Redirection to user page for OSM user "
-"will probably fail. API base URL is: ''{0}''"
-msgstr ""
-"Unerwartetes Format der API-Basis-URL. Die Weiterleitung zu den OSM-"
-"Nutzerseiten wird wahrscheinlich fehlschlagen. Die API-Basis-URL lautet: "
-"''{0}''"
-
-msgid ""
 "You are about to launch {0} browser window.<br>This may both clutter your "
 "screen with browser windows<br>and take some time to finish."
 msgid_plural ""
@@ -1692,6 +1682,15 @@ msgstr "Keine Änderungen zum Hochladen vorhanden."
 msgid "Nothing to upload. Get some data first."
 msgstr "Nichts geändert. Erfassen Sie erst einige Daten."
 
+msgid "Upload note changes to server"
+msgstr "Anmerkungsänderungen zum Server hochladen"
+
+msgid "Upload notes"
+msgstr "Anmerkungen aktualisieren"
+
+msgid "Uploading notes to server"
+msgstr "Anmerkungen werden zum Server hochgeladen"
+
 msgid "Upload selection"
 msgstr "Auswahl hochladen"
 
@@ -1985,12 +1984,20 @@ msgstr "Modus zum Hinzufügen von Hinweisen"
 msgid "Click the location where you wish to create a new note"
 msgstr "Auf den Ort klicken, wo ein neuer Hinweis hizugefügt werden soll"
 
-msgid "Enter a comment for a new note"
-msgstr "Einen Kommentar für den Hinweis eingeben"
-
 msgid "Create new note"
 msgstr "Neuen Hinweis erstellen"
 
+msgid "Create note"
+msgstr "Anmerkung erstellen"
+
+msgid "Enter a detailed comment to create a note"
+msgstr ""
+"Geben Sie einen detaillierten Kommentar zum Erstellen einer Anmerkung ein"
+
+msgid "You must enter a comment to create a new note"
+msgstr ""
+"Sie müssen einen Kommentar zum Erstellen einer neuen Anmerkung eingeben"
+
 msgid "Delete Mode"
 msgstr "Löschmodus"
 
@@ -2970,6 +2977,15 @@ msgstr "...verweist auf Relation"
 msgid "Cycling dependencies"
 msgstr "Gegenseitige Abhängigkeiten"
 
+msgid "Uploading modified notes"
+msgstr "Geänderte Anmerkungen werden hochgeladen"
+
+msgid "Note {0} failed: {1}"
+msgstr "Anmerkung {0} fehlgeschlagen: {1}"
+
+msgid "Notes failed to upload"
+msgstr "Anmerkungen konnten nicht hochgeladen werden"
+
 msgid ""
 "The following are results of automatic validation. Try fixing these, but be "
 "careful (don''t destroy valid data). When in doubt ignore them.<br>When you "
@@ -5395,6 +5411,12 @@ msgstr "Konflikthintergrund: Alle Merkmale behalten"
 msgid "Conflict foreground: keep all tags"
 msgstr "Konfliktvordergrund: Alle Merkmale behalten"
 
+msgid "Conflict background: sum all numeric tags"
+msgstr "Konflikt-Hintergrund: Alle Zahlenwerte addieren"
+
+msgid "Conflict foreground: sum all numeric tags"
+msgstr "Konflikt-Vordergrund: Alle Zahlenwerte addieren"
+
 msgid "Conflict background: keep member"
 msgstr "Konflikthintergrund: Element behalten"
 
@@ -5867,12 +5889,20 @@ msgstr "Kein"
 msgid "all"
 msgstr "alle"
 
+msgid "sum"
+msgstr "Summe"
+
 msgid "Please decide which values to keep"
 msgstr "Bitte entscheiden Sie, welche Werte behalten werden sollen."
 
 msgid "Value ''{0}'' is going to be applied for key ''{1}''"
 msgstr "Der Wert \"{0}\" wird auf den Schlüssel \"{1}\" angewandt"
 
+msgid ""
+"All numeric values sumed as ''{0}'' are going to be applied for key ''{1}''"
+msgstr ""
+"Alle Zahlenwerte addiert zu ''{0}'' werden dem Schlüssel ''{1}'' zugewiesen."
+
 msgid "The key ''{0}'' and all its values are going to be removed"
 msgstr "Der Schlüssel \"{0}\" und alle dazugehörigen Werte werden entfernt"
 
@@ -6278,24 +6308,6 @@ msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
 "</p><p>Den Filterdialog schließen, um alle Objekte zu sehen<p></html>"
 
-msgid "Display the history of all selected items."
-msgstr "Versionsprotokoll aller gewählten Objekte anzeigen."
-
-msgid "Object with history"
-msgstr "Objekt mit Geschichte"
-
-msgid "Reload"
-msgstr "Neu laden"
-
-msgid "Reload all currently selected objects and refresh the list."
-msgstr "Alle ausgewählten Objekte neu laden und die Liste aktualisieren."
-
-msgid "Show"
-msgstr "Anzeigen"
-
-msgid "Display the history of the selected objects."
-msgstr "Geschichte der markierten Elemente anzeigen."
-
 msgid "Advanced object info"
 msgstr "Erweiterte Objektinformationen"
 
@@ -6659,6 +6671,9 @@ msgstr "Kommentar hinzufügen"
 msgid "Comment"
 msgstr "Kommentar"
 
+msgid "Comment on note"
+msgstr "Anmerkung kommentieren"
+
 msgid "Add comment to note:"
 msgstr "Kommentar zu Hinweis hinzufügen:"
 
@@ -6668,9 +6683,6 @@ msgstr "Hinweis schließen"
 msgid "Close note with message:"
 msgstr "Hinweis mit Nachricht schließen:"
 
-msgid "Close Note"
-msgstr "Hinweis schließen"
-
 msgid "Create a new note"
 msgstr "Neuen Hinweis erstellen"
 
@@ -6749,6 +6761,9 @@ msgstr "Aktuelle Auswahl"
 msgid "Search for objects"
 msgstr "Nach Objekten suchen"
 
+msgid "Display the history of the selected objects."
+msgstr "Geschichte der markierten Elemente anzeigen."
+
 msgid "Zoom to selection"
 msgstr "Auf Auswahl zoomen"
 
@@ -6876,6 +6891,9 @@ msgstr "Berichtigung ({0}/{1}): ''{2}''"
 msgid "Updating map ..."
 msgstr "Karte wird aktualisiert ..."
 
+msgid "anonymous"
+msgstr "anonym"
+
 msgid "Display the basic properties of the changeset"
 msgstr "Die Haupteigenschaften des Änderungssatzes anzeigen"
 
@@ -6890,6 +6908,12 @@ msgstr ""
 "Die im Änderungssatz erstellten, aktualisierten und gelöschten Objekte "
 "anzeigen"
 
+msgid "Discussion"
+msgstr "Diskussion"
+
+msgid "Display the public discussion around this changeset"
+msgstr "Öffentliche Diskussion um diesen Änderungssatz anzeigen"
+
 msgid "Changeset Management Dialog"
 msgstr "Änderungssatzverwaltung"
 
@@ -6951,9 +6975,6 @@ msgctxt "changeset.state"
 msgid "Closed"
 msgstr "Geschlossen"
 
-msgid "anonymous"
-msgstr "anonym"
-
 msgid "ID"
 msgstr "ID"
 
@@ -6969,6 +6990,9 @@ msgstr "Erstellt am"
 msgid "Closed at"
 msgstr "Geschlossen am"
 
+msgid "Discussions"
+msgstr "Diskussionen"
+
 msgid "Downloading changeset content"
 msgstr "Änderungssatzinhalt herunterladen"
 
@@ -7092,6 +7116,15 @@ msgstr ""
 "An die Objekte, die der Änderungssatz des aktuellen Datensatzes beinhaltet, "
 "heranzoomen"
 
+msgid "Update changeset discussion"
+msgstr "Änderungssatzdiskussion aktualisieren"
+
+msgid "Update the changeset discussion from the OSM server"
+msgstr "Änderungssatzdiskussion vom OSM-Server aktualisieren"
+
+msgid "Date"
+msgstr "Datum"
+
 msgid "Download changesets"
 msgstr "Änderungssätze herunterladen"
 
@@ -7559,8 +7592,8 @@ msgstr "Bitte wählen Sie einen Wert"
 msgid "Set number of recently added tags"
 msgstr "Anzahl zuletzt ergänzter Merkmale einstellen"
 
-msgid "Remember last used tags"
-msgstr "Zu letzt verwendete Merkmale speichern"
+msgid "Remember last used tags after a restart"
+msgstr "Zuletzt verwendete Schlagwörter nach einem Neustart behalten"
 
 msgid "Please enter the number of recently added tags to display"
 msgstr ""
@@ -7954,6 +7987,9 @@ msgstr "Direkte Kinder von Elternrelationen einbeziehen"
 msgid "Load parent relations"
 msgstr "Lade Elternrelationen"
 
+msgid "Reload"
+msgstr "Neu laden"
+
 msgid "Loading parent relations"
 msgstr "Elternrelationen laden"
 
@@ -8084,6 +8120,14 @@ msgstr "GPS-Rohdaten"
 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"
+
+msgid "Select to download notes in the selected download area."
+msgstr ""
+"Wählen Sie Anmerkungen im ausgewählten Herunterladebereich zum Herunterladen "
+"aus."
+
 msgid "Download as new layer"
 msgstr "Als neue Ebene laden"
 
@@ -8433,9 +8477,6 @@ msgstr "A"
 msgid "B"
 msgstr "B"
 
-msgid "Date"
-msgstr "Datum"
-
 msgid ""
 "Failed to update primitive with id {0} because current edit layer is null"
 msgstr ""
@@ -9455,9 +9496,6 @@ msgstr ""
 msgid "Save Layer"
 msgstr "Ebene speichern"
 
-msgid "Notes"
-msgstr "Scheine"
-
 msgid "Notes layer"
 msgstr "Anmerkungsebene"
 
@@ -9473,9 +9511,6 @@ msgstr "Datenebene {0}"
 msgid "outside downloaded area"
 msgstr "Außerhalb des heruntergeladenen Bereichs"
 
-msgid "version {0}"
-msgstr "Version {0}"
-
 msgid "Merging layers"
 msgstr "Ebenen vereinen"
 
@@ -13568,6 +13603,15 @@ msgstr ""
 "Offenen Änderungssatz erwartet, aber geschlossenen Änderungssatz mit ID {0} "
 "erhalten."
 
+msgid "Note upload failed"
+msgstr "Noteupload fehlgeschlagen"
+
+msgid "Error parsing note response from server"
+msgstr "Fehler beim Parsen der Anmerkungsrückmeldung vom Server"
+
+msgid "Error encoding string: {0}"
+msgstr "Fehlerkodierungszeichenkette: {0}"
+
 msgid "(Code={0})"
 msgstr "(Kode={0})"
 
@@ -13626,16 +13670,16 @@ msgstr ""
 msgid "Parsing changeset content ..."
 msgstr "Inhalt des Änderungssatzes analysieren..."
 
+msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
+msgstr ""
+"Ungültiger Wahrheitswert für das Attribut ''{0}''. Erhielt den Wert ''{1}''."
+
 msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
 msgstr "Ungültiger Wert ''{1}'' für das Attribut ''{0}''."
 
 msgid "Illegal numeric value for attribute ''{0}''. Got ''{1}''."
 msgstr "Unzulässiger numerischer Wert ''{1}'' für Attribut ''{0}''."
 
-msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
-msgstr ""
-"Ungültiger Wahrheitswert für das Attribut ''{0}''. Erhielt den Wert ''{1}''."
-
 msgid "Missing mandatory attribute ''{0}'' of XML element {1}."
 msgstr ""
 "Notwendiges Attribut ''{0}'' für das XML-Element {1} ist nicht vorhanden."
@@ -13774,7 +13818,7 @@ msgid "Missing required attribute ''{0}''."
 msgstr "Fehlendes erforderliches Attribut \"{0}\"."
 
 msgid "Illegal long value for attribute ''{0}''. Got ''{1}''."
-msgstr "Ungültiger langer Wert für Attribut \"{0}\". Erhaltener Wert \"{1}\""
+msgstr "Ungültiger langer Wert \"{1}\" für das Attribut ''{0}''."
 
 msgid "Prepare OSM data..."
 msgstr "OSM-Daten werden vorbereitet...."
@@ -14537,10 +14581,6 @@ msgstr ""
 "Das Durchsuchen der Datei »{0}« nach Erweiterungsinformationen ist "
 "fehlgeschlagen. Datei wird übersprungen."
 
-msgid "Processing plugin site cache icon files..."
-msgstr ""
-"Zwischengespeicherte Bilddateien der Erweiterungsquellen werden verarbeitet …"
-
 msgid "Processing plugin files..."
 msgstr "Erweiterungsdateien werden verarbeitet …"
 
@@ -14559,12 +14599,6 @@ msgstr "JOSM konnte Erweiterungsliste nicht herunterladen:"
 msgid "Details:"
 msgstr "Details:"
 
-msgid "Plugin icons download error"
-msgstr "Fehler beim Herunterladen der Erweiterungssymbole"
-
-msgid "JOSM failed to download plugin icons:"
-msgstr "JOSM konnte Erweiterungssymbole nicht herunterladen:"
-
 msgid ""
 "Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
 "plugin site ''{1}''."
@@ -15676,8 +15710,12 @@ msgstr ""
 "Erstellen und Bearbeiten von Adressinformationen und Gebäuden in der "
 "Tschechischen Republik."
 
-msgid "Allows to import various file formats into JOSM directly."
-msgstr "Ermöglicht den direkten Import verschiedener Dateiformate in JOSM."
+msgid ""
+"Allows to import various file formats into JOSM directly. Currently "
+"supported: TangoGPS, Garmin Trainings Center TCX."
+msgstr ""
+"Ermöglicht das Importieren von verschiedenen Dateiformaten direkt in JOSM. "
+"Derzeit unterstützt: TangoGPS, Garmin Trainings Center TCX."
 
 msgid "Download your GPX tracks from openstreetmap.org"
 msgstr "Eigene GPS-Tracks von openstreetmap.org herunterladen"
@@ -15795,6 +15833,14 @@ msgid "A helper for IRS satellite adjustment."
 msgstr "Eine Hilfe zum Ausrichten von IRS-Satellitenbildern."
 
 msgid ""
+"Provides Java Native Access (JNA) library. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+"Stellt die Java Native Access (JNA) Bibliothek bereit. Nicht bestimmt zur "
+"direkten Installation durch Benutzer, sondern als Abhängigkeit für andere "
+"Erweiterungen."
+
+msgid ""
 "Provides Java Topology Suite (JTS) library and related utilities. Not meant "
 "to be installed directly by users, but rather as a dependency for other "
 "plugins."
@@ -16040,7 +16086,7 @@ msgid "Plugin to digital sign OSM-Data"
 msgstr "Plugin zum digitalen Signieren von OSM-Daten"
 
 msgid "${plugin.description}"
-msgstr ""
+msgstr "${plugin.description}"
 
 msgid ""
 "Provides a straightforward GUI for adding, editing and deleting turn lanes."
@@ -16219,6 +16265,25 @@ msgstr "Beleuchtet"
 msgid "Width (meters)"
 msgstr "Breite (Meter)"
 
+msgid "Sidewalk"
+msgstr "Bürgersteig"
+
+msgctxt "sidewalk"
+msgid "both"
+msgstr "beidseits"
+
+msgctxt "sidewalk"
+msgid "left"
+msgstr "links"
+
+msgctxt "sidewalk"
+msgid "right"
+msgstr "rechts"
+
+msgctxt "sidewalk"
+msgid "no"
+msgstr "nein"
+
 msgid "Service type"
 msgstr "Service-Typ"
 
@@ -16226,7 +16291,7 @@ msgid "yard"
 msgstr "Rangiergleis"
 
 msgid "siding"
-msgstr "Abstellgleis"
+msgstr "Nebengleis"
 
 msgid "spur"
 msgstr "Firmenanschlussgleis"
@@ -16585,15 +16650,19 @@ msgstr "Mo-Fr 09:00-18:00,Sa 08:00-14:00"
 msgid "May-Sep 09:30-12:30,14:15-19:30"
 msgstr "May-Sep 09:30-12:30,14:15-19:30"
 
+msgctxt "parking"
 msgid "multi-storey"
 msgstr "Parkhaus"
 
+msgctxt "parking"
 msgid "surface"
-msgstr "ebenerdig"
+msgstr "Oberfläche"
 
+msgctxt "parking"
 msgid "underground"
 msgstr "Tiefgarage"
 
+msgctxt "parking"
 msgid "rooftop"
 msgstr "Hausdach"
 
@@ -17051,14 +17120,25 @@ msgstr "Max. Länge (Meter)"
 msgid "Overtaking"
 msgstr "Überholen"
 
+msgctxt "overtaking"
+msgid "yes"
+msgstr "ja"
+
+msgctxt "overtaking"
 msgid "both"
 msgstr "beidseits"
 
+msgctxt "overtaking"
 msgid "forward"
-msgstr "Vorwärts"
+msgstr "vorwärts"
 
+msgctxt "overtaking"
 msgid "backward"
-msgstr "Rückwärts"
+msgstr "rückwärts"
+
+msgctxt "overtaking"
+msgid "no"
+msgstr "nein"
 
 msgid "Roundabout"
 msgstr "Kreisverkehr"
@@ -17248,7 +17328,7 @@ msgid "lane"
 msgstr "Fahrspur"
 
 msgid "track"
-msgstr "Weg"
+msgstr "Radweg"
 
 msgid "opposite_lane"
 msgstr "Fahrspur (Gegenrichtung)"
@@ -17367,6 +17447,12 @@ msgstr "Ampel für Füßgänger, Fahrrad, Pferd (Pegasus)"
 msgid "tiger"
 msgstr "Zebrastreifen (Tiger)"
 
+msgid "Button operated"
+msgstr "Knopfbetätigt"
+
+msgid "Sound signals"
+msgstr "akustisches Warnsignal"
+
 msgid "Crossing attendant"
 msgstr "Schülerlotse"
 
@@ -17828,7 +17914,7 @@ msgid "Turning Point"
 msgstr "Wendepunkt"
 
 msgid "Slipway"
-msgstr "Bootshebeanlage"
+msgstr "Slipanlage"
 
 msgid "Boatyard"
 msgstr "Bootswerft"
@@ -17896,9 +17982,6 @@ msgstr "Bahnübergang"
 msgid "Traffic lights"
 msgstr "Lichtsignal"
 
-msgid "Sound signals"
-msgstr "akustisches Warnsignal"
-
 msgid "Barrier"
 msgstr "Barriere"
 
@@ -19898,7 +19981,7 @@ msgstr "Studentenwohnheim"
 
 msgctxt "building"
 msgid "terrace"
-msgstr "Terrasse"
+msgstr "Reihenhaus"
 
 msgctxt "building"
 msgid "detached"
@@ -19960,6 +20043,9 @@ msgstr "Windmühle"
 msgid "Gasometer"
 msgstr "Gasometer"
 
+msgid "Bunker Silo"
+msgstr "Fahrsilo"
+
 msgid "Pipeline"
 msgstr "Pipeline"
 
@@ -20106,15 +20192,15 @@ msgstr "Beobachtungs-/Messstation"
 msgid "Monitoring:"
 msgstr "Beobachtung:"
 
-msgid "Weather"
-msgstr "Wetter"
-
 msgid "Water level"
 msgstr "Pegel/Wasserstand"
 
 msgid "Tide Level"
 msgstr "Gezeitenhub"
 
+msgid "Groundwater"
+msgstr "Grundwasser"
+
 msgid "Traffic"
 msgstr "Verkehr"
 
@@ -20133,6 +20219,9 @@ msgstr "GLONASS-Signale"
 msgid "Galileo Signals"
 msgstr "Galileo-Signale"
 
+msgid "Weather"
+msgstr "Wetter"
+
 msgid "Radiation"
 msgstr "Strahlung"
 
@@ -20313,6 +20402,9 @@ msgstr "Endportal"
 msgid "pivot_pier"
 msgstr "Drehpfeiler"
 
+msgid "Bridge outline"
+msgstr "Brückenumriss"
+
 msgid "Power Plant"
 msgstr "Kraftwerk"
 
@@ -20922,6 +21014,15 @@ msgstr "Unvollständiger Mast"
 msgid "Pole"
 msgstr "Kleiner Freileitungsmast"
 
+msgid "Pole with Transformer"
+msgstr "Kleiner Freileitungsmast mit Transformator"
+
+msgid "Pole Attributes:"
+msgstr "Mast-Attribute:"
+
+msgid "Transformer Attributes:"
+msgstr "Transformator-Attribute"
+
 msgid "Power Line"
 msgstr "Stromleitung"
 
@@ -20971,11 +21072,17 @@ msgstr "Wird für Datenkommunikation genutzt"
 msgid "Power Cable"
 msgstr "Stromkabel"
 
+msgctxt "power cable"
+msgid "underground"
+msgstr "unterirdisch"
+
+msgctxt "power cable"
 msgid "underwater"
 msgstr "unter Wasser"
 
+msgctxt "power cable"
 msgid "overground"
-msgstr "oberirdisch"
+msgstr "überirdisch"
 
 msgid "Historic Places"
 msgstr "Historische Stätten"
@@ -21001,6 +21108,33 @@ msgstr "monumentale Gedenkstätte"
 msgid "Memorial"
 msgstr "Gedenkstätte"
 
+msgctxt "memorial"
+msgid "statue"
+msgstr "Statue"
+
+msgctxt "memorial"
+msgid "bust"
+msgstr "Büste"
+
+msgctxt "memorial"
+msgid "plaque"
+msgstr "Plakette"
+
+msgctxt "memorial"
+msgid "stele"
+msgstr "Stele"
+
+msgctxt "memorial"
+msgid "stone"
+msgstr "Stein"
+
+msgctxt "memorial"
+msgid "war_memorial"
+msgstr "Kriegerdenkmal"
+
+msgid "Inscription"
+msgstr "Inschrift"
+
 msgid "Wayside Cross"
 msgstr "Wegkreuz"
 
@@ -21070,6 +21204,9 @@ msgstr "Spirituosen"
 msgid "Beverages"
 msgstr "Getränke"
 
+msgid "Wine"
+msgstr "Wein"
+
 msgid "Boutique"
 msgstr "Boutique"
 
@@ -21115,6 +21252,9 @@ msgstr "Video"
 msgid "Video Games"
 msgstr "Videospiele"
 
+msgid "Music"
+msgstr "Musik"
+
 msgid "Cash"
 msgstr "Geld"
 
@@ -21142,6 +21282,9 @@ msgstr "Küchenstudio"
 msgid "Curtain"
 msgstr "Gardinen"
 
+msgid "Art"
+msgstr "Kunst"
+
 msgid "Frame"
 msgstr "Bilderrahmen"
 
@@ -21187,6 +21330,9 @@ msgstr "Friseur"
 msgid "Beauty"
 msgstr "Schönheitssalon"
 
+msgid "Tattoo"
+msgstr "Tätowierstudio"
+
 msgid "Optician"
 msgstr "Optiker"
 
@@ -21238,6 +21384,9 @@ msgstr "Taschen"
 msgid "Pet"
 msgstr "Tierhandlung"
 
+msgid "Funeral Directors"
+msgstr "Bestattungsunternehmer"
+
 msgid "Vending Machine"
 msgstr "Verkaufsautomat"
 
@@ -21337,6 +21486,15 @@ msgstr "Postleitzahl"
 msgid "National Park"
 msgstr "Nationalpark"
 
+msgid "Protected Area"
+msgstr "Schutzgebiet"
+
+msgid "Protected Class"
+msgstr "Schutzklasse"
+
+msgid "Title or type of protection"
+msgstr "Titel oder Art des Schutzes"
+
 msgid "Places"
 msgstr "Orte"
 
@@ -22430,8 +22588,14 @@ msgstr "Estland Basiskarte (Maaamet)"
 msgid "Estonia Ortho (Maaamet)"
 msgstr "Estland Orthofoto (Maaamet)"
 
-msgid "Estonia Multi (Maaamet)"
-msgstr "Estland Multi (Maaamet)"
+msgid "Estonia Hillshade (Maaamet)"
+msgstr ""
+
+msgid "Estonia Cadastre (Maaamet)"
+msgstr ""
+
+msgid "Estonia Forestry (Maaamet)"
+msgstr ""
 
 msgid "Bordeaux - 2012"
 msgstr "Bordeaux - 2012"
@@ -22454,8 +22618,8 @@ msgstr "CRAIG - Le Puy 2010 - 15 cm"
 msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
 msgstr "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
 
-msgid "CUGN Nancy - Orthophoto 2012"
-msgstr "CUGN Nancy - Orthophoto 2012"
+msgid "GrandNancy Orthophotographie 2012"
+msgstr "GroßNancy Orthofoto 2012"
 
 msgid "Géobretagne - Brest 2010 - 10 cm"
 msgstr "Géobretagne - Brest 2010 - 10 cm"
@@ -22503,9 +22667,6 @@ msgstr ""
 "Vercors - Réserve naturelle des Hauts-Plateaux du Vercors - Orthophotos 1999 "
 "- 1 m"
 
-msgid "Streets NRW Geofabrik.de"
-msgstr "Straßen.NRW Geofabrik.de"
-
 msgid "Hike & Bike"
 msgstr "Hike & Bike"
 
@@ -22567,6 +22728,9 @@ msgstr "NRW-Atlas: Luftbilder"
 msgid "NRW-Atlas: Topographische Karte 1:10000"
 msgstr "NRW-Atlas: Topographische Karte 1:10000"
 
+msgid "Metropole Ruhr: Luftbilder (10 cm)"
+msgstr "Metropole Ruhr: Luftbilder (10 cm)"
+
 msgid "Drone Imagery (Haiti)"
 msgstr "Drone Imagery (Haiti)"
 
@@ -22768,6 +22932,9 @@ msgstr "Stadtplan Zürich"
 msgid "Stadt Zürich Übersichtsplan (Strassen, Gebäude, Hausnummer)"
 msgstr "Stadt Zürich Übersichtsplan (Strassen, Gebäude, Hausnummer)"
 
+msgid "Stadt Zürich Luftbild 2011"
+msgstr "Stadt Zürich Luftbild 2011"
+
 msgid "Orthofoto Kanton Solothurn RGB (SOGIS 2011/2012/2013)"
 msgstr "Orthofoto Kanton Solothurn RGB (SOGIS 2011/2012/2013)"
 
@@ -22786,8 +22953,8 @@ msgstr "Kanton Jura 50cm (RCJU 1998)"
 msgid "Canton de Fribourg 50cm (2005)"
 msgstr "Kanton Freiburg 50cm (2005)"
 
-msgid "Stadt Bern 10cm/25cm (2008)"
-msgstr "Stadt Bern 10cm/25cm (2008)"
+msgid "Stadt Bern 10cm/25cm (2012)"
+msgstr "Stadt Bern 10cm/25cm (2012)"
 
 msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
 msgstr "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
@@ -22825,8 +22992,8 @@ msgstr "USGS Large Scale Imagery"
 msgid "OSM US TIGER 2012 Roads Overlay"
 msgstr "OSM US TIGER 2012 Straßeneinblendung"
 
-msgid "New & Misaligned TIGER Roads (TIGER 2013)"
-msgstr "New & Misaligned TIGER Roads (TIGER 2013)"
+msgid "New & Misaligned TIGER Roads (TIGER 2014)"
+msgstr "Neue und falsch ausgerichtete TIGER Straßen (TIGER 2014)"
 
 msgid "MassGIS L3 Parcels"
 msgstr "MassGIS L3 Parzellen"
@@ -22873,9 +23040,234 @@ msgstr "OS Scottish Popular historic"
 msgid "NLS - Bartholomew Half Inch, 1897-1907"
 msgstr "NLS - Bartholomew Half Inch, 1897-1907"
 
+msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgstr "OS Stadtpläne, Aberdeen 1866-1867 (NLS)"
+
+msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgstr "OS Stadtpläne, Airdrie 1858 (NLS)"
+
+msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgstr "OS Stadtpläne, Alexandria 1859 (NLS)"
+
+msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgstr "OS Stadtpläne, Alloa 1861-1862 (NLS)"
+
+msgid "OS Town Plans, Annan 1859 (NLS)"
+msgstr "OS Stadtpläne, Annan 1859 (NLS)"
+
+msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgstr "OS Stadtpläne, Arbroath 1858 (NLS)"
+
+msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgstr "OS Stadtpläne, Ayr 1855 (NLS)"
+
+msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgstr "OS Stadtpläne, Berwick-upon-Tweed 1852 (NLS)"
+
+msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgstr "OS Stadtpläne, Brechin 1862 (NLS)"
+
+msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgstr "OS Stadtpläne, Burntisland 1894 (NLS)"
+
+msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgstr "OS Stadtpläne, Campbelton 1865 (NLS)"
+
+msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgstr "OS Stadtpläne, Coatbridge 1858 (NLS)"
+
 msgid "OS Town Plans, Cupar 1854 (NLS)"
 msgstr "OS Town Plans, Cupar 1854 (NLS)"
 
+msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgstr "OS Stadtpläne, Cupar 1893-1894 (NLS)"
+
+msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgstr "OS Stadtpläne, Dalkeith 1852 (NLS)"
+
+msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgstr "OS Stadtpläne, Dalkeith 1893 (NLS)"
+
+msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgstr "OS Stadtpläne, Dumbarton 1859 (NLS)"
+
+msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgstr "OS Stadtpläne, Dumfries 1850 (NLS)"
+
+msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgstr "OS Stadtpläne, Dumfries 1893 (NLS)"
+
+msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgstr "OS Stadtpläne, Dundee 1857-1858 (NLS)"
+
+msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgstr "OS Stadtpläne, Dundee 1870-1872 (NLS)"
+
+msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgstr "OS Stadtpläne, Dunfermline 1854 (NLS)"
+
+msgid "OS Town Plans, Dunfermline 1894 (NLS)"
+msgstr "OS Stadtpläne, Dunfermline 1894 (NLS)"
+
+msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
+msgstr "OS Stadtpläne, Edinburgh 1849-1851 (NLS)"
+
+msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
+msgstr "OS Stadtpläne, Edinburgh 1876-1877 (NLS)"
+
+msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
+msgstr "OS Stadtpläne, Edinburgh 1893-1894 (NLS)"
+
+msgid "OS Town Plans, Elgin 1868 (NLS)"
+msgstr "OS Stadtpläne, Elgin 1868 (NLS)"
+
+msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
+msgstr "OS Stadtpläne, Falkirk 1858-1859 (NLS)"
+
+msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
+msgstr "OS Stadtpläne, Forfar 1860-1861 (NLS)"
+
+msgid "OS Town Plans, Forres 1868 (NLS)"
+msgstr "OS Stadtpläne, Forres 1868 (NLS)"
+
+msgid "OS Town Plans, Galashiels 1858 (NLS)"
+msgstr "OS Stadtpläne, Galashiels 1858 (NLS)"
+
+msgid "OS Town Plans, Girvan 1857 (NLS)"
+msgstr "OS Stadtpläne, Girvan 1857 (NLS)"
+
+msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
+msgstr "OS Stadtpläne, Glasgow 1857-1858 (NLS)"
+
+msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
+msgstr "OS Stadtpläne, Glasgow 1892-1894 (NLS)"
+
+msgid "OS Town Plans, Greenock 1857 (NLS)"
+msgstr "OS Stadtpläne, Greenock 1857 (NLS)"
+
+msgid "OS Town Plans, Haddington 1853 (NLS)"
+msgstr "OS Stadtpläne, Haddington 1853 (NLS)"
+
+msgid "OS Town Plans, Haddington 1893 (NLS)"
+msgstr "OS Stadtpläne, Haddington 1893 (NLS)"
+
+msgid "OS Town Plans, Hamilton 1858 (NLS)"
+msgstr "OS Stadtpläne, Hamilton 1858 (NLS)"
+
+msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
+msgstr "OS Stadtpläne, Hawick 1857-1858 (NLS)"
+
+msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
+msgstr "OS Stadtpläne, Inverness 1867-1868 (NLS)"
+
+msgid "OS Town Plans, Irvine 1859 (NLS)"
+msgstr "OS Stadtpläne, Irvine 1859 (NLS)"
+
+msgid "OS Town Plans, Jedburgh 1858 (NLS)"
+msgstr "OS Stadtpläne, Jedburgh 1858 (NLS)"
+
+msgid "OS Town Plans, Kelso 1857 (NLS)"
+msgstr "OS Stadtpläne, Kelso 1857 (NLS)"
+
+msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
+msgstr "OS Stadtpläne, Kilmarnock 1857-1859 (NLS)"
+
+msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
+msgstr "OS Stadtpläne, Kirkcaldy 1855 (NLS)"
+
+msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
+msgstr "OS Stadtpläne, Kirkcaldy 1894 (NLS)"
+
+msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
+msgstr "OS Stadtpläne, Kirkcudbright 1850 (NLS)"
+
+msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
+msgstr "OS Stadtpläne, Kirkcudbright 1893 (NLS)"
+
+msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
+msgstr "OS Stadtpläne, Kirkintilloch 1859 (NLS)"
+
+msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
+msgstr "OS Stadtpläne, Kirriemuir 1861 (NLS)"
+
+msgid "OS Town Plans, Lanark 1858 (NLS)"
+msgstr "OS Stadtpläne, Lanark 1858 (NLS)"
+
+msgid "OS Town Plans, Linlithgow 1856 (NLS)"
+msgstr "OS Stadtpläne, Linlithgow 1856 (NLS)"
+
+msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
+msgstr "OS Stadtpläne, Mayole 1856-1857 (NLS)"
+
+msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
+msgstr "OS Stadtpläne, Montrose 1861-1862 (NLS)"
+
+msgid "OS Town Plans, Musselburgh 1853 (NLS)"
+msgstr "OS Stadtpläne, Musselburgh 1853 (NLS)"
+
+msgid "OS Town Plans, Musselburgh 1893 (NLS)"
+msgstr "OS Stadtpläne, Musselburgh 1893 (NLS)"
+
+msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
+msgstr "OS Stadtpläne, Nairn 1867-1868 (NLS)"
+
+msgid "OS Town Plans, Oban 1867-1868 (NLS)"
+msgstr "OS Stadtpläne, Oban 1867-1868 (NLS)"
+
+msgid "OS Town Plans, Peebles 1856 (NLS)"
+msgstr "OS Stadtpläne, Peebles 1856 (NLS)"
+
+msgid "OS Town Plans, Perth 1860 (NLS)"
+msgstr "OS Stadtpläne, Perth 1860 (NLS)"
+
+msgid "OS Town Plans, Peterhead 1868 (NLS)"
+msgstr "OS Stadtpläne, Peterhead 1868 (NLS)"
+
+msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
+msgstr "OS Stadtpläne, Port Glasgow 1856-1857 (NLS)"
+
+msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
+msgstr "OS Stadtpläne, Portobello 1893-1894 (NLS)"
+
+msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
+msgstr "OS Stadtpläne, Rothesay 1862-1863 (NLS)"
+
+msgid "OS Town Plans, Selkirk 1865 (NLS)"
+msgstr "OS Stadtpläne, Selkirk 1865 (NLS)"
+
+msgid "OS Town Plans, St Andrews 1854 (NLS)"
+msgstr "OS Stadtpläne, St Andrews 1854 (NLS)"
+
+msgid "OS Town Plans, St Andrews 1893 (NLS)"
+msgstr "OS Stadtpläne, St Andrews 1893 (NLS)"
+
+msgid "OS Town Plans, Stirling 1858 (NLS)"
+msgstr "OS Stadtpläne, Stirling 1858 (NLS)"
+
+msgid "OS Town Plans, Stonehaven 1864 (NLS)"
+msgstr "OS Stadtpläne, Stonehaven 1864 (NLS)"
+
+msgid "OS Town Plans, Stranraer 1847 (NLS)"
+msgstr "OS Stadtpläne, Stranraer 1847 (NLS)"
+
+msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
+msgstr "OS Stadtpläne, Stranraer 1863-1877 (NLS)"
+
+msgid "OS Town Plans, Stranraer 1893 (NLS)"
+msgstr "OS Stadtpläne, Stranraer 1893 (NLS)"
+
+msgid "OS Town Plans, Strathaven 1858 (NLS)"
+msgstr "OS Stadtpläne, Strathaven 1858 (NLS)"
+
+msgid "OS Town Plans, Wick 1872 (NLS)"
+msgstr "OS Stadtpläne, Wick 1872 (NLS)"
+
+msgid "OS Town Plans, Wigtown 1848 (NLS)"
+msgstr "OS Stadtpläne, Wigtown 1848 (NLS)"
+
+msgid "OS Town Plans, Wigtown 1894 (NLS)"
+msgstr "OS Stadtpläne, Wigtown 1894 (NLS)"
+
 msgid "Decreasing house numbers in addresses interpolation"
 msgstr "Absteigende Hausnummern in Adressinterpolation"
 
@@ -22934,9 +23326,10 @@ msgid "{0}={1} is deprecated. Please use instead a multipolygon."
 msgstr "{0}={1} ist veraltet. Bitte stattdessen ein Multipolygon verwenden."
 
 msgid ""
-"{0} is deprecated. Please specify ìnterval by using opening_hours syntax"
+"{0} is deprecated. Please specify interval by using opening_hours syntax"
 msgstr ""
-"{0} ist veraltet. Bitte das Intervall mit der opening_hours-Syntax angeben"
+"{0} ist veraltet. Bitte gib das Intervall mithilfe der Öffnungszeiten-Syntax "
+"an."
 
 msgid ""
 "{0} is deprecated. Please delete this object and use a private layer instead"
@@ -22944,12 +23337,35 @@ msgstr ""
 "{0} ist veraltet. Bitte das Objekt löschen und stattdessen eine private "
 "Ebene verwenden"
 
+msgid "{0}={1} is unspecific. Please replace ''{1}'' by a specific value."
+msgstr ""
+"{0}={1} is ungenau. Bitte ersetze ''{1}'' durch einen speziellen Wert."
+
+msgid "{0} should be replaced with {1}"
+msgstr "{0} sollte mit {1} ersetzt werden"
+
+msgid ""
+"{0}={1} is unspecific. Please replace ''{1}'' by ''left'', ''right'' or "
+"''both''."
+msgstr ""
+"{0}={1} ist unspezifisch. Bitte ersetze ''{1}'' durch ''left'', ''right'' "
+"oder ''both''."
+
+msgid "{0} on a node. Should be used on a way."
+msgstr "{0} auf einem Knotenpunkt. Sollte auf einem Weg verwendet werden."
+
+msgid "{0} on a node. Should be drawn as an area."
+msgstr "{0} auf einem Knotenpunkt. Sollte als eine Fläche gezeichnet werden."
+
+msgid "{0}=* on a node. Should be used in a relation"
+msgstr "{0}=* auf einem Punkt. Sollte in einer Relation verwendet werden."
+
+msgid "{0} on a way. Should be used in a relation"
+msgstr "{0} auf einem Weg. Sollte in einer Relation verwendet werden"
+
 msgid "{0} on a node"
 msgstr "{0} auf einem Punkt"
 
-msgid "{0} on a node. Should be drawn as an area"
-msgstr "{0} an einem Punkt. Sollte als Fläche gezeichnet werden."
-
 msgid "Building inside building"
 msgstr "Gebäude im Gebäude"
 
@@ -24327,9 +24743,12 @@ 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 ""
+"Lass uns wissen, was du gerade gemacht hast und was dabei passiert ist. Füge "
+"den folgenden Text dem Fehlerbericht hinzu sodass wir die Quelle des Fehlers "
+"finden können."
 
 msgid "Area detection algorithm settings."
-msgstr ""
+msgstr "Gebietserkennungsalgorithmus-Einstellungen."
 
 msgid "Algorithm Settings"
 msgstr "Algorithmus-Einstellungen"
@@ -28039,6 +28458,9 @@ msgstr "Haltestellen vorschlagen"
 msgid "Find"
 msgstr "Suchen"
 
+msgid "Show"
+msgstr "Anzeigen"
+
 msgid "Mark"
 msgstr "Markierung"
 
diff --git a/i18n/po/de_DE.po b/i18n/po/de_DE.po
index 996406b..c0a97b2 100644
--- a/i18n/po/de_DE.po
+++ b/i18n/po/de_DE.po
@@ -1,8 +1,13 @@
+# German (Germany) translation for josm
+# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
+# This file is distributed under the same license as the josm package.
+# FIRST AUTHOR <EMAIL at ADDRESS>, 2009.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-21 03:38+0200\n"
+"POT-Creation-Date: 2014-12-10 03:42+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"
@@ -10,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-10-21 05:36+0000\n"
-"X-Generator: Launchpad (build 17203)\n"
+"X-Launchpad-Export-Date: 2014-12-10 05:22+0000\n"
+"X-Generator: Launchpad (build 17283)\n"
 "Language: \n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -169,16 +174,6 @@ msgid "About JOSM..."
 msgstr "Über JOSM ..."
 
 msgid ""
-"Unexpected format of API base URL. Redirection to info or history page for "
-"OSM object will probably fail. API base URL is: ''{0}''"
-msgstr ""
-
-msgid ""
-"Unexpected format of API base URL. Redirection to user page for OSM user "
-"will probably fail. API base URL is: ''{0}''"
-msgstr ""
-
-msgid ""
 "You are about to launch {0} browser window.<br>This may both clutter your "
 "screen with browser windows<br>and take some time to finish."
 msgid_plural ""
@@ -1528,6 +1523,15 @@ msgstr ""
 msgid "Nothing to upload. Get some data first."
 msgstr ""
 
+msgid "Upload note changes to server"
+msgstr ""
+
+msgid "Upload notes"
+msgstr ""
+
+msgid "Uploading notes to server"
+msgstr ""
+
 msgid "Upload selection"
 msgstr ""
 
@@ -1800,10 +1804,16 @@ msgstr ""
 msgid "Click the location where you wish to create a new note"
 msgstr ""
 
-msgid "Enter a comment for a new note"
+msgid "Create new note"
 msgstr ""
 
-msgid "Create new note"
+msgid "Create note"
+msgstr ""
+
+msgid "Enter a detailed comment to create a note"
+msgstr ""
+
+msgid "You must enter a comment to create a new note"
 msgstr ""
 
 msgid "Delete Mode"
@@ -2674,6 +2684,15 @@ msgstr ""
 msgid "Cycling dependencies"
 msgstr ""
 
+msgid "Uploading modified notes"
+msgstr ""
+
+msgid "Note {0} failed: {1}"
+msgstr ""
+
+msgid "Notes failed to upload"
+msgstr ""
+
 msgid ""
 "The following are results of automatic validation. Try fixing these, but be "
 "careful (don''t destroy valid data). When in doubt ignore them.<br>When you "
@@ -4903,6 +4922,12 @@ msgstr ""
 msgid "Conflict foreground: keep all tags"
 msgstr ""
 
+msgid "Conflict background: sum all numeric tags"
+msgstr ""
+
+msgid "Conflict foreground: sum all numeric tags"
+msgstr ""
+
 msgid "Conflict background: keep member"
 msgstr ""
 
@@ -5321,12 +5346,19 @@ msgstr ""
 msgid "all"
 msgstr ""
 
+msgid "sum"
+msgstr ""
+
 msgid "Please decide which values to keep"
 msgstr ""
 
 msgid "Value ''{0}'' is going to be applied for key ''{1}''"
 msgstr ""
 
+msgid ""
+"All numeric values sumed as ''{0}'' are going to be applied for key ''{1}''"
+msgstr ""
+
 msgid "The key ''{0}'' and all its values are going to be removed"
 msgstr ""
 
@@ -5689,24 +5721,6 @@ msgstr[1] ""
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
 
-msgid "Display the history of all selected items."
-msgstr ""
-
-msgid "Object with history"
-msgstr ""
-
-msgid "Reload"
-msgstr ""
-
-msgid "Reload all currently selected objects and refresh the list."
-msgstr ""
-
-msgid "Show"
-msgstr ""
-
-msgid "Display the history of the selected objects."
-msgstr ""
-
 msgid "Advanced object info"
 msgstr ""
 
@@ -6044,6 +6058,9 @@ msgstr ""
 msgid "Comment"
 msgstr ""
 
+msgid "Comment on note"
+msgstr ""
+
 msgid "Add comment to note:"
 msgstr ""
 
@@ -6053,9 +6070,6 @@ msgstr ""
 msgid "Close note with message:"
 msgstr ""
 
-msgid "Close Note"
-msgstr ""
-
 msgid "Create a new note"
 msgstr ""
 
@@ -6128,6 +6142,9 @@ msgstr ""
 msgid "Search for objects"
 msgstr ""
 
+msgid "Display the history of the selected objects."
+msgstr ""
+
 msgid "Zoom to selection"
 msgstr ""
 
@@ -6247,6 +6264,9 @@ msgstr ""
 msgid "Updating map ..."
 msgstr ""
 
+msgid "anonymous"
+msgstr ""
+
 msgid "Display the basic properties of the changeset"
 msgstr ""
 
@@ -6259,6 +6279,12 @@ msgstr ""
 msgid "Display the objects created, updated, and deleted by the changeset"
 msgstr ""
 
+msgid "Discussion"
+msgstr ""
+
+msgid "Display the public discussion around this changeset"
+msgstr ""
+
 msgid "Changeset Management Dialog"
 msgstr ""
 
@@ -6316,9 +6342,6 @@ msgctxt "changeset.state"
 msgid "Closed"
 msgstr ""
 
-msgid "anonymous"
-msgstr ""
-
 msgid "ID"
 msgstr ""
 
@@ -6334,6 +6357,9 @@ msgstr ""
 msgid "Closed at"
 msgstr ""
 
+msgid "Discussions"
+msgstr ""
+
 msgid "Downloading changeset content"
 msgstr ""
 
@@ -6445,6 +6471,15 @@ msgid ""
 "layer"
 msgstr ""
 
+msgid "Update changeset discussion"
+msgstr ""
+
+msgid "Update the changeset discussion from the OSM server"
+msgstr ""
+
+msgid "Date"
+msgstr ""
+
 msgid "Download changesets"
 msgstr ""
 
@@ -6862,7 +6897,7 @@ msgstr ""
 msgid "Set number of recently added tags"
 msgstr ""
 
-msgid "Remember last used tags"
+msgid "Remember last used tags after a restart"
 msgstr ""
 
 msgid "Please enter the number of recently added tags to display"
@@ -7208,6 +7243,9 @@ msgstr ""
 msgid "Load parent relations"
 msgstr ""
 
+msgid "Reload"
+msgstr ""
+
 msgid "Loading parent relations"
 msgstr ""
 
@@ -7330,6 +7368,12 @@ msgstr ""
 msgid "Select to download GPS traces in the selected download area."
 msgstr ""
 
+msgid "Notes"
+msgstr ""
+
+msgid "Select to download notes in the selected download area."
+msgstr ""
+
 msgid "Download as new layer"
 msgstr ""
 
@@ -7635,9 +7679,6 @@ msgstr ""
 msgid "B"
 msgstr ""
 
-msgid "Date"
-msgstr ""
-
 msgid ""
 "Failed to update primitive with id {0} because current edit layer is null"
 msgstr ""
@@ -8492,9 +8533,6 @@ msgstr ""
 msgid "Save Layer"
 msgstr ""
 
-msgid "Notes"
-msgstr ""
-
 msgid "Notes layer"
 msgstr ""
 
@@ -8510,9 +8548,6 @@ msgstr ""
 msgid "outside downloaded area"
 msgstr ""
 
-msgid "version {0}"
-msgstr ""
-
 msgid "Merging layers"
 msgstr ""
 
@@ -12138,6 +12173,15 @@ msgstr ""
 msgid "Open changeset expected. Got closed changeset with id {0}."
 msgstr ""
 
+msgid "Note upload failed"
+msgstr ""
+
+msgid "Error parsing note response from server"
+msgstr ""
+
+msgid "Error encoding string: {0}"
+msgstr ""
+
 msgid "(Code={0})"
 msgstr ""
 
@@ -12186,13 +12230,13 @@ msgstr ""
 msgid "Parsing changeset content ..."
 msgstr ""
 
-msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
-msgid "Illegal numeric value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
-msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal numeric value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
 msgid "Missing mandatory attribute ''{0}'' of XML element {1}."
@@ -12984,9 +13028,6 @@ msgstr ""
 msgid "Failed to scan file ''{0}'' for plugin information. Skipping."
 msgstr ""
 
-msgid "Processing plugin site cache icon files..."
-msgstr ""
-
 msgid "Processing plugin files..."
 msgstr ""
 
@@ -13005,12 +13046,6 @@ msgstr ""
 msgid "Details:"
 msgstr ""
 
-msgid "Plugin icons download error"
-msgstr ""
-
-msgid "JOSM failed to download plugin icons:"
-msgstr ""
-
 msgid ""
 "Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
 "plugin site ''{1}''."
@@ -13899,7 +13934,9 @@ msgid ""
 "Creating and handling address nodes and buildings within Czech Republic."
 msgstr ""
 
-msgid "Allows to import various file formats into JOSM directly."
+msgid ""
+"Allows to import various file formats into JOSM directly. Currently "
+"supported: TangoGPS, Garmin Trainings Center TCX."
 msgstr ""
 
 msgid "Download your GPX tracks from openstreetmap.org"
@@ -13996,6 +14033,11 @@ msgid "A helper for IRS satellite adjustment."
 msgstr ""
 
 msgid ""
+"Provides Java Native Access (JNA) library. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
+msgid ""
 "Provides Java Topology Suite (JTS) library and related utilities. Not meant "
 "to be installed directly by users, but rather as a dependency for other "
 "plugins."
@@ -14351,6 +14393,25 @@ msgstr ""
 msgid "Width (meters)"
 msgstr ""
 
+msgid "Sidewalk"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "both"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "left"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "right"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "no"
+msgstr ""
+
 msgid "Service type"
 msgstr ""
 
@@ -14715,15 +14776,19 @@ msgstr ""
 msgid "May-Sep 09:30-12:30,14:15-19:30"
 msgstr ""
 
+msgctxt "parking"
 msgid "multi-storey"
 msgstr ""
 
+msgctxt "parking"
 msgid "surface"
 msgstr ""
 
+msgctxt "parking"
 msgid "underground"
 msgstr ""
 
+msgctxt "parking"
 msgid "rooftop"
 msgstr ""
 
@@ -15181,15 +15246,26 @@ msgstr ""
 msgid "Overtaking"
 msgstr ""
 
+msgctxt "overtaking"
+msgid "yes"
+msgstr ""
+
+msgctxt "overtaking"
 msgid "both"
 msgstr ""
 
+msgctxt "overtaking"
 msgid "forward"
 msgstr ""
 
+msgctxt "overtaking"
 msgid "backward"
 msgstr ""
 
+msgctxt "overtaking"
+msgid "no"
+msgstr ""
+
 msgid "Roundabout"
 msgstr ""
 
@@ -15483,6 +15559,12 @@ msgstr ""
 msgid "tiger"
 msgstr ""
 
+msgid "Button operated"
+msgstr ""
+
+msgid "Sound signals"
+msgstr ""
+
 msgid "Crossing attendant"
 msgstr ""
 
@@ -16004,9 +16086,6 @@ msgstr ""
 msgid "Traffic lights"
 msgstr ""
 
-msgid "Sound signals"
-msgstr ""
-
 msgid "Barrier"
 msgstr ""
 
@@ -18066,6 +18145,9 @@ msgstr ""
 msgid "Gasometer"
 msgstr ""
 
+msgid "Bunker Silo"
+msgstr ""
+
 msgid "Pipeline"
 msgstr ""
 
@@ -18212,15 +18294,15 @@ msgstr ""
 msgid "Monitoring:"
 msgstr ""
 
-msgid "Weather"
-msgstr ""
-
 msgid "Water level"
 msgstr ""
 
 msgid "Tide Level"
 msgstr ""
 
+msgid "Groundwater"
+msgstr ""
+
 msgid "Traffic"
 msgstr ""
 
@@ -18239,6 +18321,9 @@ msgstr ""
 msgid "Galileo Signals"
 msgstr ""
 
+msgid "Weather"
+msgstr ""
+
 msgid "Radiation"
 msgstr ""
 
@@ -18419,6 +18504,9 @@ msgstr ""
 msgid "pivot_pier"
 msgstr ""
 
+msgid "Bridge outline"
+msgstr ""
+
 msgid "Power Plant"
 msgstr ""
 
@@ -19026,6 +19114,15 @@ msgstr ""
 msgid "Pole"
 msgstr ""
 
+msgid "Pole with Transformer"
+msgstr ""
+
+msgid "Pole Attributes:"
+msgstr ""
+
+msgid "Transformer Attributes:"
+msgstr ""
+
 msgid "Power Line"
 msgstr ""
 
@@ -19075,9 +19172,15 @@ msgstr ""
 msgid "Power Cable"
 msgstr ""
 
+msgctxt "power cable"
+msgid "underground"
+msgstr ""
+
+msgctxt "power cable"
 msgid "underwater"
 msgstr ""
 
+msgctxt "power cable"
 msgid "overground"
 msgstr ""
 
@@ -19105,6 +19208,33 @@ msgstr ""
 msgid "Memorial"
 msgstr ""
 
+msgctxt "memorial"
+msgid "statue"
+msgstr ""
+
+msgctxt "memorial"
+msgid "bust"
+msgstr ""
+
+msgctxt "memorial"
+msgid "plaque"
+msgstr ""
+
+msgctxt "memorial"
+msgid "stele"
+msgstr ""
+
+msgctxt "memorial"
+msgid "stone"
+msgstr ""
+
+msgctxt "memorial"
+msgid "war_memorial"
+msgstr ""
+
+msgid "Inscription"
+msgstr ""
+
 msgid "Wayside Cross"
 msgstr ""
 
@@ -19174,6 +19304,9 @@ msgstr ""
 msgid "Beverages"
 msgstr ""
 
+msgid "Wine"
+msgstr ""
+
 msgid "Boutique"
 msgstr ""
 
@@ -19219,6 +19352,9 @@ msgstr ""
 msgid "Video Games"
 msgstr ""
 
+msgid "Music"
+msgstr ""
+
 msgid "Cash"
 msgstr ""
 
@@ -19246,6 +19382,9 @@ msgstr ""
 msgid "Curtain"
 msgstr ""
 
+msgid "Art"
+msgstr ""
+
 msgid "Frame"
 msgstr ""
 
@@ -19291,6 +19430,9 @@ msgstr ""
 msgid "Beauty"
 msgstr ""
 
+msgid "Tattoo"
+msgstr ""
+
 msgid "Optician"
 msgstr ""
 
@@ -19342,6 +19484,9 @@ msgstr ""
 msgid "Pet"
 msgstr ""
 
+msgid "Funeral Directors"
+msgstr ""
+
 msgid "Vending Machine"
 msgstr ""
 
@@ -19441,6 +19586,15 @@ msgstr ""
 msgid "National Park"
 msgstr ""
 
+msgid "Protected Area"
+msgstr ""
+
+msgid "Protected Class"
+msgstr ""
+
+msgid "Title or type of protection"
+msgstr ""
+
 msgid "Places"
 msgstr ""
 
@@ -20517,7 +20671,13 @@ msgstr ""
 msgid "Estonia Ortho (Maaamet)"
 msgstr ""
 
-msgid "Estonia Multi (Maaamet)"
+msgid "Estonia Hillshade (Maaamet)"
+msgstr ""
+
+msgid "Estonia Cadastre (Maaamet)"
+msgstr ""
+
+msgid "Estonia Forestry (Maaamet)"
 msgstr ""
 
 msgid "Bordeaux - 2012"
@@ -20541,7 +20701,7 @@ msgstr ""
 msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
 msgstr ""
 
-msgid "CUGN Nancy - Orthophoto 2012"
+msgid "GrandNancy Orthophotographie 2012"
 msgstr ""
 
 msgid "Géobretagne - Brest 2010 - 10 cm"
@@ -20588,9 +20748,6 @@ msgid ""
 "- 1 m"
 msgstr ""
 
-msgid "Streets NRW Geofabrik.de"
-msgstr ""
-
 msgid "Hike & Bike"
 msgstr ""
 
@@ -20650,6 +20807,9 @@ msgstr ""
 msgid "NRW-Atlas: Topographische Karte 1:10000"
 msgstr ""
 
+msgid "Metropole Ruhr: Luftbilder (10 cm)"
+msgstr ""
+
 msgid "Drone Imagery (Haiti)"
 msgstr ""
 
@@ -20851,6 +21011,9 @@ msgstr ""
 msgid "Stadt Zürich Übersichtsplan (Strassen, Gebäude, Hausnummer)"
 msgstr ""
 
+msgid "Stadt Zürich Luftbild 2011"
+msgstr ""
+
 msgid "Orthofoto Kanton Solothurn RGB (SOGIS 2011/2012/2013)"
 msgstr ""
 
@@ -20869,7 +21032,7 @@ msgstr ""
 msgid "Canton de Fribourg 50cm (2005)"
 msgstr ""
 
-msgid "Stadt Bern 10cm/25cm (2008)"
+msgid "Stadt Bern 10cm/25cm (2012)"
 msgstr ""
 
 msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
@@ -20908,7 +21071,7 @@ msgstr ""
 msgid "OSM US TIGER 2012 Roads Overlay"
 msgstr ""
 
-msgid "New & Misaligned TIGER Roads (TIGER 2013)"
+msgid "New & Misaligned TIGER Roads (TIGER 2014)"
 msgstr ""
 
 msgid "MassGIS L3 Parcels"
@@ -20956,9 +21119,234 @@ msgstr ""
 msgid "NLS - Bartholomew Half Inch, 1897-1907"
 msgstr ""
 
+msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Annan 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgstr ""
+
 msgid "OS Town Plans, Cupar 1854 (NLS)"
 msgstr ""
 
+msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Elgin 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Forres 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Galashiels 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Girvan 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Greenock 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Haddington 1853 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Haddington 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Hamilton 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Irvine 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Jedburgh 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kelso 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Lanark 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Linlithgow 1856 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Musselburgh 1853 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Musselburgh 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Oban 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Peebles 1856 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Perth 1860 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Peterhead 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Selkirk 1865 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, St Andrews 1854 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, St Andrews 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stirling 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stonehaven 1864 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1847 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Strathaven 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wick 1872 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wigtown 1848 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wigtown 1894 (NLS)"
+msgstr ""
+
 msgid "Decreasing house numbers in addresses interpolation"
 msgstr ""
 
@@ -21012,17 +21400,37 @@ msgid "{0}={1} is deprecated. Please use instead a multipolygon."
 msgstr ""
 
 msgid ""
-"{0} is deprecated. Please specify ìnterval by using opening_hours syntax"
+"{0} is deprecated. Please specify interval by using opening_hours syntax"
 msgstr ""
 
 msgid ""
 "{0} is deprecated. Please delete this object and use a private layer instead"
 msgstr ""
 
-msgid "{0} on a node"
+msgid "{0}={1} is unspecific. Please replace ''{1}'' by a specific value."
 msgstr ""
 
-msgid "{0} on a node. Should be drawn as an area"
+msgid "{0} should be replaced with {1}"
+msgstr ""
+
+msgid ""
+"{0}={1} is unspecific. Please replace ''{1}'' by ''left'', ''right'' or "
+"''both''."
+msgstr ""
+
+msgid "{0} on a node. Should be used on a way."
+msgstr ""
+
+msgid "{0} on a node. Should be drawn as an area."
+msgstr ""
+
+msgid "{0}=* on a node. Should be used in a relation"
+msgstr ""
+
+msgid "{0} on a way. Should be used in a relation"
+msgstr ""
+
+msgid "{0} on a node"
 msgstr ""
 
 msgid "Building inside building"
@@ -25696,6 +26104,9 @@ msgstr ""
 msgid "Find"
 msgstr ""
 
+msgid "Show"
+msgstr ""
+
 msgid "Mark"
 msgstr ""
 
diff --git a/i18n/po/el.po b/i18n/po/el.po
index ec3ad34..54d19b0 100644
--- a/i18n/po/el.po
+++ b/i18n/po/el.po
@@ -1,17 +1,22 @@
+# Greek translation for josm
+# Copyright (c) 2008 Rosetta Contributors and Canonical Ltd 2008
+# This file is distributed under the same license as the josm package.
+# FIRST AUTHOR <EMAIL at ADDRESS>, 2008.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-21 03:38+0200\n"
-"PO-Revision-Date: 2014-09-04 14:40+0000\n"
+"POT-Creation-Date: 2014-12-10 03:42+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"
 "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-10-21 04:54+0000\n"
-"X-Generator: Launchpad (build 17203)\n"
+"X-Launchpad-Export-Date: 2014-12-10 04:49+0000\n"
+"X-Generator: Launchpad (build 17283)\n"
 "Language: el\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -173,16 +178,6 @@ msgid "About JOSM..."
 msgstr "Περί του JOSM..."
 
 msgid ""
-"Unexpected format of API base URL. Redirection to info or history page for "
-"OSM object will probably fail. API base URL is: ''{0}''"
-msgstr ""
-
-msgid ""
-"Unexpected format of API base URL. Redirection to user page for OSM user "
-"will probably fail. API base URL is: ''{0}''"
-msgstr ""
-
-msgid ""
 "You are about to launch {0} browser window.<br>This may both clutter your "
 "screen with browser windows<br>and take some time to finish."
 msgid_plural ""
@@ -1645,6 +1640,15 @@ msgstr "Δεν υπάρχουν αλλαγές προς αποστολή"
 msgid "Nothing to upload. Get some data first."
 msgstr "Τίποτα για αποστολή. Κάντε λήψη δεδομένων πρώτα."
 
+msgid "Upload note changes to server"
+msgstr ""
+
+msgid "Upload notes"
+msgstr ""
+
+msgid "Uploading notes to server"
+msgstr ""
+
 msgid "Upload selection"
 msgstr "Αποστολή επιλογής"
 
@@ -1933,10 +1937,16 @@ msgstr ""
 msgid "Click the location where you wish to create a new note"
 msgstr ""
 
-msgid "Enter a comment for a new note"
+msgid "Create new note"
 msgstr ""
 
-msgid "Create new note"
+msgid "Create note"
+msgstr ""
+
+msgid "Enter a detailed comment to create a note"
+msgstr ""
+
+msgid "You must enter a comment to create a new note"
 msgstr ""
 
 msgid "Delete Mode"
@@ -2828,6 +2838,15 @@ msgstr "...αναφέρεται στη σχέση"
 msgid "Cycling dependencies"
 msgstr "Κυκλικές εξαρτήσεις"
 
+msgid "Uploading modified notes"
+msgstr ""
+
+msgid "Note {0} failed: {1}"
+msgstr ""
+
+msgid "Notes failed to upload"
+msgstr ""
+
 msgid ""
 "The following are results of automatic validation. Try fixing these, but be "
 "careful (don''t destroy valid data). When in doubt ignore them.<br>When you "
@@ -3042,8 +3061,8 @@ msgstr[1] ""
 
 msgid "Selected {0} object"
 msgid_plural "Selected {0} objects"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Επιλέχτηκε {0} αντικείμενο"
+msgstr[1] "Επιλέχτηκαν {0} αντικείμενα"
 
 msgid "Sequence: {0}"
 msgstr ""
@@ -5128,6 +5147,12 @@ msgstr ""
 msgid "Conflict foreground: keep all tags"
 msgstr ""
 
+msgid "Conflict background: sum all numeric tags"
+msgstr ""
+
+msgid "Conflict foreground: sum all numeric tags"
+msgstr ""
+
 msgid "Conflict background: keep member"
 msgstr ""
 
@@ -5549,12 +5574,19 @@ msgstr "καμοία"
 msgid "all"
 msgstr "όλα"
 
+msgid "sum"
+msgstr ""
+
 msgid "Please decide which values to keep"
 msgstr "Παρακαλώ αποφασίστε ποιες τιμές θα μείνουν"
 
 msgid "Value ''{0}'' is going to be applied for key ''{1}''"
 msgstr ""
 
+msgid ""
+"All numeric values sumed as ''{0}'' are going to be applied for key ''{1}''"
+msgstr ""
+
 msgid "The key ''{0}'' and all its values are going to be removed"
 msgstr ""
 
@@ -5921,24 +5953,6 @@ msgstr[1] ""
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
 
-msgid "Display the history of all selected items."
-msgstr "Εμφάνιση του ιστορικού όλων των επιλεγμένων αντικειμένων."
-
-msgid "Object with history"
-msgstr "Αντικείμενο με ιστορικό"
-
-msgid "Reload"
-msgstr "Επαναφόρτωση"
-
-msgid "Reload all currently selected objects and refresh the list."
-msgstr ""
-
-msgid "Show"
-msgstr "Προβολή"
-
-msgid "Display the history of the selected objects."
-msgstr "Προβολή ιστορικού επιλεγμένων αντικειμένων"
-
 msgid "Advanced object info"
 msgstr "Προχωρημένες πληροφορίες αντικειμένου"
 
@@ -6278,6 +6292,9 @@ msgstr ""
 msgid "Comment"
 msgstr "Σχόλιο"
 
+msgid "Comment on note"
+msgstr ""
+
 msgid "Add comment to note:"
 msgstr ""
 
@@ -6287,9 +6304,6 @@ msgstr ""
 msgid "Close note with message:"
 msgstr ""
 
-msgid "Close Note"
-msgstr ""
-
 msgid "Create a new note"
 msgstr ""
 
@@ -6362,6 +6376,9 @@ msgstr "Τρέχουσα επιλογή"
 msgid "Search for objects"
 msgstr "Αναζήτηση για αντικείμενα"
 
+msgid "Display the history of the selected objects."
+msgstr "Προβολή ιστορικού επιλεγμένων αντικειμένων"
+
 msgid "Zoom to selection"
 msgstr "Εστίαση στην επιλογή"
 
@@ -6485,6 +6502,9 @@ msgstr "Διόρθωση ({0}/{1}): ''{2}''"
 msgid "Updating map ..."
 msgstr "Ανανέωση χάρτη ..."
 
+msgid "anonymous"
+msgstr "ανώνυμος"
+
 msgid "Display the basic properties of the changeset"
 msgstr "Εμφάνιση των βασικών ιδιοτήτων της ομάδας αλλαγών"
 
@@ -6499,6 +6519,12 @@ msgstr ""
 "Εμφάνιση των αντικειμένων που δημιουργήθηκαν, ενημερώθηκαν, και διαγράφηκαν "
 "από την ομάδα αλλαγών"
 
+msgid "Discussion"
+msgstr ""
+
+msgid "Display the public discussion around this changeset"
+msgstr ""
+
 msgid "Changeset Management Dialog"
 msgstr ""
 
@@ -6563,9 +6589,6 @@ msgctxt "changeset.state"
 msgid "Closed"
 msgstr "Κλειστή"
 
-msgid "anonymous"
-msgstr "ανώνυμος"
-
 msgid "ID"
 msgstr "Ταυτότητα"
 
@@ -6581,6 +6604,9 @@ msgstr "Δημιουργήθηκε στις"
 msgid "Closed at"
 msgstr "Έκλεισε στις"
 
+msgid "Discussions"
+msgstr ""
+
 msgid "Downloading changeset content"
 msgstr "Γίνεται λήψη περιεχομένου ομάδας αλλαγών"
 
@@ -6692,6 +6718,15 @@ msgid ""
 "layer"
 msgstr ""
 
+msgid "Update changeset discussion"
+msgstr ""
+
+msgid "Update the changeset discussion from the OSM server"
+msgstr ""
+
+msgid "Date"
+msgstr "Ημερομηνία"
+
 msgid "Download changesets"
 msgstr "Λήψη ομάδων αλλαγών"
 
@@ -7114,7 +7149,7 @@ msgstr "Παρακαλώ επιλέξτε μια τιμή"
 msgid "Set number of recently added tags"
 msgstr ""
 
-msgid "Remember last used tags"
+msgid "Remember last used tags after a restart"
 msgstr ""
 
 msgid "Please enter the number of recently added tags to display"
@@ -7466,6 +7501,9 @@ msgstr ""
 msgid "Load parent relations"
 msgstr ""
 
+msgid "Reload"
+msgstr "Επαναφόρτωση"
+
 msgid "Loading parent relations"
 msgstr ""
 
@@ -7592,6 +7630,12 @@ msgstr "Ακατέργαστα δεδομένα GPS"
 msgid "Select to download GPS traces in the selected download area."
 msgstr ""
 
+msgid "Notes"
+msgstr "Χαρτονομίσματα"
+
+msgid "Select to download notes in the selected download area."
+msgstr ""
+
 msgid "Download as new layer"
 msgstr "Λήψη σαν νέο επίπεδο"
 
@@ -7902,9 +7946,6 @@ msgstr ""
 msgid "B"
 msgstr ""
 
-msgid "Date"
-msgstr "Ημερομηνία"
-
 msgid ""
 "Failed to update primitive with id {0} because current edit layer is null"
 msgstr ""
@@ -8807,9 +8848,6 @@ msgstr ""
 msgid "Save Layer"
 msgstr "Αποθήκευση Επιπέδου"
 
-msgid "Notes"
-msgstr "Χαρτονομίσματα"
-
 msgid "Notes layer"
 msgstr ""
 
@@ -8825,9 +8863,6 @@ msgstr "Επίπεδο Δεδομένων {0}"
 msgid "outside downloaded area"
 msgstr "εκτός περιοχής λήψης"
 
-msgid "version {0}"
-msgstr "έκδοση {0}"
-
 msgid "Merging layers"
 msgstr ""
 
@@ -11461,10 +11496,10 @@ msgid "Enable HTTPS support"
 msgstr ""
 
 msgid "Install..."
-msgstr ""
+msgstr "Εγκατάσταση"
 
 msgid "Uninstall..."
-msgstr ""
+msgstr "Απεγκατάσταση"
 
 msgid "Install JOSM localhost certificate to system/browser root keystores"
 msgstr ""
@@ -11756,7 +11791,7 @@ msgid "Warning: illegal format of entry in rule list ''{0}''. Got ''{1}''"
 msgstr ""
 
 msgid "Checks for errors on addresses"
-msgstr ""
+msgstr "Ελέγχει για σφάλματα στις διευθύνσεις"
 
 msgid "Tag combinations"
 msgstr ""
@@ -11765,13 +11800,13 @@ msgid "Checks for missing tag or suspicious combinations"
 msgstr ""
 
 msgid "Deprecated features"
-msgstr ""
+msgstr "Παρωχημένα χαρακτηριστικά"
 
 msgid "Checks for deprecated features"
 msgstr ""
 
 msgid "Geometry"
-msgstr ""
+msgstr "Γεωμετρία"
 
 msgid "Checks for geometry errors"
 msgstr ""
@@ -11813,7 +11848,7 @@ msgid "Checks for unnecessary tags"
 msgstr ""
 
 msgid "Wikipedia"
-msgstr ""
+msgstr "Wikipedia"
 
 msgid "Checks for wrong wikipedia tags"
 msgstr ""
@@ -11873,7 +11908,7 @@ msgid "Delete the selection in the tag table"
 msgstr ""
 
 msgid "Add a new tag"
-msgstr ""
+msgstr "Προσθήκη νέας ετικέτας"
 
 msgid "Paste tags from buffer"
 msgstr ""
@@ -12292,7 +12327,7 @@ msgid "Keywords"
 msgstr "Λέξεις κλειδιά"
 
 msgid "Export options"
-msgstr "Επιλογές εξαγογής"
+msgstr "Επιλογές εξαγωγής"
 
 msgid "Export and Save"
 msgstr "Εξαγωγή και Αποθήκευση"
@@ -12501,6 +12536,15 @@ msgstr ""
 msgid "Open changeset expected. Got closed changeset with id {0}."
 msgstr "Αναμένονταν ανοικτή ομάδα αλλαγών. Ελήφθη κλειστή με id {0}."
 
+msgid "Note upload failed"
+msgstr ""
+
+msgid "Error parsing note response from server"
+msgstr ""
+
+msgid "Error encoding string: {0}"
+msgstr ""
+
 msgid "(Code={0})"
 msgstr ""
 
@@ -12549,13 +12593,13 @@ msgstr ""
 msgid "Parsing changeset content ..."
 msgstr ""
 
-msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
-msgid "Illegal numeric value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
-msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal numeric value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
 msgid "Missing mandatory attribute ''{0}'' of XML element {1}."
@@ -13369,9 +13413,6 @@ msgstr "Επεξεργασία αρχείου ''{0}''"
 msgid "Failed to scan file ''{0}'' for plugin information. Skipping."
 msgstr ""
 
-msgid "Processing plugin site cache icon files..."
-msgstr ""
-
 msgid "Processing plugin files..."
 msgstr "Επεξεργασία αρχείων προσθέτων..."
 
@@ -13390,12 +13431,6 @@ msgstr ""
 msgid "Details:"
 msgstr ""
 
-msgid "Plugin icons download error"
-msgstr ""
-
-msgid "JOSM failed to download plugin icons:"
-msgstr ""
-
 msgid ""
 "Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
 "plugin site ''{1}''."
@@ -14290,8 +14325,10 @@ msgid ""
 "Creating and handling address nodes and buildings within Czech Republic."
 msgstr ""
 
-msgid "Allows to import various file formats into JOSM directly."
-msgstr "Επιτρέπει την εισαγωγή διαφόρων τύπων αρχείων απ’ ευθείας στο JOSM."
+msgid ""
+"Allows to import various file formats into JOSM directly. Currently "
+"supported: TangoGPS, Garmin Trainings Center TCX."
+msgstr ""
 
 msgid "Download your GPX tracks from openstreetmap.org"
 msgstr "Λήψη των δικών σου ιχνών GPX από το openstreetmap.org"
@@ -14387,6 +14424,11 @@ msgid "A helper for IRS satellite adjustment."
 msgstr ""
 
 msgid ""
+"Provides Java Native Access (JNA) library. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
+msgid ""
 "Provides Java Topology Suite (JTS) library and related utilities. Not meant "
 "to be installed directly by users, but rather as a dependency for other "
 "plugins."
@@ -14745,6 +14787,25 @@ msgstr ""
 msgid "Width (meters)"
 msgstr "Πλάτος (μέτρα)"
 
+msgid "Sidewalk"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "both"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "left"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "right"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "no"
+msgstr ""
+
 msgid "Service type"
 msgstr ""
 
@@ -15109,15 +15170,19 @@ msgstr ""
 msgid "May-Sep 09:30-12:30,14:15-19:30"
 msgstr ""
 
+msgctxt "parking"
 msgid "multi-storey"
-msgstr "πολυόροφο"
+msgstr ""
 
+msgctxt "parking"
 msgid "surface"
-msgstr "επιφάνεια"
+msgstr ""
 
+msgctxt "parking"
 msgid "underground"
-msgstr "υπόγειο"
+msgstr ""
 
+msgctxt "parking"
 msgid "rooftop"
 msgstr ""
 
@@ -15427,7 +15492,7 @@ msgid "Tertiary Link"
 msgstr ""
 
 msgid "Unclassified"
-msgstr "Μη κατηγοριοποιημένος"
+msgstr "Αταξινόμητος"
 
 msgid "Passing Places"
 msgstr ""
@@ -15575,15 +15640,26 @@ msgstr ""
 msgid "Overtaking"
 msgstr ""
 
+msgctxt "overtaking"
+msgid "yes"
+msgstr ""
+
+msgctxt "overtaking"
 msgid "both"
 msgstr ""
 
+msgctxt "overtaking"
 msgid "forward"
 msgstr ""
 
+msgctxt "overtaking"
 msgid "backward"
 msgstr ""
 
+msgctxt "overtaking"
+msgid "no"
+msgstr ""
+
 msgid "Roundabout"
 msgstr "Κυκλικός κόμβος"
 
@@ -15877,6 +15953,12 @@ msgstr ""
 msgid "tiger"
 msgstr ""
 
+msgid "Button operated"
+msgstr ""
+
+msgid "Sound signals"
+msgstr ""
+
 msgid "Crossing attendant"
 msgstr ""
 
@@ -16398,9 +16480,6 @@ msgstr "Ισόπεδη διάβαση"
 msgid "Traffic lights"
 msgstr ""
 
-msgid "Sound signals"
-msgstr ""
-
 msgid "Barrier"
 msgstr ""
 
@@ -18460,6 +18539,9 @@ msgstr "Ανεμόμυλος"
 msgid "Gasometer"
 msgstr "Μετρητής Αερίου"
 
+msgid "Bunker Silo"
+msgstr ""
+
 msgid "Pipeline"
 msgstr "Αγωγός"
 
@@ -18606,15 +18688,15 @@ msgstr ""
 msgid "Monitoring:"
 msgstr ""
 
-msgid "Weather"
-msgstr ""
-
 msgid "Water level"
 msgstr ""
 
 msgid "Tide Level"
 msgstr ""
 
+msgid "Groundwater"
+msgstr ""
+
 msgid "Traffic"
 msgstr ""
 
@@ -18633,6 +18715,9 @@ msgstr ""
 msgid "Galileo Signals"
 msgstr ""
 
+msgid "Weather"
+msgstr ""
+
 msgid "Radiation"
 msgstr ""
 
@@ -18813,6 +18898,9 @@ msgstr ""
 msgid "pivot_pier"
 msgstr ""
 
+msgid "Bridge outline"
+msgstr ""
+
 msgid "Power Plant"
 msgstr ""
 
@@ -19420,6 +19508,15 @@ msgstr ""
 msgid "Pole"
 msgstr "Στύλος ρεύματος"
 
+msgid "Pole with Transformer"
+msgstr ""
+
+msgid "Pole Attributes:"
+msgstr ""
+
+msgid "Transformer Attributes:"
+msgstr ""
+
 msgid "Power Line"
 msgstr "Αγωγός Μεταφοράς Ρεύματος"
 
@@ -19469,9 +19566,15 @@ msgstr ""
 msgid "Power Cable"
 msgstr ""
 
+msgctxt "power cable"
+msgid "underground"
+msgstr ""
+
+msgctxt "power cable"
 msgid "underwater"
 msgstr ""
 
+msgctxt "power cable"
 msgid "overground"
 msgstr ""
 
@@ -19499,6 +19602,33 @@ msgstr "Μνημείο"
 msgid "Memorial"
 msgstr "Ηρώο"
 
+msgctxt "memorial"
+msgid "statue"
+msgstr ""
+
+msgctxt "memorial"
+msgid "bust"
+msgstr ""
+
+msgctxt "memorial"
+msgid "plaque"
+msgstr ""
+
+msgctxt "memorial"
+msgid "stele"
+msgstr ""
+
+msgctxt "memorial"
+msgid "stone"
+msgstr ""
+
+msgctxt "memorial"
+msgid "war_memorial"
+msgstr ""
+
+msgid "Inscription"
+msgstr ""
+
 msgid "Wayside Cross"
 msgstr ""
 
@@ -19568,6 +19698,9 @@ msgstr "Κάβα Ποτών"
 msgid "Beverages"
 msgstr "Ποτά"
 
+msgid "Wine"
+msgstr ""
+
 msgid "Boutique"
 msgstr "Μπουτίκ"
 
@@ -19613,6 +19746,9 @@ msgstr ""
 msgid "Video Games"
 msgstr ""
 
+msgid "Music"
+msgstr ""
+
 msgid "Cash"
 msgstr "Μετρητά"
 
@@ -19640,6 +19776,9 @@ msgstr "Κουζίνα"
 msgid "Curtain"
 msgstr "Κουρτίνες"
 
+msgid "Art"
+msgstr ""
+
 msgid "Frame"
 msgstr "Κορνίζες"
 
@@ -19685,6 +19824,9 @@ msgstr ""
 msgid "Beauty"
 msgstr ""
 
+msgid "Tattoo"
+msgstr ""
+
 msgid "Optician"
 msgstr "Οπτικός"
 
@@ -19736,6 +19878,9 @@ msgstr ""
 msgid "Pet"
 msgstr ""
 
+msgid "Funeral Directors"
+msgstr ""
+
 msgid "Vending Machine"
 msgstr ""
 
@@ -19835,6 +19980,15 @@ msgstr ""
 msgid "National Park"
 msgstr ""
 
+msgid "Protected Area"
+msgstr ""
+
+msgid "Protected Class"
+msgstr ""
+
+msgid "Title or type of protection"
+msgstr ""
+
 msgid "Places"
 msgstr "Τοποθεσίες"
 
@@ -20911,7 +21065,13 @@ msgstr ""
 msgid "Estonia Ortho (Maaamet)"
 msgstr ""
 
-msgid "Estonia Multi (Maaamet)"
+msgid "Estonia Hillshade (Maaamet)"
+msgstr ""
+
+msgid "Estonia Cadastre (Maaamet)"
+msgstr ""
+
+msgid "Estonia Forestry (Maaamet)"
 msgstr ""
 
 msgid "Bordeaux - 2012"
@@ -20935,7 +21095,7 @@ msgstr ""
 msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
 msgstr ""
 
-msgid "CUGN Nancy - Orthophoto 2012"
+msgid "GrandNancy Orthophotographie 2012"
 msgstr ""
 
 msgid "Géobretagne - Brest 2010 - 10 cm"
@@ -20982,9 +21142,6 @@ msgid ""
 "- 1 m"
 msgstr ""
 
-msgid "Streets NRW Geofabrik.de"
-msgstr ""
-
 msgid "Hike & Bike"
 msgstr ""
 
@@ -21044,6 +21201,9 @@ msgstr ""
 msgid "NRW-Atlas: Topographische Karte 1:10000"
 msgstr ""
 
+msgid "Metropole Ruhr: Luftbilder (10 cm)"
+msgstr ""
+
 msgid "Drone Imagery (Haiti)"
 msgstr ""
 
@@ -21245,6 +21405,9 @@ msgstr ""
 msgid "Stadt Zürich Übersichtsplan (Strassen, Gebäude, Hausnummer)"
 msgstr ""
 
+msgid "Stadt Zürich Luftbild 2011"
+msgstr ""
+
 msgid "Orthofoto Kanton Solothurn RGB (SOGIS 2011/2012/2013)"
 msgstr ""
 
@@ -21263,7 +21426,7 @@ msgstr ""
 msgid "Canton de Fribourg 50cm (2005)"
 msgstr ""
 
-msgid "Stadt Bern 10cm/25cm (2008)"
+msgid "Stadt Bern 10cm/25cm (2012)"
 msgstr ""
 
 msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
@@ -21302,7 +21465,7 @@ msgstr ""
 msgid "OSM US TIGER 2012 Roads Overlay"
 msgstr ""
 
-msgid "New & Misaligned TIGER Roads (TIGER 2013)"
+msgid "New & Misaligned TIGER Roads (TIGER 2014)"
 msgstr ""
 
 msgid "MassGIS L3 Parcels"
@@ -21350,9 +21513,234 @@ msgstr ""
 msgid "NLS - Bartholomew Half Inch, 1897-1907"
 msgstr ""
 
+msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Annan 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgstr ""
+
 msgid "OS Town Plans, Cupar 1854 (NLS)"
 msgstr ""
 
+msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Elgin 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Forres 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Galashiels 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Girvan 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Greenock 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Haddington 1853 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Haddington 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Hamilton 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Irvine 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Jedburgh 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kelso 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Lanark 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Linlithgow 1856 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Musselburgh 1853 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Musselburgh 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Oban 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Peebles 1856 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Perth 1860 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Peterhead 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Selkirk 1865 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, St Andrews 1854 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, St Andrews 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stirling 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stonehaven 1864 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1847 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Strathaven 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wick 1872 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wigtown 1848 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wigtown 1894 (NLS)"
+msgstr ""
+
 msgid "Decreasing house numbers in addresses interpolation"
 msgstr ""
 
@@ -21406,17 +21794,37 @@ msgid "{0}={1} is deprecated. Please use instead a multipolygon."
 msgstr ""
 
 msgid ""
-"{0} is deprecated. Please specify ìnterval by using opening_hours syntax"
+"{0} is deprecated. Please specify interval by using opening_hours syntax"
 msgstr ""
 
 msgid ""
 "{0} is deprecated. Please delete this object and use a private layer instead"
 msgstr ""
 
-msgid "{0} on a node"
+msgid "{0}={1} is unspecific. Please replace ''{1}'' by a specific value."
 msgstr ""
 
-msgid "{0} on a node. Should be drawn as an area"
+msgid "{0} should be replaced with {1}"
+msgstr ""
+
+msgid ""
+"{0}={1} is unspecific. Please replace ''{1}'' by ''left'', ''right'' or "
+"''both''."
+msgstr ""
+
+msgid "{0} on a node. Should be used on a way."
+msgstr ""
+
+msgid "{0} on a node. Should be drawn as an area."
+msgstr ""
+
+msgid "{0}=* on a node. Should be used in a relation"
+msgstr ""
+
+msgid "{0} on a way. Should be used in a relation"
+msgstr ""
+
+msgid "{0} on a node"
 msgstr ""
 
 msgid "Building inside building"
@@ -26119,6 +26527,9 @@ msgstr ""
 msgid "Find"
 msgstr "Αναζήτηση"
 
+msgid "Show"
+msgstr "Προβολή"
+
 msgid "Mark"
 msgstr "Σημείωση"
 
@@ -27475,7 +27886,7 @@ msgstr ""
 "Επεξεργασία των ακατέργαστων ετικετών και μελών αυτού του περιορισμού στροφής"
 
 msgid "Errors/Warnings"
-msgstr ""
+msgstr "Σφάλματα/Προειδοποιήσεις"
 
 msgid "Show errors and warnings related to this turn restriction"
 msgstr ""
@@ -28078,7 +28489,7 @@ msgid "Pastes tags of previously selected object(s)"
 msgstr "Επικολλά ετικέτες από προηγουμένως επιλεγμένο(α) αντικείμενο(α)"
 
 msgid "Add Source Tag"
-msgstr ""
+msgstr "Προσθήκη ετικέτας Source"
 
 msgid "Add remembered source tag"
 msgstr ""
@@ -28193,7 +28604,7 @@ msgid "Sync with JOSM selection"
 msgstr ""
 
 msgid "Zoom to objects"
-msgstr ""
+msgstr "Εστίαση στα αντικείμενα"
 
 msgid "Remove tag"
 msgstr "Αφαίρεση ετικέτας"
@@ -28208,7 +28619,7 @@ msgid "Set tags for multiple objects"
 msgstr ""
 
 msgid "Delete from history"
-msgstr ""
+msgstr "Διαγραφή από το ιστορικό"
 
 msgid "Find primitives with these tags"
 msgstr ""
@@ -28313,10 +28724,10 @@ msgstr ""
 "διασταυρούμενες διαδρομές!"
 
 msgid "Middle nodes"
-msgstr ""
+msgstr "Ενδιάμεσοι κόμβοι"
 
 msgid "Select middle nodes"
-msgstr ""
+msgstr "Επιλογή ενδιάμεσων κόμβων"
 
 msgid "Please select two nodes connected by way!"
 msgstr ""
@@ -28617,16 +29028,16 @@ msgid "Not linked yet"
 msgstr ""
 
 msgid "{0}.Wikipedia.org"
-msgstr ""
+msgstr "{0}.Wikipedia.org"
 
 msgid "{0}.Wikipedia.org: {1}"
-msgstr ""
+msgstr "{0}.Wikipedia.org: {1}"
 
 msgid "Fetches all coordinates from Wikipedia in the current view"
 msgstr ""
 
 msgid "coordinates"
-msgstr ""
+msgstr "συντεταγμένες"
 
 msgid "Category"
 msgstr "Κατηγορία"
diff --git a/i18n/po/en_AU.po b/i18n/po/en_AU.po
index cde04f8..959fb32 100644
--- a/i18n/po/en_AU.po
+++ b/i18n/po/en_AU.po
@@ -1,8 +1,13 @@
+# English (Australia) translation for josm
+# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
+# This file is distributed under the same license as the josm package.
+# FIRST AUTHOR <EMAIL at ADDRESS>, 2009.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-21 03:38+0200\n"
+"POT-Creation-Date: 2014-12-10 03:42+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"
@@ -10,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-10-21 05:34+0000\n"
-"X-Generator: Launchpad (build 17203)\n"
+"X-Launchpad-Export-Date: 2014-12-10 05:19+0000\n"
+"X-Generator: Launchpad (build 17283)\n"
 "Language: \n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -168,16 +173,6 @@ msgid "About JOSM..."
 msgstr "About JOSM..."
 
 msgid ""
-"Unexpected format of API base URL. Redirection to info or history page for "
-"OSM object will probably fail. API base URL is: ''{0}''"
-msgstr ""
-
-msgid ""
-"Unexpected format of API base URL. Redirection to user page for OSM user "
-"will probably fail. API base URL is: ''{0}''"
-msgstr ""
-
-msgid ""
 "You are about to launch {0} browser window.<br>This may both clutter your "
 "screen with browser windows<br>and take some time to finish."
 msgid_plural ""
@@ -1559,6 +1554,15 @@ msgstr "No changes to upload."
 msgid "Nothing to upload. Get some data first."
 msgstr "Nothing to upload. Get some data first."
 
+msgid "Upload note changes to server"
+msgstr ""
+
+msgid "Upload notes"
+msgstr ""
+
+msgid "Uploading notes to server"
+msgstr ""
+
 msgid "Upload selection"
 msgstr "Upload selection"
 
@@ -1833,10 +1837,16 @@ msgstr ""
 msgid "Click the location where you wish to create a new note"
 msgstr ""
 
-msgid "Enter a comment for a new note"
+msgid "Create new note"
 msgstr ""
 
-msgid "Create new note"
+msgid "Create note"
+msgstr ""
+
+msgid "Enter a detailed comment to create a note"
+msgstr ""
+
+msgid "You must enter a comment to create a new note"
 msgstr ""
 
 msgid "Delete Mode"
@@ -2726,6 +2736,15 @@ msgstr "... refers to relation"
 msgid "Cycling dependencies"
 msgstr "Cycling dependencies"
 
+msgid "Uploading modified notes"
+msgstr ""
+
+msgid "Note {0} failed: {1}"
+msgstr ""
+
+msgid "Notes failed to upload"
+msgstr ""
+
 msgid ""
 "The following are results of automatic validation. Try fixing these, but be "
 "careful (don''t destroy valid data). When in doubt ignore them.<br>When you "
@@ -5003,6 +5022,12 @@ msgstr ""
 msgid "Conflict foreground: keep all tags"
 msgstr ""
 
+msgid "Conflict background: sum all numeric tags"
+msgstr ""
+
+msgid "Conflict foreground: sum all numeric tags"
+msgstr ""
+
 msgid "Conflict background: keep member"
 msgstr ""
 
@@ -5439,12 +5464,19 @@ msgstr "none"
 msgid "all"
 msgstr "all"
 
+msgid "sum"
+msgstr ""
+
 msgid "Please decide which values to keep"
 msgstr "Please decide which values to keep"
 
 msgid "Value ''{0}'' is going to be applied for key ''{1}''"
 msgstr "Value ''{0}'' is going to be applied for key ''{1}''"
 
+msgid ""
+"All numeric values sumed as ''{0}'' are going to be applied for key ''{1}''"
+msgstr ""
+
 msgid "The key ''{0}'' and all its values are going to be removed"
 msgstr "The key ''{0}'' and all its values are going to be removed"
 
@@ -5821,24 +5853,6 @@ msgstr[1] ""
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
 
-msgid "Display the history of all selected items."
-msgstr "Display the history of all selected items."
-
-msgid "Object with history"
-msgstr "Object with history"
-
-msgid "Reload"
-msgstr "Reload"
-
-msgid "Reload all currently selected objects and refresh the list."
-msgstr "Reload all currently selected objects and refresh the list."
-
-msgid "Show"
-msgstr "Show"
-
-msgid "Display the history of the selected objects."
-msgstr "Display the history of the selected objects."
-
 msgid "Advanced object info"
 msgstr ""
 
@@ -6176,6 +6190,9 @@ msgstr ""
 msgid "Comment"
 msgstr "Comment"
 
+msgid "Comment on note"
+msgstr ""
+
 msgid "Add comment to note:"
 msgstr ""
 
@@ -6185,9 +6202,6 @@ msgstr ""
 msgid "Close note with message:"
 msgstr ""
 
-msgid "Close Note"
-msgstr ""
-
 msgid "Create a new note"
 msgstr ""
 
@@ -6260,6 +6274,9 @@ msgstr "Current Selection"
 msgid "Search for objects"
 msgstr ""
 
+msgid "Display the history of the selected objects."
+msgstr "Display the history of the selected objects."
+
 msgid "Zoom to selection"
 msgstr "Zoom to selection"
 
@@ -6382,6 +6399,9 @@ msgstr "Fixing ({0}/{1}): ''{2}''"
 msgid "Updating map ..."
 msgstr "Updating map ..."
 
+msgid "anonymous"
+msgstr "anonymous"
+
 msgid "Display the basic properties of the changeset"
 msgstr "Display the basic properties of the changeset"
 
@@ -6394,6 +6414,12 @@ msgstr "Content"
 msgid "Display the objects created, updated, and deleted by the changeset"
 msgstr "Display the objects created, updated, and deleted by the changeset"
 
+msgid "Discussion"
+msgstr ""
+
+msgid "Display the public discussion around this changeset"
+msgstr ""
+
 msgid "Changeset Management Dialog"
 msgstr "Changeset Management Dialogue"
 
@@ -6455,9 +6481,6 @@ msgctxt "changeset.state"
 msgid "Closed"
 msgstr "Closed"
 
-msgid "anonymous"
-msgstr "anonymous"
-
 msgid "ID"
 msgstr "ID"
 
@@ -6473,6 +6496,9 @@ msgstr "Created at"
 msgid "Closed at"
 msgstr "Closed at"
 
+msgid "Discussions"
+msgstr ""
+
 msgid "Downloading changeset content"
 msgstr "Downloading changeset content"
 
@@ -6592,6 +6618,15 @@ msgid ""
 "layer"
 msgstr ""
 
+msgid "Update changeset discussion"
+msgstr ""
+
+msgid "Update the changeset discussion from the OSM server"
+msgstr ""
+
+msgid "Date"
+msgstr ""
+
 msgid "Download changesets"
 msgstr "Download changesets"
 
@@ -7033,7 +7068,7 @@ msgstr "Please select a value"
 msgid "Set number of recently added tags"
 msgstr ""
 
-msgid "Remember last used tags"
+msgid "Remember last used tags after a restart"
 msgstr ""
 
 msgid "Please enter the number of recently added tags to display"
@@ -7392,6 +7427,9 @@ msgstr "including immediate children of parent relations"
 msgid "Load parent relations"
 msgstr "Load parent relations"
 
+msgid "Reload"
+msgstr "Reload"
+
 msgid "Loading parent relations"
 msgstr "Loading parent relations"
 
@@ -7519,6 +7557,12 @@ msgstr "Raw GPS data"
 msgid "Select to download GPS traces in the selected download area."
 msgstr "Select to download GPS traces in the selected download area."
 
+msgid "Notes"
+msgstr "Notes"
+
+msgid "Select to download notes in the selected download area."
+msgstr ""
+
 msgid "Download as new layer"
 msgstr "Download as new layer"
 
@@ -7838,9 +7882,6 @@ msgstr ""
 msgid "B"
 msgstr ""
 
-msgid "Date"
-msgstr ""
-
 msgid ""
 "Failed to update primitive with id {0} because current edit layer is null"
 msgstr ""
@@ -8776,9 +8817,6 @@ msgstr ""
 msgid "Save Layer"
 msgstr "Save Layer"
 
-msgid "Notes"
-msgstr "Notes"
-
 msgid "Notes layer"
 msgstr ""
 
@@ -8794,9 +8832,6 @@ msgstr "Data Layer {0}"
 msgid "outside downloaded area"
 msgstr "outside downloaded area"
 
-msgid "version {0}"
-msgstr "version {0}"
-
 msgid "Merging layers"
 msgstr ""
 
@@ -12625,6 +12660,15 @@ msgstr "ID of current changeset > 0 required. Current ID is {0}."
 msgid "Open changeset expected. Got closed changeset with id {0}."
 msgstr "Open changeset expected. Got closed changeset with id {0}."
 
+msgid "Note upload failed"
+msgstr ""
+
+msgid "Error parsing note response from server"
+msgstr ""
+
+msgid "Error encoding string: {0}"
+msgstr ""
+
 msgid "(Code={0})"
 msgstr "(Code={0})"
 
@@ -12676,15 +12720,15 @@ msgstr ""
 msgid "Parsing changeset content ..."
 msgstr "Parsing changeset content ..."
 
+msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
+msgstr "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
+
 msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
 msgstr "Illegal value for attribute ''{0}''. Got ''{1}''."
 
 msgid "Illegal numeric value for attribute ''{0}''. Got ''{1}''."
 msgstr "Illegal numeric value for attribute ''{0}''. Got ''{1}''."
 
-msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
-msgstr "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
-
 msgid "Missing mandatory attribute ''{0}'' of XML element {1}."
 msgstr "Missing mandatory attribute ''{0}'' of XML element {1}."
 
@@ -13519,9 +13563,6 @@ msgstr "Processing file ''{0}''"
 msgid "Failed to scan file ''{0}'' for plugin information. Skipping."
 msgstr ""
 
-msgid "Processing plugin site cache icon files..."
-msgstr ""
-
 msgid "Processing plugin files..."
 msgstr "Processing plug-in files..."
 
@@ -13540,12 +13581,6 @@ msgstr ""
 msgid "Details:"
 msgstr ""
 
-msgid "Plugin icons download error"
-msgstr ""
-
-msgid "JOSM failed to download plugin icons:"
-msgstr ""
-
 msgid ""
 "Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
 "plugin site ''{1}''."
@@ -14494,8 +14529,10 @@ msgid ""
 msgstr ""
 "Creating and handling address nodes and buildings within Czech Republic."
 
-msgid "Allows to import various file formats into JOSM directly."
-msgstr "Allows to import various file formats into JOSM directly."
+msgid ""
+"Allows to import various file formats into JOSM directly. Currently "
+"supported: TangoGPS, Garmin Trainings Center TCX."
+msgstr ""
 
 msgid "Download your GPX tracks from openstreetmap.org"
 msgstr ""
@@ -14599,6 +14636,11 @@ msgid "A helper for IRS satellite adjustment."
 msgstr ""
 
 msgid ""
+"Provides Java Native Access (JNA) library. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
+msgid ""
 "Provides Java Topology Suite (JTS) library and related utilities. Not meant "
 "to be installed directly by users, but rather as a dependency for other "
 "plugins."
@@ -14976,6 +15018,25 @@ msgstr ""
 msgid "Width (meters)"
 msgstr "Width (metres)"
 
+msgid "Sidewalk"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "both"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "left"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "right"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "no"
+msgstr ""
+
 msgid "Service type"
 msgstr ""
 
@@ -15340,15 +15401,19 @@ msgstr ""
 msgid "May-Sep 09:30-12:30,14:15-19:30"
 msgstr ""
 
+msgctxt "parking"
 msgid "multi-storey"
-msgstr "multi-storey"
+msgstr ""
 
+msgctxt "parking"
 msgid "surface"
-msgstr "surface"
+msgstr ""
 
+msgctxt "parking"
 msgid "underground"
-msgstr "underground"
+msgstr ""
 
+msgctxt "parking"
 msgid "rooftop"
 msgstr ""
 
@@ -15806,15 +15871,26 @@ msgstr ""
 msgid "Overtaking"
 msgstr ""
 
+msgctxt "overtaking"
+msgid "yes"
+msgstr ""
+
+msgctxt "overtaking"
 msgid "both"
 msgstr ""
 
+msgctxt "overtaking"
 msgid "forward"
 msgstr ""
 
+msgctxt "overtaking"
 msgid "backward"
 msgstr ""
 
+msgctxt "overtaking"
+msgid "no"
+msgstr ""
+
 msgid "Roundabout"
 msgstr "Roundabout"
 
@@ -16108,6 +16184,12 @@ msgstr "pegasus"
 msgid "tiger"
 msgstr "tiger"
 
+msgid "Button operated"
+msgstr ""
+
+msgid "Sound signals"
+msgstr ""
+
 msgid "Crossing attendant"
 msgstr "Crossing attendant"
 
@@ -16629,9 +16711,6 @@ msgstr "Level Crossing"
 msgid "Traffic lights"
 msgstr ""
 
-msgid "Sound signals"
-msgstr ""
-
 msgid "Barrier"
 msgstr ""
 
@@ -18691,6 +18770,9 @@ msgstr "Windmill"
 msgid "Gasometer"
 msgstr "Gasometer"
 
+msgid "Bunker Silo"
+msgstr ""
+
 msgid "Pipeline"
 msgstr "Pipeline"
 
@@ -18837,15 +18919,15 @@ msgstr ""
 msgid "Monitoring:"
 msgstr ""
 
-msgid "Weather"
-msgstr ""
-
 msgid "Water level"
 msgstr ""
 
 msgid "Tide Level"
 msgstr ""
 
+msgid "Groundwater"
+msgstr ""
+
 msgid "Traffic"
 msgstr ""
 
@@ -18864,6 +18946,9 @@ msgstr ""
 msgid "Galileo Signals"
 msgstr ""
 
+msgid "Weather"
+msgstr ""
+
 msgid "Radiation"
 msgstr ""
 
@@ -19044,6 +19129,9 @@ msgstr ""
 msgid "pivot_pier"
 msgstr ""
 
+msgid "Bridge outline"
+msgstr ""
+
 msgid "Power Plant"
 msgstr ""
 
@@ -19651,6 +19739,15 @@ msgstr ""
 msgid "Pole"
 msgstr ""
 
+msgid "Pole with Transformer"
+msgstr ""
+
+msgid "Pole Attributes:"
+msgstr ""
+
+msgid "Transformer Attributes:"
+msgstr ""
+
 msgid "Power Line"
 msgstr "Power Line"
 
@@ -19700,9 +19797,15 @@ msgstr ""
 msgid "Power Cable"
 msgstr ""
 
+msgctxt "power cable"
+msgid "underground"
+msgstr ""
+
+msgctxt "power cable"
 msgid "underwater"
 msgstr ""
 
+msgctxt "power cable"
 msgid "overground"
 msgstr ""
 
@@ -19730,6 +19833,33 @@ msgstr "Monument"
 msgid "Memorial"
 msgstr "Memorial"
 
+msgctxt "memorial"
+msgid "statue"
+msgstr ""
+
+msgctxt "memorial"
+msgid "bust"
+msgstr ""
+
+msgctxt "memorial"
+msgid "plaque"
+msgstr ""
+
+msgctxt "memorial"
+msgid "stele"
+msgstr ""
+
+msgctxt "memorial"
+msgid "stone"
+msgstr ""
+
+msgctxt "memorial"
+msgid "war_memorial"
+msgstr ""
+
+msgid "Inscription"
+msgstr ""
+
 msgid "Wayside Cross"
 msgstr "Wayside Cross"
 
@@ -19799,6 +19929,9 @@ msgstr "Alcohol"
 msgid "Beverages"
 msgstr "Beverages"
 
+msgid "Wine"
+msgstr ""
+
 msgid "Boutique"
 msgstr ""
 
@@ -19844,6 +19977,9 @@ msgstr "Video"
 msgid "Video Games"
 msgstr ""
 
+msgid "Music"
+msgstr ""
+
 msgid "Cash"
 msgstr "Cash"
 
@@ -19871,6 +20007,9 @@ msgstr ""
 msgid "Curtain"
 msgstr ""
 
+msgid "Art"
+msgstr ""
+
 msgid "Frame"
 msgstr ""
 
@@ -19916,6 +20055,9 @@ msgstr ""
 msgid "Beauty"
 msgstr ""
 
+msgid "Tattoo"
+msgstr ""
+
 msgid "Optician"
 msgstr "Optician"
 
@@ -19967,6 +20109,9 @@ msgstr ""
 msgid "Pet"
 msgstr ""
 
+msgid "Funeral Directors"
+msgstr ""
+
 msgid "Vending Machine"
 msgstr ""
 
@@ -20066,6 +20211,15 @@ msgstr ""
 msgid "National Park"
 msgstr ""
 
+msgid "Protected Area"
+msgstr ""
+
+msgid "Protected Class"
+msgstr ""
+
+msgid "Title or type of protection"
+msgstr ""
+
 msgid "Places"
 msgstr "Places"
 
@@ -21142,7 +21296,13 @@ msgstr ""
 msgid "Estonia Ortho (Maaamet)"
 msgstr ""
 
-msgid "Estonia Multi (Maaamet)"
+msgid "Estonia Hillshade (Maaamet)"
+msgstr ""
+
+msgid "Estonia Cadastre (Maaamet)"
+msgstr ""
+
+msgid "Estonia Forestry (Maaamet)"
 msgstr ""
 
 msgid "Bordeaux - 2012"
@@ -21166,7 +21326,7 @@ msgstr ""
 msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
 msgstr ""
 
-msgid "CUGN Nancy - Orthophoto 2012"
+msgid "GrandNancy Orthophotographie 2012"
 msgstr ""
 
 msgid "Géobretagne - Brest 2010 - 10 cm"
@@ -21213,9 +21373,6 @@ msgid ""
 "- 1 m"
 msgstr ""
 
-msgid "Streets NRW Geofabrik.de"
-msgstr ""
-
 msgid "Hike & Bike"
 msgstr ""
 
@@ -21275,6 +21432,9 @@ msgstr ""
 msgid "NRW-Atlas: Topographische Karte 1:10000"
 msgstr ""
 
+msgid "Metropole Ruhr: Luftbilder (10 cm)"
+msgstr ""
+
 msgid "Drone Imagery (Haiti)"
 msgstr ""
 
@@ -21476,6 +21636,9 @@ msgstr ""
 msgid "Stadt Zürich Übersichtsplan (Strassen, Gebäude, Hausnummer)"
 msgstr ""
 
+msgid "Stadt Zürich Luftbild 2011"
+msgstr ""
+
 msgid "Orthofoto Kanton Solothurn RGB (SOGIS 2011/2012/2013)"
 msgstr ""
 
@@ -21494,7 +21657,7 @@ msgstr ""
 msgid "Canton de Fribourg 50cm (2005)"
 msgstr ""
 
-msgid "Stadt Bern 10cm/25cm (2008)"
+msgid "Stadt Bern 10cm/25cm (2012)"
 msgstr ""
 
 msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
@@ -21533,7 +21696,7 @@ msgstr ""
 msgid "OSM US TIGER 2012 Roads Overlay"
 msgstr ""
 
-msgid "New & Misaligned TIGER Roads (TIGER 2013)"
+msgid "New & Misaligned TIGER Roads (TIGER 2014)"
 msgstr ""
 
 msgid "MassGIS L3 Parcels"
@@ -21581,9 +21744,234 @@ msgstr ""
 msgid "NLS - Bartholomew Half Inch, 1897-1907"
 msgstr ""
 
+msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Annan 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgstr ""
+
 msgid "OS Town Plans, Cupar 1854 (NLS)"
 msgstr ""
 
+msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Elgin 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Forres 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Galashiels 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Girvan 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Greenock 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Haddington 1853 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Haddington 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Hamilton 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Irvine 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Jedburgh 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kelso 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Lanark 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Linlithgow 1856 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Musselburgh 1853 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Musselburgh 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Oban 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Peebles 1856 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Perth 1860 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Peterhead 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Selkirk 1865 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, St Andrews 1854 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, St Andrews 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stirling 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stonehaven 1864 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1847 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Strathaven 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wick 1872 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wigtown 1848 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wigtown 1894 (NLS)"
+msgstr ""
+
 msgid "Decreasing house numbers in addresses interpolation"
 msgstr ""
 
@@ -21637,17 +22025,37 @@ msgid "{0}={1} is deprecated. Please use instead a multipolygon."
 msgstr ""
 
 msgid ""
-"{0} is deprecated. Please specify ìnterval by using opening_hours syntax"
+"{0} is deprecated. Please specify interval by using opening_hours syntax"
 msgstr ""
 
 msgid ""
 "{0} is deprecated. Please delete this object and use a private layer instead"
 msgstr ""
 
-msgid "{0} on a node"
+msgid "{0}={1} is unspecific. Please replace ''{1}'' by a specific value."
 msgstr ""
 
-msgid "{0} on a node. Should be drawn as an area"
+msgid "{0} should be replaced with {1}"
+msgstr ""
+
+msgid ""
+"{0}={1} is unspecific. Please replace ''{1}'' by ''left'', ''right'' or "
+"''both''."
+msgstr ""
+
+msgid "{0} on a node. Should be used on a way."
+msgstr ""
+
+msgid "{0} on a node. Should be drawn as an area."
+msgstr ""
+
+msgid "{0}=* on a node. Should be used in a relation"
+msgstr ""
+
+msgid "{0} on a way. Should be used in a relation"
+msgstr ""
+
+msgid "{0} on a node"
 msgstr ""
 
 msgid "Building inside building"
@@ -26388,6 +26796,9 @@ msgstr ""
 msgid "Find"
 msgstr ""
 
+msgid "Show"
+msgstr "Show"
+
 msgid "Mark"
 msgstr ""
 
diff --git a/i18n/po/en_CA.po b/i18n/po/en_CA.po
index 81cddb1..13012c2 100644
--- a/i18n/po/en_CA.po
+++ b/i18n/po/en_CA.po
@@ -1,8 +1,13 @@
+# English (Canada) translation for josm
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the josm package.
+# FIRST AUTHOR <EMAIL at ADDRESS>, 2010.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-21 03:38+0200\n"
+"POT-Creation-Date: 2014-12-10 03:42+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"
@@ -10,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-10-21 05:37+0000\n"
-"X-Generator: Launchpad (build 17203)\n"
+"X-Launchpad-Export-Date: 2014-12-10 05:22+0000\n"
+"X-Generator: Launchpad (build 17283)\n"
 "Language: \n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -168,16 +173,6 @@ msgid "About JOSM..."
 msgstr "About JOSM..."
 
 msgid ""
-"Unexpected format of API base URL. Redirection to info or history page for "
-"OSM object will probably fail. API base URL is: ''{0}''"
-msgstr ""
-
-msgid ""
-"Unexpected format of API base URL. Redirection to user page for OSM user "
-"will probably fail. API base URL is: ''{0}''"
-msgstr ""
-
-msgid ""
 "You are about to launch {0} browser window.<br>This may both clutter your "
 "screen with browser windows<br>and take some time to finish."
 msgid_plural ""
@@ -1525,6 +1520,15 @@ msgstr ""
 msgid "Nothing to upload. Get some data first."
 msgstr ""
 
+msgid "Upload note changes to server"
+msgstr ""
+
+msgid "Upload notes"
+msgstr ""
+
+msgid "Uploading notes to server"
+msgstr ""
+
 msgid "Upload selection"
 msgstr ""
 
@@ -1797,10 +1801,16 @@ msgstr ""
 msgid "Click the location where you wish to create a new note"
 msgstr ""
 
-msgid "Enter a comment for a new note"
+msgid "Create new note"
 msgstr ""
 
-msgid "Create new note"
+msgid "Create note"
+msgstr ""
+
+msgid "Enter a detailed comment to create a note"
+msgstr ""
+
+msgid "You must enter a comment to create a new note"
 msgstr ""
 
 msgid "Delete Mode"
@@ -2671,6 +2681,15 @@ msgstr ""
 msgid "Cycling dependencies"
 msgstr ""
 
+msgid "Uploading modified notes"
+msgstr ""
+
+msgid "Note {0} failed: {1}"
+msgstr ""
+
+msgid "Notes failed to upload"
+msgstr ""
+
 msgid ""
 "The following are results of automatic validation. Try fixing these, but be "
 "careful (don''t destroy valid data). When in doubt ignore them.<br>When you "
@@ -4900,6 +4919,12 @@ msgstr ""
 msgid "Conflict foreground: keep all tags"
 msgstr ""
 
+msgid "Conflict background: sum all numeric tags"
+msgstr ""
+
+msgid "Conflict foreground: sum all numeric tags"
+msgstr ""
+
 msgid "Conflict background: keep member"
 msgstr ""
 
@@ -5318,12 +5343,19 @@ msgstr ""
 msgid "all"
 msgstr ""
 
+msgid "sum"
+msgstr ""
+
 msgid "Please decide which values to keep"
 msgstr ""
 
 msgid "Value ''{0}'' is going to be applied for key ''{1}''"
 msgstr ""
 
+msgid ""
+"All numeric values sumed as ''{0}'' are going to be applied for key ''{1}''"
+msgstr ""
+
 msgid "The key ''{0}'' and all its values are going to be removed"
 msgstr ""
 
@@ -5686,24 +5718,6 @@ msgstr[1] ""
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
 
-msgid "Display the history of all selected items."
-msgstr ""
-
-msgid "Object with history"
-msgstr ""
-
-msgid "Reload"
-msgstr ""
-
-msgid "Reload all currently selected objects and refresh the list."
-msgstr ""
-
-msgid "Show"
-msgstr ""
-
-msgid "Display the history of the selected objects."
-msgstr ""
-
 msgid "Advanced object info"
 msgstr ""
 
@@ -6041,6 +6055,9 @@ msgstr ""
 msgid "Comment"
 msgstr ""
 
+msgid "Comment on note"
+msgstr ""
+
 msgid "Add comment to note:"
 msgstr ""
 
@@ -6050,9 +6067,6 @@ msgstr ""
 msgid "Close note with message:"
 msgstr ""
 
-msgid "Close Note"
-msgstr ""
-
 msgid "Create a new note"
 msgstr ""
 
@@ -6125,6 +6139,9 @@ msgstr ""
 msgid "Search for objects"
 msgstr ""
 
+msgid "Display the history of the selected objects."
+msgstr ""
+
 msgid "Zoom to selection"
 msgstr ""
 
@@ -6244,6 +6261,9 @@ msgstr ""
 msgid "Updating map ..."
 msgstr ""
 
+msgid "anonymous"
+msgstr ""
+
 msgid "Display the basic properties of the changeset"
 msgstr ""
 
@@ -6256,6 +6276,12 @@ msgstr ""
 msgid "Display the objects created, updated, and deleted by the changeset"
 msgstr ""
 
+msgid "Discussion"
+msgstr ""
+
+msgid "Display the public discussion around this changeset"
+msgstr ""
+
 msgid "Changeset Management Dialog"
 msgstr ""
 
@@ -6313,9 +6339,6 @@ msgctxt "changeset.state"
 msgid "Closed"
 msgstr ""
 
-msgid "anonymous"
-msgstr ""
-
 msgid "ID"
 msgstr ""
 
@@ -6331,6 +6354,9 @@ msgstr ""
 msgid "Closed at"
 msgstr ""
 
+msgid "Discussions"
+msgstr ""
+
 msgid "Downloading changeset content"
 msgstr ""
 
@@ -6442,6 +6468,15 @@ msgid ""
 "layer"
 msgstr ""
 
+msgid "Update changeset discussion"
+msgstr ""
+
+msgid "Update the changeset discussion from the OSM server"
+msgstr ""
+
+msgid "Date"
+msgstr ""
+
 msgid "Download changesets"
 msgstr ""
 
@@ -6859,7 +6894,7 @@ msgstr ""
 msgid "Set number of recently added tags"
 msgstr ""
 
-msgid "Remember last used tags"
+msgid "Remember last used tags after a restart"
 msgstr ""
 
 msgid "Please enter the number of recently added tags to display"
@@ -7205,6 +7240,9 @@ msgstr ""
 msgid "Load parent relations"
 msgstr ""
 
+msgid "Reload"
+msgstr ""
+
 msgid "Loading parent relations"
 msgstr ""
 
@@ -7327,6 +7365,12 @@ msgstr ""
 msgid "Select to download GPS traces in the selected download area."
 msgstr ""
 
+msgid "Notes"
+msgstr ""
+
+msgid "Select to download notes in the selected download area."
+msgstr ""
+
 msgid "Download as new layer"
 msgstr ""
 
@@ -7632,9 +7676,6 @@ msgstr ""
 msgid "B"
 msgstr ""
 
-msgid "Date"
-msgstr ""
-
 msgid ""
 "Failed to update primitive with id {0} because current edit layer is null"
 msgstr ""
@@ -8489,9 +8530,6 @@ msgstr ""
 msgid "Save Layer"
 msgstr ""
 
-msgid "Notes"
-msgstr ""
-
 msgid "Notes layer"
 msgstr ""
 
@@ -8507,9 +8545,6 @@ msgstr ""
 msgid "outside downloaded area"
 msgstr ""
 
-msgid "version {0}"
-msgstr ""
-
 msgid "Merging layers"
 msgstr ""
 
@@ -12135,6 +12170,15 @@ msgstr ""
 msgid "Open changeset expected. Got closed changeset with id {0}."
 msgstr ""
 
+msgid "Note upload failed"
+msgstr ""
+
+msgid "Error parsing note response from server"
+msgstr ""
+
+msgid "Error encoding string: {0}"
+msgstr ""
+
 msgid "(Code={0})"
 msgstr ""
 
@@ -12183,13 +12227,13 @@ msgstr ""
 msgid "Parsing changeset content ..."
 msgstr ""
 
-msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
-msgid "Illegal numeric value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
-msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal numeric value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
 msgid "Missing mandatory attribute ''{0}'' of XML element {1}."
@@ -12981,9 +13025,6 @@ msgstr ""
 msgid "Failed to scan file ''{0}'' for plugin information. Skipping."
 msgstr ""
 
-msgid "Processing plugin site cache icon files..."
-msgstr ""
-
 msgid "Processing plugin files..."
 msgstr ""
 
@@ -13002,12 +13043,6 @@ msgstr ""
 msgid "Details:"
 msgstr ""
 
-msgid "Plugin icons download error"
-msgstr ""
-
-msgid "JOSM failed to download plugin icons:"
-msgstr ""
-
 msgid ""
 "Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
 "plugin site ''{1}''."
@@ -13893,7 +13928,9 @@ msgid ""
 "Creating and handling address nodes and buildings within Czech Republic."
 msgstr ""
 
-msgid "Allows to import various file formats into JOSM directly."
+msgid ""
+"Allows to import various file formats into JOSM directly. Currently "
+"supported: TangoGPS, Garmin Trainings Center TCX."
 msgstr ""
 
 msgid "Download your GPX tracks from openstreetmap.org"
@@ -13990,6 +14027,11 @@ msgid "A helper for IRS satellite adjustment."
 msgstr ""
 
 msgid ""
+"Provides Java Native Access (JNA) library. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
+msgid ""
 "Provides Java Topology Suite (JTS) library and related utilities. Not meant "
 "to be installed directly by users, but rather as a dependency for other "
 "plugins."
@@ -14345,6 +14387,25 @@ msgstr ""
 msgid "Width (meters)"
 msgstr ""
 
+msgid "Sidewalk"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "both"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "left"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "right"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "no"
+msgstr ""
+
 msgid "Service type"
 msgstr ""
 
@@ -14709,15 +14770,19 @@ msgstr ""
 msgid "May-Sep 09:30-12:30,14:15-19:30"
 msgstr ""
 
+msgctxt "parking"
 msgid "multi-storey"
 msgstr ""
 
+msgctxt "parking"
 msgid "surface"
 msgstr ""
 
+msgctxt "parking"
 msgid "underground"
 msgstr ""
 
+msgctxt "parking"
 msgid "rooftop"
 msgstr ""
 
@@ -15175,15 +15240,26 @@ msgstr ""
 msgid "Overtaking"
 msgstr ""
 
+msgctxt "overtaking"
+msgid "yes"
+msgstr ""
+
+msgctxt "overtaking"
 msgid "both"
 msgstr ""
 
+msgctxt "overtaking"
 msgid "forward"
 msgstr ""
 
+msgctxt "overtaking"
 msgid "backward"
 msgstr ""
 
+msgctxt "overtaking"
+msgid "no"
+msgstr ""
+
 msgid "Roundabout"
 msgstr ""
 
@@ -15477,6 +15553,12 @@ msgstr ""
 msgid "tiger"
 msgstr ""
 
+msgid "Button operated"
+msgstr ""
+
+msgid "Sound signals"
+msgstr ""
+
 msgid "Crossing attendant"
 msgstr ""
 
@@ -15998,9 +16080,6 @@ msgstr ""
 msgid "Traffic lights"
 msgstr ""
 
-msgid "Sound signals"
-msgstr ""
-
 msgid "Barrier"
 msgstr ""
 
@@ -18060,6 +18139,9 @@ msgstr ""
 msgid "Gasometer"
 msgstr ""
 
+msgid "Bunker Silo"
+msgstr ""
+
 msgid "Pipeline"
 msgstr ""
 
@@ -18206,15 +18288,15 @@ msgstr ""
 msgid "Monitoring:"
 msgstr ""
 
-msgid "Weather"
-msgstr ""
-
 msgid "Water level"
 msgstr ""
 
 msgid "Tide Level"
 msgstr ""
 
+msgid "Groundwater"
+msgstr ""
+
 msgid "Traffic"
 msgstr ""
 
@@ -18233,6 +18315,9 @@ msgstr ""
 msgid "Galileo Signals"
 msgstr ""
 
+msgid "Weather"
+msgstr ""
+
 msgid "Radiation"
 msgstr ""
 
@@ -18413,6 +18498,9 @@ msgstr ""
 msgid "pivot_pier"
 msgstr ""
 
+msgid "Bridge outline"
+msgstr ""
+
 msgid "Power Plant"
 msgstr ""
 
@@ -19020,6 +19108,15 @@ msgstr ""
 msgid "Pole"
 msgstr ""
 
+msgid "Pole with Transformer"
+msgstr ""
+
+msgid "Pole Attributes:"
+msgstr ""
+
+msgid "Transformer Attributes:"
+msgstr ""
+
 msgid "Power Line"
 msgstr ""
 
@@ -19069,9 +19166,15 @@ msgstr ""
 msgid "Power Cable"
 msgstr ""
 
+msgctxt "power cable"
+msgid "underground"
+msgstr ""
+
+msgctxt "power cable"
 msgid "underwater"
 msgstr ""
 
+msgctxt "power cable"
 msgid "overground"
 msgstr ""
 
@@ -19099,6 +19202,33 @@ msgstr ""
 msgid "Memorial"
 msgstr ""
 
+msgctxt "memorial"
+msgid "statue"
+msgstr ""
+
+msgctxt "memorial"
+msgid "bust"
+msgstr ""
+
+msgctxt "memorial"
+msgid "plaque"
+msgstr ""
+
+msgctxt "memorial"
+msgid "stele"
+msgstr ""
+
+msgctxt "memorial"
+msgid "stone"
+msgstr ""
+
+msgctxt "memorial"
+msgid "war_memorial"
+msgstr ""
+
+msgid "Inscription"
+msgstr ""
+
 msgid "Wayside Cross"
 msgstr ""
 
@@ -19168,6 +19298,9 @@ msgstr ""
 msgid "Beverages"
 msgstr ""
 
+msgid "Wine"
+msgstr ""
+
 msgid "Boutique"
 msgstr ""
 
@@ -19213,6 +19346,9 @@ msgstr ""
 msgid "Video Games"
 msgstr ""
 
+msgid "Music"
+msgstr ""
+
 msgid "Cash"
 msgstr ""
 
@@ -19240,6 +19376,9 @@ msgstr ""
 msgid "Curtain"
 msgstr ""
 
+msgid "Art"
+msgstr ""
+
 msgid "Frame"
 msgstr ""
 
@@ -19285,6 +19424,9 @@ msgstr ""
 msgid "Beauty"
 msgstr ""
 
+msgid "Tattoo"
+msgstr ""
+
 msgid "Optician"
 msgstr ""
 
@@ -19336,6 +19478,9 @@ msgstr ""
 msgid "Pet"
 msgstr ""
 
+msgid "Funeral Directors"
+msgstr ""
+
 msgid "Vending Machine"
 msgstr ""
 
@@ -19435,6 +19580,15 @@ msgstr ""
 msgid "National Park"
 msgstr ""
 
+msgid "Protected Area"
+msgstr ""
+
+msgid "Protected Class"
+msgstr ""
+
+msgid "Title or type of protection"
+msgstr ""
+
 msgid "Places"
 msgstr ""
 
@@ -20511,7 +20665,13 @@ msgstr ""
 msgid "Estonia Ortho (Maaamet)"
 msgstr ""
 
-msgid "Estonia Multi (Maaamet)"
+msgid "Estonia Hillshade (Maaamet)"
+msgstr ""
+
+msgid "Estonia Cadastre (Maaamet)"
+msgstr ""
+
+msgid "Estonia Forestry (Maaamet)"
 msgstr ""
 
 msgid "Bordeaux - 2012"
@@ -20535,7 +20695,7 @@ msgstr ""
 msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
 msgstr ""
 
-msgid "CUGN Nancy - Orthophoto 2012"
+msgid "GrandNancy Orthophotographie 2012"
 msgstr ""
 
 msgid "Géobretagne - Brest 2010 - 10 cm"
@@ -20582,9 +20742,6 @@ msgid ""
 "- 1 m"
 msgstr ""
 
-msgid "Streets NRW Geofabrik.de"
-msgstr ""
-
 msgid "Hike & Bike"
 msgstr ""
 
@@ -20644,6 +20801,9 @@ msgstr ""
 msgid "NRW-Atlas: Topographische Karte 1:10000"
 msgstr ""
 
+msgid "Metropole Ruhr: Luftbilder (10 cm)"
+msgstr ""
+
 msgid "Drone Imagery (Haiti)"
 msgstr ""
 
@@ -20845,6 +21005,9 @@ msgstr ""
 msgid "Stadt Zürich Übersichtsplan (Strassen, Gebäude, Hausnummer)"
 msgstr ""
 
+msgid "Stadt Zürich Luftbild 2011"
+msgstr ""
+
 msgid "Orthofoto Kanton Solothurn RGB (SOGIS 2011/2012/2013)"
 msgstr ""
 
@@ -20863,7 +21026,7 @@ msgstr ""
 msgid "Canton de Fribourg 50cm (2005)"
 msgstr ""
 
-msgid "Stadt Bern 10cm/25cm (2008)"
+msgid "Stadt Bern 10cm/25cm (2012)"
 msgstr ""
 
 msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
@@ -20902,7 +21065,7 @@ msgstr ""
 msgid "OSM US TIGER 2012 Roads Overlay"
 msgstr ""
 
-msgid "New & Misaligned TIGER Roads (TIGER 2013)"
+msgid "New & Misaligned TIGER Roads (TIGER 2014)"
 msgstr ""
 
 msgid "MassGIS L3 Parcels"
@@ -20950,9 +21113,234 @@ msgstr ""
 msgid "NLS - Bartholomew Half Inch, 1897-1907"
 msgstr ""
 
+msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Annan 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgstr ""
+
 msgid "OS Town Plans, Cupar 1854 (NLS)"
 msgstr ""
 
+msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Elgin 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Forres 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Galashiels 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Girvan 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Greenock 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Haddington 1853 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Haddington 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Hamilton 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Irvine 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Jedburgh 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kelso 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Lanark 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Linlithgow 1856 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Musselburgh 1853 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Musselburgh 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Oban 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Peebles 1856 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Perth 1860 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Peterhead 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Selkirk 1865 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, St Andrews 1854 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, St Andrews 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stirling 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stonehaven 1864 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1847 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Strathaven 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wick 1872 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wigtown 1848 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wigtown 1894 (NLS)"
+msgstr ""
+
 msgid "Decreasing house numbers in addresses interpolation"
 msgstr ""
 
@@ -21006,17 +21394,37 @@ msgid "{0}={1} is deprecated. Please use instead a multipolygon."
 msgstr ""
 
 msgid ""
-"{0} is deprecated. Please specify ìnterval by using opening_hours syntax"
+"{0} is deprecated. Please specify interval by using opening_hours syntax"
 msgstr ""
 
 msgid ""
 "{0} is deprecated. Please delete this object and use a private layer instead"
 msgstr ""
 
-msgid "{0} on a node"
+msgid "{0}={1} is unspecific. Please replace ''{1}'' by a specific value."
 msgstr ""
 
-msgid "{0} on a node. Should be drawn as an area"
+msgid "{0} should be replaced with {1}"
+msgstr ""
+
+msgid ""
+"{0}={1} is unspecific. Please replace ''{1}'' by ''left'', ''right'' or "
+"''both''."
+msgstr ""
+
+msgid "{0} on a node. Should be used on a way."
+msgstr ""
+
+msgid "{0} on a node. Should be drawn as an area."
+msgstr ""
+
+msgid "{0}=* on a node. Should be used in a relation"
+msgstr ""
+
+msgid "{0} on a way. Should be used in a relation"
+msgstr ""
+
+msgid "{0} on a node"
 msgstr ""
 
 msgid "Building inside building"
@@ -25686,6 +26094,9 @@ msgstr ""
 msgid "Find"
 msgstr ""
 
+msgid "Show"
+msgstr ""
+
 msgid "Mark"
 msgstr ""
 
diff --git a/i18n/po/en_GB.po b/i18n/po/en_GB.po
index fba0be4..1397e3a 100644
--- a/i18n/po/en_GB.po
+++ b/i18n/po/en_GB.po
@@ -1,8 +1,16 @@
+# English (British) translation of JOSM.
+# Copyright (C) 2006 Immanuel Scholz
+# This file is distributed under the same licence as the JOSM package.
+#
+# Bruce Cowan <bcowan at fastmail.co.uk>, 2006 - 2009.
+# Dirk Stöcker <openstreetmap at dstoecker.de>, 2008.
+# Bruce Cowan <bcowan at fastmail.co.uk>, 2009.
+# Matthias Julius <mdeb at julius-net.net>, 2010.
 msgid ""
 msgstr ""
 "Project-Id-Version: JOSM\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-21 03:38+0200\n"
+"POT-Creation-Date: 2014-12-10 03:42+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"
@@ -10,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-10-21 05:33+0000\n"
-"X-Generator: Launchpad (build 17203)\n"
+"X-Launchpad-Export-Date: 2014-12-10 05:19+0000\n"
+"X-Generator: Launchpad (build 17283)\n"
 "Language: de\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -171,20 +179,6 @@ msgid "About JOSM..."
 msgstr "About JOSM..."
 
 msgid ""
-"Unexpected format of API base URL. Redirection to info or history page for "
-"OSM object will probably fail. API base URL is: ''{0}''"
-msgstr ""
-"Unexpected format of API base URL. Redirection to info or history page for "
-"OSM object will probably fail. API base URL is: ''{0}''"
-
-msgid ""
-"Unexpected format of API base URL. Redirection to user page for OSM user "
-"will probably fail. API base URL is: ''{0}''"
-msgstr ""
-"Unexpected format of API base URL. Redirection to user page for OSM user "
-"will probably fail. API base URL is: ''{0}''"
-
-msgid ""
 "You are about to launch {0} browser window.<br>This may both clutter your "
 "screen with browser windows<br>and take some time to finish."
 msgid_plural ""
@@ -1642,6 +1636,15 @@ msgstr "No changes to upload."
 msgid "Nothing to upload. Get some data first."
 msgstr "Nothing to upload. Get some data first."
 
+msgid "Upload note changes to server"
+msgstr ""
+
+msgid "Upload notes"
+msgstr ""
+
+msgid "Uploading notes to server"
+msgstr ""
+
 msgid "Upload selection"
 msgstr "Upload selection"
 
@@ -1925,10 +1928,16 @@ msgstr ""
 msgid "Click the location where you wish to create a new note"
 msgstr ""
 
-msgid "Enter a comment for a new note"
+msgid "Create new note"
 msgstr ""
 
-msgid "Create new note"
+msgid "Create note"
+msgstr ""
+
+msgid "Enter a detailed comment to create a note"
+msgstr ""
+
+msgid "You must enter a comment to create a new note"
 msgstr ""
 
 msgid "Delete Mode"
@@ -2878,6 +2887,15 @@ msgstr "... refers to relation"
 msgid "Cycling dependencies"
 msgstr "Cycling dependencies"
 
+msgid "Uploading modified notes"
+msgstr ""
+
+msgid "Note {0} failed: {1}"
+msgstr ""
+
+msgid "Notes failed to upload"
+msgstr ""
+
 msgid ""
 "The following are results of automatic validation. Try fixing these, but be "
 "careful (don''t destroy valid data). When in doubt ignore them.<br>When you "
@@ -5228,6 +5246,12 @@ msgstr "Conflict background: keep all tags"
 msgid "Conflict foreground: keep all tags"
 msgstr "Conflict foreground: keep all tags"
 
+msgid "Conflict background: sum all numeric tags"
+msgstr ""
+
+msgid "Conflict foreground: sum all numeric tags"
+msgstr ""
+
 msgid "Conflict background: keep member"
 msgstr "Conflict background: keep member"
 
@@ -5686,12 +5710,19 @@ msgstr "none"
 msgid "all"
 msgstr "all"
 
+msgid "sum"
+msgstr ""
+
 msgid "Please decide which values to keep"
 msgstr "Please decide which values to keep"
 
 msgid "Value ''{0}'' is going to be applied for key ''{1}''"
 msgstr "Value ''{0}'' is going to be applied for key ''{1}''"
 
+msgid ""
+"All numeric values sumed as ''{0}'' are going to be applied for key ''{1}''"
+msgstr ""
+
 msgid "The key ''{0}'' and all its values are going to be removed"
 msgstr "The key ''{0}'' and all its values are going to be removed"
 
@@ -6084,24 +6115,6 @@ msgstr[1] "<b>{0}</b> objects disabled"
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr "</p><p>Close the filter dialogue to see all objects.<p></html>"
 
-msgid "Display the history of all selected items."
-msgstr "Display the history of all selected items."
-
-msgid "Object with history"
-msgstr "Object with history"
-
-msgid "Reload"
-msgstr "Reload"
-
-msgid "Reload all currently selected objects and refresh the list."
-msgstr "Reload all currently selected objects and refresh the list."
-
-msgid "Show"
-msgstr "Show"
-
-msgid "Display the history of the selected objects."
-msgstr "Display the history of the selected objects."
-
 msgid "Advanced object info"
 msgstr "Advanced object info"
 
@@ -6462,6 +6475,9 @@ msgstr ""
 msgid "Comment"
 msgstr "Comment"
 
+msgid "Comment on note"
+msgstr ""
+
 msgid "Add comment to note:"
 msgstr ""
 
@@ -6471,9 +6487,6 @@ msgstr ""
 msgid "Close note with message:"
 msgstr ""
 
-msgid "Close Note"
-msgstr ""
-
 msgid "Create a new note"
 msgstr ""
 
@@ -6551,6 +6564,9 @@ msgstr "Current Selection"
 msgid "Search for objects"
 msgstr "Search for objects"
 
+msgid "Display the history of the selected objects."
+msgstr "Display the history of the selected objects."
+
 msgid "Zoom to selection"
 msgstr "Zoom to selection"
 
@@ -6673,6 +6689,9 @@ msgstr "Fixing ({0}/{1}): ''{2}''"
 msgid "Updating map ..."
 msgstr "Updating map ..."
 
+msgid "anonymous"
+msgstr "anonymous"
+
 msgid "Display the basic properties of the changeset"
 msgstr "Display the basic properties of the changeset"
 
@@ -6685,6 +6704,12 @@ msgstr "Content"
 msgid "Display the objects created, updated, and deleted by the changeset"
 msgstr "Display the objects created, updated, and deleted by the changeset"
 
+msgid "Discussion"
+msgstr ""
+
+msgid "Display the public discussion around this changeset"
+msgstr ""
+
 msgid "Changeset Management Dialog"
 msgstr "Changeset Management Dialogue"
 
@@ -6746,9 +6771,6 @@ msgctxt "changeset.state"
 msgid "Closed"
 msgstr "Closed"
 
-msgid "anonymous"
-msgstr "anonymous"
-
 msgid "ID"
 msgstr "ID"
 
@@ -6764,6 +6786,9 @@ msgstr "Created at"
 msgid "Closed at"
 msgstr "Closed at"
 
+msgid "Discussions"
+msgstr ""
+
 msgid "Downloading changeset content"
 msgstr "Downloading changeset content"
 
@@ -6885,6 +6910,15 @@ msgstr ""
 "Zoom to the objects in the content of this changeset in the current data "
 "layer"
 
+msgid "Update changeset discussion"
+msgstr ""
+
+msgid "Update the changeset discussion from the OSM server"
+msgstr ""
+
+msgid "Date"
+msgstr "Date"
+
 msgid "Download changesets"
 msgstr "Download changesets"
 
@@ -7340,8 +7374,8 @@ msgstr "Please select a value"
 msgid "Set number of recently added tags"
 msgstr "Set number of recently added tags"
 
-msgid "Remember last used tags"
-msgstr "Remember last used tags"
+msgid "Remember last used tags after a restart"
+msgstr ""
 
 msgid "Please enter the number of recently added tags to display"
 msgstr "Please enter the number of recently added tags to display"
@@ -7718,6 +7752,9 @@ msgstr "including immediate children of parent relations"
 msgid "Load parent relations"
 msgstr "Load parent relations"
 
+msgid "Reload"
+msgstr "Reload"
+
 msgid "Loading parent relations"
 msgstr "Loading parent relations"
 
@@ -7845,6 +7882,12 @@ msgstr "Raw GPS data"
 msgid "Select to download GPS traces in the selected download area."
 msgstr "Select to download GPS traces in the selected download area."
 
+msgid "Notes"
+msgstr "Notes"
+
+msgid "Select to download notes in the selected download area."
+msgstr ""
+
 msgid "Download as new layer"
 msgstr "Download as new layer"
 
@@ -8180,9 +8223,6 @@ msgstr "A"
 msgid "B"
 msgstr "B"
 
-msgid "Date"
-msgstr "Date"
-
 msgid ""
 "Failed to update primitive with id {0} because current edit layer is null"
 msgstr ""
@@ -9157,9 +9197,6 @@ msgstr ""
 msgid "Save Layer"
 msgstr "Save Layer"
 
-msgid "Notes"
-msgstr "Notes"
-
 msgid "Notes layer"
 msgstr "Notes layer"
 
@@ -9175,9 +9212,6 @@ msgstr "Data Layer {0}"
 msgid "outside downloaded area"
 msgstr "outside downloaded area"
 
-msgid "version {0}"
-msgstr "version {0}"
-
 msgid "Merging layers"
 msgstr "Merging layers"
 
@@ -13127,6 +13161,15 @@ msgstr "ID of current changeset > 0 required. Current ID is {0}."
 msgid "Open changeset expected. Got closed changeset with id {0}."
 msgstr "Open changeset expected. Got closed changeset with id {0}."
 
+msgid "Note upload failed"
+msgstr ""
+
+msgid "Error parsing note response from server"
+msgstr ""
+
+msgid "Error encoding string: {0}"
+msgstr ""
+
 msgid "(Code={0})"
 msgstr "(Code={0})"
 
@@ -13182,15 +13225,15 @@ msgstr ""
 msgid "Parsing changeset content ..."
 msgstr "Parsing changeset content ..."
 
+msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
+msgstr "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
+
 msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
 msgstr "Illegal value for attribute ''{0}''. Got ''{1}''."
 
 msgid "Illegal numeric value for attribute ''{0}''. Got ''{1}''."
 msgstr "Illegal numeric value for attribute ''{0}''. Got ''{1}''."
 
-msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
-msgstr "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
-
 msgid "Missing mandatory attribute ''{0}'' of XML element {1}."
 msgstr "Missing mandatory attribute ''{0}'' of XML element {1}."
 
@@ -14059,9 +14102,6 @@ msgstr "Processing file ''{0}''"
 msgid "Failed to scan file ''{0}'' for plugin information. Skipping."
 msgstr "Failed to scan file ''{0}'' for plugin information. Skipping."
 
-msgid "Processing plugin site cache icon files..."
-msgstr "Processing plugin site cache icon files..."
-
 msgid "Processing plugin files..."
 msgstr "Processing plug-in files..."
 
@@ -14080,12 +14120,6 @@ msgstr "JOSM failed to download plugin list:"
 msgid "Details:"
 msgstr "Details:"
 
-msgid "Plugin icons download error"
-msgstr "Plugin icons download error"
-
-msgid "JOSM failed to download plugin icons:"
-msgstr "JOSM failed to download plugin icons:"
-
 msgid ""
 "Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
 "plugin site ''{1}''."
@@ -15168,8 +15202,10 @@ msgid ""
 msgstr ""
 "Creating and handling address nodes and buildings within Czech Republic."
 
-msgid "Allows to import various file formats into JOSM directly."
-msgstr "Allows to import various file formats into JOSM directly."
+msgid ""
+"Allows to import various file formats into JOSM directly. Currently "
+"supported: TangoGPS, Garmin Trainings Center TCX."
+msgstr ""
 
 msgid "Download your GPX tracks from openstreetmap.org"
 msgstr "Download your GPX tracks from openstreetmap.org"
@@ -15284,6 +15320,11 @@ msgid "A helper for IRS satellite adjustment."
 msgstr "A helper for IRS satellite adjustment."
 
 msgid ""
+"Provides Java Native Access (JNA) library. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
+msgid ""
 "Provides Java Topology Suite (JTS) library and related utilities. Not meant "
 "to be installed directly by users, but rather as a dependency for other "
 "plugins."
@@ -15697,6 +15738,25 @@ msgstr "Lit"
 msgid "Width (meters)"
 msgstr "Width (metres)"
 
+msgid "Sidewalk"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "both"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "left"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "right"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "no"
+msgstr ""
+
 msgid "Service type"
 msgstr "Service type"
 
@@ -16063,17 +16123,21 @@ msgstr ""
 msgid "May-Sep 09:30-12:30,14:15-19:30"
 msgstr ""
 
+msgctxt "parking"
 msgid "multi-storey"
-msgstr "multi-storey"
+msgstr ""
 
+msgctxt "parking"
 msgid "surface"
-msgstr "surface"
+msgstr ""
 
+msgctxt "parking"
 msgid "underground"
-msgstr "underground"
+msgstr ""
 
+msgctxt "parking"
 msgid "rooftop"
-msgstr "rooftop"
+msgstr ""
 
 msgid "Reference number"
 msgstr "Reference number"
@@ -16529,14 +16593,25 @@ msgstr "Max. length (meters)"
 msgid "Overtaking"
 msgstr "Overtaking"
 
+msgctxt "overtaking"
+msgid "yes"
+msgstr ""
+
+msgctxt "overtaking"
 msgid "both"
-msgstr "both"
+msgstr ""
 
+msgctxt "overtaking"
 msgid "forward"
-msgstr "forward"
+msgstr ""
 
+msgctxt "overtaking"
 msgid "backward"
-msgstr "backward"
+msgstr ""
+
+msgctxt "overtaking"
+msgid "no"
+msgstr ""
 
 msgid "Roundabout"
 msgstr "Roundabout"
@@ -16842,6 +16917,12 @@ msgstr "pegasus"
 msgid "tiger"
 msgstr "tiger"
 
+msgid "Button operated"
+msgstr ""
+
+msgid "Sound signals"
+msgstr "Sound signals"
+
 msgid "Crossing attendant"
 msgstr "Crossing attendant"
 
@@ -17369,9 +17450,6 @@ msgstr "Level Crossing"
 msgid "Traffic lights"
 msgstr "Traffic lights"
 
-msgid "Sound signals"
-msgstr "Sound signals"
-
 msgid "Barrier"
 msgstr "Barrier"
 
@@ -19432,6 +19510,9 @@ msgstr "Windmill"
 msgid "Gasometer"
 msgstr "Gasometer"
 
+msgid "Bunker Silo"
+msgstr ""
+
 msgid "Pipeline"
 msgstr "Pipeline"
 
@@ -19578,15 +19659,15 @@ msgstr ""
 msgid "Monitoring:"
 msgstr ""
 
-msgid "Weather"
-msgstr ""
-
 msgid "Water level"
 msgstr ""
 
 msgid "Tide Level"
 msgstr ""
 
+msgid "Groundwater"
+msgstr ""
+
 msgid "Traffic"
 msgstr ""
 
@@ -19605,6 +19686,9 @@ msgstr ""
 msgid "Galileo Signals"
 msgstr ""
 
+msgid "Weather"
+msgstr ""
+
 msgid "Radiation"
 msgstr ""
 
@@ -19785,6 +19869,9 @@ msgstr ""
 msgid "pivot_pier"
 msgstr ""
 
+msgid "Bridge outline"
+msgstr ""
+
 msgid "Power Plant"
 msgstr ""
 
@@ -20392,6 +20479,15 @@ msgstr ""
 msgid "Pole"
 msgstr ""
 
+msgid "Pole with Transformer"
+msgstr ""
+
+msgid "Pole Attributes:"
+msgstr ""
+
+msgid "Transformer Attributes:"
+msgstr ""
+
 msgid "Power Line"
 msgstr "Power Line"
 
@@ -20441,9 +20537,15 @@ msgstr ""
 msgid "Power Cable"
 msgstr ""
 
+msgctxt "power cable"
+msgid "underground"
+msgstr ""
+
+msgctxt "power cable"
 msgid "underwater"
 msgstr ""
 
+msgctxt "power cable"
 msgid "overground"
 msgstr ""
 
@@ -20471,6 +20573,33 @@ msgstr "Monument"
 msgid "Memorial"
 msgstr "Memorial"
 
+msgctxt "memorial"
+msgid "statue"
+msgstr ""
+
+msgctxt "memorial"
+msgid "bust"
+msgstr ""
+
+msgctxt "memorial"
+msgid "plaque"
+msgstr ""
+
+msgctxt "memorial"
+msgid "stele"
+msgstr ""
+
+msgctxt "memorial"
+msgid "stone"
+msgstr ""
+
+msgctxt "memorial"
+msgid "war_memorial"
+msgstr ""
+
+msgid "Inscription"
+msgstr ""
+
 msgid "Wayside Cross"
 msgstr "Wayside Cross"
 
@@ -20540,6 +20669,9 @@ msgstr "Alcohol"
 msgid "Beverages"
 msgstr "Beverages"
 
+msgid "Wine"
+msgstr ""
+
 msgid "Boutique"
 msgstr ""
 
@@ -20585,6 +20717,9 @@ msgstr "Video"
 msgid "Video Games"
 msgstr ""
 
+msgid "Music"
+msgstr ""
+
 msgid "Cash"
 msgstr "Cash"
 
@@ -20612,6 +20747,9 @@ msgstr ""
 msgid "Curtain"
 msgstr ""
 
+msgid "Art"
+msgstr ""
+
 msgid "Frame"
 msgstr ""
 
@@ -20657,6 +20795,9 @@ msgstr ""
 msgid "Beauty"
 msgstr ""
 
+msgid "Tattoo"
+msgstr ""
+
 msgid "Optician"
 msgstr "Optician"
 
@@ -20708,6 +20849,9 @@ msgstr ""
 msgid "Pet"
 msgstr ""
 
+msgid "Funeral Directors"
+msgstr ""
+
 msgid "Vending Machine"
 msgstr ""
 
@@ -20807,6 +20951,15 @@ msgstr ""
 msgid "National Park"
 msgstr ""
 
+msgid "Protected Area"
+msgstr ""
+
+msgid "Protected Class"
+msgstr ""
+
+msgid "Title or type of protection"
+msgstr ""
+
 msgid "Places"
 msgstr "Places"
 
@@ -21885,7 +22038,13 @@ msgstr ""
 msgid "Estonia Ortho (Maaamet)"
 msgstr ""
 
-msgid "Estonia Multi (Maaamet)"
+msgid "Estonia Hillshade (Maaamet)"
+msgstr ""
+
+msgid "Estonia Cadastre (Maaamet)"
+msgstr ""
+
+msgid "Estonia Forestry (Maaamet)"
 msgstr ""
 
 msgid "Bordeaux - 2012"
@@ -21909,7 +22068,7 @@ msgstr ""
 msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
 msgstr ""
 
-msgid "CUGN Nancy - Orthophoto 2012"
+msgid "GrandNancy Orthophotographie 2012"
 msgstr ""
 
 msgid "Géobretagne - Brest 2010 - 10 cm"
@@ -21956,9 +22115,6 @@ msgid ""
 "- 1 m"
 msgstr ""
 
-msgid "Streets NRW Geofabrik.de"
-msgstr ""
-
 msgid "Hike & Bike"
 msgstr ""
 
@@ -22018,6 +22174,9 @@ msgstr ""
 msgid "NRW-Atlas: Topographische Karte 1:10000"
 msgstr ""
 
+msgid "Metropole Ruhr: Luftbilder (10 cm)"
+msgstr ""
+
 msgid "Drone Imagery (Haiti)"
 msgstr ""
 
@@ -22219,6 +22378,9 @@ msgstr ""
 msgid "Stadt Zürich Übersichtsplan (Strassen, Gebäude, Hausnummer)"
 msgstr ""
 
+msgid "Stadt Zürich Luftbild 2011"
+msgstr ""
+
 msgid "Orthofoto Kanton Solothurn RGB (SOGIS 2011/2012/2013)"
 msgstr ""
 
@@ -22237,7 +22399,7 @@ msgstr ""
 msgid "Canton de Fribourg 50cm (2005)"
 msgstr ""
 
-msgid "Stadt Bern 10cm/25cm (2008)"
+msgid "Stadt Bern 10cm/25cm (2012)"
 msgstr ""
 
 msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
@@ -22276,7 +22438,7 @@ msgstr ""
 msgid "OSM US TIGER 2012 Roads Overlay"
 msgstr ""
 
-msgid "New & Misaligned TIGER Roads (TIGER 2013)"
+msgid "New & Misaligned TIGER Roads (TIGER 2014)"
 msgstr ""
 
 msgid "MassGIS L3 Parcels"
@@ -22324,9 +22486,234 @@ msgstr ""
 msgid "NLS - Bartholomew Half Inch, 1897-1907"
 msgstr ""
 
+msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Annan 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgstr ""
+
 msgid "OS Town Plans, Cupar 1854 (NLS)"
 msgstr ""
 
+msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Elgin 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Forres 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Galashiels 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Girvan 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Greenock 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Haddington 1853 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Haddington 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Hamilton 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Irvine 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Jedburgh 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kelso 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Lanark 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Linlithgow 1856 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Musselburgh 1853 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Musselburgh 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Oban 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Peebles 1856 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Perth 1860 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Peterhead 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Selkirk 1865 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, St Andrews 1854 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, St Andrews 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stirling 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stonehaven 1864 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1847 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Strathaven 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wick 1872 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wigtown 1848 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wigtown 1894 (NLS)"
+msgstr ""
+
 msgid "Decreasing house numbers in addresses interpolation"
 msgstr "Decreasing house numbers in addresses interpolation"
 
@@ -22384,19 +22771,39 @@ msgid "{0}={1} is deprecated. Please use instead a multipolygon."
 msgstr "{0}={1} is deprecated. Please use a multipolygon instead."
 
 msgid ""
-"{0} is deprecated. Please specify ìnterval by using opening_hours syntax"
+"{0} is deprecated. Please specify interval by using opening_hours syntax"
 msgstr ""
 
 msgid ""
 "{0} is deprecated. Please delete this object and use a private layer instead"
 msgstr ""
 
+msgid "{0}={1} is unspecific. Please replace ''{1}'' by a specific value."
+msgstr ""
+
+msgid "{0} should be replaced with {1}"
+msgstr ""
+
+msgid ""
+"{0}={1} is unspecific. Please replace ''{1}'' by ''left'', ''right'' or "
+"''both''."
+msgstr ""
+
+msgid "{0} on a node. Should be used on a way."
+msgstr ""
+
+msgid "{0} on a node. Should be drawn as an area."
+msgstr ""
+
+msgid "{0}=* on a node. Should be used in a relation"
+msgstr ""
+
+msgid "{0} on a way. Should be used in a relation"
+msgstr ""
+
 msgid "{0} on a node"
 msgstr "{0} on a node"
 
-msgid "{0} on a node. Should be drawn as an area"
-msgstr "{0} on a node. Should be drawn as an area"
-
 msgid "Building inside building"
 msgstr "Building inside building"
 
@@ -27232,6 +27639,9 @@ msgstr ""
 msgid "Find"
 msgstr ""
 
+msgid "Show"
+msgstr "Show"
+
 msgid "Mark"
 msgstr ""
 
diff --git a/i18n/po/eo.po b/i18n/po/eo.po
index fd2257e..c20a50a 100644
--- a/i18n/po/eo.po
+++ b/i18n/po/eo.po
@@ -1,8 +1,13 @@
+# Esperanto translation for josm
+# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
+# This file is distributed under the same license as the josm package.
+# FIRST AUTHOR <EMAIL at ADDRESS>, 2009.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-21 03:38+0200\n"
+"POT-Creation-Date: 2014-12-10 03:42+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"
@@ -10,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-10-21 04:47+0000\n"
-"X-Generator: Launchpad (build 17203)\n"
+"X-Launchpad-Export-Date: 2014-12-10 04:44+0000\n"
+"X-Generator: Launchpad (build 17283)\n"
 "Language: eo\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -168,16 +173,6 @@ msgid "About JOSM..."
 msgstr "Pri JOSM…"
 
 msgid ""
-"Unexpected format of API base URL. Redirection to info or history page for "
-"OSM object will probably fail. API base URL is: ''{0}''"
-msgstr ""
-
-msgid ""
-"Unexpected format of API base URL. Redirection to user page for OSM user "
-"will probably fail. API base URL is: ''{0}''"
-msgstr ""
-
-msgid ""
 "You are about to launch {0} browser window.<br>This may both clutter your "
 "screen with browser windows<br>and take some time to finish."
 msgid_plural ""
@@ -1521,6 +1516,15 @@ msgstr ""
 msgid "Nothing to upload. Get some data first."
 msgstr ""
 
+msgid "Upload note changes to server"
+msgstr ""
+
+msgid "Upload notes"
+msgstr ""
+
+msgid "Uploading notes to server"
+msgstr ""
+
 msgid "Upload selection"
 msgstr ""
 
@@ -1793,10 +1797,16 @@ msgstr ""
 msgid "Click the location where you wish to create a new note"
 msgstr ""
 
-msgid "Enter a comment for a new note"
+msgid "Create new note"
 msgstr ""
 
-msgid "Create new note"
+msgid "Create note"
+msgstr ""
+
+msgid "Enter a detailed comment to create a note"
+msgstr ""
+
+msgid "You must enter a comment to create a new note"
 msgstr ""
 
 msgid "Delete Mode"
@@ -2667,6 +2677,15 @@ msgstr ""
 msgid "Cycling dependencies"
 msgstr ""
 
+msgid "Uploading modified notes"
+msgstr ""
+
+msgid "Note {0} failed: {1}"
+msgstr ""
+
+msgid "Notes failed to upload"
+msgstr ""
+
 msgid ""
 "The following are results of automatic validation. Try fixing these, but be "
 "careful (don''t destroy valid data). When in doubt ignore them.<br>When you "
@@ -4896,6 +4915,12 @@ msgstr ""
 msgid "Conflict foreground: keep all tags"
 msgstr ""
 
+msgid "Conflict background: sum all numeric tags"
+msgstr ""
+
+msgid "Conflict foreground: sum all numeric tags"
+msgstr ""
+
 msgid "Conflict background: keep member"
 msgstr ""
 
@@ -5314,12 +5339,19 @@ msgstr "neniom"
 msgid "all"
 msgstr "ĉiom"
 
+msgid "sum"
+msgstr ""
+
 msgid "Please decide which values to keep"
 msgstr ""
 
 msgid "Value ''{0}'' is going to be applied for key ''{1}''"
 msgstr ""
 
+msgid ""
+"All numeric values sumed as ''{0}'' are going to be applied for key ''{1}''"
+msgstr ""
+
 msgid "The key ''{0}'' and all its values are going to be removed"
 msgstr ""
 
@@ -5682,24 +5714,6 @@ msgstr[1] ""
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
 
-msgid "Display the history of all selected items."
-msgstr ""
-
-msgid "Object with history"
-msgstr ""
-
-msgid "Reload"
-msgstr "Reŝarĝi"
-
-msgid "Reload all currently selected objects and refresh the list."
-msgstr ""
-
-msgid "Show"
-msgstr ""
-
-msgid "Display the history of the selected objects."
-msgstr ""
-
 msgid "Advanced object info"
 msgstr ""
 
@@ -6037,6 +6051,9 @@ msgstr ""
 msgid "Comment"
 msgstr ""
 
+msgid "Comment on note"
+msgstr ""
+
 msgid "Add comment to note:"
 msgstr ""
 
@@ -6046,9 +6063,6 @@ msgstr ""
 msgid "Close note with message:"
 msgstr ""
 
-msgid "Close Note"
-msgstr ""
-
 msgid "Create a new note"
 msgstr ""
 
@@ -6121,6 +6135,9 @@ msgstr ""
 msgid "Search for objects"
 msgstr ""
 
+msgid "Display the history of the selected objects."
+msgstr ""
+
 msgid "Zoom to selection"
 msgstr ""
 
@@ -6240,6 +6257,9 @@ msgstr ""
 msgid "Updating map ..."
 msgstr ""
 
+msgid "anonymous"
+msgstr ""
+
 msgid "Display the basic properties of the changeset"
 msgstr ""
 
@@ -6252,6 +6272,12 @@ msgstr ""
 msgid "Display the objects created, updated, and deleted by the changeset"
 msgstr ""
 
+msgid "Discussion"
+msgstr ""
+
+msgid "Display the public discussion around this changeset"
+msgstr ""
+
 msgid "Changeset Management Dialog"
 msgstr ""
 
@@ -6309,9 +6335,6 @@ msgctxt "changeset.state"
 msgid "Closed"
 msgstr ""
 
-msgid "anonymous"
-msgstr ""
-
 msgid "ID"
 msgstr ""
 
@@ -6327,6 +6350,9 @@ msgstr ""
 msgid "Closed at"
 msgstr ""
 
+msgid "Discussions"
+msgstr ""
+
 msgid "Downloading changeset content"
 msgstr ""
 
@@ -6438,6 +6464,15 @@ msgid ""
 "layer"
 msgstr ""
 
+msgid "Update changeset discussion"
+msgstr ""
+
+msgid "Update the changeset discussion from the OSM server"
+msgstr ""
+
+msgid "Date"
+msgstr ""
+
 msgid "Download changesets"
 msgstr ""
 
@@ -6855,7 +6890,7 @@ msgstr ""
 msgid "Set number of recently added tags"
 msgstr ""
 
-msgid "Remember last used tags"
+msgid "Remember last used tags after a restart"
 msgstr ""
 
 msgid "Please enter the number of recently added tags to display"
@@ -7201,6 +7236,9 @@ msgstr ""
 msgid "Load parent relations"
 msgstr ""
 
+msgid "Reload"
+msgstr "Reŝarĝi"
+
 msgid "Loading parent relations"
 msgstr ""
 
@@ -7323,6 +7361,12 @@ msgstr ""
 msgid "Select to download GPS traces in the selected download area."
 msgstr ""
 
+msgid "Notes"
+msgstr "Biletoj"
+
+msgid "Select to download notes in the selected download area."
+msgstr ""
+
 msgid "Download as new layer"
 msgstr ""
 
@@ -7628,9 +7672,6 @@ msgstr ""
 msgid "B"
 msgstr ""
 
-msgid "Date"
-msgstr ""
-
 msgid ""
 "Failed to update primitive with id {0} because current edit layer is null"
 msgstr ""
@@ -8485,9 +8526,6 @@ msgstr ""
 msgid "Save Layer"
 msgstr ""
 
-msgid "Notes"
-msgstr "Biletoj"
-
 msgid "Notes layer"
 msgstr ""
 
@@ -8503,9 +8541,6 @@ msgstr ""
 msgid "outside downloaded area"
 msgstr ""
 
-msgid "version {0}"
-msgstr ""
-
 msgid "Merging layers"
 msgstr ""
 
@@ -12135,6 +12170,15 @@ msgstr ""
 msgid "Open changeset expected. Got closed changeset with id {0}."
 msgstr ""
 
+msgid "Note upload failed"
+msgstr ""
+
+msgid "Error parsing note response from server"
+msgstr ""
+
+msgid "Error encoding string: {0}"
+msgstr ""
+
 msgid "(Code={0})"
 msgstr ""
 
@@ -12183,13 +12227,13 @@ msgstr ""
 msgid "Parsing changeset content ..."
 msgstr ""
 
-msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
-msgid "Illegal numeric value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
-msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal numeric value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
 msgid "Missing mandatory attribute ''{0}'' of XML element {1}."
@@ -12981,9 +13025,6 @@ msgstr ""
 msgid "Failed to scan file ''{0}'' for plugin information. Skipping."
 msgstr ""
 
-msgid "Processing plugin site cache icon files..."
-msgstr ""
-
 msgid "Processing plugin files..."
 msgstr ""
 
@@ -13002,12 +13043,6 @@ msgstr ""
 msgid "Details:"
 msgstr ""
 
-msgid "Plugin icons download error"
-msgstr ""
-
-msgid "JOSM failed to download plugin icons:"
-msgstr ""
-
 msgid ""
 "Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
 "plugin site ''{1}''."
@@ -13893,7 +13928,9 @@ msgid ""
 "Creating and handling address nodes and buildings within Czech Republic."
 msgstr ""
 
-msgid "Allows to import various file formats into JOSM directly."
+msgid ""
+"Allows to import various file formats into JOSM directly. Currently "
+"supported: TangoGPS, Garmin Trainings Center TCX."
 msgstr ""
 
 msgid "Download your GPX tracks from openstreetmap.org"
@@ -13990,6 +14027,11 @@ msgid "A helper for IRS satellite adjustment."
 msgstr ""
 
 msgid ""
+"Provides Java Native Access (JNA) library. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
+msgid ""
 "Provides Java Topology Suite (JTS) library and related utilities. Not meant "
 "to be installed directly by users, but rather as a dependency for other "
 "plugins."
@@ -14345,6 +14387,25 @@ msgstr ""
 msgid "Width (meters)"
 msgstr ""
 
+msgid "Sidewalk"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "both"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "left"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "right"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "no"
+msgstr ""
+
 msgid "Service type"
 msgstr ""
 
@@ -14709,15 +14770,19 @@ msgstr ""
 msgid "May-Sep 09:30-12:30,14:15-19:30"
 msgstr ""
 
+msgctxt "parking"
 msgid "multi-storey"
 msgstr ""
 
+msgctxt "parking"
 msgid "surface"
 msgstr ""
 
+msgctxt "parking"
 msgid "underground"
 msgstr ""
 
+msgctxt "parking"
 msgid "rooftop"
 msgstr ""
 
@@ -15175,15 +15240,26 @@ msgstr ""
 msgid "Overtaking"
 msgstr ""
 
+msgctxt "overtaking"
+msgid "yes"
+msgstr ""
+
+msgctxt "overtaking"
 msgid "both"
 msgstr ""
 
+msgctxt "overtaking"
 msgid "forward"
 msgstr ""
 
+msgctxt "overtaking"
 msgid "backward"
 msgstr ""
 
+msgctxt "overtaking"
+msgid "no"
+msgstr ""
+
 msgid "Roundabout"
 msgstr ""
 
@@ -15477,6 +15553,12 @@ msgstr ""
 msgid "tiger"
 msgstr ""
 
+msgid "Button operated"
+msgstr ""
+
+msgid "Sound signals"
+msgstr ""
+
 msgid "Crossing attendant"
 msgstr ""
 
@@ -15998,9 +16080,6 @@ msgstr ""
 msgid "Traffic lights"
 msgstr ""
 
-msgid "Sound signals"
-msgstr ""
-
 msgid "Barrier"
 msgstr ""
 
@@ -18060,6 +18139,9 @@ msgstr ""
 msgid "Gasometer"
 msgstr ""
 
+msgid "Bunker Silo"
+msgstr ""
+
 msgid "Pipeline"
 msgstr ""
 
@@ -18206,15 +18288,15 @@ msgstr ""
 msgid "Monitoring:"
 msgstr ""
 
-msgid "Weather"
-msgstr ""
-
 msgid "Water level"
 msgstr ""
 
 msgid "Tide Level"
 msgstr ""
 
+msgid "Groundwater"
+msgstr ""
+
 msgid "Traffic"
 msgstr ""
 
@@ -18233,6 +18315,9 @@ msgstr ""
 msgid "Galileo Signals"
 msgstr ""
 
+msgid "Weather"
+msgstr ""
+
 msgid "Radiation"
 msgstr ""
 
@@ -18413,6 +18498,9 @@ msgstr ""
 msgid "pivot_pier"
 msgstr ""
 
+msgid "Bridge outline"
+msgstr ""
+
 msgid "Power Plant"
 msgstr ""
 
@@ -19020,6 +19108,15 @@ msgstr ""
 msgid "Pole"
 msgstr ""
 
+msgid "Pole with Transformer"
+msgstr ""
+
+msgid "Pole Attributes:"
+msgstr ""
+
+msgid "Transformer Attributes:"
+msgstr ""
+
 msgid "Power Line"
 msgstr ""
 
@@ -19069,9 +19166,15 @@ msgstr ""
 msgid "Power Cable"
 msgstr ""
 
+msgctxt "power cable"
+msgid "underground"
+msgstr ""
+
+msgctxt "power cable"
 msgid "underwater"
 msgstr ""
 
+msgctxt "power cable"
 msgid "overground"
 msgstr ""
 
@@ -19099,6 +19202,33 @@ msgstr ""
 msgid "Memorial"
 msgstr ""
 
+msgctxt "memorial"
+msgid "statue"
+msgstr ""
+
+msgctxt "memorial"
+msgid "bust"
+msgstr ""
+
+msgctxt "memorial"
+msgid "plaque"
+msgstr ""
+
+msgctxt "memorial"
+msgid "stele"
+msgstr ""
+
+msgctxt "memorial"
+msgid "stone"
+msgstr ""
+
+msgctxt "memorial"
+msgid "war_memorial"
+msgstr ""
+
+msgid "Inscription"
+msgstr ""
+
 msgid "Wayside Cross"
 msgstr ""
 
@@ -19168,6 +19298,9 @@ msgstr ""
 msgid "Beverages"
 msgstr ""
 
+msgid "Wine"
+msgstr ""
+
 msgid "Boutique"
 msgstr ""
 
@@ -19213,6 +19346,9 @@ msgstr ""
 msgid "Video Games"
 msgstr ""
 
+msgid "Music"
+msgstr ""
+
 msgid "Cash"
 msgstr ""
 
@@ -19240,6 +19376,9 @@ msgstr ""
 msgid "Curtain"
 msgstr ""
 
+msgid "Art"
+msgstr ""
+
 msgid "Frame"
 msgstr ""
 
@@ -19285,6 +19424,9 @@ msgstr ""
 msgid "Beauty"
 msgstr ""
 
+msgid "Tattoo"
+msgstr ""
+
 msgid "Optician"
 msgstr "Optikisto"
 
@@ -19336,6 +19478,9 @@ msgstr ""
 msgid "Pet"
 msgstr ""
 
+msgid "Funeral Directors"
+msgstr ""
+
 msgid "Vending Machine"
 msgstr ""
 
@@ -19435,6 +19580,15 @@ msgstr ""
 msgid "National Park"
 msgstr ""
 
+msgid "Protected Area"
+msgstr ""
+
+msgid "Protected Class"
+msgstr ""
+
+msgid "Title or type of protection"
+msgstr ""
+
 msgid "Places"
 msgstr ""
 
@@ -20511,7 +20665,13 @@ msgstr ""
 msgid "Estonia Ortho (Maaamet)"
 msgstr ""
 
-msgid "Estonia Multi (Maaamet)"
+msgid "Estonia Hillshade (Maaamet)"
+msgstr ""
+
+msgid "Estonia Cadastre (Maaamet)"
+msgstr ""
+
+msgid "Estonia Forestry (Maaamet)"
 msgstr ""
 
 msgid "Bordeaux - 2012"
@@ -20535,7 +20695,7 @@ msgstr ""
 msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
 msgstr ""
 
-msgid "CUGN Nancy - Orthophoto 2012"
+msgid "GrandNancy Orthophotographie 2012"
 msgstr ""
 
 msgid "Géobretagne - Brest 2010 - 10 cm"
@@ -20582,9 +20742,6 @@ msgid ""
 "- 1 m"
 msgstr ""
 
-msgid "Streets NRW Geofabrik.de"
-msgstr ""
-
 msgid "Hike & Bike"
 msgstr ""
 
@@ -20644,6 +20801,9 @@ msgstr ""
 msgid "NRW-Atlas: Topographische Karte 1:10000"
 msgstr ""
 
+msgid "Metropole Ruhr: Luftbilder (10 cm)"
+msgstr ""
+
 msgid "Drone Imagery (Haiti)"
 msgstr ""
 
@@ -20845,6 +21005,9 @@ msgstr ""
 msgid "Stadt Zürich Übersichtsplan (Strassen, Gebäude, Hausnummer)"
 msgstr ""
 
+msgid "Stadt Zürich Luftbild 2011"
+msgstr ""
+
 msgid "Orthofoto Kanton Solothurn RGB (SOGIS 2011/2012/2013)"
 msgstr ""
 
@@ -20863,7 +21026,7 @@ msgstr ""
 msgid "Canton de Fribourg 50cm (2005)"
 msgstr ""
 
-msgid "Stadt Bern 10cm/25cm (2008)"
+msgid "Stadt Bern 10cm/25cm (2012)"
 msgstr ""
 
 msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
@@ -20902,7 +21065,7 @@ msgstr ""
 msgid "OSM US TIGER 2012 Roads Overlay"
 msgstr ""
 
-msgid "New & Misaligned TIGER Roads (TIGER 2013)"
+msgid "New & Misaligned TIGER Roads (TIGER 2014)"
 msgstr ""
 
 msgid "MassGIS L3 Parcels"
@@ -20950,9 +21113,234 @@ msgstr ""
 msgid "NLS - Bartholomew Half Inch, 1897-1907"
 msgstr ""
 
+msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Annan 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgstr ""
+
 msgid "OS Town Plans, Cupar 1854 (NLS)"
 msgstr ""
 
+msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Elgin 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Forres 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Galashiels 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Girvan 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Greenock 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Haddington 1853 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Haddington 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Hamilton 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Irvine 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Jedburgh 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kelso 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Lanark 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Linlithgow 1856 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Musselburgh 1853 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Musselburgh 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Oban 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Peebles 1856 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Perth 1860 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Peterhead 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Selkirk 1865 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, St Andrews 1854 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, St Andrews 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stirling 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stonehaven 1864 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1847 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Strathaven 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wick 1872 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wigtown 1848 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wigtown 1894 (NLS)"
+msgstr ""
+
 msgid "Decreasing house numbers in addresses interpolation"
 msgstr ""
 
@@ -21006,17 +21394,37 @@ msgid "{0}={1} is deprecated. Please use instead a multipolygon."
 msgstr ""
 
 msgid ""
-"{0} is deprecated. Please specify ìnterval by using opening_hours syntax"
+"{0} is deprecated. Please specify interval by using opening_hours syntax"
 msgstr ""
 
 msgid ""
 "{0} is deprecated. Please delete this object and use a private layer instead"
 msgstr ""
 
-msgid "{0} on a node"
+msgid "{0}={1} is unspecific. Please replace ''{1}'' by a specific value."
 msgstr ""
 
-msgid "{0} on a node. Should be drawn as an area"
+msgid "{0} should be replaced with {1}"
+msgstr ""
+
+msgid ""
+"{0}={1} is unspecific. Please replace ''{1}'' by ''left'', ''right'' or "
+"''both''."
+msgstr ""
+
+msgid "{0} on a node. Should be used on a way."
+msgstr ""
+
+msgid "{0} on a node. Should be drawn as an area."
+msgstr ""
+
+msgid "{0}=* on a node. Should be used in a relation"
+msgstr ""
+
+msgid "{0} on a way. Should be used in a relation"
+msgstr ""
+
+msgid "{0} on a node"
 msgstr ""
 
 msgid "Building inside building"
@@ -25686,6 +26094,9 @@ msgstr ""
 msgid "Find"
 msgstr ""
 
+msgid "Show"
+msgstr ""
+
 msgid "Mark"
 msgstr ""
 
diff --git a/i18n/po/es.po b/i18n/po/es.po
index 948f4bf..a64a3f6 100644
--- a/i18n/po/es.po
+++ b/i18n/po/es.po
@@ -1,17 +1,22 @@
+# Spanish translation for josm
+# Copyright (c) 2006 Rosetta Contributors and Canonical Ltd 2006
+# This file is distributed under the same license as the josm package.
+# FIRST AUTHOR <EMAIL at ADDRESS>, 2006.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-21 03:38+0200\n"
-"PO-Revision-Date: 2014-10-11 10:31+0000\n"
-"Last-Translator: Emilio Gomez Fernandez <Unknown>\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"
 "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-10-21 05:23+0000\n"
-"X-Generator: Launchpad (build 17203)\n"
+"X-Launchpad-Export-Date: 2014-12-10 05:12+0000\n"
+"X-Generator: Launchpad (build 17283)\n"
 "Language: es\n"
 "X-Language: es_ES\n"
 "X-Source-Language: C\n"
@@ -173,22 +178,6 @@ msgid "About JOSM..."
 msgstr "Acerca de JOSM..."
 
 msgid ""
-"Unexpected format of API base URL. Redirection to info or history page for "
-"OSM object will probably fail. API base URL is: ''{0}''"
-msgstr ""
-"El formato del URL base de la API es incorrecto. Es posible que falle la "
-"redirección a la página de información o de histórico para el objeto de OSM. "
-"El URL base de la API es: «{0}»"
-
-msgid ""
-"Unexpected format of API base URL. Redirection to user page for OSM user "
-"will probably fail. API base URL is: ''{0}''"
-msgstr ""
-"Formato inesperado para la URL base de la API . La redirección a la página "
-"de usuario para el usuario de OSM probablemente fallará. La URL base de la "
-"API es: ''{0}''"
-
-msgid ""
 "You are about to launch {0} browser window.<br>This may both clutter your "
 "screen with browser windows<br>and take some time to finish."
 msgid_plural ""
@@ -1231,7 +1220,7 @@ msgid "Report bug"
 msgstr "Reportar error"
 
 msgid "Report a ticket to JOSM bugtracker"
-msgstr ""
+msgstr "Reporta un billete para JOSM bugtracker"
 
 msgid "Restart"
 msgstr "Reiniciar"
@@ -1679,6 +1668,15 @@ msgstr "Ningún cambio que subir"
 msgid "Nothing to upload. Get some data first."
 msgstr "Nada que subir. Consigue algunos datos primero."
 
+msgid "Upload note changes to server"
+msgstr "Cargar nota cambios en el servidor"
+
+msgid "Upload notes"
+msgstr "Cargar notas"
+
+msgid "Uploading notes to server"
+msgstr "Cargar notas al servidor"
+
 msgid "Upload selection"
 msgstr "Subir selección"
 
@@ -1960,18 +1958,24 @@ msgid "Error during download"
 msgstr "Error durante la descarga"
 
 msgid "Add a new Note"
-msgstr ""
+msgstr "Añadir una nueva nota"
 
 msgid "Add note mode"
-msgstr ""
+msgstr "Añadir el modo de nota"
 
 msgid "Click the location where you wish to create a new note"
+msgstr "Haga clic en la ubicación en la que desea crear una nueva nota"
+
+msgid "Create new note"
+msgstr "Crear nueva nota"
+
+msgid "Create note"
 msgstr ""
 
-msgid "Enter a comment for a new note"
+msgid "Enter a detailed comment to create a note"
 msgstr ""
 
-msgid "Create new note"
+msgid "You must enter a comment to create a new note"
 msgstr ""
 
 msgid "Delete Mode"
@@ -2951,6 +2955,15 @@ msgstr "... se refiere a la relación"
 msgid "Cycling dependencies"
 msgstr "Dependencias cíclicas"
 
+msgid "Uploading modified notes"
+msgstr "Cargando notas modificadas"
+
+msgid "Note {0} failed: {1}"
+msgstr "Nota {0} fallidas: {1}"
+
+msgid "Notes failed to upload"
+msgstr "Falla al cargar notas"
+
 msgid ""
 "The following are results of automatic validation. Try fixing these, but be "
 "careful (don''t destroy valid data). When in doubt ignore them.<br>When you "
@@ -5385,6 +5398,12 @@ msgstr "Conflicto de fondo: conserve todas las etiquetas"
 msgid "Conflict foreground: keep all tags"
 msgstr "Conflicto de primer plano: conserve todas las etiquetas"
 
+msgid "Conflict background: sum all numeric tags"
+msgstr ""
+
+msgid "Conflict foreground: sum all numeric tags"
+msgstr ""
+
 msgid "Conflict background: keep member"
 msgstr "Conflicto de fondo: mantenga el miembro"
 
@@ -5869,12 +5888,19 @@ msgstr "ninguno"
 msgid "all"
 msgstr "todos"
 
+msgid "sum"
+msgstr ""
+
 msgid "Please decide which values to keep"
 msgstr "Por favor, decida que valores hay que mantener"
 
 msgid "Value ''{0}'' is going to be applied for key ''{1}''"
 msgstr "El valor ''{0}'' será aplicado a la clave ''{1}''"
 
+msgid ""
+"All numeric values sumed as ''{0}'' are going to be applied for key ''{1}''"
+msgstr ""
+
 msgid "The key ''{0}'' and all its values are going to be removed"
 msgstr "La clave ''{0}'' y todos sus valores serán suprimidos"
 
@@ -6282,25 +6308,6 @@ msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
 "</p><p>Cierre el diálogo de filtrado para ver todos los objetos.<p></html>"
 
-msgid "Display the history of all selected items."
-msgstr "Mostrar el historial de todos los elementos seleccionados"
-
-msgid "Object with history"
-msgstr "Objeto con histórico"
-
-msgid "Reload"
-msgstr "Recargar"
-
-msgid "Reload all currently selected objects and refresh the list."
-msgstr ""
-"Recargar todos los objetos actualmente seleccionados y refrescar la lista"
-
-msgid "Show"
-msgstr "Mostrar"
-
-msgid "Display the history of the selected objects."
-msgstr "Mostrar el histórico de los objetos seleccionados."
-
 msgid "Advanced object info"
 msgstr "Información ampliada sobre el objeto"
 
@@ -6659,37 +6666,37 @@ msgid "Customize the style"
 msgstr "Personalizar el estilo"
 
 msgid "Add comment"
-msgstr ""
+msgstr "Añadir comentario"
 
 msgid "Comment"
 msgstr "Comentario"
 
-msgid "Add comment to note:"
+msgid "Comment on note"
 msgstr ""
 
+msgid "Add comment to note:"
+msgstr "Añadir comentario a la nota:"
+
 msgid "Close note"
-msgstr ""
+msgstr "Cerrar nota"
 
 msgid "Close note with message:"
-msgstr ""
-
-msgid "Close Note"
-msgstr ""
+msgstr "Cerrar nota con el mensaje;"
 
 msgid "Create a new note"
-msgstr ""
+msgstr "Crear una nueva nota"
 
 msgid "Create"
 msgstr "Crear"
 
 msgid "Reopen note"
-msgstr ""
+msgstr "Reabrir nota"
 
 msgid "Reopen"
-msgstr ""
+msgstr "Reabrir"
 
 msgid "Reopen note with message:"
-msgstr ""
+msgstr "Reabrir nota con el mensaje;"
 
 msgid "Object type:"
 msgstr "Tipo de objeto:"
@@ -6754,6 +6761,9 @@ msgstr "Selección actual"
 msgid "Search for objects"
 msgstr "Búsqueda de objetos"
 
+msgid "Display the history of the selected objects."
+msgstr "Mostrar el histórico de los objetos seleccionados."
+
 msgid "Zoom to selection"
 msgstr "Zoom a la selección"
 
@@ -6879,6 +6889,9 @@ msgstr "Corrigiendo ({0}/{1}): ''{2}''"
 msgid "Updating map ..."
 msgstr "Actualizando mapa..."
 
+msgid "anonymous"
+msgstr "anónimo"
+
 msgid "Display the basic properties of the changeset"
 msgstr "Mostrar las propiedades básicas de la modificación"
 
@@ -6892,6 +6905,12 @@ msgid "Display the objects created, updated, and deleted by the changeset"
 msgstr ""
 "Mostrar los objetos creados, actualizados y borrados del conjunto de cambios"
 
+msgid "Discussion"
+msgstr "Discusión"
+
+msgid "Display the public discussion around this changeset"
+msgstr "Mostrar la discusión pública alrededor de este conjunto de cambios"
+
 msgid "Changeset Management Dialog"
 msgstr "Diálogo de administración de conjuntos de cambios"
 
@@ -6956,9 +6975,6 @@ msgctxt "changeset.state"
 msgid "Closed"
 msgstr "Cerrado"
 
-msgid "anonymous"
-msgstr "anónimo"
-
 msgid "ID"
 msgstr "ID"
 
@@ -6974,6 +6990,9 @@ msgstr "Creado el"
 msgid "Closed at"
 msgstr "Cerrado el"
 
+msgid "Discussions"
+msgstr "Discusiones"
+
 msgid "Downloading changeset content"
 msgstr "Descargando el contenido de la modificación"
 
@@ -7099,6 +7118,15 @@ msgstr ""
 "Hacer zoom a los objetos que forman parte de este conjunto de cambios en la "
 "capa de datos actual"
 
+msgid "Update changeset discussion"
+msgstr "Actualización discusión de cambios"
+
+msgid "Update the changeset discussion from the OSM server"
+msgstr "Actualización de la discusión de cambios desde el servidor de OSM"
+
+msgid "Date"
+msgstr "Fecha"
+
 msgid "Download changesets"
 msgstr "Descargar modificaciones"
 
@@ -7576,8 +7604,8 @@ msgstr "Por favor, selecciona un valor"
 msgid "Set number of recently added tags"
 msgstr "Establecer el número de etiquetas añadidas recientemente"
 
-msgid "Remember last used tags"
-msgstr "Recordar últimas etiquetas usadas"
+msgid "Remember last used tags after a restart"
+msgstr "Recordar últimas etiquetas usadas después de reiniciar"
 
 msgid "Please enter the number of recently added tags to display"
 msgstr ""
@@ -7973,6 +8001,9 @@ msgstr "incluyendo los hijos inmediatos de las relaciones padre"
 msgid "Load parent relations"
 msgstr "Cargar relaciones padre"
 
+msgid "Reload"
+msgstr "Recargar"
+
 msgid "Loading parent relations"
 msgstr "Cargando relaciones padre"
 
@@ -8101,6 +8132,12 @@ msgstr "Datos GPS en bruto"
 msgid "Select to download GPS traces in the selected download area."
 msgstr "Elija para descargar trazas GPS del área de descarga seleccionada."
 
+msgid "Notes"
+msgstr "Billetes"
+
+msgid "Select to download notes in the selected download area."
+msgstr ""
+
 msgid "Download as new layer"
 msgstr "Descargar como nueva capa"
 
@@ -8216,13 +8253,14 @@ msgid "Querying name server ..."
 msgstr "Obteniendo nombre de servidor ..."
 
 msgid "Error occured with query ''{0}'': ''{1}''"
-msgstr ""
+msgstr "Ocurrió un error con la consulta '' {0} '': '' {1} ''"
 
 msgid "Name server returned invalid data. Please try again."
 msgstr ""
+"Nombre servidor devuelve datos no válidos. Por favor, inténtelo de nuevo."
 
 msgid "Bad response"
-msgstr ""
+msgstr "Mala respuesta"
 
 msgid "Type"
 msgstr "Tipo"
@@ -8452,9 +8490,6 @@ msgstr "A"
 msgid "B"
 msgstr "B"
 
-msgid "Date"
-msgstr "Fecha"
-
 msgid ""
 "Failed to update primitive with id {0} because current edit layer is null"
 msgstr ""
@@ -9466,9 +9501,6 @@ msgstr ""
 msgid "Save Layer"
 msgstr "Guardar capa"
 
-msgid "Notes"
-msgstr "Billetes"
-
 msgid "Notes layer"
 msgstr "Capa de notas"
 
@@ -9484,9 +9516,6 @@ msgstr "Capa de datos {0}"
 msgid "outside downloaded area"
 msgstr "fuera del área descargada"
 
-msgid "version {0}"
-msgstr "versión {0}"
-
 msgid "Merging layers"
 msgstr "Combinar capas"
 
@@ -13587,6 +13616,15 @@ msgstr ""
 "Se esperaba apertura del conjunto de cambios. Se obtuvo ciere de conjunto de "
 "cambios con id {0}."
 
+msgid "Note upload failed"
+msgstr "Carga de nota fallida"
+
+msgid "Error parsing note response from server"
+msgstr "Error analizando la nota de respuesta desde el servidor"
+
+msgid "Error encoding string: {0}"
+msgstr "Error codificando la cadena: {0}"
+
 msgid "(Code={0})"
 msgstr "(Código={0})"
 
@@ -13645,15 +13683,15 @@ msgstr ""
 msgid "Parsing changeset content ..."
 msgstr "Verificando contenido del conjunto de cambios..."
 
+msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
+msgstr "Valor booleano ilegal para el atributo \"{0}\". Se obtuvo \"{1}\"."
+
 msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
 msgstr "Valor ilegal para el atributo \"{0}\". Se obtuvo \"{1}\"."
 
 msgid "Illegal numeric value for attribute ''{0}''. Got ''{1}''."
 msgstr "Valor numérico ilegal para el atributo \"{0}\". Se ovtuvo \"{1}\"."
 
-msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
-msgstr "Valor booleano ilegal para el atributo \"{0}\". Se obtuvo \"{1}\"."
-
 msgid "Missing mandatory attribute ''{0}'' of XML element {1}."
 msgstr "Hace falta el atributo obligatorio \"{0}\" para el elemento XML {1}."
 
@@ -14057,10 +14095,10 @@ msgid "The minima must be less than the maxima"
 msgstr "Los mínimos debe ser inferior a los máximos"
 
 msgid "Remote Control has been asked to load the following data:"
-msgstr ""
+msgstr "Se ha perdido el control remoto al cargar los siguientes datos:"
 
 msgid "Loading data"
-msgstr ""
+msgstr "Cargando datos"
 
 msgid ""
 "Remote Control has been asked to load objects (specified by their id) from "
@@ -14559,9 +14597,6 @@ msgstr ""
 "Error al analizar el archivo ''{0}'' para obtener la información del "
 "complemento. Omitiendo."
 
-msgid "Processing plugin site cache icon files..."
-msgstr "Procesando archivos de icono del caché del sitio del complemento..."
-
 msgid "Processing plugin files..."
 msgstr "Procesando archivos de complementos..."
 
@@ -14580,12 +14615,6 @@ msgstr "JOSM falló al descargar la lista del complemento:"
 msgid "Details:"
 msgstr "Detalles:"
 
-msgid "Plugin icons download error"
-msgstr "Error al descargar los iconos del complemento"
-
-msgid "JOSM failed to download plugin icons:"
-msgstr "JOSM falló al descargar iconos del complemento"
-
 msgid ""
 "Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
 "plugin site ''{1}''."
@@ -15365,7 +15394,7 @@ msgstr "bosque"
 
 msgctxt "landuse"
 msgid "meadow"
-msgstr ""
+msgstr "Prado"
 
 msgctxt "landuse"
 msgid "farmland"
@@ -15692,8 +15721,10 @@ msgid ""
 "Creating and handling address nodes and buildings within Czech Republic."
 msgstr "Creación y manipulación de números de policía en la República Checa."
 
-msgid "Allows to import various file formats into JOSM directly."
-msgstr "Permite importar directamente distintos formatos de archivo en JOSM."
+msgid ""
+"Allows to import various file formats into JOSM directly. Currently "
+"supported: TangoGPS, Garmin Trainings Center TCX."
+msgstr ""
 
 msgid "Download your GPX tracks from openstreetmap.org"
 msgstr "Descarga tus trazas GPX desde openstreetmap.org"
@@ -15818,6 +15849,11 @@ msgid "A helper for IRS satellite adjustment."
 msgstr "Complemento irsrectify(rectificador irs)"
 
 msgid ""
+"Provides Java Native Access (JNA) library. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
+msgid ""
 "Provides Java Topology Suite (JTS) library and related utilities. Not meant "
 "to be installed directly by users, but rather as a dependency for other "
 "plugins."
@@ -16076,7 +16112,7 @@ msgid "Plugin to digital sign OSM-Data"
 msgstr "Complemento para firmar digitalmente datos OSM"
 
 msgid "${plugin.description}"
-msgstr ""
+msgstr "${plugin.description}"
 
 msgid ""
 "Provides a straightforward GUI for adding, editing and deleting turn lanes."
@@ -16256,6 +16292,25 @@ msgstr "Iluminación"
 msgid "Width (meters)"
 msgstr "Anchura (metros)"
 
+msgid "Sidewalk"
+msgstr "anden"
+
+msgctxt "sidewalk"
+msgid "both"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "left"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "right"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "no"
+msgstr ""
+
 msgid "Service type"
 msgstr "Tipo de servicio"
 
@@ -16615,25 +16670,29 @@ msgid "Fee"
 msgstr "De pago"
 
 msgid "06:00-20:00"
-msgstr ""
+msgstr "06:00-20:00"
 
 msgid "Mo-Fr 09:00-18:00,Sa 08:00-14:00"
-msgstr ""
+msgstr "Lu-Vi 09:00-18:00,Sa 08:00-14:00"
 
 msgid "May-Sep 09:30-12:30,14:15-19:30"
-msgstr ""
+msgstr "May-Sep 09:30-12:30,14:15-19:30"
 
+msgctxt "parking"
 msgid "multi-storey"
-msgstr "de pisos"
+msgstr ""
 
+msgctxt "parking"
 msgid "surface"
-msgstr "al aire libre"
+msgstr ""
 
+msgctxt "parking"
 msgid "underground"
-msgstr "subterráneo"
+msgstr ""
 
+msgctxt "parking"
 msgid "rooftop"
-msgstr "en azotea"
+msgstr ""
 
 msgid "Reference number"
 msgstr "Número de referencia"
@@ -16920,25 +16979,25 @@ msgid "Motorroad"
 msgstr "Autovía"
 
 msgid "Trunk Link"
-msgstr "Enlace a carretera principal"
+msgstr "Enlace de carretera principal"
 
 msgid "Primary"
 msgstr "Carretera primaria"
 
 msgid "Primary Link"
-msgstr "Enlace a carretera primaria"
+msgstr "Enlace de carretera primaria"
 
 msgid "Secondary"
 msgstr "Carretera secundaria"
 
 msgid "Secondary Link"
-msgstr "Enlace a carretera secundaria"
+msgstr "Enlace de carretera secundaria"
 
 msgid "Tertiary"
 msgstr "Carretera local"
 
 msgid "Tertiary Link"
-msgstr "Enlace a carretera local"
+msgstr "Enlace de carretera local"
 
 msgid "Unclassified"
 msgstr "Carretera sin clasificación"
@@ -17091,14 +17150,25 @@ msgstr "Longitud máxima (metros)"
 msgid "Overtaking"
 msgstr "sobrepaso"
 
+msgctxt "overtaking"
+msgid "yes"
+msgstr ""
+
+msgctxt "overtaking"
 msgid "both"
-msgstr "ambos"
+msgstr ""
 
+msgctxt "overtaking"
 msgid "forward"
-msgstr "avanzar"
+msgstr ""
 
+msgctxt "overtaking"
 msgid "backward"
-msgstr "retroceder"
+msgstr ""
+
+msgctxt "overtaking"
+msgid "no"
+msgstr ""
 
 msgid "Roundabout"
 msgstr "Rotonda"
@@ -17113,7 +17183,7 @@ msgid "trunk"
 msgstr "Carretera principal"
 
 msgid "trunk_link"
-msgstr "Enlace a carretera principal"
+msgstr "Enlace de carretera principal"
 
 msgid "primary"
 msgstr "vía primaria"
@@ -17407,6 +17477,12 @@ msgstr "pegaso"
 msgid "tiger"
 msgstr "tigre"
 
+msgid "Button operated"
+msgstr ""
+
+msgid "Sound signals"
+msgstr "Señales sonoras"
+
 msgid "Crossing attendant"
 msgstr "Guarda cruces"
 
@@ -17938,9 +18014,6 @@ msgstr "Paso a nivel"
 msgid "Traffic lights"
 msgstr "Semáforos"
 
-msgid "Sound signals"
-msgstr "Señales sonoras"
-
 msgid "Barrier"
 msgstr "Barrera"
 
@@ -18944,7 +19017,7 @@ msgid "charcoal"
 msgstr "Carbón vegetal"
 
 msgid "Firepit"
-msgstr ""
+msgstr "hoguera"
 
 msgid "Fishing"
 msgstr "Pesca"
@@ -19295,7 +19368,7 @@ msgid "urinal"
 msgstr "urinario"
 
 msgid "Shower"
-msgstr ""
+msgstr "Ducha"
 
 msgid "Post Box"
 msgstr "Buzón de correos"
@@ -19648,7 +19721,7 @@ msgid "water_park"
 msgstr "parque acuático"
 
 msgid "Scuba Diving"
-msgstr ""
+msgstr "Buceo"
 
 msgid "Piste type"
 msgstr "Tipo de pista de esquí"
@@ -19912,7 +19985,7 @@ msgstr "caseta"
 
 msgctxt "building"
 msgid "cowshed"
-msgstr ""
+msgstr "Establo"
 
 msgctxt "building"
 msgid "construction"
@@ -20005,6 +20078,9 @@ msgstr "Molino de viento"
 msgid "Gasometer"
 msgstr "Gasómetro"
 
+msgid "Bunker Silo"
+msgstr ""
+
 msgid "Pipeline"
 msgstr "Tubería"
 
@@ -20151,15 +20227,15 @@ msgstr "Estación de monitorización"
 msgid "Monitoring:"
 msgstr "Monitoreo:"
 
-msgid "Weather"
-msgstr "Clima"
-
 msgid "Water level"
 msgstr "Nivel del agua"
 
 msgid "Tide Level"
 msgstr "Nivel de la marea"
 
+msgid "Groundwater"
+msgstr ""
+
 msgid "Traffic"
 msgstr "Tráfico"
 
@@ -20178,6 +20254,9 @@ msgstr "Señales GLONASS"
 msgid "Galileo Signals"
 msgstr "Señales Galileo"
 
+msgid "Weather"
+msgstr "Clima"
+
 msgid "Radiation"
 msgstr "Radiación"
 
@@ -20358,6 +20437,9 @@ msgstr "muelle levadizo"
 msgid "pivot_pier"
 msgstr "muelle pivot"
 
+msgid "Bridge outline"
+msgstr "esquema Puente"
+
 msgid "Power Plant"
 msgstr "Planta generadora de energía"
 
@@ -20967,6 +21049,15 @@ msgstr "Torre incompleta"
 msgid "Pole"
 msgstr "Poste"
 
+msgid "Pole with Transformer"
+msgstr "Polo con transformador"
+
+msgid "Pole Attributes:"
+msgstr "Polo de atributos"
+
+msgid "Transformer Attributes:"
+msgstr "Transformador de Atributos:"
+
 msgid "Power Line"
 msgstr "Tendido eléctrico"
 
@@ -21016,11 +21107,17 @@ msgstr "Utilizado para comunicaciones de datos"
 msgid "Power Cable"
 msgstr "Cable de energía"
 
+msgctxt "power cable"
+msgid "underground"
+msgstr ""
+
+msgctxt "power cable"
 msgid "underwater"
-msgstr "submarino"
+msgstr ""
 
+msgctxt "power cable"
 msgid "overground"
-msgstr "en superficie"
+msgstr ""
 
 msgid "Historic Places"
 msgstr "Lugares históricos"
@@ -21046,6 +21143,33 @@ msgstr "Monumento"
 msgid "Memorial"
 msgstr "Monumento conmemorativo"
 
+msgctxt "memorial"
+msgid "statue"
+msgstr ""
+
+msgctxt "memorial"
+msgid "bust"
+msgstr "busto"
+
+msgctxt "memorial"
+msgid "plaque"
+msgstr "Placa"
+
+msgctxt "memorial"
+msgid "stele"
+msgstr ""
+
+msgctxt "memorial"
+msgid "stone"
+msgstr ""
+
+msgctxt "memorial"
+msgid "war_memorial"
+msgstr "war_memorial"
+
+msgid "Inscription"
+msgstr "Inscripción"
+
 msgid "Wayside Cross"
 msgstr "Crucero"
 
@@ -21115,6 +21239,9 @@ msgstr "Tienda de bebidas alcohólicas"
 msgid "Beverages"
 msgstr "Bebidas"
 
+msgid "Wine"
+msgstr "Vino"
+
 msgid "Boutique"
 msgstr "Boutique"
 
@@ -21160,6 +21287,9 @@ msgstr "Vídeo"
 msgid "Video Games"
 msgstr "Videojuegos"
 
+msgid "Music"
+msgstr "Música"
+
 msgid "Cash"
 msgstr "Dinero en efectivo"
 
@@ -21187,6 +21317,9 @@ msgstr "Cocinas"
 msgid "Curtain"
 msgstr "Cortinajes"
 
+msgid "Art"
+msgstr "Arte"
+
 msgid "Frame"
 msgstr "Enmarcaciones"
 
@@ -21197,7 +21330,7 @@ msgid "Interior Decoration"
 msgstr "Decoración de interiores"
 
 msgid "Antiques"
-msgstr ""
+msgstr "Antigüedades"
 
 msgid "Printed Material"
 msgstr "Material impreso"
@@ -21232,6 +21365,9 @@ msgstr "Peluquería/Barbería"
 msgid "Beauty"
 msgstr "Salón de belleza"
 
+msgid "Tattoo"
+msgstr "Tatuaje"
+
 msgid "Optician"
 msgstr "Óptica"
 
@@ -21283,6 +21419,9 @@ msgstr "Cartera"
 msgid "Pet"
 msgstr "Mascota"
 
+msgid "Funeral Directors"
+msgstr "Directorios funerarios"
+
 msgid "Vending Machine"
 msgstr "Máquina expendedora"
 
@@ -21382,6 +21521,15 @@ msgstr "Código postal"
 msgid "National Park"
 msgstr "Parque Nacional"
 
+msgid "Protected Area"
+msgstr ""
+
+msgid "Protected Class"
+msgstr ""
+
+msgid "Title or type of protection"
+msgstr ""
+
 msgid "Places"
 msgstr "Lugares"
 
@@ -22481,8 +22629,14 @@ msgstr "Mapa base de Estonia (Maaamet)"
 msgid "Estonia Ortho (Maaamet)"
 msgstr "Estonia Ortofoto (Maaamet)"
 
-msgid "Estonia Multi (Maaamet)"
-msgstr "Estonia Multi (Maaamet)"
+msgid "Estonia Hillshade (Maaamet)"
+msgstr ""
+
+msgid "Estonia Cadastre (Maaamet)"
+msgstr ""
+
+msgid "Estonia Forestry (Maaamet)"
+msgstr ""
 
 msgid "Bordeaux - 2012"
 msgstr "Burdeos - 2012"
@@ -22505,8 +22659,8 @@ msgstr "CRAIG - Le Puy 2010 - 15 cm"
 msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
 msgstr "CRIGE PACA Alpes-Marítimos 2009 - 40 cm"
 
-msgid "CUGN Nancy - Orthophoto 2012"
-msgstr ""
+msgid "GrandNancy Orthophotographie 2012"
+msgstr "GrandNancy Ortografía 2012"
 
 msgid "Géobretagne - Brest 2010 - 10 cm"
 msgstr "Géobretagne - Brest 2010 - 10 cm"
@@ -22553,9 +22707,6 @@ msgid ""
 msgstr ""
 "Vercors - Reserva natural de Hauts-Plateaux du Vercors - Ortofotos 1999 - 1 m"
 
-msgid "Streets NRW Geofabrik.de"
-msgstr "Calles NRW Geofabrik.de"
-
 msgid "Hike & Bike"
 msgstr "Ciclismo & Montañismo"
 
@@ -22619,11 +22770,14 @@ msgstr "NRW-Atlas: Luftbilder"
 msgid "NRW-Atlas: Topographische Karte 1:10000"
 msgstr "NRW-Atlas: Mapa topográfico 1:10000"
 
+msgid "Metropole Ruhr: Luftbilder (10 cm)"
+msgstr ""
+
 msgid "Drone Imagery (Haiti)"
 msgstr "Imágenes aéreas de drones (Haití)"
 
 msgid "Drone Imagery 2014 (Haiti)"
-msgstr ""
+msgstr "Avión no tripulado Imágenes 2014 (Haití)"
 
 msgid "Ireland British War Office 1:25k GSGS 3906"
 msgstr "Oficina de Guerra de Irlanda del Norte 1:25k GSGS 3906"
@@ -22671,10 +22825,10 @@ msgid "ORT10LT (Lithuania)"
 msgstr "ORT10LT (Lituania)"
 
 msgid "Luxembourg Inspire Ortho 2010"
-msgstr ""
+msgstr "Luxemburgo Inspire Ortho 2010"
 
 msgid "Luxembourg Inspire Ortho 2013"
-msgstr ""
+msgstr "Luxemburgo Inspire Ortho 2013"
 
 msgid "Luxembourg Inspire Railway"
 msgstr ""
@@ -22820,6 +22974,9 @@ msgstr "Stadtplan Zürich"
 msgid "Stadt Zürich Übersichtsplan (Strassen, Gebäude, Hausnummer)"
 msgstr "Stadt Zürich Übersichtsplan (Strassen, Gebäude, Hausnummer)"
 
+msgid "Stadt Zürich Luftbild 2011"
+msgstr ""
+
 msgid "Orthofoto Kanton Solothurn RGB (SOGIS 2011/2012/2013)"
 msgstr "Ortofoto Kanton Solothurn RGB (SOGIS 2011/2012/2013)"
 
@@ -22838,8 +22995,8 @@ msgstr "Cantón de Jura 50cm (RCJU 1998)"
 msgid "Canton de Fribourg 50cm (2005)"
 msgstr "Cantón de Friburgo 50cm (2005)"
 
-msgid "Stadt Bern 10cm/25cm (2008)"
-msgstr "Stadt Berna 10cm/25cm (2008)"
+msgid "Stadt Bern 10cm/25cm (2012)"
+msgstr ""
 
 msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
 msgstr "HEIG-VD / Orthofoto Yverdon-les-Bains 25cm (2007)"
@@ -22877,8 +23034,8 @@ msgstr "Imágenes aéreas grandes USGS"
 msgid "OSM US TIGER 2012 Roads Overlay"
 msgstr "OSM EEUU TIGER 2012 Superposición de Caminos"
 
-msgid "New & Misaligned TIGER Roads (TIGER 2013)"
-msgstr "Caminos TIGER Nuevos & Desalineados TIGER (TIGER 2013)"
+msgid "New & Misaligned TIGER Roads (TIGER 2014)"
+msgstr ""
 
 msgid "MassGIS L3 Parcels"
 msgstr "MassGIS L3 Parcelas"
@@ -22925,9 +23082,234 @@ msgstr "OS Escocia Popular histórico"
 msgid "NLS - Bartholomew Half Inch, 1897-1907"
 msgstr "NLS - Bartolomé Media Pulgada, 1897-1907"
 
+msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Annan 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgstr ""
+
 msgid "OS Town Plans, Cupar 1854 (NLS)"
 msgstr "OS Planos de la Ciudad, Cupar 1854 (NLS)"
 
+msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Elgin 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Forres 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Galashiels 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Girvan 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Greenock 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Haddington 1853 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Haddington 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Hamilton 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Irvine 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Jedburgh 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kelso 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Lanark 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Linlithgow 1856 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Musselburgh 1853 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Musselburgh 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Oban 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Peebles 1856 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Perth 1860 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Peterhead 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Selkirk 1865 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, St Andrews 1854 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, St Andrews 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stirling 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stonehaven 1864 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1847 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Strathaven 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wick 1872 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wigtown 1848 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wigtown 1894 (NLS)"
+msgstr ""
+
 msgid "Decreasing house numbers in addresses interpolation"
 msgstr "Decrementando números de portal en la interpolación de portales"
 
@@ -22988,19 +23370,39 @@ msgstr ""
 "{0}={1} está en desuso. Por favor utilice en su lugar un multipolígono."
 
 msgid ""
-"{0} is deprecated. Please specify ìnterval by using opening_hours syntax"
+"{0} is deprecated. Please specify interval by using opening_hours syntax"
 msgstr ""
 
 msgid ""
 "{0} is deprecated. Please delete this object and use a private layer instead"
 msgstr ""
 
+msgid "{0}={1} is unspecific. Please replace ''{1}'' by a specific value."
+msgstr ""
+
+msgid "{0} should be replaced with {1}"
+msgstr ""
+
+msgid ""
+"{0}={1} is unspecific. Please replace ''{1}'' by ''left'', ''right'' or "
+"''both''."
+msgstr ""
+
+msgid "{0} on a node. Should be used on a way."
+msgstr ""
+
+msgid "{0} on a node. Should be drawn as an area."
+msgstr ""
+
+msgid "{0}=* on a node. Should be used in a relation"
+msgstr ""
+
+msgid "{0} on a way. Should be used in a relation"
+msgstr ""
+
 msgid "{0} on a node"
 msgstr "{0} en un nodo"
 
-msgid "{0} on a node. Should be drawn as an area"
-msgstr "{0} en un nodo. Debería ser dibujado como un área"
-
 msgid "Building inside building"
 msgstr "Edificio dentro de un edificio"
 
@@ -28126,6 +28528,9 @@ msgstr "Paradas sugeridas"
 msgid "Find"
 msgstr "Buscar"
 
+msgid "Show"
+msgstr "Mostrar"
+
 msgid "Mark"
 msgstr "Marcar"
 
diff --git a/i18n/po/et.po b/i18n/po/et.po
index 85fc03b..d6d9654 100644
--- a/i18n/po/et.po
+++ b/i18n/po/et.po
@@ -1,17 +1,22 @@
+# Estonian translation for josm
+# Copyright (c) 2008 Rosetta Contributors and Canonical Ltd 2008
+# This file is distributed under the same license as the josm package.
+# FIRST AUTHOR <EMAIL at ADDRESS>, 2008.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-21 03:38+0200\n"
-"PO-Revision-Date: 2014-10-20 21:12+0000\n"
+"POT-Creation-Date: 2014-12-10 03:42+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"
 "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-10-21 04:48+0000\n"
-"X-Generator: Launchpad (build 17203)\n"
+"X-Launchpad-Export-Date: 2014-12-10 04:44+0000\n"
+"X-Generator: Launchpad (build 17283)\n"
 "Language: et\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -170,16 +175,6 @@ msgid "About JOSM..."
 msgstr "JOSMi kohta"
 
 msgid ""
-"Unexpected format of API base URL. Redirection to info or history page for "
-"OSM object will probably fail. API base URL is: ''{0}''"
-msgstr ""
-
-msgid ""
-"Unexpected format of API base URL. Redirection to user page for OSM user "
-"will probably fail. API base URL is: ''{0}''"
-msgstr ""
-
-msgid ""
 "You are about to launch {0} browser window.<br>This may both clutter your "
 "screen with browser windows<br>and take some time to finish."
 msgid_plural ""
@@ -1575,6 +1570,15 @@ msgstr "Pole muudatusi, mida üles laadida."
 msgid "Nothing to upload. Get some data first."
 msgstr "Midagi pole üles laadida. Hangi esmalt andmeid."
 
+msgid "Upload note changes to server"
+msgstr ""
+
+msgid "Upload notes"
+msgstr ""
+
+msgid "Uploading notes to server"
+msgstr ""
+
 msgid "Upload selection"
 msgstr "Laadi valik üles."
 
@@ -1851,10 +1855,16 @@ msgstr ""
 msgid "Click the location where you wish to create a new note"
 msgstr ""
 
-msgid "Enter a comment for a new note"
+msgid "Create new note"
 msgstr ""
 
-msgid "Create new note"
+msgid "Create note"
+msgstr ""
+
+msgid "Enter a detailed comment to create a note"
+msgstr ""
+
+msgid "You must enter a comment to create a new note"
 msgstr ""
 
 msgid "Delete Mode"
@@ -2732,6 +2742,15 @@ msgstr "... viitab relatsioonile"
 msgid "Cycling dependencies"
 msgstr ""
 
+msgid "Uploading modified notes"
+msgstr ""
+
+msgid "Note {0} failed: {1}"
+msgstr ""
+
+msgid "Notes failed to upload"
+msgstr ""
+
 msgid ""
 "The following are results of automatic validation. Try fixing these, but be "
 "careful (don''t destroy valid data). When in doubt ignore them.<br>When you "
@@ -4978,6 +4997,12 @@ msgstr ""
 msgid "Conflict foreground: keep all tags"
 msgstr ""
 
+msgid "Conflict background: sum all numeric tags"
+msgstr ""
+
+msgid "Conflict foreground: sum all numeric tags"
+msgstr ""
+
 msgid "Conflict background: keep member"
 msgstr ""
 
@@ -5396,12 +5421,19 @@ msgstr ""
 msgid "all"
 msgstr "kõik"
 
+msgid "sum"
+msgstr ""
+
 msgid "Please decide which values to keep"
 msgstr ""
 
 msgid "Value ''{0}'' is going to be applied for key ''{1}''"
 msgstr "Võti ''{1}'' saab väärtuse ''{0}''"
 
+msgid ""
+"All numeric values sumed as ''{0}'' are going to be applied for key ''{1}''"
+msgstr ""
+
 msgid "The key ''{0}'' and all its values are going to be removed"
 msgstr ""
 
@@ -5767,24 +5799,6 @@ msgstr[1] "<b>{0}</b> objekti keelatud"
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr "</p><p>Kõigi objektide nägemiseks sulge filtri dialoog.<p></html>"
 
-msgid "Display the history of all selected items."
-msgstr "Kuva kõikide valitud objektide ajalugu."
-
-msgid "Object with history"
-msgstr ""
-
-msgid "Reload"
-msgstr "Lae uuesti"
-
-msgid "Reload all currently selected objects and refresh the list."
-msgstr "Laadi kõik valitud objektid uuesti ja värskenda nimekirja."
-
-msgid "Show"
-msgstr "Näita"
-
-msgid "Display the history of the selected objects."
-msgstr "Kuva valitud objektide ajalugu."
-
 msgid "Advanced object info"
 msgstr "Objekti põhjalikum info"
 
@@ -6122,6 +6136,9 @@ msgstr ""
 msgid "Comment"
 msgstr "Kommentaar"
 
+msgid "Comment on note"
+msgstr ""
+
 msgid "Add comment to note:"
 msgstr ""
 
@@ -6131,9 +6148,6 @@ msgstr ""
 msgid "Close note with message:"
 msgstr ""
 
-msgid "Close Note"
-msgstr ""
-
 msgid "Create a new note"
 msgstr ""
 
@@ -6206,6 +6220,9 @@ msgstr "Praegune valik"
 msgid "Search for objects"
 msgstr "Otsi objekte"
 
+msgid "Display the history of the selected objects."
+msgstr "Kuva valitud objektide ajalugu."
+
 msgid "Zoom to selection"
 msgstr "Suurenda valikule"
 
@@ -6326,6 +6343,9 @@ msgstr ""
 msgid "Updating map ..."
 msgstr ""
 
+msgid "anonymous"
+msgstr ""
+
 msgid "Display the basic properties of the changeset"
 msgstr "Kuva muutuskogumi põhiatribuudid"
 
@@ -6338,6 +6358,12 @@ msgstr "Sisu"
 msgid "Display the objects created, updated, and deleted by the changeset"
 msgstr "Kuva objektid, mida muutuskogumiga loodi, uuendati või kustutati"
 
+msgid "Discussion"
+msgstr ""
+
+msgid "Display the public discussion around this changeset"
+msgstr ""
+
 msgid "Changeset Management Dialog"
 msgstr ""
 
@@ -6395,9 +6421,6 @@ msgctxt "changeset.state"
 msgid "Closed"
 msgstr "Suletud"
 
-msgid "anonymous"
-msgstr ""
-
 msgid "ID"
 msgstr ""
 
@@ -6413,6 +6436,9 @@ msgstr "Loodud"
 msgid "Closed at"
 msgstr "Suletud"
 
+msgid "Discussions"
+msgstr ""
+
 msgid "Downloading changeset content"
 msgstr "Laadin alla muutustekogumi sisu"
 
@@ -6528,6 +6554,15 @@ msgid ""
 "layer"
 msgstr ""
 
+msgid "Update changeset discussion"
+msgstr ""
+
+msgid "Update the changeset discussion from the OSM server"
+msgstr ""
+
+msgid "Date"
+msgstr "Kuupäev"
+
 msgid "Download changesets"
 msgstr ""
 
@@ -6955,7 +6990,7 @@ msgstr "Palun vali väärtus"
 msgid "Set number of recently added tags"
 msgstr ""
 
-msgid "Remember last used tags"
+msgid "Remember last used tags after a restart"
 msgstr ""
 
 msgid "Please enter the number of recently added tags to display"
@@ -7303,6 +7338,9 @@ msgstr ""
 msgid "Load parent relations"
 msgstr ""
 
+msgid "Reload"
+msgstr "Lae uuesti"
+
 msgid "Loading parent relations"
 msgstr "Vanemrelatsioonide allalaadimine"
 
@@ -7428,6 +7466,12 @@ msgstr "GPS toorandmed"
 msgid "Select to download GPS traces in the selected download area."
 msgstr "Laadib alla GPS rajad valitud allalaadimisalal"
 
+msgid "Notes"
+msgstr "Märkused"
+
+msgid "Select to download notes in the selected download area."
+msgstr ""
+
 msgid "Download as new layer"
 msgstr "Laadi alla uue kihina"
 
@@ -7746,9 +7790,6 @@ msgstr ""
 msgid "B"
 msgstr ""
 
-msgid "Date"
-msgstr "Kuupäev"
-
 msgid ""
 "Failed to update primitive with id {0} because current edit layer is null"
 msgstr ""
@@ -8633,9 +8674,6 @@ msgstr ""
 msgid "Save Layer"
 msgstr "Salvesta kiht"
 
-msgid "Notes"
-msgstr "Märkused"
-
 msgid "Notes layer"
 msgstr ""
 
@@ -8651,9 +8689,6 @@ msgstr "Andmekiht {0}"
 msgid "outside downloaded area"
 msgstr ""
 
-msgid "version {0}"
-msgstr "versioon {0}"
-
 msgid "Merging layers"
 msgstr ""
 
@@ -12331,6 +12366,15 @@ msgstr ""
 msgid "Open changeset expected. Got closed changeset with id {0}."
 msgstr ""
 
+msgid "Note upload failed"
+msgstr ""
+
+msgid "Error parsing note response from server"
+msgstr ""
+
+msgid "Error encoding string: {0}"
+msgstr ""
+
 msgid "(Code={0})"
 msgstr ""
 
@@ -12379,13 +12423,13 @@ msgstr ""
 msgid "Parsing changeset content ..."
 msgstr ""
 
-msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
-msgid "Illegal numeric value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
-msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal numeric value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
 msgid "Missing mandatory attribute ''{0}'' of XML element {1}."
@@ -13193,9 +13237,6 @@ msgstr ""
 msgid "Failed to scan file ''{0}'' for plugin information. Skipping."
 msgstr ""
 
-msgid "Processing plugin site cache icon files..."
-msgstr "Pluginate saidi vahemälu ikoonifailide töötlemine..."
-
 msgid "Processing plugin files..."
 msgstr "Plugina failide töötlemine..."
 
@@ -13214,12 +13255,6 @@ msgstr ""
 msgid "Details:"
 msgstr ""
 
-msgid "Plugin icons download error"
-msgstr ""
-
-msgid "JOSM failed to download plugin icons:"
-msgstr ""
-
 msgid ""
 "Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
 "plugin site ''{1}''."
@@ -14117,7 +14152,9 @@ msgid ""
 "Creating and handling address nodes and buildings within Czech Republic."
 msgstr ""
 
-msgid "Allows to import various file formats into JOSM directly."
+msgid ""
+"Allows to import various file formats into JOSM directly. Currently "
+"supported: TangoGPS, Garmin Trainings Center TCX."
 msgstr ""
 
 msgid "Download your GPX tracks from openstreetmap.org"
@@ -14214,6 +14251,11 @@ msgid "A helper for IRS satellite adjustment."
 msgstr ""
 
 msgid ""
+"Provides Java Native Access (JNA) library. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
+msgid ""
 "Provides Java Topology Suite (JTS) library and related utilities. Not meant "
 "to be installed directly by users, but rather as a dependency for other "
 "plugins."
@@ -14571,6 +14613,25 @@ msgstr "Valgustatud"
 msgid "Width (meters)"
 msgstr "Laius (meetrites)"
 
+msgid "Sidewalk"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "both"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "left"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "right"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "no"
+msgstr ""
+
 msgid "Service type"
 msgstr ""
 
@@ -14935,17 +14996,21 @@ msgstr ""
 msgid "May-Sep 09:30-12:30,14:15-19:30"
 msgstr ""
 
+msgctxt "parking"
 msgid "multi-storey"
-msgstr "mitmekorruseline"
+msgstr ""
 
+msgctxt "parking"
 msgid "surface"
-msgstr "maa tasapinnal"
+msgstr ""
 
+msgctxt "parking"
 msgid "underground"
-msgstr "maa-alune"
+msgstr ""
 
+msgctxt "parking"
 msgid "rooftop"
-msgstr "katuseparkla"
+msgstr ""
 
 msgid "Reference number"
 msgstr "Viitenumber"
@@ -15401,15 +15466,26 @@ msgstr "Suurim pikkus (meetrit)"
 msgid "Overtaking"
 msgstr ""
 
+msgctxt "overtaking"
+msgid "yes"
+msgstr ""
+
+msgctxt "overtaking"
 msgid "both"
 msgstr ""
 
+msgctxt "overtaking"
 msgid "forward"
 msgstr ""
 
+msgctxt "overtaking"
 msgid "backward"
 msgstr ""
 
+msgctxt "overtaking"
+msgid "no"
+msgstr ""
+
 msgid "Roundabout"
 msgstr "Ringristmik"
 
@@ -15703,6 +15779,12 @@ msgstr ""
 msgid "tiger"
 msgstr ""
 
+msgid "Button operated"
+msgstr ""
+
+msgid "Sound signals"
+msgstr ""
+
 msgid "Crossing attendant"
 msgstr ""
 
@@ -15965,7 +16047,7 @@ msgid "Stream"
 msgstr "Oja"
 
 msgid "Wadi"
-msgstr ""
+msgstr "Vadi"
 
 msgid "Canal"
 msgstr "Kanal"
@@ -16224,9 +16306,6 @@ msgstr ""
 msgid "Traffic lights"
 msgstr ""
 
-msgid "Sound signals"
-msgstr ""
-
 msgid "Barrier"
 msgstr ""
 
@@ -18286,6 +18365,9 @@ msgstr "Tuuleveski"
 msgid "Gasometer"
 msgstr "Gaasimõõtejaam"
 
+msgid "Bunker Silo"
+msgstr ""
+
 msgid "Pipeline"
 msgstr "Torustik"
 
@@ -18432,15 +18514,15 @@ msgstr ""
 msgid "Monitoring:"
 msgstr ""
 
-msgid "Weather"
-msgstr ""
-
 msgid "Water level"
 msgstr ""
 
 msgid "Tide Level"
 msgstr ""
 
+msgid "Groundwater"
+msgstr ""
+
 msgid "Traffic"
 msgstr ""
 
@@ -18459,6 +18541,9 @@ msgstr ""
 msgid "Galileo Signals"
 msgstr ""
 
+msgid "Weather"
+msgstr ""
+
 msgid "Radiation"
 msgstr ""
 
@@ -18639,6 +18724,9 @@ msgstr ""
 msgid "pivot_pier"
 msgstr ""
 
+msgid "Bridge outline"
+msgstr ""
+
 msgid "Power Plant"
 msgstr ""
 
@@ -19246,6 +19334,15 @@ msgstr ""
 msgid "Pole"
 msgstr "Elektripost"
 
+msgid "Pole with Transformer"
+msgstr ""
+
+msgid "Pole Attributes:"
+msgstr ""
+
+msgid "Transformer Attributes:"
+msgstr ""
+
 msgid "Power Line"
 msgstr "Elektriliin"
 
@@ -19295,9 +19392,15 @@ msgstr ""
 msgid "Power Cable"
 msgstr ""
 
+msgctxt "power cable"
+msgid "underground"
+msgstr ""
+
+msgctxt "power cable"
 msgid "underwater"
 msgstr ""
 
+msgctxt "power cable"
 msgid "overground"
 msgstr ""
 
@@ -19325,6 +19428,33 @@ msgstr "Monument"
 msgid "Memorial"
 msgstr "Mälestusmärk"
 
+msgctxt "memorial"
+msgid "statue"
+msgstr ""
+
+msgctxt "memorial"
+msgid "bust"
+msgstr ""
+
+msgctxt "memorial"
+msgid "plaque"
+msgstr ""
+
+msgctxt "memorial"
+msgid "stele"
+msgstr ""
+
+msgctxt "memorial"
+msgid "stone"
+msgstr ""
+
+msgctxt "memorial"
+msgid "war_memorial"
+msgstr ""
+
+msgid "Inscription"
+msgstr ""
+
 msgid "Wayside Cross"
 msgstr "Teeäärne rist"
 
@@ -19350,7 +19480,7 @@ msgid "Kiosk"
 msgstr "Kiosk"
 
 msgid "Bakery"
-msgstr ""
+msgstr "Pagariäri"
 
 msgid "Butcher"
 msgstr "Lihunik"
@@ -19362,16 +19492,16 @@ msgid "Deli (Fine Food)"
 msgstr "Delikatessid"
 
 msgid "Candy Store"
-msgstr ""
+msgstr "Maiustused"
 
 msgid "Tea"
-msgstr ""
+msgstr "Teepood"
 
 msgid "Coffee"
-msgstr ""
+msgstr "Kohvipood"
 
 msgid "Public Market"
-msgstr ""
+msgstr "Turg"
 
 msgid "Organic"
 msgstr "Ökokaubad"
@@ -19394,6 +19524,9 @@ msgstr "Alkohol"
 msgid "Beverages"
 msgstr "Joogipood"
 
+msgid "Wine"
+msgstr "Alkohol"
+
 msgid "Boutique"
 msgstr "Butiik"
 
@@ -19439,6 +19572,9 @@ msgstr "Video"
 msgid "Video Games"
 msgstr ""
 
+msgid "Music"
+msgstr ""
+
 msgid "Cash"
 msgstr "Sularaha"
 
@@ -19466,6 +19602,9 @@ msgstr "Valmisköögid"
 msgid "Curtain"
 msgstr "Kardinad"
 
+msgid "Art"
+msgstr ""
+
 msgid "Frame"
 msgstr "Raamimiskoda"
 
@@ -19511,6 +19650,9 @@ msgstr ""
 msgid "Beauty"
 msgstr ""
 
+msgid "Tattoo"
+msgstr ""
+
 msgid "Optician"
 msgstr "Optik"
 
@@ -19562,6 +19704,9 @@ msgstr ""
 msgid "Pet"
 msgstr ""
 
+msgid "Funeral Directors"
+msgstr ""
+
 msgid "Vending Machine"
 msgstr ""
 
@@ -19661,6 +19806,15 @@ msgstr ""
 msgid "National Park"
 msgstr ""
 
+msgid "Protected Area"
+msgstr ""
+
+msgid "Protected Class"
+msgstr ""
+
+msgid "Title or type of protection"
+msgstr ""
+
 msgid "Places"
 msgstr "Asukohad"
 
@@ -20737,7 +20891,13 @@ msgstr ""
 msgid "Estonia Ortho (Maaamet)"
 msgstr ""
 
-msgid "Estonia Multi (Maaamet)"
+msgid "Estonia Hillshade (Maaamet)"
+msgstr ""
+
+msgid "Estonia Cadastre (Maaamet)"
+msgstr ""
+
+msgid "Estonia Forestry (Maaamet)"
 msgstr ""
 
 msgid "Bordeaux - 2012"
@@ -20761,7 +20921,7 @@ msgstr ""
 msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
 msgstr ""
 
-msgid "CUGN Nancy - Orthophoto 2012"
+msgid "GrandNancy Orthophotographie 2012"
 msgstr ""
 
 msgid "Géobretagne - Brest 2010 - 10 cm"
@@ -20808,9 +20968,6 @@ msgid ""
 "- 1 m"
 msgstr ""
 
-msgid "Streets NRW Geofabrik.de"
-msgstr ""
-
 msgid "Hike & Bike"
 msgstr ""
 
@@ -20870,6 +21027,9 @@ msgstr ""
 msgid "NRW-Atlas: Topographische Karte 1:10000"
 msgstr ""
 
+msgid "Metropole Ruhr: Luftbilder (10 cm)"
+msgstr ""
+
 msgid "Drone Imagery (Haiti)"
 msgstr ""
 
@@ -21071,6 +21231,9 @@ msgstr ""
 msgid "Stadt Zürich Übersichtsplan (Strassen, Gebäude, Hausnummer)"
 msgstr ""
 
+msgid "Stadt Zürich Luftbild 2011"
+msgstr ""
+
 msgid "Orthofoto Kanton Solothurn RGB (SOGIS 2011/2012/2013)"
 msgstr ""
 
@@ -21089,7 +21252,7 @@ msgstr ""
 msgid "Canton de Fribourg 50cm (2005)"
 msgstr ""
 
-msgid "Stadt Bern 10cm/25cm (2008)"
+msgid "Stadt Bern 10cm/25cm (2012)"
 msgstr ""
 
 msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
@@ -21128,7 +21291,7 @@ msgstr ""
 msgid "OSM US TIGER 2012 Roads Overlay"
 msgstr ""
 
-msgid "New & Misaligned TIGER Roads (TIGER 2013)"
+msgid "New & Misaligned TIGER Roads (TIGER 2014)"
 msgstr ""
 
 msgid "MassGIS L3 Parcels"
@@ -21176,9 +21339,234 @@ msgstr ""
 msgid "NLS - Bartholomew Half Inch, 1897-1907"
 msgstr ""
 
+msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Annan 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgstr ""
+
 msgid "OS Town Plans, Cupar 1854 (NLS)"
 msgstr ""
 
+msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Elgin 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Forres 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Galashiels 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Girvan 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Greenock 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Haddington 1853 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Haddington 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Hamilton 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Irvine 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Jedburgh 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kelso 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Lanark 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Linlithgow 1856 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Musselburgh 1853 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Musselburgh 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Oban 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Peebles 1856 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Perth 1860 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Peterhead 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Selkirk 1865 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, St Andrews 1854 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, St Andrews 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stirling 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stonehaven 1864 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1847 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Strathaven 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wick 1872 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wigtown 1848 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wigtown 1894 (NLS)"
+msgstr ""
+
 msgid "Decreasing house numbers in addresses interpolation"
 msgstr ""
 
@@ -21232,17 +21620,37 @@ msgid "{0}={1} is deprecated. Please use instead a multipolygon."
 msgstr ""
 
 msgid ""
-"{0} is deprecated. Please specify ìnterval by using opening_hours syntax"
+"{0} is deprecated. Please specify interval by using opening_hours syntax"
 msgstr ""
 
 msgid ""
 "{0} is deprecated. Please delete this object and use a private layer instead"
 msgstr ""
 
-msgid "{0} on a node"
+msgid "{0}={1} is unspecific. Please replace ''{1}'' by a specific value."
 msgstr ""
 
-msgid "{0} on a node. Should be drawn as an area"
+msgid "{0} should be replaced with {1}"
+msgstr ""
+
+msgid ""
+"{0}={1} is unspecific. Please replace ''{1}'' by ''left'', ''right'' or "
+"''both''."
+msgstr ""
+
+msgid "{0} on a node. Should be used on a way."
+msgstr ""
+
+msgid "{0} on a node. Should be drawn as an area."
+msgstr ""
+
+msgid "{0}=* on a node. Should be used in a relation"
+msgstr ""
+
+msgid "{0} on a way. Should be used in a relation"
+msgstr ""
+
+msgid "{0} on a node"
 msgstr ""
 
 msgid "Building inside building"
@@ -25934,6 +26342,9 @@ msgstr ""
 msgid "Find"
 msgstr ""
 
+msgid "Show"
+msgstr "Näita"
+
 msgid "Mark"
 msgstr ""
 
diff --git a/i18n/po/eu.po b/i18n/po/eu.po
index c35eac5..20c4cb2 100644
--- a/i18n/po/eu.po
+++ b/i18n/po/eu.po
@@ -1,8 +1,13 @@
+# Basque translation for josm
+# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
+# This file is distributed under the same license as the josm package.
+# FIRST AUTHOR <EMAIL at ADDRESS>, 2009.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-21 03:38+0200\n"
+"POT-Creation-Date: 2014-12-10 03:42+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"
@@ -10,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-10-21 04:38+0000\n"
-"X-Generator: Launchpad (build 17203)\n"
+"X-Launchpad-Export-Date: 2014-12-10 04:36+0000\n"
+"X-Generator: Launchpad (build 17283)\n"
 "Language: eu\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -170,16 +175,6 @@ msgid "About JOSM..."
 msgstr "JOSM-i buruz"
 
 msgid ""
-"Unexpected format of API base URL. Redirection to info or history page for "
-"OSM object will probably fail. API base URL is: ''{0}''"
-msgstr ""
-
-msgid ""
-"Unexpected format of API base URL. Redirection to user page for OSM user "
-"will probably fail. API base URL is: ''{0}''"
-msgstr ""
-
-msgid ""
 "You are about to launch {0} browser window.<br>This may both clutter your "
 "screen with browser windows<br>and take some time to finish."
 msgid_plural ""
@@ -1592,6 +1587,15 @@ msgstr "Kargatzeko aldaketarik ez."
 msgid "Nothing to upload. Get some data first."
 msgstr "Ez dago kargatzeko ezer. Aurretik datu batzuk lor itzazu."
 
+msgid "Upload note changes to server"
+msgstr ""
+
+msgid "Upload notes"
+msgstr ""
+
+msgid "Uploading notes to server"
+msgstr ""
+
 msgid "Upload selection"
 msgstr "Aukeraketa kargatu"
 
@@ -1871,10 +1875,16 @@ msgstr ""
 msgid "Click the location where you wish to create a new note"
 msgstr ""
 
-msgid "Enter a comment for a new note"
+msgid "Create new note"
 msgstr ""
 
-msgid "Create new note"
+msgid "Create note"
+msgstr ""
+
+msgid "Enter a detailed comment to create a note"
+msgstr ""
+
+msgid "You must enter a comment to create a new note"
 msgstr ""
 
 msgid "Delete Mode"
@@ -2786,6 +2796,15 @@ msgstr "... erlazioari egiten dio erreferentzia"
 msgid "Cycling dependencies"
 msgstr "Mendekotasun ziklikoak"
 
+msgid "Uploading modified notes"
+msgstr ""
+
+msgid "Note {0} failed: {1}"
+msgstr ""
+
+msgid "Notes failed to upload"
+msgstr ""
+
 msgid ""
 "The following are results of automatic validation. Try fixing these, but be "
 "careful (don''t destroy valid data). When in doubt ignore them.<br>When you "
@@ -5076,6 +5095,12 @@ msgstr ""
 msgid "Conflict foreground: keep all tags"
 msgstr ""
 
+msgid "Conflict background: sum all numeric tags"
+msgstr ""
+
+msgid "Conflict foreground: sum all numeric tags"
+msgstr ""
+
 msgid "Conflict background: keep member"
 msgstr ""
 
@@ -5515,12 +5540,19 @@ msgstr "ezer ere ez"
 msgid "all"
 msgstr "denak"
 
+msgid "sum"
+msgstr ""
+
 msgid "Please decide which values to keep"
 msgstr "Mesedez, aukeratu zein balio gorde"
 
 msgid "Value ''{0}'' is going to be applied for key ''{1}''"
 msgstr ""
 
+msgid ""
+"All numeric values sumed as ''{0}'' are going to be applied for key ''{1}''"
+msgstr ""
+
 msgid "The key ''{0}'' and all its values are going to be removed"
 msgstr ""
 
@@ -5885,24 +5917,6 @@ msgstr ""
 "</p><p>Objektu guztiak ikusi ahal izateko itxi ezazu elkarrizketa-"
 "iragazkia.<p></html>"
 
-msgid "Display the history of all selected items."
-msgstr ""
-
-msgid "Object with history"
-msgstr "Historiadun objektua"
-
-msgid "Reload"
-msgstr "Birkargatu"
-
-msgid "Reload all currently selected objects and refresh the list."
-msgstr ""
-
-msgid "Show"
-msgstr "Erakutsi"
-
-msgid "Display the history of the selected objects."
-msgstr "Aukeratutako objektuen historia erakutsi"
-
 msgid "Advanced object info"
 msgstr "Objektuen informazio aurreratua"
 
@@ -6240,6 +6254,9 @@ msgstr ""
 msgid "Comment"
 msgstr "Iruzkina"
 
+msgid "Comment on note"
+msgstr ""
+
 msgid "Add comment to note:"
 msgstr ""
 
@@ -6249,9 +6266,6 @@ msgstr ""
 msgid "Close note with message:"
 msgstr ""
 
-msgid "Close Note"
-msgstr ""
-
 msgid "Create a new note"
 msgstr ""
 
@@ -6324,6 +6338,9 @@ msgstr ""
 msgid "Search for objects"
 msgstr ""
 
+msgid "Display the history of the selected objects."
+msgstr "Aukeratutako objektuen historia erakutsi"
+
 msgid "Zoom to selection"
 msgstr ""
 
@@ -6444,6 +6461,9 @@ msgstr ""
 msgid "Updating map ..."
 msgstr ""
 
+msgid "anonymous"
+msgstr "anonimoa"
+
 msgid "Display the basic properties of the changeset"
 msgstr ""
 
@@ -6456,6 +6476,12 @@ msgstr "Edukia"
 msgid "Display the objects created, updated, and deleted by the changeset"
 msgstr ""
 
+msgid "Discussion"
+msgstr ""
+
+msgid "Display the public discussion around this changeset"
+msgstr ""
+
 msgid "Changeset Management Dialog"
 msgstr ""
 
@@ -6513,9 +6539,6 @@ msgctxt "changeset.state"
 msgid "Closed"
 msgstr "Itxita"
 
-msgid "anonymous"
-msgstr "anonimoa"
-
 msgid "ID"
 msgstr "IDa"
 
@@ -6531,6 +6554,9 @@ msgstr "Sorketa data"
 msgid "Closed at"
 msgstr "Itxiera data"
 
+msgid "Discussions"
+msgstr ""
+
 msgid "Downloading changeset content"
 msgstr ""
 
@@ -6642,6 +6668,15 @@ msgid ""
 "layer"
 msgstr ""
 
+msgid "Update changeset discussion"
+msgstr ""
+
+msgid "Update the changeset discussion from the OSM server"
+msgstr ""
+
+msgid "Date"
+msgstr ""
+
 msgid "Download changesets"
 msgstr ""
 
@@ -7059,7 +7094,7 @@ msgstr "Mesedez, aukeratu balio bat"
 msgid "Set number of recently added tags"
 msgstr ""
 
-msgid "Remember last used tags"
+msgid "Remember last used tags after a restart"
 msgstr ""
 
 msgid "Please enter the number of recently added tags to display"
@@ -7405,6 +7440,9 @@ msgstr ""
 msgid "Load parent relations"
 msgstr ""
 
+msgid "Reload"
+msgstr "Birkargatu"
+
 msgid "Loading parent relations"
 msgstr ""
 
@@ -7527,6 +7565,12 @@ msgstr "GPS datu gordinak"
 msgid "Select to download GPS traces in the selected download area."
 msgstr ""
 
+msgid "Notes"
+msgstr "Oharrak"
+
+msgid "Select to download notes in the selected download area."
+msgstr ""
+
 msgid "Download as new layer"
 msgstr "Geruza berri bezala deskargatu"
 
@@ -7832,9 +7876,6 @@ msgstr ""
 msgid "B"
 msgstr ""
 
-msgid "Date"
-msgstr ""
-
 msgid ""
 "Failed to update primitive with id {0} because current edit layer is null"
 msgstr ""
@@ -8689,9 +8730,6 @@ msgstr ""
 msgid "Save Layer"
 msgstr "Geruza gorde"
 
-msgid "Notes"
-msgstr "Oharrak"
-
 msgid "Notes layer"
 msgstr ""
 
@@ -8707,9 +8745,6 @@ msgstr ""
 msgid "outside downloaded area"
 msgstr ""
 
-msgid "version {0}"
-msgstr ""
-
 msgid "Merging layers"
 msgstr ""
 
@@ -12340,6 +12375,15 @@ msgstr ""
 msgid "Open changeset expected. Got closed changeset with id {0}."
 msgstr ""
 
+msgid "Note upload failed"
+msgstr ""
+
+msgid "Error parsing note response from server"
+msgstr ""
+
+msgid "Error encoding string: {0}"
+msgstr ""
+
 msgid "(Code={0})"
 msgstr ""
 
@@ -12388,13 +12432,13 @@ msgstr ""
 msgid "Parsing changeset content ..."
 msgstr ""
 
-msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
-msgid "Illegal numeric value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
-msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal numeric value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
 msgid "Missing mandatory attribute ''{0}'' of XML element {1}."
@@ -13186,9 +13230,6 @@ msgstr ""
 msgid "Failed to scan file ''{0}'' for plugin information. Skipping."
 msgstr ""
 
-msgid "Processing plugin site cache icon files..."
-msgstr ""
-
 msgid "Processing plugin files..."
 msgstr ""
 
@@ -13207,12 +13248,6 @@ msgstr ""
 msgid "Details:"
 msgstr ""
 
-msgid "Plugin icons download error"
-msgstr ""
-
-msgid "JOSM failed to download plugin icons:"
-msgstr ""
-
 msgid ""
 "Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
 "plugin site ''{1}''."
@@ -14104,8 +14139,10 @@ msgid ""
 "Creating and handling address nodes and buildings within Czech Republic."
 msgstr "Sortu eta kudeatu helbide-nodoak eta eraikinak Txekiar Errepublikan"
 
-msgid "Allows to import various file formats into JOSM directly."
-msgstr "Zenbait fitxategi-formatu JOSMra zuzenean inportatzeko aukera."
+msgid ""
+"Allows to import various file formats into JOSM directly. Currently "
+"supported: TangoGPS, Garmin Trainings Center TCX."
+msgstr ""
 
 msgid "Download your GPX tracks from openstreetmap.org"
 msgstr ""
@@ -14209,6 +14246,11 @@ msgid "A helper for IRS satellite adjustment."
 msgstr ""
 
 msgid ""
+"Provides Java Native Access (JNA) library. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
+msgid ""
 "Provides Java Topology Suite (JTS) library and related utilities. Not meant "
 "to be installed directly by users, but rather as a dependency for other "
 "plugins."
@@ -14599,6 +14641,25 @@ msgstr ""
 msgid "Width (meters)"
 msgstr "Zabalera (metroak)"
 
+msgid "Sidewalk"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "both"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "left"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "right"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "no"
+msgstr ""
+
 msgid "Service type"
 msgstr ""
 
@@ -14963,15 +15024,19 @@ msgstr ""
 msgid "May-Sep 09:30-12:30,14:15-19:30"
 msgstr ""
 
+msgctxt "parking"
 msgid "multi-storey"
-msgstr "hainbat solairuduna"
+msgstr ""
 
+msgctxt "parking"
 msgid "surface"
-msgstr "kanpoan"
+msgstr ""
 
+msgctxt "parking"
 msgid "underground"
-msgstr "lurrazpian"
+msgstr ""
 
+msgctxt "parking"
 msgid "rooftop"
 msgstr ""
 
@@ -15429,15 +15494,26 @@ msgstr ""
 msgid "Overtaking"
 msgstr ""
 
+msgctxt "overtaking"
+msgid "yes"
+msgstr ""
+
+msgctxt "overtaking"
 msgid "both"
 msgstr ""
 
+msgctxt "overtaking"
 msgid "forward"
 msgstr ""
 
+msgctxt "overtaking"
 msgid "backward"
 msgstr ""
 
+msgctxt "overtaking"
+msgid "no"
+msgstr ""
+
 msgid "Roundabout"
 msgstr "Errotonda"
 
@@ -15731,6 +15807,12 @@ msgstr "pegaso"
 msgid "tiger"
 msgstr "tigrea"
 
+msgid "Button operated"
+msgstr ""
+
+msgid "Sound signals"
+msgstr ""
+
 msgid "Crossing attendant"
 msgstr "Bidegurutze-zaintzailea"
 
@@ -16252,9 +16334,6 @@ msgstr "Trenbide-pasagunea"
 msgid "Traffic lights"
 msgstr ""
 
-msgid "Sound signals"
-msgstr ""
-
 msgid "Barrier"
 msgstr ""
 
@@ -18314,6 +18393,9 @@ msgstr "Haize-errota"
 msgid "Gasometer"
 msgstr "Gasometroa"
 
+msgid "Bunker Silo"
+msgstr ""
+
 msgid "Pipeline"
 msgstr "Hodiak"
 
@@ -18460,15 +18542,15 @@ msgstr ""
 msgid "Monitoring:"
 msgstr ""
 
-msgid "Weather"
-msgstr ""
-
 msgid "Water level"
 msgstr ""
 
 msgid "Tide Level"
 msgstr ""
 
+msgid "Groundwater"
+msgstr ""
+
 msgid "Traffic"
 msgstr ""
 
@@ -18487,6 +18569,9 @@ msgstr ""
 msgid "Galileo Signals"
 msgstr ""
 
+msgid "Weather"
+msgstr ""
+
 msgid "Radiation"
 msgstr ""
 
@@ -18667,6 +18752,9 @@ msgstr ""
 msgid "pivot_pier"
 msgstr ""
 
+msgid "Bridge outline"
+msgstr ""
+
 msgid "Power Plant"
 msgstr ""
 
@@ -19274,6 +19362,15 @@ msgstr ""
 msgid "Pole"
 msgstr ""
 
+msgid "Pole with Transformer"
+msgstr ""
+
+msgid "Pole Attributes:"
+msgstr ""
+
+msgid "Transformer Attributes:"
+msgstr ""
+
 msgid "Power Line"
 msgstr "Linea elektrikoa"
 
@@ -19323,9 +19420,15 @@ msgstr ""
 msgid "Power Cable"
 msgstr ""
 
+msgctxt "power cable"
+msgid "underground"
+msgstr ""
+
+msgctxt "power cable"
 msgid "underwater"
 msgstr ""
 
+msgctxt "power cable"
 msgid "overground"
 msgstr ""
 
@@ -19353,6 +19456,33 @@ msgstr "Monumentua"
 msgid "Memorial"
 msgstr "Oroitarria"
 
+msgctxt "memorial"
+msgid "statue"
+msgstr ""
+
+msgctxt "memorial"
+msgid "bust"
+msgstr ""
+
+msgctxt "memorial"
+msgid "plaque"
+msgstr ""
+
+msgctxt "memorial"
+msgid "stele"
+msgstr ""
+
+msgctxt "memorial"
+msgid "stone"
+msgstr ""
+
+msgctxt "memorial"
+msgid "war_memorial"
+msgstr ""
+
+msgid "Inscription"
+msgstr ""
+
 msgid "Wayside Cross"
 msgstr "Gurutzadura"
 
@@ -19422,6 +19552,9 @@ msgstr "Alkohola"
 msgid "Beverages"
 msgstr "Edariak"
 
+msgid "Wine"
+msgstr ""
+
 msgid "Boutique"
 msgstr ""
 
@@ -19467,6 +19600,9 @@ msgstr "Bideoa"
 msgid "Video Games"
 msgstr ""
 
+msgid "Music"
+msgstr ""
+
 msgid "Cash"
 msgstr "Dirua"
 
@@ -19494,6 +19630,9 @@ msgstr ""
 msgid "Curtain"
 msgstr ""
 
+msgid "Art"
+msgstr ""
+
 msgid "Frame"
 msgstr ""
 
@@ -19539,6 +19678,9 @@ msgstr ""
 msgid "Beauty"
 msgstr ""
 
+msgid "Tattoo"
+msgstr ""
+
 msgid "Optician"
 msgstr "Optika"
 
@@ -19590,6 +19732,9 @@ msgstr ""
 msgid "Pet"
 msgstr ""
 
+msgid "Funeral Directors"
+msgstr ""
+
 msgid "Vending Machine"
 msgstr ""
 
@@ -19689,6 +19834,15 @@ msgstr ""
 msgid "National Park"
 msgstr ""
 
+msgid "Protected Area"
+msgstr ""
+
+msgid "Protected Class"
+msgstr ""
+
+msgid "Title or type of protection"
+msgstr ""
+
 msgid "Places"
 msgstr "Lekuak"
 
@@ -20765,7 +20919,13 @@ msgstr ""
 msgid "Estonia Ortho (Maaamet)"
 msgstr ""
 
-msgid "Estonia Multi (Maaamet)"
+msgid "Estonia Hillshade (Maaamet)"
+msgstr ""
+
+msgid "Estonia Cadastre (Maaamet)"
+msgstr ""
+
+msgid "Estonia Forestry (Maaamet)"
 msgstr ""
 
 msgid "Bordeaux - 2012"
@@ -20789,7 +20949,7 @@ msgstr ""
 msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
 msgstr ""
 
-msgid "CUGN Nancy - Orthophoto 2012"
+msgid "GrandNancy Orthophotographie 2012"
 msgstr ""
 
 msgid "Géobretagne - Brest 2010 - 10 cm"
@@ -20836,9 +20996,6 @@ msgid ""
 "- 1 m"
 msgstr ""
 
-msgid "Streets NRW Geofabrik.de"
-msgstr ""
-
 msgid "Hike & Bike"
 msgstr ""
 
@@ -20898,6 +21055,9 @@ msgstr ""
 msgid "NRW-Atlas: Topographische Karte 1:10000"
 msgstr ""
 
+msgid "Metropole Ruhr: Luftbilder (10 cm)"
+msgstr ""
+
 msgid "Drone Imagery (Haiti)"
 msgstr ""
 
@@ -21099,6 +21259,9 @@ msgstr ""
 msgid "Stadt Zürich Übersichtsplan (Strassen, Gebäude, Hausnummer)"
 msgstr ""
 
+msgid "Stadt Zürich Luftbild 2011"
+msgstr ""
+
 msgid "Orthofoto Kanton Solothurn RGB (SOGIS 2011/2012/2013)"
 msgstr ""
 
@@ -21117,7 +21280,7 @@ msgstr ""
 msgid "Canton de Fribourg 50cm (2005)"
 msgstr ""
 
-msgid "Stadt Bern 10cm/25cm (2008)"
+msgid "Stadt Bern 10cm/25cm (2012)"
 msgstr ""
 
 msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
@@ -21156,7 +21319,7 @@ msgstr ""
 msgid "OSM US TIGER 2012 Roads Overlay"
 msgstr ""
 
-msgid "New & Misaligned TIGER Roads (TIGER 2013)"
+msgid "New & Misaligned TIGER Roads (TIGER 2014)"
 msgstr ""
 
 msgid "MassGIS L3 Parcels"
@@ -21204,9 +21367,234 @@ msgstr ""
 msgid "NLS - Bartholomew Half Inch, 1897-1907"
 msgstr ""
 
+msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Annan 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgstr ""
+
 msgid "OS Town Plans, Cupar 1854 (NLS)"
 msgstr ""
 
+msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Elgin 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Forres 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Galashiels 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Girvan 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Greenock 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Haddington 1853 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Haddington 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Hamilton 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Irvine 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Jedburgh 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kelso 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Lanark 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Linlithgow 1856 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Musselburgh 1853 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Musselburgh 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Oban 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Peebles 1856 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Perth 1860 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Peterhead 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Selkirk 1865 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, St Andrews 1854 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, St Andrews 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stirling 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stonehaven 1864 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1847 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Strathaven 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wick 1872 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wigtown 1848 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wigtown 1894 (NLS)"
+msgstr ""
+
 msgid "Decreasing house numbers in addresses interpolation"
 msgstr ""
 
@@ -21260,17 +21648,37 @@ msgid "{0}={1} is deprecated. Please use instead a multipolygon."
 msgstr ""
 
 msgid ""
-"{0} is deprecated. Please specify ìnterval by using opening_hours syntax"
+"{0} is deprecated. Please specify interval by using opening_hours syntax"
 msgstr ""
 
 msgid ""
 "{0} is deprecated. Please delete this object and use a private layer instead"
 msgstr ""
 
-msgid "{0} on a node"
+msgid "{0}={1} is unspecific. Please replace ''{1}'' by a specific value."
 msgstr ""
 
-msgid "{0} on a node. Should be drawn as an area"
+msgid "{0} should be replaced with {1}"
+msgstr ""
+
+msgid ""
+"{0}={1} is unspecific. Please replace ''{1}'' by ''left'', ''right'' or "
+"''both''."
+msgstr ""
+
+msgid "{0} on a node. Should be used on a way."
+msgstr ""
+
+msgid "{0} on a node. Should be drawn as an area."
+msgstr ""
+
+msgid "{0}=* on a node. Should be used in a relation"
+msgstr ""
+
+msgid "{0} on a way. Should be used in a relation"
+msgstr ""
+
+msgid "{0} on a node"
 msgstr ""
 
 msgid "Building inside building"
@@ -25945,6 +26353,9 @@ msgstr ""
 msgid "Find"
 msgstr ""
 
+msgid "Show"
+msgstr "Erakutsi"
+
 msgid "Mark"
 msgstr ""
 
diff --git a/i18n/po/fa.po b/i18n/po/fa.po
index 8c8318f..0483f6a 100644
--- a/i18n/po/fa.po
+++ b/i18n/po/fa.po
@@ -1,8 +1,13 @@
+# Persian translation for josm
+# Copyright (c) 2008 Rosetta Contributors and Canonical Ltd 2008
+# This file is distributed under the same license as the josm package.
+# FIRST AUTHOR <EMAIL at ADDRESS>, 2008.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-21 03:38+0200\n"
+"POT-Creation-Date: 2014-12-10 03:42+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"
@@ -10,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-10-21 05:14+0000\n"
-"X-Generator: Launchpad (build 17203)\n"
+"X-Launchpad-Export-Date: 2014-12-10 05:05+0000\n"
+"X-Generator: Launchpad (build 17283)\n"
 "Language: fa\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -168,20 +173,6 @@ msgid "About JOSM..."
 msgstr "درباره JOSM ..."
 
 msgid ""
-"Unexpected format of API base URL. Redirection to info or history page for "
-"OSM object will probably fail. API base URL is: ''{0}''"
-msgstr ""
-"فرمت غیر منتظره از آدرس پایه API. راهنمایی مجدد به اطلاعات یا صفحه ی تاریخچه "
-"برای هدف OSM احتمالا ناموفق باشد. آدرس پایه API هست: ''{0}''"
-
-msgid ""
-"Unexpected format of API base URL. Redirection to user page for OSM user "
-"will probably fail. API base URL is: ''{0}''"
-msgstr ""
-"فرمت غیر منتظره از آدرس پایه API. راهنمایی مجدد به صفحه ی کاربر برای کاربر "
-"OSM احتمالا ناموفق باشد. آدرس پایه API هست: ''{0}''"
-
-msgid ""
 "You are about to launch {0} browser window.<br>This may both clutter your "
 "screen with browser windows<br>and take some time to finish."
 msgid_plural ""
@@ -1592,6 +1583,15 @@ msgstr ""
 msgid "Nothing to upload. Get some data first."
 msgstr ""
 
+msgid "Upload note changes to server"
+msgstr ""
+
+msgid "Upload notes"
+msgstr ""
+
+msgid "Uploading notes to server"
+msgstr ""
+
 msgid "Upload selection"
 msgstr ""
 
@@ -1864,10 +1864,16 @@ msgstr ""
 msgid "Click the location where you wish to create a new note"
 msgstr ""
 
-msgid "Enter a comment for a new note"
+msgid "Create new note"
 msgstr ""
 
-msgid "Create new note"
+msgid "Create note"
+msgstr ""
+
+msgid "Enter a detailed comment to create a note"
+msgstr ""
+
+msgid "You must enter a comment to create a new note"
 msgstr ""
 
 msgid "Delete Mode"
@@ -2738,6 +2744,15 @@ msgstr ""
 msgid "Cycling dependencies"
 msgstr ""
 
+msgid "Uploading modified notes"
+msgstr ""
+
+msgid "Note {0} failed: {1}"
+msgstr ""
+
+msgid "Notes failed to upload"
+msgstr ""
+
 msgid ""
 "The following are results of automatic validation. Try fixing these, but be "
 "careful (don''t destroy valid data). When in doubt ignore them.<br>When you "
@@ -4966,6 +4981,12 @@ msgstr ""
 msgid "Conflict foreground: keep all tags"
 msgstr ""
 
+msgid "Conflict background: sum all numeric tags"
+msgstr ""
+
+msgid "Conflict foreground: sum all numeric tags"
+msgstr ""
+
 msgid "Conflict background: keep member"
 msgstr ""
 
@@ -5384,12 +5405,19 @@ msgstr ""
 msgid "all"
 msgstr ""
 
+msgid "sum"
+msgstr ""
+
 msgid "Please decide which values to keep"
 msgstr ""
 
 msgid "Value ''{0}'' is going to be applied for key ''{1}''"
 msgstr ""
 
+msgid ""
+"All numeric values sumed as ''{0}'' are going to be applied for key ''{1}''"
+msgstr ""
+
 msgid "The key ''{0}'' and all its values are going to be removed"
 msgstr ""
 
@@ -5752,24 +5780,6 @@ msgstr[1] ""
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
 
-msgid "Display the history of all selected items."
-msgstr ""
-
-msgid "Object with history"
-msgstr ""
-
-msgid "Reload"
-msgstr ""
-
-msgid "Reload all currently selected objects and refresh the list."
-msgstr ""
-
-msgid "Show"
-msgstr ""
-
-msgid "Display the history of the selected objects."
-msgstr ""
-
 msgid "Advanced object info"
 msgstr ""
 
@@ -6107,6 +6117,9 @@ msgstr ""
 msgid "Comment"
 msgstr ""
 
+msgid "Comment on note"
+msgstr ""
+
 msgid "Add comment to note:"
 msgstr ""
 
@@ -6116,9 +6129,6 @@ msgstr ""
 msgid "Close note with message:"
 msgstr ""
 
-msgid "Close Note"
-msgstr ""
-
 msgid "Create a new note"
 msgstr ""
 
@@ -6191,6 +6201,9 @@ msgstr ""
 msgid "Search for objects"
 msgstr ""
 
+msgid "Display the history of the selected objects."
+msgstr ""
+
 msgid "Zoom to selection"
 msgstr ""
 
@@ -6310,6 +6323,9 @@ msgstr ""
 msgid "Updating map ..."
 msgstr ""
 
+msgid "anonymous"
+msgstr ""
+
 msgid "Display the basic properties of the changeset"
 msgstr ""
 
@@ -6322,6 +6338,12 @@ msgstr ""
 msgid "Display the objects created, updated, and deleted by the changeset"
 msgstr ""
 
+msgid "Discussion"
+msgstr ""
+
+msgid "Display the public discussion around this changeset"
+msgstr ""
+
 msgid "Changeset Management Dialog"
 msgstr ""
 
@@ -6379,9 +6401,6 @@ msgctxt "changeset.state"
 msgid "Closed"
 msgstr ""
 
-msgid "anonymous"
-msgstr ""
-
 msgid "ID"
 msgstr ""
 
@@ -6397,6 +6416,9 @@ msgstr ""
 msgid "Closed at"
 msgstr ""
 
+msgid "Discussions"
+msgstr ""
+
 msgid "Downloading changeset content"
 msgstr ""
 
@@ -6508,6 +6530,15 @@ msgid ""
 "layer"
 msgstr ""
 
+msgid "Update changeset discussion"
+msgstr ""
+
+msgid "Update the changeset discussion from the OSM server"
+msgstr ""
+
+msgid "Date"
+msgstr ""
+
 msgid "Download changesets"
 msgstr ""
 
@@ -6925,7 +6956,7 @@ msgstr ""
 msgid "Set number of recently added tags"
 msgstr ""
 
-msgid "Remember last used tags"
+msgid "Remember last used tags after a restart"
 msgstr ""
 
 msgid "Please enter the number of recently added tags to display"
@@ -7271,6 +7302,9 @@ msgstr ""
 msgid "Load parent relations"
 msgstr ""
 
+msgid "Reload"
+msgstr ""
+
 msgid "Loading parent relations"
 msgstr ""
 
@@ -7393,6 +7427,12 @@ msgstr ""
 msgid "Select to download GPS traces in the selected download area."
 msgstr ""
 
+msgid "Notes"
+msgstr ""
+
+msgid "Select to download notes in the selected download area."
+msgstr ""
+
 msgid "Download as new layer"
 msgstr ""
 
@@ -7698,9 +7738,6 @@ msgstr ""
 msgid "B"
 msgstr ""
 
-msgid "Date"
-msgstr ""
-
 msgid ""
 "Failed to update primitive with id {0} because current edit layer is null"
 msgstr ""
@@ -8560,9 +8597,6 @@ msgstr ""
 msgid "Save Layer"
 msgstr ""
 
-msgid "Notes"
-msgstr ""
-
 msgid "Notes layer"
 msgstr ""
 
@@ -8578,9 +8612,6 @@ msgstr ""
 msgid "outside downloaded area"
 msgstr ""
 
-msgid "version {0}"
-msgstr ""
-
 msgid "Merging layers"
 msgstr ""
 
@@ -12206,6 +12237,15 @@ msgstr ""
 msgid "Open changeset expected. Got closed changeset with id {0}."
 msgstr ""
 
+msgid "Note upload failed"
+msgstr ""
+
+msgid "Error parsing note response from server"
+msgstr ""
+
+msgid "Error encoding string: {0}"
+msgstr ""
+
 msgid "(Code={0})"
 msgstr ""
 
@@ -12254,13 +12294,13 @@ msgstr ""
 msgid "Parsing changeset content ..."
 msgstr ""
 
-msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
-msgid "Illegal numeric value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
-msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal numeric value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
 msgid "Missing mandatory attribute ''{0}'' of XML element {1}."
@@ -13052,9 +13092,6 @@ msgstr ""
 msgid "Failed to scan file ''{0}'' for plugin information. Skipping."
 msgstr ""
 
-msgid "Processing plugin site cache icon files..."
-msgstr ""
-
 msgid "Processing plugin files..."
 msgstr ""
 
@@ -13073,12 +13110,6 @@ msgstr ""
 msgid "Details:"
 msgstr ""
 
-msgid "Plugin icons download error"
-msgstr ""
-
-msgid "JOSM failed to download plugin icons:"
-msgstr ""
-
 msgid ""
 "Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
 "plugin site ''{1}''."
@@ -13964,7 +13995,9 @@ msgid ""
 "Creating and handling address nodes and buildings within Czech Republic."
 msgstr ""
 
-msgid "Allows to import various file formats into JOSM directly."
+msgid ""
+"Allows to import various file formats into JOSM directly. Currently "
+"supported: TangoGPS, Garmin Trainings Center TCX."
 msgstr ""
 
 msgid "Download your GPX tracks from openstreetmap.org"
@@ -14061,6 +14094,11 @@ msgid "A helper for IRS satellite adjustment."
 msgstr ""
 
 msgid ""
+"Provides Java Native Access (JNA) library. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
+msgid ""
 "Provides Java Topology Suite (JTS) library and related utilities. Not meant "
 "to be installed directly by users, but rather as a dependency for other "
 "plugins."
@@ -14416,6 +14454,25 @@ msgstr ""
 msgid "Width (meters)"
 msgstr ""
 
+msgid "Sidewalk"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "both"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "left"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "right"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "no"
+msgstr ""
+
 msgid "Service type"
 msgstr ""
 
@@ -14780,15 +14837,19 @@ msgstr ""
 msgid "May-Sep 09:30-12:30,14:15-19:30"
 msgstr ""
 
+msgctxt "parking"
 msgid "multi-storey"
 msgstr ""
 
+msgctxt "parking"
 msgid "surface"
 msgstr ""
 
+msgctxt "parking"
 msgid "underground"
 msgstr ""
 
+msgctxt "parking"
 msgid "rooftop"
 msgstr ""
 
@@ -15246,15 +15307,26 @@ msgstr ""
 msgid "Overtaking"
 msgstr ""
 
+msgctxt "overtaking"
+msgid "yes"
+msgstr ""
+
+msgctxt "overtaking"
 msgid "both"
 msgstr ""
 
+msgctxt "overtaking"
 msgid "forward"
 msgstr ""
 
+msgctxt "overtaking"
 msgid "backward"
 msgstr ""
 
+msgctxt "overtaking"
+msgid "no"
+msgstr ""
+
 msgid "Roundabout"
 msgstr ""
 
@@ -15548,6 +15620,12 @@ msgstr ""
 msgid "tiger"
 msgstr ""
 
+msgid "Button operated"
+msgstr ""
+
+msgid "Sound signals"
+msgstr ""
+
 msgid "Crossing attendant"
 msgstr ""
 
@@ -16069,9 +16147,6 @@ msgstr ""
 msgid "Traffic lights"
 msgstr ""
 
-msgid "Sound signals"
-msgstr ""
-
 msgid "Barrier"
 msgstr ""
 
@@ -18131,6 +18206,9 @@ msgstr ""
 msgid "Gasometer"
 msgstr ""
 
+msgid "Bunker Silo"
+msgstr ""
+
 msgid "Pipeline"
 msgstr ""
 
@@ -18277,15 +18355,15 @@ msgstr ""
 msgid "Monitoring:"
 msgstr ""
 
-msgid "Weather"
-msgstr ""
-
 msgid "Water level"
 msgstr ""
 
 msgid "Tide Level"
 msgstr ""
 
+msgid "Groundwater"
+msgstr ""
+
 msgid "Traffic"
 msgstr ""
 
@@ -18304,6 +18382,9 @@ msgstr ""
 msgid "Galileo Signals"
 msgstr ""
 
+msgid "Weather"
+msgstr ""
+
 msgid "Radiation"
 msgstr ""
 
@@ -18484,6 +18565,9 @@ msgstr ""
 msgid "pivot_pier"
 msgstr ""
 
+msgid "Bridge outline"
+msgstr ""
+
 msgid "Power Plant"
 msgstr ""
 
@@ -19091,6 +19175,15 @@ msgstr ""
 msgid "Pole"
 msgstr ""
 
+msgid "Pole with Transformer"
+msgstr ""
+
+msgid "Pole Attributes:"
+msgstr ""
+
+msgid "Transformer Attributes:"
+msgstr ""
+
 msgid "Power Line"
 msgstr ""
 
@@ -19140,9 +19233,15 @@ msgstr ""
 msgid "Power Cable"
 msgstr ""
 
+msgctxt "power cable"
+msgid "underground"
+msgstr ""
+
+msgctxt "power cable"
 msgid "underwater"
 msgstr ""
 
+msgctxt "power cable"
 msgid "overground"
 msgstr ""
 
@@ -19170,6 +19269,33 @@ msgstr ""
 msgid "Memorial"
 msgstr ""
 
+msgctxt "memorial"
+msgid "statue"
+msgstr ""
+
+msgctxt "memorial"
+msgid "bust"
+msgstr ""
+
+msgctxt "memorial"
+msgid "plaque"
+msgstr ""
+
+msgctxt "memorial"
+msgid "stele"
+msgstr ""
+
+msgctxt "memorial"
+msgid "stone"
+msgstr ""
+
+msgctxt "memorial"
+msgid "war_memorial"
+msgstr ""
+
+msgid "Inscription"
+msgstr ""
+
 msgid "Wayside Cross"
 msgstr ""
 
@@ -19239,6 +19365,9 @@ msgstr ""
 msgid "Beverages"
 msgstr ""
 
+msgid "Wine"
+msgstr ""
+
 msgid "Boutique"
 msgstr ""
 
@@ -19284,6 +19413,9 @@ msgstr ""
 msgid "Video Games"
 msgstr ""
 
+msgid "Music"
+msgstr ""
+
 msgid "Cash"
 msgstr ""
 
@@ -19311,6 +19443,9 @@ msgstr ""
 msgid "Curtain"
 msgstr ""
 
+msgid "Art"
+msgstr ""
+
 msgid "Frame"
 msgstr ""
 
@@ -19356,6 +19491,9 @@ msgstr ""
 msgid "Beauty"
 msgstr ""
 
+msgid "Tattoo"
+msgstr ""
+
 msgid "Optician"
 msgstr ""
 
@@ -19407,6 +19545,9 @@ msgstr ""
 msgid "Pet"
 msgstr ""
 
+msgid "Funeral Directors"
+msgstr ""
+
 msgid "Vending Machine"
 msgstr ""
 
@@ -19506,6 +19647,15 @@ msgstr ""
 msgid "National Park"
 msgstr ""
 
+msgid "Protected Area"
+msgstr ""
+
+msgid "Protected Class"
+msgstr ""
+
+msgid "Title or type of protection"
+msgstr ""
+
 msgid "Places"
 msgstr ""
 
@@ -20582,7 +20732,13 @@ msgstr ""
 msgid "Estonia Ortho (Maaamet)"
 msgstr ""
 
-msgid "Estonia Multi (Maaamet)"
+msgid "Estonia Hillshade (Maaamet)"
+msgstr ""
+
+msgid "Estonia Cadastre (Maaamet)"
+msgstr ""
+
+msgid "Estonia Forestry (Maaamet)"
 msgstr ""
 
 msgid "Bordeaux - 2012"
@@ -20606,7 +20762,7 @@ msgstr ""
 msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
 msgstr ""
 
-msgid "CUGN Nancy - Orthophoto 2012"
+msgid "GrandNancy Orthophotographie 2012"
 msgstr ""
 
 msgid "Géobretagne - Brest 2010 - 10 cm"
@@ -20653,9 +20809,6 @@ msgid ""
 "- 1 m"
 msgstr ""
 
-msgid "Streets NRW Geofabrik.de"
-msgstr ""
-
 msgid "Hike & Bike"
 msgstr ""
 
@@ -20715,6 +20868,9 @@ msgstr ""
 msgid "NRW-Atlas: Topographische Karte 1:10000"
 msgstr ""
 
+msgid "Metropole Ruhr: Luftbilder (10 cm)"
+msgstr ""
+
 msgid "Drone Imagery (Haiti)"
 msgstr ""
 
@@ -20916,6 +21072,9 @@ msgstr ""
 msgid "Stadt Zürich Übersichtsplan (Strassen, Gebäude, Hausnummer)"
 msgstr ""
 
+msgid "Stadt Zürich Luftbild 2011"
+msgstr ""
+
 msgid "Orthofoto Kanton Solothurn RGB (SOGIS 2011/2012/2013)"
 msgstr ""
 
@@ -20934,7 +21093,7 @@ msgstr ""
 msgid "Canton de Fribourg 50cm (2005)"
 msgstr ""
 
-msgid "Stadt Bern 10cm/25cm (2008)"
+msgid "Stadt Bern 10cm/25cm (2012)"
 msgstr ""
 
 msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
@@ -20973,7 +21132,7 @@ msgstr ""
 msgid "OSM US TIGER 2012 Roads Overlay"
 msgstr ""
 
-msgid "New & Misaligned TIGER Roads (TIGER 2013)"
+msgid "New & Misaligned TIGER Roads (TIGER 2014)"
 msgstr ""
 
 msgid "MassGIS L3 Parcels"
@@ -21021,9 +21180,234 @@ msgstr ""
 msgid "NLS - Bartholomew Half Inch, 1897-1907"
 msgstr ""
 
+msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Annan 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgstr ""
+
 msgid "OS Town Plans, Cupar 1854 (NLS)"
 msgstr ""
 
+msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Elgin 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Forres 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Galashiels 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Girvan 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Greenock 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Haddington 1853 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Haddington 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Hamilton 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Irvine 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Jedburgh 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kelso 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Lanark 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Linlithgow 1856 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Musselburgh 1853 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Musselburgh 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Oban 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Peebles 1856 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Perth 1860 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Peterhead 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Selkirk 1865 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, St Andrews 1854 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, St Andrews 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stirling 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stonehaven 1864 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1847 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Strathaven 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wick 1872 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wigtown 1848 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wigtown 1894 (NLS)"
+msgstr ""
+
 msgid "Decreasing house numbers in addresses interpolation"
 msgstr ""
 
@@ -21077,17 +21461,37 @@ msgid "{0}={1} is deprecated. Please use instead a multipolygon."
 msgstr ""
 
 msgid ""
-"{0} is deprecated. Please specify ìnterval by using opening_hours syntax"
+"{0} is deprecated. Please specify interval by using opening_hours syntax"
 msgstr ""
 
 msgid ""
 "{0} is deprecated. Please delete this object and use a private layer instead"
 msgstr ""
 
-msgid "{0} on a node"
+msgid "{0}={1} is unspecific. Please replace ''{1}'' by a specific value."
 msgstr ""
 
-msgid "{0} on a node. Should be drawn as an area"
+msgid "{0} should be replaced with {1}"
+msgstr ""
+
+msgid ""
+"{0}={1} is unspecific. Please replace ''{1}'' by ''left'', ''right'' or "
+"''both''."
+msgstr ""
+
+msgid "{0} on a node. Should be used on a way."
+msgstr ""
+
+msgid "{0} on a node. Should be drawn as an area."
+msgstr ""
+
+msgid "{0}=* on a node. Should be used in a relation"
+msgstr ""
+
+msgid "{0} on a way. Should be used in a relation"
+msgstr ""
+
+msgid "{0} on a node"
 msgstr ""
 
 msgid "Building inside building"
@@ -25757,6 +26161,9 @@ msgstr ""
 msgid "Find"
 msgstr ""
 
+msgid "Show"
+msgstr ""
+
 msgid "Mark"
 msgstr ""
 
diff --git a/i18n/po/fi.po b/i18n/po/fi.po
index bc3c152..42fe805 100644
--- a/i18n/po/fi.po
+++ b/i18n/po/fi.po
@@ -1,8 +1,13 @@
+# Finnish translation for josm
+# Copyright (c) 2008 Rosetta Contributors and Canonical Ltd 2008
+# This file is distributed under the same license as the josm package.
+# FIRST AUTHOR <EMAIL at ADDRESS>, 2008.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-21 03:38+0200\n"
+"POT-Creation-Date: 2014-12-10 03:42+0100\n"
 "PO-Revision-Date: 2014-02-26 18:35+0000\n"
 "Last-Translator: Lauri Kytömaa <Unknown>\n"
 "Language-Team: Finnish <fi at li.org>\n"
@@ -10,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-10-21 04:49+0000\n"
-"X-Generator: Launchpad (build 17203)\n"
+"X-Launchpad-Export-Date: 2014-12-10 04:45+0000\n"
+"X-Generator: Launchpad (build 17283)\n"
 "Language: fi\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -169,22 +174,6 @@ msgid "About JOSM..."
 msgstr "Tietoja JOSM:sta..."
 
 msgid ""
-"Unexpected format of API base URL. Redirection to info or history page for "
-"OSM object will probably fail. API base URL is: ''{0}''"
-msgstr ""
-"OSM-palvelimen yhteysosoitteen muoto poikkeaa tavanomaisesta. Selaimen "
-"ohjaus karttakohteen tieto- tai historiasivulle todennäköisesti epäonnistuu. "
-"Nykyinen yhteysosoite on: \"{0}\""
-
-msgid ""
-"Unexpected format of API base URL. Redirection to user page for OSM user "
-"will probably fail. API base URL is: ''{0}''"
-msgstr ""
-"OSM-palvelimen yhteysosoitteen muoto poikkeaa tavanomaisesta. Selaimen "
-"ohjaus käyttäjän tietosivulle todennäköisesti epäonnistuu. Nykyinen "
-"yhteysosoite on: \"{0}\""
-
-msgid ""
 "You are about to launch {0} browser window.<br>This may both clutter your "
 "screen with browser windows<br>and take some time to finish."
 msgid_plural ""
@@ -1647,6 +1636,15 @@ msgstr "Ei lähetettäviä muutoksia."
 msgid "Nothing to upload. Get some data first."
 msgstr "Ei mitään lähetettävää. Hae ensin dataa."
 
+msgid "Upload note changes to server"
+msgstr ""
+
+msgid "Upload notes"
+msgstr ""
+
+msgid "Uploading notes to server"
+msgstr ""
+
 msgid "Upload selection"
 msgstr "Lähetä valinta"
 
@@ -1933,10 +1931,16 @@ msgstr ""
 msgid "Click the location where you wish to create a new note"
 msgstr ""
 
-msgid "Enter a comment for a new note"
+msgid "Create new note"
 msgstr ""
 
-msgid "Create new note"
+msgid "Create note"
+msgstr ""
+
+msgid "Enter a detailed comment to create a note"
+msgstr ""
+
+msgid "You must enter a comment to create a new note"
 msgstr ""
 
 msgid "Delete Mode"
@@ -2905,6 +2909,15 @@ msgstr "...viittaa relaatioon"
 msgid "Cycling dependencies"
 msgstr "Syklisiä riippuvuuksia"
 
+msgid "Uploading modified notes"
+msgstr ""
+
+msgid "Note {0} failed: {1}"
+msgstr ""
+
+msgid "Notes failed to upload"
+msgstr ""
+
 msgid ""
 "The following are results of automatic validation. Try fixing these, but be "
 "careful (don''t destroy valid data). When in doubt ignore them.<br>When you "
@@ -5237,6 +5250,12 @@ msgstr ""
 msgid "Conflict foreground: keep all tags"
 msgstr ""
 
+msgid "Conflict background: sum all numeric tags"
+msgstr ""
+
+msgid "Conflict foreground: sum all numeric tags"
+msgstr ""
+
 msgid "Conflict background: keep member"
 msgstr ""
 
@@ -5679,12 +5698,19 @@ msgstr "ei mitään"
 msgid "all"
 msgstr "kaikki"
 
+msgid "sum"
+msgstr ""
+
 msgid "Please decide which values to keep"
 msgstr "Valitse mitkä arvot pidetään"
 
 msgid "Value ''{0}'' is going to be applied for key ''{1}''"
 msgstr "Arvo \"{0}\" tullaan toteuttamaan avaimelle \"{1}\""
 
+msgid ""
+"All numeric values sumed as ''{0}'' are going to be applied for key ''{1}''"
+msgstr ""
+
 msgid "The key ''{0}'' and all its values are going to be removed"
 msgstr "Avain \"{0}\" ja kaikki sen arvot tullaan poistamaan"
 
@@ -6069,24 +6095,6 @@ msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
 "</p><p>Saat kaikki kohteet näkyviin sulkemalla suodinpaneelin.<p></html>"
 
-msgid "Display the history of all selected items."
-msgstr "Näytä valittujen kohteiden historia."
-
-msgid "Object with history"
-msgstr "Kohde historialla"
-
-msgid "Reload"
-msgstr "Lataa uudelleen"
-
-msgid "Reload all currently selected objects and refresh the list."
-msgstr "Lataa kaikki valitut objektit uudelleen ja päivitä lista."
-
-msgid "Show"
-msgstr "Näytä"
-
-msgid "Display the history of the selected objects."
-msgstr "Näytä valittujen objektien historia"
-
 msgid "Advanced object info"
 msgstr "Kohteen tarkat tiedot"
 
@@ -6442,6 +6450,9 @@ msgstr ""
 msgid "Comment"
 msgstr "Kommentti"
 
+msgid "Comment on note"
+msgstr ""
+
 msgid "Add comment to note:"
 msgstr ""
 
@@ -6451,9 +6462,6 @@ msgstr ""
 msgid "Close note with message:"
 msgstr ""
 
-msgid "Close Note"
-msgstr ""
-
 msgid "Create a new note"
 msgstr ""
 
@@ -6526,6 +6534,9 @@ msgstr "Tämänhetkinen valinta"
 msgid "Search for objects"
 msgstr "Etsi kohteita"
 
+msgid "Display the history of the selected objects."
+msgstr "Näytä valittujen objektien historia"
+
 msgid "Zoom to selection"
 msgstr "Sovita näkymä valintaan"
 
@@ -6649,6 +6660,9 @@ msgstr "Korjataan ({0}/{1}): ''{2}''"
 msgid "Updating map ..."
 msgstr "Päivitetään karttaa..."
 
+msgid "anonymous"
+msgstr "anonyymi"
+
 msgid "Display the basic properties of the changeset"
 msgstr "Näytä muutoskokoelman perustiedot"
 
@@ -6661,6 +6675,12 @@ msgstr "Sisältö"
 msgid "Display the objects created, updated, and deleted by the changeset"
 msgstr "Näytä muutoskokoelmassa luodut, muokatut ja poistetut objektit"
 
+msgid "Discussion"
+msgstr ""
+
+msgid "Display the public discussion around this changeset"
+msgstr ""
+
 msgid "Changeset Management Dialog"
 msgstr "Muutoskokoelmat"
 
@@ -6723,9 +6743,6 @@ msgctxt "changeset.state"
 msgid "Closed"
 msgstr "Suljettu"
 
-msgid "anonymous"
-msgstr "anonyymi"
-
 msgid "ID"
 msgstr "ID"
 
@@ -6741,6 +6758,9 @@ msgstr "Luotu"
 msgid "Closed at"
 msgstr "Suljettu"
 
+msgid "Discussions"
+msgstr ""
+
 msgid "Downloading changeset content"
 msgstr "Ladataan muutoskokoelman sisältöä"
 
@@ -6860,6 +6880,15 @@ msgid ""
 "layer"
 msgstr ""
 
+msgid "Update changeset discussion"
+msgstr ""
+
+msgid "Update the changeset discussion from the OSM server"
+msgstr ""
+
+msgid "Date"
+msgstr "Päivämäärä"
+
 msgid "Download changesets"
 msgstr "Ladataan muutoskokoelmat"
 
@@ -7309,8 +7338,8 @@ msgstr "Valitse arvo"
 msgid "Set number of recently added tags"
 msgstr "Valitse muistettavien tagien määrä"
 
-msgid "Remember last used tags"
-msgstr "Muista viimeksi käytetyt tagit"
+msgid "Remember last used tags after a restart"
+msgstr ""
 
 msgid "Please enter the number of recently added tags to display"
 msgstr ""
@@ -7693,6 +7722,9 @@ msgstr "myös emorelaatioiden välittömät lapsirelaatiot"
 msgid "Load parent relations"
 msgstr "Lataa emorelaatiot"
 
+msgid "Reload"
+msgstr "Lataa uudelleen"
+
 msgid "Loading parent relations"
 msgstr "Ladataan emorelaatioita"
 
@@ -7824,6 +7856,12 @@ msgstr ""
 "Merkkaa valituksi, jos haluat ladata tallennetut GPS-pisteet valitulta "
 "latausalueelta."
 
+msgid "Notes"
+msgstr "Setelit"
+
+msgid "Select to download notes in the selected download area."
+msgstr ""
+
 msgid "Download as new layer"
 msgstr "Lataa uutena tasona"
 
@@ -8165,9 +8203,6 @@ msgstr "A"
 msgid "B"
 msgstr "B"
 
-msgid "Date"
-msgstr "Päivämäärä"
-
 msgid ""
 "Failed to update primitive with id {0} because current edit layer is null"
 msgstr ""
@@ -9135,9 +9170,6 @@ msgstr ""
 msgid "Save Layer"
 msgstr "Tallenna kerros"
 
-msgid "Notes"
-msgstr "Setelit"
-
 msgid "Notes layer"
 msgstr ""
 
@@ -9153,9 +9185,6 @@ msgstr "Datataso {0}"
 msgid "outside downloaded area"
 msgstr "ladatun alueen ulkopuolella"
 
-msgid "version {0}"
-msgstr ""
-
 msgid "Merging layers"
 msgstr ""
 
@@ -12882,6 +12911,15 @@ msgstr ""
 msgid "Open changeset expected. Got closed changeset with id {0}."
 msgstr ""
 
+msgid "Note upload failed"
+msgstr ""
+
+msgid "Error parsing note response from server"
+msgstr ""
+
+msgid "Error encoding string: {0}"
+msgstr ""
+
 msgid "(Code={0})"
 msgstr ""
 
@@ -12930,13 +12968,13 @@ msgstr ""
 msgid "Parsing changeset content ..."
 msgstr ""
 
-msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
-msgid "Illegal numeric value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
-msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal numeric value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
 msgid "Missing mandatory attribute ''{0}'' of XML element {1}."
@@ -13755,9 +13793,6 @@ msgstr "Käsitellään tiedostoa \"{0}\""
 msgid "Failed to scan file ''{0}'' for plugin information. Skipping."
 msgstr ""
 
-msgid "Processing plugin site cache icon files..."
-msgstr "Käsitellään liitännäissivustojen kuvakkeiden välimuistitiedostoa..."
-
 msgid "Processing plugin files..."
 msgstr ""
 
@@ -13776,12 +13811,6 @@ msgstr ""
 msgid "Details:"
 msgstr ""
 
-msgid "Plugin icons download error"
-msgstr ""
-
-msgid "JOSM failed to download plugin icons:"
-msgstr ""
-
 msgid ""
 "Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
 "plugin site ''{1}''."
@@ -14698,7 +14727,9 @@ msgid ""
 "Creating and handling address nodes and buildings within Czech Republic."
 msgstr ""
 
-msgid "Allows to import various file formats into JOSM directly."
+msgid ""
+"Allows to import various file formats into JOSM directly. Currently "
+"supported: TangoGPS, Garmin Trainings Center TCX."
 msgstr ""
 
 msgid "Download your GPX tracks from openstreetmap.org"
@@ -14797,6 +14828,11 @@ msgid "A helper for IRS satellite adjustment."
 msgstr ""
 
 msgid ""
+"Provides Java Native Access (JNA) library. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
+msgid ""
 "Provides Java Topology Suite (JTS) library and related utilities. Not meant "
 "to be installed directly by users, but rather as a dependency for other "
 "plugins."
@@ -15169,6 +15205,25 @@ msgstr ""
 msgid "Width (meters)"
 msgstr ""
 
+msgid "Sidewalk"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "both"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "left"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "right"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "no"
+msgstr ""
+
 msgid "Service type"
 msgstr ""
 
@@ -15533,17 +15588,21 @@ msgstr ""
 msgid "May-Sep 09:30-12:30,14:15-19:30"
 msgstr ""
 
+msgctxt "parking"
 msgid "multi-storey"
-msgstr "monikerroksinen"
+msgstr ""
 
+msgctxt "parking"
 msgid "surface"
-msgstr "alue maan pinnalla"
+msgstr ""
 
+msgctxt "parking"
 msgid "underground"
-msgstr "maanalainen"
+msgstr ""
 
+msgctxt "parking"
 msgid "rooftop"
-msgstr "kattopysäköinti"
+msgstr ""
 
 msgid "Reference number"
 msgstr ""
@@ -15999,15 +16058,26 @@ msgstr "Ajoneuvon suurin sallittu pituus (metriä)"
 msgid "Overtaking"
 msgstr ""
 
+msgctxt "overtaking"
+msgid "yes"
+msgstr ""
+
+msgctxt "overtaking"
 msgid "both"
 msgstr ""
 
+msgctxt "overtaking"
 msgid "forward"
 msgstr ""
 
+msgctxt "overtaking"
 msgid "backward"
 msgstr ""
 
+msgctxt "overtaking"
+msgid "no"
+msgstr ""
+
 msgid "Roundabout"
 msgstr "Kiertoliittymä"
 
@@ -16301,6 +16371,12 @@ msgstr ""
 msgid "tiger"
 msgstr ""
 
+msgid "Button operated"
+msgstr ""
+
+msgid "Sound signals"
+msgstr ""
+
 msgid "Crossing attendant"
 msgstr "Suojatien valvoja"
 
@@ -16822,9 +16898,6 @@ msgstr "Tasoristeys"
 msgid "Traffic lights"
 msgstr ""
 
-msgid "Sound signals"
-msgstr ""
-
 msgid "Barrier"
 msgstr ""
 
@@ -18884,6 +18957,9 @@ msgstr "Tuulimylly"
 msgid "Gasometer"
 msgstr "Kaasukello"
 
+msgid "Bunker Silo"
+msgstr ""
+
 msgid "Pipeline"
 msgstr "Putki"
 
@@ -19030,15 +19106,15 @@ msgstr ""
 msgid "Monitoring:"
 msgstr ""
 
-msgid "Weather"
-msgstr ""
-
 msgid "Water level"
 msgstr ""
 
 msgid "Tide Level"
 msgstr ""
 
+msgid "Groundwater"
+msgstr ""
+
 msgid "Traffic"
 msgstr ""
 
@@ -19057,6 +19133,9 @@ msgstr ""
 msgid "Galileo Signals"
 msgstr ""
 
+msgid "Weather"
+msgstr ""
+
 msgid "Radiation"
 msgstr ""
 
@@ -19237,6 +19316,9 @@ msgstr ""
 msgid "pivot_pier"
 msgstr ""
 
+msgid "Bridge outline"
+msgstr ""
+
 msgid "Power Plant"
 msgstr ""
 
@@ -19844,6 +19926,15 @@ msgstr ""
 msgid "Pole"
 msgstr ""
 
+msgid "Pole with Transformer"
+msgstr ""
+
+msgid "Pole Attributes:"
+msgstr ""
+
+msgid "Transformer Attributes:"
+msgstr ""
+
 msgid "Power Line"
 msgstr "Sähkölinja"
 
@@ -19893,9 +19984,15 @@ msgstr ""
 msgid "Power Cable"
 msgstr ""
 
+msgctxt "power cable"
+msgid "underground"
+msgstr ""
+
+msgctxt "power cable"
 msgid "underwater"
 msgstr ""
 
+msgctxt "power cable"
 msgid "overground"
 msgstr ""
 
@@ -19923,6 +20020,33 @@ msgstr "Monumentti"
 msgid "Memorial"
 msgstr "Muistomerkki"
 
+msgctxt "memorial"
+msgid "statue"
+msgstr ""
+
+msgctxt "memorial"
+msgid "bust"
+msgstr ""
+
+msgctxt "memorial"
+msgid "plaque"
+msgstr ""
+
+msgctxt "memorial"
+msgid "stele"
+msgstr ""
+
+msgctxt "memorial"
+msgid "stone"
+msgstr ""
+
+msgctxt "memorial"
+msgid "war_memorial"
+msgstr ""
+
+msgid "Inscription"
+msgstr ""
+
 msgid "Wayside Cross"
 msgstr "Tienvarsiristi"
 
@@ -19992,6 +20116,9 @@ msgstr ""
 msgid "Beverages"
 msgstr ""
 
+msgid "Wine"
+msgstr ""
+
 msgid "Boutique"
 msgstr ""
 
@@ -20037,6 +20164,9 @@ msgstr ""
 msgid "Video Games"
 msgstr ""
 
+msgid "Music"
+msgstr ""
+
 msgid "Cash"
 msgstr "Raha"
 
@@ -20064,6 +20194,9 @@ msgstr ""
 msgid "Curtain"
 msgstr ""
 
+msgid "Art"
+msgstr ""
+
 msgid "Frame"
 msgstr ""
 
@@ -20109,6 +20242,9 @@ msgstr ""
 msgid "Beauty"
 msgstr ""
 
+msgid "Tattoo"
+msgstr ""
+
 msgid "Optician"
 msgstr ""
 
@@ -20160,6 +20296,9 @@ msgstr ""
 msgid "Pet"
 msgstr ""
 
+msgid "Funeral Directors"
+msgstr ""
+
 msgid "Vending Machine"
 msgstr ""
 
@@ -20259,6 +20398,15 @@ msgstr ""
 msgid "National Park"
 msgstr ""
 
+msgid "Protected Area"
+msgstr ""
+
+msgid "Protected Class"
+msgstr ""
+
+msgid "Title or type of protection"
+msgstr ""
+
 msgid "Places"
 msgstr "Paikat"
 
@@ -21336,7 +21484,13 @@ msgstr ""
 msgid "Estonia Ortho (Maaamet)"
 msgstr ""
 
-msgid "Estonia Multi (Maaamet)"
+msgid "Estonia Hillshade (Maaamet)"
+msgstr ""
+
+msgid "Estonia Cadastre (Maaamet)"
+msgstr ""
+
+msgid "Estonia Forestry (Maaamet)"
 msgstr ""
 
 msgid "Bordeaux - 2012"
@@ -21360,7 +21514,7 @@ msgstr ""
 msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
 msgstr ""
 
-msgid "CUGN Nancy - Orthophoto 2012"
+msgid "GrandNancy Orthophotographie 2012"
 msgstr ""
 
 msgid "Géobretagne - Brest 2010 - 10 cm"
@@ -21407,9 +21561,6 @@ msgid ""
 "- 1 m"
 msgstr ""
 
-msgid "Streets NRW Geofabrik.de"
-msgstr ""
-
 msgid "Hike & Bike"
 msgstr ""
 
@@ -21469,6 +21620,9 @@ msgstr ""
 msgid "NRW-Atlas: Topographische Karte 1:10000"
 msgstr ""
 
+msgid "Metropole Ruhr: Luftbilder (10 cm)"
+msgstr ""
+
 msgid "Drone Imagery (Haiti)"
 msgstr ""
 
@@ -21670,6 +21824,9 @@ msgstr ""
 msgid "Stadt Zürich Übersichtsplan (Strassen, Gebäude, Hausnummer)"
 msgstr ""
 
+msgid "Stadt Zürich Luftbild 2011"
+msgstr ""
+
 msgid "Orthofoto Kanton Solothurn RGB (SOGIS 2011/2012/2013)"
 msgstr ""
 
@@ -21688,7 +21845,7 @@ msgstr ""
 msgid "Canton de Fribourg 50cm (2005)"
 msgstr ""
 
-msgid "Stadt Bern 10cm/25cm (2008)"
+msgid "Stadt Bern 10cm/25cm (2012)"
 msgstr ""
 
 msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
@@ -21727,7 +21884,7 @@ msgstr ""
 msgid "OSM US TIGER 2012 Roads Overlay"
 msgstr ""
 
-msgid "New & Misaligned TIGER Roads (TIGER 2013)"
+msgid "New & Misaligned TIGER Roads (TIGER 2014)"
 msgstr ""
 
 msgid "MassGIS L3 Parcels"
@@ -21775,9 +21932,234 @@ msgstr ""
 msgid "NLS - Bartholomew Half Inch, 1897-1907"
 msgstr ""
 
+msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Annan 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgstr ""
+
 msgid "OS Town Plans, Cupar 1854 (NLS)"
 msgstr ""
 
+msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Elgin 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Forres 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Galashiels 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Girvan 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Greenock 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Haddington 1853 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Haddington 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Hamilton 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Irvine 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Jedburgh 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kelso 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Lanark 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Linlithgow 1856 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Musselburgh 1853 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Musselburgh 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Oban 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Peebles 1856 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Perth 1860 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Peterhead 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Selkirk 1865 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, St Andrews 1854 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, St Andrews 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stirling 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stonehaven 1864 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1847 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Strathaven 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wick 1872 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wigtown 1848 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wigtown 1894 (NLS)"
+msgstr ""
+
 msgid "Decreasing house numbers in addresses interpolation"
 msgstr ""
 
@@ -21831,17 +22213,37 @@ msgid "{0}={1} is deprecated. Please use instead a multipolygon."
 msgstr ""
 
 msgid ""
-"{0} is deprecated. Please specify ìnterval by using opening_hours syntax"
+"{0} is deprecated. Please specify interval by using opening_hours syntax"
 msgstr ""
 
 msgid ""
 "{0} is deprecated. Please delete this object and use a private layer instead"
 msgstr ""
 
-msgid "{0} on a node"
+msgid "{0}={1} is unspecific. Please replace ''{1}'' by a specific value."
 msgstr ""
 
-msgid "{0} on a node. Should be drawn as an area"
+msgid "{0} should be replaced with {1}"
+msgstr ""
+
+msgid ""
+"{0}={1} is unspecific. Please replace ''{1}'' by ''left'', ''right'' or "
+"''both''."
+msgstr ""
+
+msgid "{0} on a node. Should be used on a way."
+msgstr ""
+
+msgid "{0} on a node. Should be drawn as an area."
+msgstr ""
+
+msgid "{0}=* on a node. Should be used in a relation"
+msgstr ""
+
+msgid "{0} on a way. Should be used in a relation"
+msgstr ""
+
+msgid "{0} on a node"
 msgstr ""
 
 msgid "Building inside building"
@@ -26561,6 +26963,9 @@ msgstr ""
 msgid "Find"
 msgstr ""
 
+msgid "Show"
+msgstr "Näytä"
+
 msgid "Mark"
 msgstr ""
 
diff --git a/i18n/po/fil.po b/i18n/po/fil.po
index 4c34a65..87c2683 100644
--- a/i18n/po/fil.po
+++ b/i18n/po/fil.po
@@ -1,8 +1,13 @@
+# Filipino translation for josm
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the josm package.
+# FIRST AUTHOR <EMAIL at ADDRESS>, 2011.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-21 03:38+0200\n"
+"POT-Creation-Date: 2014-12-10 03:42+0100\n"
 "PO-Revision-Date: 2011-06-19 14:15+0000\n"
 "Last-Translator: Anthony Balico <Unknown>\n"
 "Language-Team: Filipino <fil at li.org>\n"
@@ -10,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-10-21 05:38+0000\n"
-"X-Generator: Launchpad (build 17203)\n"
+"X-Launchpad-Export-Date: 2014-12-10 05:23+0000\n"
+"X-Generator: Launchpad (build 17283)\n"
 "Language: fil\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -168,16 +173,6 @@ msgid "About JOSM..."
 msgstr ""
 
 msgid ""
-"Unexpected format of API base URL. Redirection to info or history page for "
-"OSM object will probably fail. API base URL is: ''{0}''"
-msgstr ""
-
-msgid ""
-"Unexpected format of API base URL. Redirection to user page for OSM user "
-"will probably fail. API base URL is: ''{0}''"
-msgstr ""
-
-msgid ""
 "You are about to launch {0} browser window.<br>This may both clutter your "
 "screen with browser windows<br>and take some time to finish."
 msgid_plural ""
@@ -1519,6 +1514,15 @@ msgstr ""
 msgid "Nothing to upload. Get some data first."
 msgstr ""
 
+msgid "Upload note changes to server"
+msgstr ""
+
+msgid "Upload notes"
+msgstr ""
+
+msgid "Uploading notes to server"
+msgstr ""
+
 msgid "Upload selection"
 msgstr ""
 
@@ -1791,10 +1795,16 @@ msgstr ""
 msgid "Click the location where you wish to create a new note"
 msgstr ""
 
-msgid "Enter a comment for a new note"
+msgid "Create new note"
 msgstr ""
 
-msgid "Create new note"
+msgid "Create note"
+msgstr ""
+
+msgid "Enter a detailed comment to create a note"
+msgstr ""
+
+msgid "You must enter a comment to create a new note"
 msgstr ""
 
 msgid "Delete Mode"
@@ -2665,6 +2675,15 @@ msgstr ""
 msgid "Cycling dependencies"
 msgstr ""
 
+msgid "Uploading modified notes"
+msgstr ""
+
+msgid "Note {0} failed: {1}"
+msgstr ""
+
+msgid "Notes failed to upload"
+msgstr ""
+
 msgid ""
 "The following are results of automatic validation. Try fixing these, but be "
 "careful (don''t destroy valid data). When in doubt ignore them.<br>When you "
@@ -4894,6 +4913,12 @@ msgstr ""
 msgid "Conflict foreground: keep all tags"
 msgstr ""
 
+msgid "Conflict background: sum all numeric tags"
+msgstr ""
+
+msgid "Conflict foreground: sum all numeric tags"
+msgstr ""
+
 msgid "Conflict background: keep member"
 msgstr ""
 
@@ -5312,12 +5337,19 @@ msgstr ""
 msgid "all"
 msgstr ""
 
+msgid "sum"
+msgstr ""
+
 msgid "Please decide which values to keep"
 msgstr ""
 
 msgid "Value ''{0}'' is going to be applied for key ''{1}''"
 msgstr ""
 
+msgid ""
+"All numeric values sumed as ''{0}'' are going to be applied for key ''{1}''"
+msgstr ""
+
 msgid "The key ''{0}'' and all its values are going to be removed"
 msgstr ""
 
@@ -5680,24 +5712,6 @@ msgstr[1] ""
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
 
-msgid "Display the history of all selected items."
-msgstr ""
-
-msgid "Object with history"
-msgstr ""
-
-msgid "Reload"
-msgstr ""
-
-msgid "Reload all currently selected objects and refresh the list."
-msgstr ""
-
-msgid "Show"
-msgstr ""
-
-msgid "Display the history of the selected objects."
-msgstr ""
-
 msgid "Advanced object info"
 msgstr ""
 
@@ -6035,6 +6049,9 @@ msgstr ""
 msgid "Comment"
 msgstr ""
 
+msgid "Comment on note"
+msgstr ""
+
 msgid "Add comment to note:"
 msgstr ""
 
@@ -6044,9 +6061,6 @@ msgstr ""
 msgid "Close note with message:"
 msgstr ""
 
-msgid "Close Note"
-msgstr ""
-
 msgid "Create a new note"
 msgstr ""
 
@@ -6119,6 +6133,9 @@ msgstr ""
 msgid "Search for objects"
 msgstr ""
 
+msgid "Display the history of the selected objects."
+msgstr ""
+
 msgid "Zoom to selection"
 msgstr ""
 
@@ -6238,6 +6255,9 @@ msgstr ""
 msgid "Updating map ..."
 msgstr ""
 
+msgid "anonymous"
+msgstr ""
+
 msgid "Display the basic properties of the changeset"
 msgstr ""
 
@@ -6250,6 +6270,12 @@ msgstr ""
 msgid "Display the objects created, updated, and deleted by the changeset"
 msgstr ""
 
+msgid "Discussion"
+msgstr ""
+
+msgid "Display the public discussion around this changeset"
+msgstr ""
+
 msgid "Changeset Management Dialog"
 msgstr ""
 
@@ -6307,9 +6333,6 @@ msgctxt "changeset.state"
 msgid "Closed"
 msgstr ""
 
-msgid "anonymous"
-msgstr ""
-
 msgid "ID"
 msgstr ""
 
@@ -6325,6 +6348,9 @@ msgstr ""
 msgid "Closed at"
 msgstr ""
 
+msgid "Discussions"
+msgstr ""
+
 msgid "Downloading changeset content"
 msgstr ""
 
@@ -6436,6 +6462,15 @@ msgid ""
 "layer"
 msgstr ""
 
+msgid "Update changeset discussion"
+msgstr ""
+
+msgid "Update the changeset discussion from the OSM server"
+msgstr ""
+
+msgid "Date"
+msgstr ""
+
 msgid "Download changesets"
 msgstr ""
 
@@ -6853,7 +6888,7 @@ msgstr ""
 msgid "Set number of recently added tags"
 msgstr ""
 
-msgid "Remember last used tags"
+msgid "Remember last used tags after a restart"
 msgstr ""
 
 msgid "Please enter the number of recently added tags to display"
@@ -7199,6 +7234,9 @@ msgstr ""
 msgid "Load parent relations"
 msgstr ""
 
+msgid "Reload"
+msgstr ""
+
 msgid "Loading parent relations"
 msgstr ""
 
@@ -7321,6 +7359,12 @@ msgstr ""
 msgid "Select to download GPS traces in the selected download area."
 msgstr ""
 
+msgid "Notes"
+msgstr ""
+
+msgid "Select to download notes in the selected download area."
+msgstr ""
+
 msgid "Download as new layer"
 msgstr ""
 
@@ -7626,9 +7670,6 @@ msgstr ""
 msgid "B"
 msgstr ""
 
-msgid "Date"
-msgstr ""
-
 msgid ""
 "Failed to update primitive with id {0} because current edit layer is null"
 msgstr ""
@@ -8483,9 +8524,6 @@ msgstr ""
 msgid "Save Layer"
 msgstr ""
 
-msgid "Notes"
-msgstr ""
-
 msgid "Notes layer"
 msgstr ""
 
@@ -8501,9 +8539,6 @@ msgstr ""
 msgid "outside downloaded area"
 msgstr ""
 
-msgid "version {0}"
-msgstr ""
-
 msgid "Merging layers"
 msgstr ""
 
@@ -12129,6 +12164,15 @@ msgstr ""
 msgid "Open changeset expected. Got closed changeset with id {0}."
 msgstr ""
 
+msgid "Note upload failed"
+msgstr ""
+
+msgid "Error parsing note response from server"
+msgstr ""
+
+msgid "Error encoding string: {0}"
+msgstr ""
+
 msgid "(Code={0})"
 msgstr ""
 
@@ -12177,13 +12221,13 @@ msgstr ""
 msgid "Parsing changeset content ..."
 msgstr ""
 
-msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
-msgid "Illegal numeric value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
-msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal numeric value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
 msgid "Missing mandatory attribute ''{0}'' of XML element {1}."
@@ -12975,9 +13019,6 @@ msgstr ""
 msgid "Failed to scan file ''{0}'' for plugin information. Skipping."
 msgstr ""
 
-msgid "Processing plugin site cache icon files..."
-msgstr ""
-
 msgid "Processing plugin files..."
 msgstr ""
 
@@ -12996,12 +13037,6 @@ msgstr ""
 msgid "Details:"
 msgstr ""
 
-msgid "Plugin icons download error"
-msgstr ""
-
-msgid "JOSM failed to download plugin icons:"
-msgstr ""
-
 msgid ""
 "Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
 "plugin site ''{1}''."
@@ -13887,7 +13922,9 @@ msgid ""
 "Creating and handling address nodes and buildings within Czech Republic."
 msgstr ""
 
-msgid "Allows to import various file formats into JOSM directly."
+msgid ""
+"Allows to import various file formats into JOSM directly. Currently "
+"supported: TangoGPS, Garmin Trainings Center TCX."
 msgstr ""
 
 msgid "Download your GPX tracks from openstreetmap.org"
@@ -13984,6 +14021,11 @@ msgid "A helper for IRS satellite adjustment."
 msgstr ""
 
 msgid ""
+"Provides Java Native Access (JNA) library. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
+msgid ""
 "Provides Java Topology Suite (JTS) library and related utilities. Not meant "
 "to be installed directly by users, but rather as a dependency for other "
 "plugins."
@@ -14339,6 +14381,25 @@ msgstr ""
 msgid "Width (meters)"
 msgstr ""
 
+msgid "Sidewalk"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "both"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "left"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "right"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "no"
+msgstr ""
+
 msgid "Service type"
 msgstr ""
 
@@ -14703,15 +14764,19 @@ msgstr ""
 msgid "May-Sep 09:30-12:30,14:15-19:30"
 msgstr ""
 
+msgctxt "parking"
 msgid "multi-storey"
 msgstr ""
 
+msgctxt "parking"
 msgid "surface"
 msgstr ""
 
+msgctxt "parking"
 msgid "underground"
 msgstr ""
 
+msgctxt "parking"
 msgid "rooftop"
 msgstr ""
 
@@ -15169,15 +15234,26 @@ msgstr ""
 msgid "Overtaking"
 msgstr ""
 
+msgctxt "overtaking"
+msgid "yes"
+msgstr ""
+
+msgctxt "overtaking"
 msgid "both"
 msgstr ""
 
+msgctxt "overtaking"
 msgid "forward"
 msgstr ""
 
+msgctxt "overtaking"
 msgid "backward"
 msgstr ""
 
+msgctxt "overtaking"
+msgid "no"
+msgstr ""
+
 msgid "Roundabout"
 msgstr ""
 
@@ -15471,6 +15547,12 @@ msgstr ""
 msgid "tiger"
 msgstr ""
 
+msgid "Button operated"
+msgstr ""
+
+msgid "Sound signals"
+msgstr ""
+
 msgid "Crossing attendant"
 msgstr ""
 
@@ -15992,9 +16074,6 @@ msgstr ""
 msgid "Traffic lights"
 msgstr ""
 
-msgid "Sound signals"
-msgstr ""
-
 msgid "Barrier"
 msgstr ""
 
@@ -18054,6 +18133,9 @@ msgstr ""
 msgid "Gasometer"
 msgstr ""
 
+msgid "Bunker Silo"
+msgstr ""
+
 msgid "Pipeline"
 msgstr ""
 
@@ -18200,15 +18282,15 @@ msgstr ""
 msgid "Monitoring:"
 msgstr ""
 
-msgid "Weather"
-msgstr ""
-
 msgid "Water level"
 msgstr ""
 
 msgid "Tide Level"
 msgstr ""
 
+msgid "Groundwater"
+msgstr ""
+
 msgid "Traffic"
 msgstr ""
 
@@ -18227,6 +18309,9 @@ msgstr ""
 msgid "Galileo Signals"
 msgstr ""
 
+msgid "Weather"
+msgstr ""
+
 msgid "Radiation"
 msgstr ""
 
@@ -18407,6 +18492,9 @@ msgstr ""
 msgid "pivot_pier"
 msgstr ""
 
+msgid "Bridge outline"
+msgstr ""
+
 msgid "Power Plant"
 msgstr ""
 
@@ -19014,6 +19102,15 @@ msgstr ""
 msgid "Pole"
 msgstr ""
 
+msgid "Pole with Transformer"
+msgstr ""
+
+msgid "Pole Attributes:"
+msgstr ""
+
+msgid "Transformer Attributes:"
+msgstr ""
+
 msgid "Power Line"
 msgstr ""
 
@@ -19063,9 +19160,15 @@ msgstr ""
 msgid "Power Cable"
 msgstr ""
 
+msgctxt "power cable"
+msgid "underground"
+msgstr ""
+
+msgctxt "power cable"
 msgid "underwater"
 msgstr ""
 
+msgctxt "power cable"
 msgid "overground"
 msgstr ""
 
@@ -19093,6 +19196,33 @@ msgstr ""
 msgid "Memorial"
 msgstr ""
 
+msgctxt "memorial"
+msgid "statue"
+msgstr ""
+
+msgctxt "memorial"
+msgid "bust"
+msgstr ""
+
+msgctxt "memorial"
+msgid "plaque"
+msgstr ""
+
+msgctxt "memorial"
+msgid "stele"
+msgstr ""
+
+msgctxt "memorial"
+msgid "stone"
+msgstr ""
+
+msgctxt "memorial"
+msgid "war_memorial"
+msgstr ""
+
+msgid "Inscription"
+msgstr ""
+
 msgid "Wayside Cross"
 msgstr ""
 
@@ -19162,6 +19292,9 @@ msgstr ""
 msgid "Beverages"
 msgstr ""
 
+msgid "Wine"
+msgstr ""
+
 msgid "Boutique"
 msgstr ""
 
@@ -19207,6 +19340,9 @@ msgstr ""
 msgid "Video Games"
 msgstr ""
 
+msgid "Music"
+msgstr ""
+
 msgid "Cash"
 msgstr ""
 
@@ -19234,6 +19370,9 @@ msgstr ""
 msgid "Curtain"
 msgstr ""
 
+msgid "Art"
+msgstr ""
+
 msgid "Frame"
 msgstr ""
 
@@ -19279,6 +19418,9 @@ msgstr ""
 msgid "Beauty"
 msgstr ""
 
+msgid "Tattoo"
+msgstr ""
+
 msgid "Optician"
 msgstr ""
 
@@ -19330,6 +19472,9 @@ msgstr ""
 msgid "Pet"
 msgstr ""
 
+msgid "Funeral Directors"
+msgstr ""
+
 msgid "Vending Machine"
 msgstr ""
 
@@ -19429,6 +19574,15 @@ msgstr ""
 msgid "National Park"
 msgstr ""
 
+msgid "Protected Area"
+msgstr ""
+
+msgid "Protected Class"
+msgstr ""
+
+msgid "Title or type of protection"
+msgstr ""
+
 msgid "Places"
 msgstr ""
 
@@ -20505,7 +20659,13 @@ msgstr ""
 msgid "Estonia Ortho (Maaamet)"
 msgstr ""
 
-msgid "Estonia Multi (Maaamet)"
+msgid "Estonia Hillshade (Maaamet)"
+msgstr ""
+
+msgid "Estonia Cadastre (Maaamet)"
+msgstr ""
+
+msgid "Estonia Forestry (Maaamet)"
 msgstr ""
 
 msgid "Bordeaux - 2012"
@@ -20529,7 +20689,7 @@ msgstr ""
 msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
 msgstr ""
 
-msgid "CUGN Nancy - Orthophoto 2012"
+msgid "GrandNancy Orthophotographie 2012"
 msgstr ""
 
 msgid "Géobretagne - Brest 2010 - 10 cm"
@@ -20576,9 +20736,6 @@ msgid ""
 "- 1 m"
 msgstr ""
 
-msgid "Streets NRW Geofabrik.de"
-msgstr ""
-
 msgid "Hike & Bike"
 msgstr ""
 
@@ -20638,6 +20795,9 @@ msgstr ""
 msgid "NRW-Atlas: Topographische Karte 1:10000"
 msgstr ""
 
+msgid "Metropole Ruhr: Luftbilder (10 cm)"
+msgstr ""
+
 msgid "Drone Imagery (Haiti)"
 msgstr ""
 
@@ -20839,6 +20999,9 @@ msgstr ""
 msgid "Stadt Zürich Übersichtsplan (Strassen, Gebäude, Hausnummer)"
 msgstr ""
 
+msgid "Stadt Zürich Luftbild 2011"
+msgstr ""
+
 msgid "Orthofoto Kanton Solothurn RGB (SOGIS 2011/2012/2013)"
 msgstr ""
 
@@ -20857,7 +21020,7 @@ msgstr ""
 msgid "Canton de Fribourg 50cm (2005)"
 msgstr ""
 
-msgid "Stadt Bern 10cm/25cm (2008)"
+msgid "Stadt Bern 10cm/25cm (2012)"
 msgstr ""
 
 msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
@@ -20896,7 +21059,7 @@ msgstr ""
 msgid "OSM US TIGER 2012 Roads Overlay"
 msgstr ""
 
-msgid "New & Misaligned TIGER Roads (TIGER 2013)"
+msgid "New & Misaligned TIGER Roads (TIGER 2014)"
 msgstr ""
 
 msgid "MassGIS L3 Parcels"
@@ -20944,9 +21107,234 @@ msgstr ""
 msgid "NLS - Bartholomew Half Inch, 1897-1907"
 msgstr ""
 
+msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Annan 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgstr ""
+
 msgid "OS Town Plans, Cupar 1854 (NLS)"
 msgstr ""
 
+msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Elgin 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Forres 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Galashiels 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Girvan 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Greenock 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Haddington 1853 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Haddington 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Hamilton 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Irvine 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Jedburgh 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kelso 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Lanark 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Linlithgow 1856 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Musselburgh 1853 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Musselburgh 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Oban 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Peebles 1856 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Perth 1860 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Peterhead 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Selkirk 1865 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, St Andrews 1854 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, St Andrews 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stirling 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stonehaven 1864 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1847 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Strathaven 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wick 1872 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wigtown 1848 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wigtown 1894 (NLS)"
+msgstr ""
+
 msgid "Decreasing house numbers in addresses interpolation"
 msgstr ""
 
@@ -21000,17 +21388,37 @@ msgid "{0}={1} is deprecated. Please use instead a multipolygon."
 msgstr ""
 
 msgid ""
-"{0} is deprecated. Please specify ìnterval by using opening_hours syntax"
+"{0} is deprecated. Please specify interval by using opening_hours syntax"
 msgstr ""
 
 msgid ""
 "{0} is deprecated. Please delete this object and use a private layer instead"
 msgstr ""
 
-msgid "{0} on a node"
+msgid "{0}={1} is unspecific. Please replace ''{1}'' by a specific value."
 msgstr ""
 
-msgid "{0} on a node. Should be drawn as an area"
+msgid "{0} should be replaced with {1}"
+msgstr ""
+
+msgid ""
+"{0}={1} is unspecific. Please replace ''{1}'' by ''left'', ''right'' or "
+"''both''."
+msgstr ""
+
+msgid "{0} on a node. Should be used on a way."
+msgstr ""
+
+msgid "{0} on a node. Should be drawn as an area."
+msgstr ""
+
+msgid "{0}=* on a node. Should be used in a relation"
+msgstr ""
+
+msgid "{0} on a way. Should be used in a relation"
+msgstr ""
+
+msgid "{0} on a node"
 msgstr ""
 
 msgid "Building inside building"
@@ -25680,6 +26088,9 @@ msgstr ""
 msgid "Find"
 msgstr ""
 
+msgid "Show"
+msgstr ""
+
 msgid "Mark"
 msgstr ""
 
diff --git a/i18n/po/fr.po b/i18n/po/fr.po
index 4d5337c..6c995f8 100644
--- a/i18n/po/fr.po
+++ b/i18n/po/fr.po
@@ -1,17 +1,20 @@
+# translation of fr.po to
+#
+# Frederic Bonifas <fredericbonifas at gmail.com>, 2006.
 msgid ""
 msgstr ""
 "Project-Id-Version: fr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-21 03:38+0200\n"
-"PO-Revision-Date: 2014-10-20 18:32+0000\n"
+"POT-Creation-Date: 2014-12-10 03:42+0100\n"
+"PO-Revision-Date: 2014-11-29 23:11+0000\n"
 "Last-Translator: Don-vip <Unknown>\n"
 "Language-Team: Fr <>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2014-10-21 04:50+0000\n"
-"X-Generator: Launchpad (build 17203)\n"
+"X-Launchpad-Export-Date: 2014-12-10 04:46+0000\n"
+"X-Generator: Launchpad (build 17283)\n"
 "Language: fr\n"
 "X-Poedit-Bookmarks: 1767,-1,-1,2669,-1,-1,-1,-1,-1,-1\n"
 
@@ -176,21 +179,6 @@ msgid "About JOSM..."
 msgstr "À propos de JOSM"
 
 msgid ""
-"Unexpected format of API base URL. Redirection to info or history page for "
-"OSM object will probably fail. API base URL is: ''{0}''"
-msgstr ""
-"Format inattendu de l''URL de base pour l''API. La redirection vers les "
-"pages d''information ou d''historique des objets OSM échouera probablement. "
-"L''URL de base est : ''{0}''"
-
-msgid ""
-"Unexpected format of API base URL. Redirection to user page for OSM user "
-"will probably fail. API base URL is: ''{0}''"
-msgstr ""
-"Format inattendu de l''URL de base pour l''API. La redirection vers les "
-"pages utilisateur OSM échouera probablement. L''URL de base est : ''{0}''"
-
-msgid ""
 "You are about to launch {0} browser window.<br>This may both clutter your "
 "screen with browser windows<br>and take some time to finish."
 msgid_plural ""
@@ -745,10 +733,10 @@ msgid "Include a node into the nearest way segments"
 msgstr "Inclure un nœud aux segments de chemin les plus proches"
 
 msgid "Move Node onto Way"
-msgstr "Déplacer le noeud sur la Route"
+msgstr "Déplacer le noeud sur le chemin"
 
 msgid "Move the node onto the nearest way segments and include it"
-msgstr "Déplacer le noeud sur la plus proche portion de Route et l''insérer"
+msgstr "Déplacer le noeud sur la plus proche portion de chemin et l''insérer"
 
 msgid "No Shortcut"
 msgstr "Aucun raccourci"
@@ -1225,7 +1213,7 @@ msgid "Report bug"
 msgstr "Signaler une erreur"
 
 msgid "Report a ticket to JOSM bugtracker"
-msgstr ""
+msgstr "Signaler un ticket sur le site de suivi des problèmes de JOSM"
 
 msgid "Restart"
 msgstr "Redémarrer"
@@ -1673,6 +1661,15 @@ msgstr "Il n’y a aucune modification à envoyer."
 msgid "Nothing to upload. Get some data first."
 msgstr "Rien à envoyer. Obtenez d’abord des données."
 
+msgid "Upload note changes to server"
+msgstr "Envoi des changements de notes sur le serveur"
+
+msgid "Upload notes"
+msgstr "Envoi des notes"
+
+msgid "Uploading notes to server"
+msgstr "En cours d’envoi des notes sur le serveur"
+
 msgid "Upload selection"
 msgstr "Envoyer la sélection"
 
@@ -1956,17 +1953,24 @@ msgid "Add a new Note"
 msgstr "Ajouter une nouvelle note"
 
 msgid "Add note mode"
-msgstr ""
+msgstr "Mode d''ajout de notes"
 
 msgid "Click the location where you wish to create a new note"
 msgstr "Cliquer sur le lieu où vous voulez créer une nouvelle note"
 
-msgid "Enter a comment for a new note"
-msgstr "Entrer un commentaire pour une nouvelle note"
-
 msgid "Create new note"
 msgstr "Créer une nouvelle note"
 
+msgid "Create note"
+msgstr "Créer une note"
+
+msgid "Enter a detailed comment to create a note"
+msgstr "Donnez un commentaire détaillé pour créer une note"
+
+msgid "You must enter a comment to create a new note"
+msgstr ""
+"Vous avez l’obligation d’écrire un commentaire pour créer une nouvelle note"
+
 msgid "Delete Mode"
 msgstr "Mode Suppression"
 
@@ -2939,6 +2943,15 @@ msgstr "…se réfère à la relation"
 msgid "Cycling dependencies"
 msgstr "Dépendances cycliques."
 
+msgid "Uploading modified notes"
+msgstr "En cours d’envoi des notes modifiées"
+
+msgid "Note {0} failed: {1}"
+msgstr "La note {0} a échouée : {1}"
+
+msgid "Notes failed to upload"
+msgstr "Les notes n’ont pu être envoyées"
+
 msgid ""
 "The following are results of automatic validation. Try fixing these, but be "
 "careful (don''t destroy valid data). When in doubt ignore them.<br>When you "
@@ -3867,16 +3880,16 @@ msgid "URL contains an invalid protocol: {0}"
 msgstr "L’URL possède un protocole invalide : {0}"
 
 msgid "URL contains an invalid authority: {0}"
-msgstr ""
+msgstr "L''URL contient une autorité invalide: {0}"
 
 msgid "URL contains an invalid path: {0}"
-msgstr ""
+msgstr "L''URL contient un chemin invalide: {0}"
 
 msgid "URL contains an invalid query: {0}"
 msgstr "L’URL possède une requête invalide : {0}"
 
 msgid "URL contains an invalid fragment: {0}"
-msgstr ""
+msgstr "L''URL contient un fragment invalide: {0}"
 
 msgid "Addresses"
 msgstr "Adresse"
@@ -4154,7 +4167,7 @@ msgid "Role for ''{0}'' should be ''{1}''"
 msgstr "Le rôle de \"{0}\" devrait être \"{1}\""
 
 msgid "No area style for multipolygon"
-msgstr ""
+msgstr "Pas de style de zone pour le multipolygone"
 
 msgid ""
 "Multipolygon relation should be tagged with area tags and not the outer way"
@@ -5345,6 +5358,12 @@ msgstr "Conflit d''arrière-plan: garder tous les attributs"
 msgid "Conflict foreground: keep all tags"
 msgstr "Conflit d''avant-plan: garder tous les attributs"
 
+msgid "Conflict background: sum all numeric tags"
+msgstr ""
+
+msgid "Conflict foreground: sum all numeric tags"
+msgstr ""
+
 msgid "Conflict background: keep member"
 msgstr "Conflit d''arrière-plan: garder le membre"
 
@@ -5818,12 +5837,19 @@ msgstr "aucun"
 msgid "all"
 msgstr "tous"
 
+msgid "sum"
+msgstr "somme"
+
 msgid "Please decide which values to keep"
 msgstr "Veuillez choisir les valeurs à conserver"
 
 msgid "Value ''{0}'' is going to be applied for key ''{1}''"
 msgstr "La valeur ''{0}'' va être appliquée à la clé ''{1}''"
 
+msgid ""
+"All numeric values sumed as ''{0}'' are going to be applied for key ''{1}''"
+msgstr ""
+
 msgid "The key ''{0}'' and all its values are going to be removed"
 msgstr "La clé ''{0}'' et toutes ses valeurs vont être supprimées."
 
@@ -6221,24 +6247,6 @@ msgstr[1] "<b>{0}</b> objets désactivés"
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr "</p><p>Fermer le filtre pour voir tous les objets.<p></html>"
 
-msgid "Display the history of all selected items."
-msgstr "Afficher l’historique de la sélection"
-
-msgid "Object with history"
-msgstr "Objet avec un historique"
-
-msgid "Reload"
-msgstr "Actualiser"
-
-msgid "Reload all currently selected objects and refresh the list."
-msgstr "Mettre à jour la sélection"
-
-msgid "Show"
-msgstr "Afficher"
-
-msgid "Display the history of the selected objects."
-msgstr "Afficher l’historique de l’objet"
-
 msgid "Advanced object info"
 msgstr "Informations sur l’objet"
 
@@ -6602,6 +6610,9 @@ msgstr "Ajouter un commentaire"
 msgid "Comment"
 msgstr "Commentaire"
 
+msgid "Comment on note"
+msgstr "Commentaire dans une note"
+
 msgid "Add comment to note:"
 msgstr "Ajouter un commentaire à la note :"
 
@@ -6611,9 +6622,6 @@ msgstr "Fermer une note"
 msgid "Close note with message:"
 msgstr "Fermer une note avec un message :"
 
-msgid "Close Note"
-msgstr "Fermer une Note"
-
 msgid "Create a new note"
 msgstr "Créer une nouvelle note"
 
@@ -6692,6 +6700,9 @@ msgstr "Sélection"
 msgid "Search for objects"
 msgstr "Rechercher un objet"
 
+msgid "Display the history of the selected objects."
+msgstr "Afficher l’historique de l’objet"
+
 msgid "Zoom to selection"
 msgstr "Zoomer sur la sélection"
 
@@ -6817,6 +6828,9 @@ msgstr "Corrige ({0}/{1}): ''{2}''"
 msgid "Updating map ..."
 msgstr "Mise à jour de la carte…"
 
+msgid "anonymous"
+msgstr "anonyme"
+
 msgid "Display the basic properties of the changeset"
 msgstr "Afficher les propriétés du groupe de modifications"
 
@@ -6831,6 +6845,12 @@ msgstr ""
 "Afficher les objets créés, modifiés ou supprimés par le groupe de "
 "modifications"
 
+msgid "Discussion"
+msgstr "Discussion"
+
+msgid "Display the public discussion around this changeset"
+msgstr "Affiche la discussion publique autour de ce groupe de modifications"
+
 msgid "Changeset Management Dialog"
 msgstr "Gestionnaire des groupes de modifications"
 
@@ -6891,9 +6911,6 @@ msgctxt "changeset.state"
 msgid "Closed"
 msgstr "Fermé"
 
-msgid "anonymous"
-msgstr "anonyme"
-
 msgid "ID"
 msgstr "Identifiant"
 
@@ -6909,6 +6926,9 @@ msgstr "Créé le"
 msgid "Closed at"
 msgstr "Fermé le"
 
+msgid "Discussions"
+msgstr "Discussions"
+
 msgid "Downloading changeset content"
 msgstr "Téléchargement du contenu du groupe de modification"
 
@@ -7027,6 +7047,16 @@ msgid ""
 "layer"
 msgstr "Zoomer sur les objets du groupe de modifications"
 
+msgid "Update changeset discussion"
+msgstr "Mettre à jour la discussion du groupe de modifications"
+
+msgid "Update the changeset discussion from the OSM server"
+msgstr ""
+"Mettre à jour la discussion du groupe de modifications depuis le serveur OSM"
+
+msgid "Date"
+msgstr "Date"
+
 msgid "Download changesets"
 msgstr "Télécharger les groupes de modifications"
 
@@ -7496,8 +7526,8 @@ msgstr "Valeur :"
 msgid "Set number of recently added tags"
 msgstr "Fixer le nombre d’attributs récemment ajoutés"
 
-msgid "Remember last used tags"
-msgstr "Mémoriser les derniers tags utilisés"
+msgid "Remember last used tags after a restart"
+msgstr "Mémoriser les derniers attributs utilisés après un redémarrage"
 
 msgid "Please enter the number of recently added tags to display"
 msgstr ""
@@ -7875,6 +7905,9 @@ msgstr "Inclure les enfants des relations parentes"
 msgid "Load parent relations"
 msgstr "Charger les relations parentes"
 
+msgid "Reload"
+msgstr "Actualiser"
+
 msgid "Loading parent relations"
 msgstr "Chargement des relations parentes."
 
@@ -8001,6 +8034,14 @@ msgstr "Données GPS"
 msgid "Select to download GPS traces in the selected download area."
 msgstr "Télécharger les traces GPS de la zone sélectionnée"
 
+msgid "Notes"
+msgstr "Notes"
+
+msgid "Select to download notes in the selected download area."
+msgstr ""
+"Sélectionner pour télécharger les notes dans la zone de téléchargement "
+"sélectionnée."
+
 msgid "Download as new layer"
 msgstr "Télécharger dans un nouveau calque"
 
@@ -8114,13 +8155,14 @@ msgid "Querying name server ..."
 msgstr "Récupération du serveur de noms…"
 
 msgid "Error occured with query ''{0}'': ''{1}''"
-msgstr ""
+msgstr "Une erreur s''est produite dans la requête ''{0}'': ''{1}''"
 
 msgid "Name server returned invalid data. Please try again."
 msgstr ""
+"Le serveur de nom a retourné des données invalides. Veuillez réessayer."
 
 msgid "Bad response"
-msgstr ""
+msgstr "Mauvaise réponse"
 
 msgid "Type"
 msgstr "Type"
@@ -8349,9 +8391,6 @@ msgstr "A"
 msgid "B"
 msgstr "B"
 
-msgid "Date"
-msgstr "Date"
-
 msgid ""
 "Failed to update primitive with id {0} because current edit layer is null"
 msgstr ""
@@ -9377,9 +9416,6 @@ msgstr ""
 msgid "Save Layer"
 msgstr "Enregistrer le calque"
 
-msgid "Notes"
-msgstr "Billets"
-
 msgid "Notes layer"
 msgstr "Calque des notes"
 
@@ -9395,9 +9431,6 @@ msgstr "Calque de données {0}"
 msgid "outside downloaded area"
 msgstr "en dehors de la zone téléchargée"
 
-msgid "version {0}"
-msgstr "version {0}"
-
 msgid "Merging layers"
 msgstr "Fusion des calques"
 
@@ -10029,7 +10062,7 @@ msgid "Velocity, km/h"
 msgstr "Vélocité, km/h"
 
 msgid "HDOP, m"
-msgstr ""
+msgstr "HDOP, m"
 
 msgid "Time"
 msgstr "Heure"
@@ -11487,7 +11520,7 @@ msgid "Dynamic buttons in side menus"
 msgstr "Boutons dynamiques dans les fenêtres latérales"
 
 msgid "Display ISO dates"
-msgstr ""
+msgstr "Afficher les dates au format ISO"
 
 msgid "Use native file choosers (nicer, but do not support file filters)"
 msgstr ""
@@ -13356,7 +13389,7 @@ msgid "NMEA import failure!"
 msgstr "L’importation des trames NMEA a échoué !"
 
 msgid "Note Files"
-msgstr ""
+msgstr "Fichiers de notes"
 
 msgid "OSM API"
 msgstr "API OSM"
@@ -13447,6 +13480,15 @@ msgstr ""
 "Un groupe de modifications ouvert était attendu. Actuellement il est fermé "
 "et il a l’identifiant {0}."
 
+msgid "Note upload failed"
+msgstr "L''envoi de notes a échoué"
+
+msgid "Error parsing note response from server"
+msgstr ""
+
+msgid "Error encoding string: {0}"
+msgstr "Erreur d''encodage de la chaîne: {0}"
+
 msgid "(Code={0})"
 msgstr "(Code={0})"
 
@@ -13505,6 +13547,11 @@ msgstr ""
 msgid "Parsing changeset content ..."
 msgstr "Analyse du contenu du groupe de modifications…"
 
+msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
+msgstr ""
+"La valeur booléenne pour l’attribut ''{0}'' est erronée. Actuellement elle "
+"est ''{1}''."
+
 msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 "La valeur pour l’attribut ''{0}'' est erronée. Actuellement elle est ''{1}''."
@@ -13514,11 +13561,6 @@ msgstr ""
 "La valeur numérique pour l’attribut ''{0}'' est erronée. Actuellement elle "
 "est ''{1}''."
 
-msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
-msgstr ""
-"La valeur booléenne pour l’attribut ''{0}'' est erronée. Actuellement elle "
-"est ''{1}''."
-
 msgid "Missing mandatory attribute ''{0}'' of XML element {1}."
 msgstr "L’attribut obligatoire ''{0}'' de l’élément XML {1} est manquant."
 
@@ -13942,7 +13984,7 @@ msgid "Remote Control has been asked to load the following data:"
 msgstr ""
 
 msgid "Loading data"
-msgstr ""
+msgstr "Chargement des données"
 
 msgid ""
 "Remote Control has been asked to load objects (specified by their id) from "
@@ -14439,9 +14481,6 @@ msgstr ""
 "Impossible dʼanalyser le fichier ''{0}'' pour les informations du greffon. "
 "Abandon."
 
-msgid "Processing plugin site cache icon files..."
-msgstr "Mise en cache des icônes du greffon…"
-
 msgid "Processing plugin files..."
 msgstr "Traitement des fichiers du greffon…"
 
@@ -14460,12 +14499,6 @@ msgstr "JOSM n’à pas réussi à télécharger la liste des plugins"
 msgid "Details:"
 msgstr "Détails:"
 
-msgid "Plugin icons download error"
-msgstr "Erreur de téléchargement des icônes des greffons"
-
-msgid "JOSM failed to download plugin icons:"
-msgstr "JOSM n’à pas réussi à télécharger les icones des plugins"
-
 msgid ""
 "Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
 "plugin site ''{1}''."
@@ -14521,6 +14554,10 @@ msgid ""
 "(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
 "bug report."
 msgstr ""
+"Une erreur de codage est survenue.<br><br>Cependant, vous utilisez une "
+"vieille version de JOSM ({0}),<br>au lieu d’utiliser la version stable "
+"courante (<b>{1}</b>).<br><br><b>Veuillez mettre à jour JOSM</b> avant de "
+"considérer de signaler un rapport d’erreur."
 
 msgid "Unexpected Exception"
 msgstr "Exception inattendue"
@@ -15548,9 +15585,10 @@ msgid ""
 msgstr ""
 "Crée et gère les adresses des nœuds et bâtiments en République Tchèque."
 
-msgid "Allows to import various file formats into JOSM directly."
+msgid ""
+"Allows to import various file formats into JOSM directly. Currently "
+"supported: TangoGPS, Garmin Trainings Center TCX."
 msgstr ""
-"Permet d’importer différents formats de fichiers directement dans JOSM."
 
 msgid "Download your GPX tracks from openstreetmap.org"
 msgstr "Télécharger vos traces GPX à partir d’openstreetmap.org"
@@ -15669,6 +15707,11 @@ msgid "A helper for IRS satellite adjustment."
 msgstr "Facilite les ajustements de satellite IRS"
 
 msgid ""
+"Provides Java Native Access (JNA) library. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
+msgid ""
 "Provides Java Topology Suite (JTS) library and related utilities. Not meant "
 "to be installed directly by users, but rather as a dependency for other "
 "plugins."
@@ -16099,6 +16142,25 @@ msgstr "Éclairé"
 msgid "Width (meters)"
 msgstr "Largeur (mètres)"
 
+msgid "Sidewalk"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "both"
+msgstr "dans les deux sens"
+
+msgctxt "sidewalk"
+msgid "left"
+msgstr "à gauche"
+
+msgctxt "sidewalk"
+msgid "right"
+msgstr "à droite"
+
+msgctxt "sidewalk"
+msgid "no"
+msgstr "non"
+
 msgid "Service type"
 msgstr "Type de service"
 
@@ -16465,17 +16527,21 @@ msgstr "Lu-Ve 09:00-18:00,Sa 08:00-14:00"
 msgid "May-Sep 09:30-12:30,14:15-19:30"
 msgstr "Mai-Sep 09:30-12:30,14:15-19:30"
 
+msgctxt "parking"
 msgid "multi-storey"
-msgstr "couvert"
+msgstr ""
 
+msgctxt "parking"
 msgid "surface"
-msgstr "en surface"
+msgstr ""
 
+msgctxt "parking"
 msgid "underground"
-msgstr "souterraine"
+msgstr ""
 
+msgctxt "parking"
 msgid "rooftop"
-msgstr "toit"
+msgstr ""
 
 msgid "Reference number"
 msgstr "Numéro de référence"
@@ -16931,14 +16997,25 @@ msgstr "Longueur maximale (mètres)"
 msgid "Overtaking"
 msgstr "Dépassement"
 
+msgctxt "overtaking"
+msgid "yes"
+msgstr "autorisé"
+
+msgctxt "overtaking"
 msgid "both"
-msgstr "les deux"
+msgstr "dans les deux sens"
 
+msgctxt "overtaking"
 msgid "forward"
-msgstr "avance"
+msgstr ""
 
+msgctxt "overtaking"
 msgid "backward"
-msgstr "retour"
+msgstr ""
+
+msgctxt "overtaking"
+msgid "no"
+msgstr "non autorisé"
 
 msgid "Roundabout"
 msgstr "Giratoire"
@@ -17246,6 +17323,12 @@ msgstr "pegasus"
 msgid "tiger"
 msgstr "tiger"
 
+msgid "Button operated"
+msgstr ""
+
+msgid "Sound signals"
+msgstr "Signaux sonores"
+
 msgid "Crossing attendant"
 msgstr "Aide à la traversée"
 
@@ -17631,7 +17714,7 @@ msgid "Mud"
 msgstr "Terrain boueux"
 
 msgid "Large area covered with mud."
-msgstr ""
+msgstr "Grand espace couvert avec boue."
 
 msgid "Beach"
 msgstr "Plage"
@@ -17776,9 +17859,6 @@ msgstr "Passage à niveau routier"
 msgid "Traffic lights"
 msgstr "Feux de signalisation"
 
-msgid "Sound signals"
-msgstr "Signaux sonores"
-
 msgid "Barrier"
 msgstr "Barrière"
 
@@ -18472,7 +18552,7 @@ msgid "Motel"
 msgstr "Motel"
 
 msgid "Guest House/Bed & Breakfast"
-msgstr ""
+msgstr "Chambre d''hôtes/Gîte"
 
 msgid "Chalet"
 msgstr "Chalet"
@@ -18484,7 +18564,7 @@ msgid "Alpine Hut"
 msgstr "Refuge"
 
 msgid "Caravan Site/RV Park"
-msgstr ""
+msgstr "Aire de service et/ou stationnement pour Camping-car"
 
 msgid "Number of places"
 msgstr "Nombre de places"
@@ -18583,7 +18663,7 @@ msgid "Pub"
 msgstr "Pub"
 
 msgid "Beer Garden"
-msgstr ""
+msgstr "Biergarten"
 
 msgid "Bar"
 msgstr "Bar"
@@ -19284,7 +19364,7 @@ msgstr "Cabane"
 
 msgctxt "shelter"
 msgid "lean_to"
-msgstr ""
+msgstr "Abri"
 
 msgctxt "shelter"
 msgid "picnic_shelter"
@@ -19487,7 +19567,7 @@ msgid "water_park"
 msgstr "parc aquatique"
 
 msgid "Scuba Diving"
-msgstr ""
+msgstr "Plongée sous-marine"
 
 msgid "Piste type"
 msgstr "Ski"
@@ -19619,7 +19699,7 @@ msgid "Boule"
 msgstr "Jeu de boules"
 
 msgid "Lawn Bowling"
-msgstr ""
+msgstr "Boulingrin"
 
 msgid "Cricket"
 msgstr "Cricket"
@@ -19751,7 +19831,7 @@ msgstr "hangar"
 
 msgctxt "building"
 msgid "cowshed"
-msgstr ""
+msgstr "étable"
 
 msgctxt "building"
 msgid "construction"
@@ -19844,6 +19924,9 @@ msgstr "Moulin à vent"
 msgid "Gasometer"
 msgstr "Gazomètre"
 
+msgid "Bunker Silo"
+msgstr ""
+
 msgid "Pipeline"
 msgstr "Canalisation"
 
@@ -19990,15 +20073,15 @@ msgstr "Station de mesure"
 msgid "Monitoring:"
 msgstr "Type de mesure :"
 
-msgid "Weather"
-msgstr "Météo"
-
 msgid "Water level"
 msgstr "Niveau dʼeau"
 
 msgid "Tide Level"
 msgstr "Niveau de marée"
 
+msgid "Groundwater"
+msgstr ""
+
 msgid "Traffic"
 msgstr "Trafic"
 
@@ -20017,6 +20100,9 @@ msgstr "Signal GLONASS"
 msgid "Galileo Signals"
 msgstr "Signal Galiléo"
 
+msgid "Weather"
+msgstr "Météo"
+
 msgid "Radiation"
 msgstr "Radioactivité"
 
@@ -20117,7 +20203,7 @@ msgid "aqueduct"
 msgstr "aqueduc"
 
 msgid "boardwalk"
-msgstr ""
+msgstr "pont sur pilotis"
 
 msgid "cantilever"
 msgstr "pont levant"
@@ -20144,10 +20230,10 @@ msgid "beam"
 msgstr ""
 
 msgid "truss"
-msgstr ""
+msgstr "pont en treillis"
 
 msgid "floating"
-msgstr ""
+msgstr "pont flottant"
 
 msgid "suspension"
 msgstr "suspension"
@@ -20165,22 +20251,22 @@ msgid "Movable Bridge"
 msgstr "Pont Mobile"
 
 msgid "bascule"
-msgstr ""
+msgstr "pont basculant"
 
 msgid "drawbridge"
-msgstr ""
+msgstr "pont-levis"
 
 msgid "lift"
-msgstr ""
+msgstr "pont levant"
 
 msgid "submersible"
-msgstr ""
+msgstr "pont submersible"
 
 msgid "swing"
 msgstr "tournant"
 
 msgid "transporter"
-msgstr ""
+msgstr "pont transbordeur"
 
 msgid "Bridge Support"
 msgstr ""
@@ -20197,6 +20283,9 @@ msgstr ""
 msgid "pivot_pier"
 msgstr ""
 
+msgid "Bridge outline"
+msgstr ""
+
 msgid "Power Plant"
 msgstr "Centrale électrique"
 
@@ -20806,6 +20895,15 @@ msgstr "Tour incomplète"
 msgid "Pole"
 msgstr "Pylône basse-tension"
 
+msgid "Pole with Transformer"
+msgstr ""
+
+msgid "Pole Attributes:"
+msgstr ""
+
+msgid "Transformer Attributes:"
+msgstr ""
+
 msgid "Power Line"
 msgstr "Ligne électrique"
 
@@ -20855,9 +20953,15 @@ msgstr "Utilisé pour la communication de données"
 msgid "Power Cable"
 msgstr ""
 
+msgctxt "power cable"
+msgid "underground"
+msgstr ""
+
+msgctxt "power cable"
 msgid "underwater"
-msgstr "sous-marin"
+msgstr ""
 
+msgctxt "power cable"
 msgid "overground"
 msgstr ""
 
@@ -20885,6 +20989,33 @@ msgstr "Monument"
 msgid "Memorial"
 msgstr "Mémorial"
 
+msgctxt "memorial"
+msgid "statue"
+msgstr "statue"
+
+msgctxt "memorial"
+msgid "bust"
+msgstr "buste"
+
+msgctxt "memorial"
+msgid "plaque"
+msgstr "plaque"
+
+msgctxt "memorial"
+msgid "stele"
+msgstr "stèle"
+
+msgctxt "memorial"
+msgid "stone"
+msgstr "en pierre"
+
+msgctxt "memorial"
+msgid "war_memorial"
+msgstr "mémorial de guerre"
+
+msgid "Inscription"
+msgstr "Inscription"
+
 msgid "Wayside Cross"
 msgstr "Croix"
 
@@ -20954,6 +21085,9 @@ msgstr "Boissons alcoolisées"
 msgid "Beverages"
 msgstr "Boissons"
 
+msgid "Wine"
+msgstr "Vins"
+
 msgid "Boutique"
 msgstr "Haute Couture"
 
@@ -20999,6 +21133,9 @@ msgstr "Vidéo"
 msgid "Video Games"
 msgstr "Jeux vidéo"
 
+msgid "Music"
+msgstr "Musique"
+
 msgid "Cash"
 msgstr "Argent"
 
@@ -21026,6 +21163,9 @@ msgstr "Cuisine"
 msgid "Curtain"
 msgstr "Rideaux"
 
+msgid "Art"
+msgstr "Art"
+
 msgid "Frame"
 msgstr "Cadres"
 
@@ -21036,7 +21176,7 @@ msgid "Interior Decoration"
 msgstr "Décoration intérieure"
 
 msgid "Antiques"
-msgstr ""
+msgstr "Antiquités"
 
 msgid "Printed Material"
 msgstr "Matériel d’impression"
@@ -21071,6 +21211,9 @@ msgstr "Coiffeur/Barbier"
 msgid "Beauty"
 msgstr "Salon de beauté"
 
+msgid "Tattoo"
+msgstr "Tatouages"
+
 msgid "Optician"
 msgstr "Opticien"
 
@@ -21122,6 +21265,9 @@ msgstr ""
 msgid "Pet"
 msgstr "Animaux"
 
+msgid "Funeral Directors"
+msgstr "Pompes funèbres"
+
 msgid "Vending Machine"
 msgstr "Distributeur"
 
@@ -21204,7 +21350,7 @@ msgid "Political"
 msgstr "Électorale"
 
 msgid "Division"
-msgstr ""
+msgstr "Division"
 
 msgid "canton"
 msgstr "canton"
@@ -21213,7 +21359,7 @@ msgid "linguistic_community"
 msgstr "groupe linguistique"
 
 msgid "ward"
-msgstr ""
+msgstr "circonscription"
 
 msgid "Postal Code"
 msgstr "Code postal"
@@ -21221,6 +21367,15 @@ msgstr "Code postal"
 msgid "National Park"
 msgstr "Parc National"
 
+msgid "Protected Area"
+msgstr "Aire protégée"
+
+msgid "Protected Class"
+msgstr ""
+
+msgid "Title or type of protection"
+msgstr "Titre ou type de protection"
+
 msgid "Places"
 msgstr "Lieu"
 
@@ -22299,7 +22454,13 @@ msgstr "Carte de base estonienne (Maaamet)"
 msgid "Estonia Ortho (Maaamet)"
 msgstr ""
 
-msgid "Estonia Multi (Maaamet)"
+msgid "Estonia Hillshade (Maaamet)"
+msgstr ""
+
+msgid "Estonia Cadastre (Maaamet)"
+msgstr ""
+
+msgid "Estonia Forestry (Maaamet)"
 msgstr ""
 
 msgid "Bordeaux - 2012"
@@ -22323,8 +22484,8 @@ msgstr "CRAIG - Le Puy 2010 - 15 cm"
 msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
 msgstr "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
 
-msgid "CUGN Nancy - Orthophoto 2012"
-msgstr ""
+msgid "GrandNancy Orthophotographie 2012"
+msgstr "GrandNancy Orthophotographie 2012"
 
 msgid "Géobretagne - Brest 2010 - 10 cm"
 msgstr "Géobretagne - Brest 2010 - 10 cm"
@@ -22372,9 +22533,6 @@ msgstr ""
 "Vercors - Réserve naturelle des Hauts-Plateaux du Vercors - Orthophotos 1999 "
 "- 1 m"
 
-msgid "Streets NRW Geofabrik.de"
-msgstr ""
-
 msgid "Hike & Bike"
 msgstr "Hike & Bike"
 
@@ -22436,6 +22594,9 @@ msgstr ""
 msgid "NRW-Atlas: Topographische Karte 1:10000"
 msgstr "NRW-Atlas : Carte topographique 1:10000"
 
+msgid "Metropole Ruhr: Luftbilder (10 cm)"
+msgstr ""
+
 msgid "Drone Imagery (Haiti)"
 msgstr "Imagerie drone (Haïti)"
 
@@ -22488,16 +22649,16 @@ msgid "ORT10LT (Lithuania)"
 msgstr "ORT10LT (Lithuanie)"
 
 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 Chemin de fer"
 
 msgid "Luxembourg Inspire Roads"
-msgstr ""
+msgstr "Luxembourg Inspire Routes"
 
 msgid "Niger Delta Oct 2012 Landsat"
 msgstr "Delta du Niger Oct 2012 Landsat"
@@ -22637,6 +22798,9 @@ msgstr "Carte de ville de Zurich"
 msgid "Stadt Zürich Übersichtsplan (Strassen, Gebäude, Hausnummer)"
 msgstr ""
 
+msgid "Stadt Zürich Luftbild 2011"
+msgstr ""
+
 msgid "Orthofoto Kanton Solothurn RGB (SOGIS 2011/2012/2013)"
 msgstr ""
 
@@ -22655,8 +22819,8 @@ msgstr "Canton du Jura 50 cm (RCJU 1998)"
 msgid "Canton de Fribourg 50cm (2005)"
 msgstr "Canton de Fribourg 50 cm (2005)"
 
-msgid "Stadt Bern 10cm/25cm (2008)"
-msgstr "Ville de Bern 10 cm/25 cm (2008)"
+msgid "Stadt Bern 10cm/25cm (2012)"
+msgstr ""
 
 msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
 msgstr "HEIG-VD / Orthophoto Yverdon-les-Bains 25 cm (2007)"
@@ -22694,7 +22858,7 @@ msgstr ""
 msgid "OSM US TIGER 2012 Roads Overlay"
 msgstr ""
 
-msgid "New & Misaligned TIGER Roads (TIGER 2013)"
+msgid "New & Misaligned TIGER Roads (TIGER 2014)"
 msgstr ""
 
 msgid "MassGIS L3 Parcels"
@@ -22742,9 +22906,237 @@ msgstr ""
 msgid "NLS - Bartholomew Half Inch, 1897-1907"
 msgstr ""
 
+msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Annan 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgstr ""
+
 msgid "OS Town Plans, Cupar 1854 (NLS)"
 msgstr ""
 
+msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
+msgstr ""
+"OS Plans de ville, Édimbourg 1849-1851 (Bibliothèque nationale d''Écosse)"
+
+msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
+msgstr ""
+"OS Plans de ville, Édimbourg 1876-1877 (Bibliothèque nationale d''Écosse)"
+
+msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
+msgstr ""
+"OS Plans de ville, Édimbourg 1893-1894 (Bibliothèque nationale d''Écosse)"
+
+msgid "OS Town Plans, Elgin 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Forres 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Galashiels 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Girvan 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Greenock 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Haddington 1853 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Haddington 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Hamilton 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Irvine 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Jedburgh 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kelso 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Lanark 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Linlithgow 1856 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Musselburgh 1853 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Musselburgh 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Oban 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Peebles 1856 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Perth 1860 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Peterhead 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Selkirk 1865 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, St Andrews 1854 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, St Andrews 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stirling 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stonehaven 1864 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1847 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Strathaven 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wick 1872 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wigtown 1848 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wigtown 1894 (NLS)"
+msgstr ""
+
 msgid "Decreasing house numbers in addresses interpolation"
 msgstr "Décroître les numéros de rue dans l’interpolation des adresses"
 
@@ -22803,21 +23195,39 @@ msgstr ""
 "{0}={1} est déprécié. Veuillez utiliser un multi-polygone à la place."
 
 msgid ""
-"{0} is deprecated. Please specify ìnterval by using opening_hours syntax"
+"{0} is deprecated. Please specify interval by using opening_hours syntax"
 msgstr ""
-"{0} est déprécié. Veuillez spécifier un intervalle en utilisant la syntaxe "
-"relative aux heures d’ouverture (opening_hours)."
 
 msgid ""
 "{0} is deprecated. Please delete this object and use a private layer instead"
 msgstr ""
 
+msgid "{0}={1} is unspecific. Please replace ''{1}'' by a specific value."
+msgstr ""
+
+msgid "{0} should be replaced with {1}"
+msgstr ""
+
+msgid ""
+"{0}={1} is unspecific. Please replace ''{1}'' by ''left'', ''right'' or "
+"''both''."
+msgstr ""
+
+msgid "{0} on a node. Should be used on a way."
+msgstr ""
+
+msgid "{0} on a node. Should be drawn as an area."
+msgstr ""
+
+msgid "{0}=* on a node. Should be used in a relation"
+msgstr ""
+
+msgid "{0} on a way. Should be used in a relation"
+msgstr ""
+
 msgid "{0} on a node"
 msgstr "{0} sur un nœud"
 
-msgid "{0} on a node. Should be drawn as an area"
-msgstr "{0} sur un nœud. Devrait être tracé sur une surface."
-
 msgid "Building inside building"
 msgstr "Bâtiment à l’intérieur d’un autre"
 
@@ -25712,7 +26122,7 @@ msgid ""
 "'{' '',  '' '}' '', ''='', ''|''"
 msgstr ""
 "Les valeurs de surfaces ne doivent contenir aucun des caractères suivants : "
-"'','', ''{'', ''}'', ''='', ''|''"
+"'','', '' '{' '', '' '}' '', ''='', ''|''"
 
 msgid "Imagery XML Files"
 msgstr "Fichiers d’’imagerie XML"
@@ -27844,6 +28254,9 @@ msgstr "Suggérer des arrêts"
 msgid "Find"
 msgstr "Rechercher"
 
+msgid "Show"
+msgstr "Afficher"
+
 msgid "Mark"
 msgstr "Marquer"
 
diff --git a/i18n/po/gl.po b/i18n/po/gl.po
index 2138bbe..223f096 100644
--- a/i18n/po/gl.po
+++ b/i18n/po/gl.po
@@ -1,8 +1,14 @@
+# Galician translation for josm
+# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
+# This file is distributed under the same license as the josm package.
+#
+# FIRST AUTHOR <EMAIL at ADDRESS>, 2009, 2010.
+# Adrián Chaves Fernández <adriyetichaves at gmail.com>, 2014.
 msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-21 03:38+0200\n"
+"POT-Creation-Date: 2014-12-10 03:42+0100\n"
 "PO-Revision-Date: 2014-08-20 14:37+0000\n"
 "Last-Translator: Adrián Chaves Fernández <adriyetichaves at gmail.com>\n"
 "Language-Team: Galician <proxecto at trasno.net>\n"
@@ -10,8 +16,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2014-10-21 04:53+0000\n"
-"X-Generator: Launchpad (build 17203)\n"
+"X-Launchpad-Export-Date: 2014-12-10 04:48+0000\n"
+"X-Generator: Launchpad (build 17283)\n"
 "Language: gl\n"
 "X-Poedit-Language: Galician\n"
 
@@ -175,21 +181,6 @@ msgid "About JOSM..."
 msgstr "Sobre JOSM..."
 
 msgid ""
-"Unexpected format of API base URL. Redirection to info or history page for "
-"OSM object will probably fail. API base URL is: ''{0}''"
-msgstr ""
-"O URL base da API ten un formato inesperado. É probábel que as redireccións "
-"ás páxinas de información e historiais dos obxectos de OSM non funcionen. O "
-"URL base da API é «{0}»."
-
-msgid ""
-"Unexpected format of API base URL. Redirection to user page for OSM user "
-"will probably fail. API base URL is: ''{0}''"
-msgstr ""
-"O URL base da API ten un formato inesperado. É probábel que as redireccións "
-"ás páxinas dos usuarios de OSM non funcionen. O URL base da API é «{0}»."
-
-msgid ""
 "You are about to launch {0} browser window.<br>This may both clutter your "
 "screen with browser windows<br>and take some time to finish."
 msgid_plural ""
@@ -1640,6 +1631,15 @@ msgstr "Non hai cambios que subir."
 msgid "Nothing to upload. Get some data first."
 msgstr "Nada que subir. Consigue algún dato antes."
 
+msgid "Upload note changes to server"
+msgstr ""
+
+msgid "Upload notes"
+msgstr ""
+
+msgid "Uploading notes to server"
+msgstr ""
+
 msgid "Upload selection"
 msgstr "Subir seleccion"
 
@@ -1917,10 +1917,16 @@ msgstr ""
 msgid "Click the location where you wish to create a new note"
 msgstr ""
 
-msgid "Enter a comment for a new note"
+msgid "Create new note"
 msgstr ""
 
-msgid "Create new note"
+msgid "Create note"
+msgstr ""
+
+msgid "Enter a detailed comment to create a note"
+msgstr ""
+
+msgid "You must enter a comment to create a new note"
 msgstr ""
 
 msgid "Delete Mode"
@@ -2823,6 +2829,15 @@ msgstr "... refierese á relación"
 msgid "Cycling dependencies"
 msgstr "Dependencias cíclicas"
 
+msgid "Uploading modified notes"
+msgstr ""
+
+msgid "Note {0} failed: {1}"
+msgstr ""
+
+msgid "Notes failed to upload"
+msgstr ""
+
 msgid ""
 "The following are results of automatic validation. Try fixing these, but be "
 "careful (don''t destroy valid data). When in doubt ignore them.<br>When you "
@@ -5112,6 +5127,12 @@ msgstr ""
 msgid "Conflict foreground: keep all tags"
 msgstr ""
 
+msgid "Conflict background: sum all numeric tags"
+msgstr ""
+
+msgid "Conflict foreground: sum all numeric tags"
+msgstr ""
+
 msgid "Conflict background: keep member"
 msgstr ""
 
@@ -5564,12 +5585,19 @@ msgstr "ningún"
 msgid "all"
 msgstr "todo"
 
+msgid "sum"
+msgstr ""
+
 msgid "Please decide which values to keep"
 msgstr "Decide que valores hay que manter"
 
 msgid "Value ''{0}'' is going to be applied for key ''{1}''"
 msgstr "O valor «{0}» será aplicado á clave «{1}»"
 
+msgid ""
+"All numeric values sumed as ''{0}'' are going to be applied for key ''{1}''"
+msgstr ""
+
 msgid "The key ''{0}'' and all its values are going to be removed"
 msgstr "A clave «{0}»  e todos os seus valores van a ser retirados"
 
@@ -5955,25 +5983,6 @@ msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
 "</p><p>Pechar o diálogo de filtrado para ver todos os obxectos.<p></html>"
 
-msgid "Display the history of all selected items."
-msgstr "Amosar o historial de todos os elementos seleccionados."
-
-msgid "Object with history"
-msgstr "Obxecto con histórico"
-
-msgid "Reload"
-msgstr "Recargar"
-
-msgid "Reload all currently selected objects and refresh the list."
-msgstr ""
-"Recargar todos os obxectos seleccionados actualmente e actualizar a lista."
-
-msgid "Show"
-msgstr "Amosar"
-
-msgid "Display the history of the selected objects."
-msgstr "Amosar o histórico dos obxectos escollidos."
-
 msgid "Advanced object info"
 msgstr "Información do obxecto avanzada"
 
@@ -6311,6 +6320,9 @@ msgstr ""
 msgid "Comment"
 msgstr "Comentario"
 
+msgid "Comment on note"
+msgstr ""
+
 msgid "Add comment to note:"
 msgstr ""
 
@@ -6320,9 +6332,6 @@ msgstr ""
 msgid "Close note with message:"
 msgstr ""
 
-msgid "Close Note"
-msgstr ""
-
 msgid "Create a new note"
 msgstr ""
 
@@ -6395,6 +6404,9 @@ msgstr "Selección Actual"
 msgid "Search for objects"
 msgstr "Buscar obxectos"
 
+msgid "Display the history of the selected objects."
+msgstr "Amosar o histórico dos obxectos escollidos."
+
 msgid "Zoom to selection"
 msgstr "Facer zoom sobre a selección"
 
@@ -6519,6 +6531,9 @@ msgstr "Arranxando ({0}/{1}): ''{2}''"
 msgid "Updating map ..."
 msgstr "Actualizando mapa ..."
 
+msgid "anonymous"
+msgstr "anónimo"
+
 msgid "Display the basic properties of the changeset"
 msgstr "Amosa as propiedades básicas da modificación"
 
@@ -6532,6 +6547,12 @@ msgid "Display the objects created, updated, and deleted by the changeset"
 msgstr ""
 "Amosa os obxectos creados, actualizados , e eliminados do conxunto de cambios"
 
+msgid "Discussion"
+msgstr ""
+
+msgid "Display the public discussion around this changeset"
+msgstr ""
+
 msgid "Changeset Management Dialog"
 msgstr "Diálogo do Xestor de Conxunto de Cambios"
 
@@ -6593,9 +6614,6 @@ msgctxt "changeset.state"
 msgid "Closed"
 msgstr "Pechado"
 
-msgid "anonymous"
-msgstr "anónimo"
-
 msgid "ID"
 msgstr "ID"
 
@@ -6611,6 +6629,9 @@ msgstr "Creado en"
 msgid "Closed at"
 msgstr "Pechado en"
 
+msgid "Discussions"
+msgstr ""
+
 msgid "Downloading changeset content"
 msgstr "Descargando o contido do conxunto de cambios"
 
@@ -6725,6 +6746,15 @@ msgid ""
 "layer"
 msgstr ""
 
+msgid "Update changeset discussion"
+msgstr ""
+
+msgid "Update the changeset discussion from the OSM server"
+msgstr ""
+
+msgid "Date"
+msgstr "Data"
+
 msgid "Download changesets"
 msgstr "Descargar conxuntos de cambios"
 
@@ -7168,7 +7198,7 @@ msgstr "Por favor selecciona un valor"
 msgid "Set number of recently added tags"
 msgstr ""
 
-msgid "Remember last used tags"
+msgid "Remember last used tags after a restart"
 msgstr ""
 
 msgid "Please enter the number of recently added tags to display"
@@ -7526,6 +7556,9 @@ msgstr "incluíndo os fillos inmediatos das relacións pai"
 msgid "Load parent relations"
 msgstr "Cagar relacións pais"
 
+msgid "Reload"
+msgstr "Recargar"
+
 msgid "Loading parent relations"
 msgstr "Cagando relacións pais"
 
@@ -7652,6 +7685,12 @@ msgstr "Datos GPS en bruto"
 msgid "Select to download GPS traces in the selected download area."
 msgstr ""
 
+msgid "Notes"
+msgstr "Anotacións"
+
+msgid "Select to download notes in the selected download area."
+msgstr ""
+
 msgid "Download as new layer"
 msgstr "Descargar como unha nova capa"
 
@@ -7971,9 +8010,6 @@ msgstr ""
 msgid "B"
 msgstr ""
 
-msgid "Date"
-msgstr "Data"
-
 msgid ""
 "Failed to update primitive with id {0} because current edit layer is null"
 msgstr ""
@@ -8850,9 +8886,6 @@ msgstr ""
 msgid "Save Layer"
 msgstr "Gardar capa"
 
-msgid "Notes"
-msgstr "Anotacións"
-
 msgid "Notes layer"
 msgstr ""
 
@@ -8868,9 +8901,6 @@ msgstr "Capa de datos {0}"
 msgid "outside downloaded area"
 msgstr "fora da área descargada"
 
-msgid "version {0}"
-msgstr "versión {0}"
-
 msgid "Merging layers"
 msgstr ""
 
@@ -12594,6 +12624,15 @@ msgstr ""
 msgid "Open changeset expected. Got closed changeset with id {0}."
 msgstr ""
 
+msgid "Note upload failed"
+msgstr ""
+
+msgid "Error parsing note response from server"
+msgstr ""
+
+msgid "Error encoding string: {0}"
+msgstr ""
+
 msgid "(Code={0})"
 msgstr "(Código={0})"
 
@@ -12644,15 +12683,15 @@ msgstr ""
 msgid "Parsing changeset content ..."
 msgstr "Procesando contido do concunto de cambios..."
 
+msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
+msgstr "Valor lóxico ilegal para o atributo «{0}». Obtívose «{1}»."
+
 msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
 msgstr "Valor ilegal para o atributo «{0}». Obtívose «{1}»."
 
 msgid "Illegal numeric value for attribute ''{0}''. Got ''{1}''."
 msgstr "Valor numérico ilegal para o atributo «{0}». Obtívose «{1}»."
 
-msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
-msgstr "Valor lóxico ilegal para o atributo «{0}». Obtívose «{1}»."
-
 msgid "Missing mandatory attribute ''{0}'' of XML element {1}."
 msgstr ""
 
@@ -13493,9 +13532,6 @@ msgstr "Procesando o ficheiro «{0}»"
 msgid "Failed to scan file ''{0}'' for plugin information. Skipping."
 msgstr ""
 
-msgid "Processing plugin site cache icon files..."
-msgstr ""
-
 msgid "Processing plugin files..."
 msgstr ""
 
@@ -13514,12 +13550,6 @@ msgstr ""
 msgid "Details:"
 msgstr ""
 
-msgid "Plugin icons download error"
-msgstr ""
-
-msgid "JOSM failed to download plugin icons:"
-msgstr ""
-
 msgid ""
 "Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
 "plugin site ''{1}''."
@@ -14413,9 +14443,10 @@ msgid ""
 "Creating and handling address nodes and buildings within Czech Republic."
 msgstr ""
 
-msgid "Allows to import various file formats into JOSM directly."
+msgid ""
+"Allows to import various file formats into JOSM directly. Currently "
+"supported: TangoGPS, Garmin Trainings Center TCX."
 msgstr ""
-"Permite importar varios tipos de formatos de ficheiro directamente en JOSM"
 
 msgid "Download your GPX tracks from openstreetmap.org"
 msgstr "Descargar os seus camiños GPX desde openstreetmap.org"
@@ -14514,6 +14545,11 @@ msgid "A helper for IRS satellite adjustment."
 msgstr "Asistente para o axuste do satélite IRS."
 
 msgid ""
+"Provides Java Native Access (JNA) library. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
+msgid ""
 "Provides Java Topology Suite (JTS) library and related utilities. Not meant "
 "to be installed directly by users, but rather as a dependency for other "
 "plugins."
@@ -14900,6 +14936,25 @@ msgstr ""
 msgid "Width (meters)"
 msgstr "Anchura (metros)"
 
+msgid "Sidewalk"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "both"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "left"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "right"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "no"
+msgstr ""
+
 msgid "Service type"
 msgstr ""
 
@@ -15264,15 +15319,19 @@ msgstr ""
 msgid "May-Sep 09:30-12:30,14:15-19:30"
 msgstr ""
 
+msgctxt "parking"
 msgid "multi-storey"
-msgstr "de pisos"
+msgstr ""
 
+msgctxt "parking"
 msgid "surface"
-msgstr "ao aire libre"
+msgstr ""
 
+msgctxt "parking"
 msgid "underground"
-msgstr "subterráneo"
+msgstr ""
 
+msgctxt "parking"
 msgid "rooftop"
 msgstr ""
 
@@ -15730,15 +15789,26 @@ msgstr ""
 msgid "Overtaking"
 msgstr ""
 
+msgctxt "overtaking"
+msgid "yes"
+msgstr ""
+
+msgctxt "overtaking"
 msgid "both"
 msgstr ""
 
+msgctxt "overtaking"
 msgid "forward"
 msgstr ""
 
+msgctxt "overtaking"
 msgid "backward"
 msgstr ""
 
+msgctxt "overtaking"
+msgid "no"
+msgstr ""
+
 msgid "Roundabout"
 msgstr "Rotonda"
 
@@ -16032,6 +16102,12 @@ msgstr "pegaso"
 msgid "tiger"
 msgstr "tigre"
 
+msgid "Button operated"
+msgstr ""
+
+msgid "Sound signals"
+msgstr ""
+
 msgid "Crossing attendant"
 msgstr "Guarda cruces"
 
@@ -16554,9 +16630,6 @@ msgstr "Paso a nivel"
 msgid "Traffic lights"
 msgstr ""
 
-msgid "Sound signals"
-msgstr ""
-
 msgid "Barrier"
 msgstr ""
 
@@ -18616,6 +18689,9 @@ msgstr "Muíño de vento"
 msgid "Gasometer"
 msgstr "Gasómetro"
 
+msgid "Bunker Silo"
+msgstr ""
+
 msgid "Pipeline"
 msgstr "Tubería"
 
@@ -18762,15 +18838,15 @@ msgstr ""
 msgid "Monitoring:"
 msgstr ""
 
-msgid "Weather"
-msgstr ""
-
 msgid "Water level"
 msgstr ""
 
 msgid "Tide Level"
 msgstr ""
 
+msgid "Groundwater"
+msgstr ""
+
 msgid "Traffic"
 msgstr ""
 
@@ -18789,6 +18865,9 @@ msgstr ""
 msgid "Galileo Signals"
 msgstr ""
 
+msgid "Weather"
+msgstr ""
+
 msgid "Radiation"
 msgstr ""
 
@@ -18969,6 +19048,9 @@ msgstr ""
 msgid "pivot_pier"
 msgstr ""
 
+msgid "Bridge outline"
+msgstr ""
+
 msgid "Power Plant"
 msgstr ""
 
@@ -19576,6 +19658,15 @@ msgstr ""
 msgid "Pole"
 msgstr "Poste"
 
+msgid "Pole with Transformer"
+msgstr ""
+
+msgid "Pole Attributes:"
+msgstr ""
+
+msgid "Transformer Attributes:"
+msgstr ""
+
 msgid "Power Line"
 msgstr "Tendido eléctrico"
 
@@ -19625,9 +19716,15 @@ msgstr ""
 msgid "Power Cable"
 msgstr ""
 
+msgctxt "power cable"
+msgid "underground"
+msgstr ""
+
+msgctxt "power cable"
 msgid "underwater"
 msgstr ""
 
+msgctxt "power cable"
 msgid "overground"
 msgstr ""
 
@@ -19655,6 +19752,33 @@ msgstr "Monumento"
 msgid "Memorial"
 msgstr "Monumento conmemorativo"
 
+msgctxt "memorial"
+msgid "statue"
+msgstr ""
+
+msgctxt "memorial"
+msgid "bust"
+msgstr ""
+
+msgctxt "memorial"
+msgid "plaque"
+msgstr ""
+
+msgctxt "memorial"
+msgid "stele"
+msgstr ""
+
+msgctxt "memorial"
+msgid "stone"
+msgstr ""
+
+msgctxt "memorial"
+msgid "war_memorial"
+msgstr ""
+
+msgid "Inscription"
+msgstr ""
+
 msgid "Wayside Cross"
 msgstr "Cruceiro"
 
@@ -19724,6 +19848,9 @@ msgstr "Tenda de bebidas alcohólicas"
 msgid "Beverages"
 msgstr "Brebaxes"
 
+msgid "Wine"
+msgstr ""
+
 msgid "Boutique"
 msgstr "Boutique"
 
@@ -19769,6 +19896,9 @@ msgstr "Vídeo"
 msgid "Video Games"
 msgstr ""
 
+msgid "Music"
+msgstr ""
+
 msgid "Cash"
 msgstr "Cartos en efectivo"
 
@@ -19796,6 +19926,9 @@ msgstr "Cociña"
 msgid "Curtain"
 msgstr "Cortinas"
 
+msgid "Art"
+msgstr ""
+
 msgid "Frame"
 msgstr "Marco"
 
@@ -19841,6 +19974,9 @@ msgstr ""
 msgid "Beauty"
 msgstr ""
 
+msgid "Tattoo"
+msgstr ""
+
 msgid "Optician"
 msgstr "Óptica"
 
@@ -19892,6 +20028,9 @@ msgstr ""
 msgid "Pet"
 msgstr ""
 
+msgid "Funeral Directors"
+msgstr ""
+
 msgid "Vending Machine"
 msgstr ""
 
@@ -19991,6 +20130,15 @@ msgstr ""
 msgid "National Park"
 msgstr ""
 
+msgid "Protected Area"
+msgstr ""
+
+msgid "Protected Class"
+msgstr ""
+
+msgid "Title or type of protection"
+msgstr ""
+
 msgid "Places"
 msgstr "Lugares"
 
@@ -21067,7 +21215,13 @@ msgstr ""
 msgid "Estonia Ortho (Maaamet)"
 msgstr ""
 
-msgid "Estonia Multi (Maaamet)"
+msgid "Estonia Hillshade (Maaamet)"
+msgstr ""
+
+msgid "Estonia Cadastre (Maaamet)"
+msgstr ""
+
+msgid "Estonia Forestry (Maaamet)"
 msgstr ""
 
 msgid "Bordeaux - 2012"
@@ -21091,7 +21245,7 @@ msgstr ""
 msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
 msgstr ""
 
-msgid "CUGN Nancy - Orthophoto 2012"
+msgid "GrandNancy Orthophotographie 2012"
 msgstr ""
 
 msgid "Géobretagne - Brest 2010 - 10 cm"
@@ -21138,9 +21292,6 @@ msgid ""
 "- 1 m"
 msgstr ""
 
-msgid "Streets NRW Geofabrik.de"
-msgstr ""
-
 msgid "Hike & Bike"
 msgstr ""
 
@@ -21200,6 +21351,9 @@ msgstr ""
 msgid "NRW-Atlas: Topographische Karte 1:10000"
 msgstr ""
 
+msgid "Metropole Ruhr: Luftbilder (10 cm)"
+msgstr ""
+
 msgid "Drone Imagery (Haiti)"
 msgstr ""
 
@@ -21401,6 +21555,9 @@ msgstr ""
 msgid "Stadt Zürich Übersichtsplan (Strassen, Gebäude, Hausnummer)"
 msgstr ""
 
+msgid "Stadt Zürich Luftbild 2011"
+msgstr ""
+
 msgid "Orthofoto Kanton Solothurn RGB (SOGIS 2011/2012/2013)"
 msgstr ""
 
@@ -21419,7 +21576,7 @@ msgstr ""
 msgid "Canton de Fribourg 50cm (2005)"
 msgstr ""
 
-msgid "Stadt Bern 10cm/25cm (2008)"
+msgid "Stadt Bern 10cm/25cm (2012)"
 msgstr ""
 
 msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
@@ -21458,7 +21615,7 @@ msgstr ""
 msgid "OSM US TIGER 2012 Roads Overlay"
 msgstr ""
 
-msgid "New & Misaligned TIGER Roads (TIGER 2013)"
+msgid "New & Misaligned TIGER Roads (TIGER 2014)"
 msgstr ""
 
 msgid "MassGIS L3 Parcels"
@@ -21506,9 +21663,234 @@ msgstr ""
 msgid "NLS - Bartholomew Half Inch, 1897-1907"
 msgstr ""
 
+msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Annan 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgstr ""
+
 msgid "OS Town Plans, Cupar 1854 (NLS)"
 msgstr ""
 
+msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Elgin 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Forres 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Galashiels 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Girvan 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Greenock 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Haddington 1853 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Haddington 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Hamilton 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Irvine 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Jedburgh 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kelso 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Lanark 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Linlithgow 1856 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Musselburgh 1853 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Musselburgh 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Oban 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Peebles 1856 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Perth 1860 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Peterhead 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Selkirk 1865 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, St Andrews 1854 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, St Andrews 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stirling 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stonehaven 1864 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1847 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Strathaven 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wick 1872 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wigtown 1848 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wigtown 1894 (NLS)"
+msgstr ""
+
 msgid "Decreasing house numbers in addresses interpolation"
 msgstr ""
 
@@ -21562,17 +21944,37 @@ msgid "{0}={1} is deprecated. Please use instead a multipolygon."
 msgstr ""
 
 msgid ""
-"{0} is deprecated. Please specify ìnterval by using opening_hours syntax"
+"{0} is deprecated. Please specify interval by using opening_hours syntax"
 msgstr ""
 
 msgid ""
 "{0} is deprecated. Please delete this object and use a private layer instead"
 msgstr ""
 
-msgid "{0} on a node"
+msgid "{0}={1} is unspecific. Please replace ''{1}'' by a specific value."
 msgstr ""
 
-msgid "{0} on a node. Should be drawn as an area"
+msgid "{0} should be replaced with {1}"
+msgstr ""
+
+msgid ""
+"{0}={1} is unspecific. Please replace ''{1}'' by ''left'', ''right'' or "
+"''both''."
+msgstr ""
+
+msgid "{0} on a node. Should be used on a way."
+msgstr ""
+
+msgid "{0} on a node. Should be drawn as an area."
+msgstr ""
+
+msgid "{0}=* on a node. Should be used in a relation"
+msgstr ""
+
+msgid "{0} on a way. Should be used in a relation"
+msgstr ""
+
+msgid "{0} on a node"
 msgstr ""
 
 msgid "Building inside building"
@@ -26268,6 +26670,9 @@ msgstr ""
 msgid "Find"
 msgstr ""
 
+msgid "Show"
+msgstr "Amosar"
+
 msgid "Mark"
 msgstr ""
 
diff --git a/i18n/po/he.po b/i18n/po/he.po
index 29375c1..ced894c 100644
--- a/i18n/po/he.po
+++ b/i18n/po/he.po
@@ -1,8 +1,13 @@
+# Hebrew translation for josm
+# Copyright (c) 2008 Rosetta Contributors and Canonical Ltd 2008
+# This file is distributed under the same license as the josm package.
+# FIRST AUTHOR <EMAIL at ADDRESS>, 2008.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-21 03:38+0200\n"
+"POT-Creation-Date: 2014-12-10 03:42+0100\n"
 "PO-Revision-Date: 2013-03-30 13:38+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad at dstoecker.de>\n"
 "Language-Team: Hebrew <he at li.org>\n"
@@ -10,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-10-21 04:55+0000\n"
-"X-Generator: Launchpad (build 17203)\n"
+"X-Launchpad-Export-Date: 2014-12-10 04:51+0000\n"
+"X-Generator: Launchpad (build 17283)\n"
 "Language: he\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -168,16 +173,6 @@ msgid "About JOSM..."
 msgstr "אודות JOSM..."
 
 msgid ""
-"Unexpected format of API base URL. Redirection to info or history page for "
-"OSM object will probably fail. API base URL is: ''{0}''"
-msgstr ""
-
-msgid ""
-"Unexpected format of API base URL. Redirection to user page for OSM user "
-"will probably fail. API base URL is: ''{0}''"
-msgstr ""
-
-msgid ""
 "You are about to launch {0} browser window.<br>This may both clutter your "
 "screen with browser windows<br>and take some time to finish."
 msgid_plural ""
@@ -1523,6 +1518,15 @@ msgstr "אין שינויים להעלאה."
 msgid "Nothing to upload. Get some data first."
 msgstr "אין מה להעלות. קבל כמה נתונים תחילה."
 
+msgid "Upload note changes to server"
+msgstr ""
+
+msgid "Upload notes"
+msgstr ""
+
+msgid "Uploading notes to server"
+msgstr ""
+
 msgid "Upload selection"
 msgstr ""
 
@@ -1795,10 +1799,16 @@ msgstr ""
 msgid "Click the location where you wish to create a new note"
 msgstr ""
 
-msgid "Enter a comment for a new note"
+msgid "Create new note"
 msgstr ""
 
-msgid "Create new note"
+msgid "Create note"
+msgstr ""
+
+msgid "Enter a detailed comment to create a note"
+msgstr ""
+
+msgid "You must enter a comment to create a new note"
 msgstr ""
 
 msgid "Delete Mode"
@@ -2676,6 +2686,15 @@ msgstr ""
 msgid "Cycling dependencies"
 msgstr ""
 
+msgid "Uploading modified notes"
+msgstr ""
+
+msgid "Note {0} failed: {1}"
+msgstr ""
+
+msgid "Notes failed to upload"
+msgstr ""
+
 msgid ""
 "The following are results of automatic validation. Try fixing these, but be "
 "careful (don''t destroy valid data). When in doubt ignore them.<br>When you "
@@ -4911,6 +4930,12 @@ msgstr ""
 msgid "Conflict foreground: keep all tags"
 msgstr ""
 
+msgid "Conflict background: sum all numeric tags"
+msgstr ""
+
+msgid "Conflict foreground: sum all numeric tags"
+msgstr ""
+
 msgid "Conflict background: keep member"
 msgstr ""
 
@@ -5337,12 +5362,19 @@ msgstr "כלום"
 msgid "all"
 msgstr "הכל"
 
+msgid "sum"
+msgstr ""
+
 msgid "Please decide which values to keep"
 msgstr ""
 
 msgid "Value ''{0}'' is going to be applied for key ''{1}''"
 msgstr ""
 
+msgid ""
+"All numeric values sumed as ''{0}'' are going to be applied for key ''{1}''"
+msgstr ""
+
 msgid "The key ''{0}'' and all its values are going to be removed"
 msgstr ""
 
@@ -5705,24 +5737,6 @@ msgstr[1] ""
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
 
-msgid "Display the history of all selected items."
-msgstr "הצג את ההיסטוריה של כל הפריטים הבחורים."
-
-msgid "Object with history"
-msgstr ""
-
-msgid "Reload"
-msgstr "טען מחדש"
-
-msgid "Reload all currently selected objects and refresh the list."
-msgstr "טען מחדש את כל העצמים הבחורים ורענן את הרשימה."
-
-msgid "Show"
-msgstr ""
-
-msgid "Display the history of the selected objects."
-msgstr ""
-
 msgid "Advanced object info"
 msgstr ""
 
@@ -6060,6 +6074,9 @@ msgstr ""
 msgid "Comment"
 msgstr ""
 
+msgid "Comment on note"
+msgstr ""
+
 msgid "Add comment to note:"
 msgstr ""
 
@@ -6069,9 +6086,6 @@ msgstr ""
 msgid "Close note with message:"
 msgstr ""
 
-msgid "Close Note"
-msgstr ""
-
 msgid "Create a new note"
 msgstr ""
 
@@ -6144,6 +6158,9 @@ msgstr "הבחירה הנוכחית"
 msgid "Search for objects"
 msgstr ""
 
+msgid "Display the history of the selected objects."
+msgstr ""
+
 msgid "Zoom to selection"
 msgstr "התאם מיקוד לבחירה"
 
@@ -6264,6 +6281,9 @@ msgstr ""
 msgid "Updating map ..."
 msgstr ""
 
+msgid "anonymous"
+msgstr ""
+
 msgid "Display the basic properties of the changeset"
 msgstr ""
 
@@ -6276,6 +6296,12 @@ msgstr ""
 msgid "Display the objects created, updated, and deleted by the changeset"
 msgstr ""
 
+msgid "Discussion"
+msgstr ""
+
+msgid "Display the public discussion around this changeset"
+msgstr ""
+
 msgid "Changeset Management Dialog"
 msgstr ""
 
@@ -6333,9 +6359,6 @@ msgctxt "changeset.state"
 msgid "Closed"
 msgstr ""
 
-msgid "anonymous"
-msgstr ""
-
 msgid "ID"
 msgstr ""
 
@@ -6351,6 +6374,9 @@ msgstr ""
 msgid "Closed at"
 msgstr ""
 
+msgid "Discussions"
+msgstr ""
+
 msgid "Downloading changeset content"
 msgstr ""
 
@@ -6462,6 +6488,15 @@ msgid ""
 "layer"
 msgstr ""
 
+msgid "Update changeset discussion"
+msgstr ""
+
+msgid "Update the changeset discussion from the OSM server"
+msgstr ""
+
+msgid "Date"
+msgstr "תאריך"
+
 msgid "Download changesets"
 msgstr ""
 
@@ -6879,7 +6914,7 @@ msgstr "נא בחר ערך"
 msgid "Set number of recently added tags"
 msgstr ""
 
-msgid "Remember last used tags"
+msgid "Remember last used tags after a restart"
 msgstr ""
 
 msgid "Please enter the number of recently added tags to display"
@@ -7225,6 +7260,9 @@ msgstr ""
 msgid "Load parent relations"
 msgstr ""
 
+msgid "Reload"
+msgstr "טען מחדש"
+
 msgid "Loading parent relations"
 msgstr ""
 
@@ -7348,6 +7386,12 @@ msgstr "נתוני GPS גולמיים"
 msgid "Select to download GPS traces in the selected download area."
 msgstr ""
 
+msgid "Notes"
+msgstr ""
+
+msgid "Select to download notes in the selected download area."
+msgstr ""
+
 msgid "Download as new layer"
 msgstr "הורדה כשכבה חדשה"
 
@@ -7653,9 +7697,6 @@ msgstr ""
 msgid "B"
 msgstr ""
 
-msgid "Date"
-msgstr "תאריך"
-
 msgid ""
 "Failed to update primitive with id {0} because current edit layer is null"
 msgstr ""
@@ -8510,9 +8551,6 @@ msgstr ""
 msgid "Save Layer"
 msgstr "שמור שכבה"
 
-msgid "Notes"
-msgstr ""
-
 msgid "Notes layer"
 msgstr ""
 
@@ -8528,9 +8566,6 @@ msgstr "שכבת נתונים {0}"
 msgid "outside downloaded area"
 msgstr "מחוץ לשטח שהורד"
 
-msgid "version {0}"
-msgstr "גירסה {0}"
-
 msgid "Merging layers"
 msgstr ""
 
@@ -12170,6 +12205,15 @@ msgstr ""
 msgid "Open changeset expected. Got closed changeset with id {0}."
 msgstr ""
 
+msgid "Note upload failed"
+msgstr ""
+
+msgid "Error parsing note response from server"
+msgstr ""
+
+msgid "Error encoding string: {0}"
+msgstr ""
+
 msgid "(Code={0})"
 msgstr ""
 
@@ -12218,13 +12262,13 @@ msgstr ""
 msgid "Parsing changeset content ..."
 msgstr ""
 
-msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
-msgid "Illegal numeric value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
-msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal numeric value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
 msgid "Missing mandatory attribute ''{0}'' of XML element {1}."
@@ -13016,9 +13060,6 @@ msgstr ""
 msgid "Failed to scan file ''{0}'' for plugin information. Skipping."
 msgstr ""
 
-msgid "Processing plugin site cache icon files..."
-msgstr ""
-
 msgid "Processing plugin files..."
 msgstr ""
 
@@ -13037,12 +13078,6 @@ msgstr ""
 msgid "Details:"
 msgstr ""
 
-msgid "Plugin icons download error"
-msgstr ""
-
-msgid "JOSM failed to download plugin icons:"
-msgstr ""
-
 msgid ""
 "Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
 "plugin site ''{1}''."
@@ -13930,7 +13965,9 @@ msgid ""
 "Creating and handling address nodes and buildings within Czech Republic."
 msgstr ""
 
-msgid "Allows to import various file formats into JOSM directly."
+msgid ""
+"Allows to import various file formats into JOSM directly. Currently "
+"supported: TangoGPS, Garmin Trainings Center TCX."
 msgstr ""
 
 msgid "Download your GPX tracks from openstreetmap.org"
@@ -14027,6 +14064,11 @@ msgid "A helper for IRS satellite adjustment."
 msgstr ""
 
 msgid ""
+"Provides Java Native Access (JNA) library. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
+msgid ""
 "Provides Java Topology Suite (JTS) library and related utilities. Not meant "
 "to be installed directly by users, but rather as a dependency for other "
 "plugins."
@@ -14382,6 +14424,25 @@ msgstr ""
 msgid "Width (meters)"
 msgstr ""
 
+msgid "Sidewalk"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "both"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "left"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "right"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "no"
+msgstr ""
+
 msgid "Service type"
 msgstr ""
 
@@ -14746,15 +14807,19 @@ msgstr ""
 msgid "May-Sep 09:30-12:30,14:15-19:30"
 msgstr ""
 
+msgctxt "parking"
 msgid "multi-storey"
 msgstr ""
 
+msgctxt "parking"
 msgid "surface"
 msgstr ""
 
+msgctxt "parking"
 msgid "underground"
 msgstr ""
 
+msgctxt "parking"
 msgid "rooftop"
 msgstr ""
 
@@ -15212,15 +15277,26 @@ msgstr ""
 msgid "Overtaking"
 msgstr ""
 
+msgctxt "overtaking"
+msgid "yes"
+msgstr ""
+
+msgctxt "overtaking"
 msgid "both"
 msgstr ""
 
+msgctxt "overtaking"
 msgid "forward"
 msgstr ""
 
+msgctxt "overtaking"
 msgid "backward"
 msgstr ""
 
+msgctxt "overtaking"
+msgid "no"
+msgstr ""
+
 msgid "Roundabout"
 msgstr "כיכר"
 
@@ -15514,6 +15590,12 @@ msgstr ""
 msgid "tiger"
 msgstr ""
 
+msgid "Button operated"
+msgstr ""
+
+msgid "Sound signals"
+msgstr ""
+
 msgid "Crossing attendant"
 msgstr ""
 
@@ -16035,9 +16117,6 @@ msgstr ""
 msgid "Traffic lights"
 msgstr ""
 
-msgid "Sound signals"
-msgstr ""
-
 msgid "Barrier"
 msgstr ""
 
@@ -18097,6 +18176,9 @@ msgstr "טחנת רוח"
 msgid "Gasometer"
 msgstr ""
 
+msgid "Bunker Silo"
+msgstr ""
+
 msgid "Pipeline"
 msgstr "צינור"
 
@@ -18243,15 +18325,15 @@ msgstr ""
 msgid "Monitoring:"
 msgstr ""
 
-msgid "Weather"
-msgstr ""
-
 msgid "Water level"
 msgstr ""
 
 msgid "Tide Level"
 msgstr ""
 
+msgid "Groundwater"
+msgstr ""
+
 msgid "Traffic"
 msgstr ""
 
@@ -18270,6 +18352,9 @@ msgstr ""
 msgid "Galileo Signals"
 msgstr ""
 
+msgid "Weather"
+msgstr ""
+
 msgid "Radiation"
 msgstr ""
 
@@ -18450,6 +18535,9 @@ msgstr ""
 msgid "pivot_pier"
 msgstr ""
 
+msgid "Bridge outline"
+msgstr ""
+
 msgid "Power Plant"
 msgstr ""
 
@@ -19057,6 +19145,15 @@ msgstr ""
 msgid "Pole"
 msgstr ""
 
+msgid "Pole with Transformer"
+msgstr ""
+
+msgid "Pole Attributes:"
+msgstr ""
+
+msgid "Transformer Attributes:"
+msgstr ""
+
 msgid "Power Line"
 msgstr "קו מתח"
 
@@ -19106,9 +19203,15 @@ msgstr ""
 msgid "Power Cable"
 msgstr ""
 
+msgctxt "power cable"
+msgid "underground"
+msgstr ""
+
+msgctxt "power cable"
 msgid "underwater"
 msgstr ""
 
+msgctxt "power cable"
 msgid "overground"
 msgstr ""
 
@@ -19136,6 +19239,33 @@ msgstr "אנדרטה"
 msgid "Memorial"
 msgstr "מצבת זיכרון"
 
+msgctxt "memorial"
+msgid "statue"
+msgstr ""
+
+msgctxt "memorial"
+msgid "bust"
+msgstr ""
+
+msgctxt "memorial"
+msgid "plaque"
+msgstr ""
+
+msgctxt "memorial"
+msgid "stele"
+msgstr ""
+
+msgctxt "memorial"
+msgid "stone"
+msgstr ""
+
+msgctxt "memorial"
+msgid "war_memorial"
+msgstr ""
+
+msgid "Inscription"
+msgstr ""
+
 msgid "Wayside Cross"
 msgstr ""
 
@@ -19205,6 +19335,9 @@ msgstr ""
 msgid "Beverages"
 msgstr ""
 
+msgid "Wine"
+msgstr ""
+
 msgid "Boutique"
 msgstr ""
 
@@ -19250,6 +19383,9 @@ msgstr ""
 msgid "Video Games"
 msgstr ""
 
+msgid "Music"
+msgstr ""
+
 msgid "Cash"
 msgstr "מזומן"
 
@@ -19277,6 +19413,9 @@ msgstr ""
 msgid "Curtain"
 msgstr ""
 
+msgid "Art"
+msgstr ""
+
 msgid "Frame"
 msgstr ""
 
@@ -19322,6 +19461,9 @@ msgstr ""
 msgid "Beauty"
 msgstr ""
 
+msgid "Tattoo"
+msgstr ""
+
 msgid "Optician"
 msgstr ""
 
@@ -19373,6 +19515,9 @@ msgstr ""
 msgid "Pet"
 msgstr ""
 
+msgid "Funeral Directors"
+msgstr ""
+
 msgid "Vending Machine"
 msgstr ""
 
@@ -19472,6 +19617,15 @@ msgstr ""
 msgid "National Park"
 msgstr ""
 
+msgid "Protected Area"
+msgstr ""
+
+msgid "Protected Class"
+msgstr ""
+
+msgid "Title or type of protection"
+msgstr ""
+
 msgid "Places"
 msgstr "מקומות"
 
@@ -20548,7 +20702,13 @@ msgstr ""
 msgid "Estonia Ortho (Maaamet)"
 msgstr ""
 
-msgid "Estonia Multi (Maaamet)"
+msgid "Estonia Hillshade (Maaamet)"
+msgstr ""
+
+msgid "Estonia Cadastre (Maaamet)"
+msgstr ""
+
+msgid "Estonia Forestry (Maaamet)"
 msgstr ""
 
 msgid "Bordeaux - 2012"
@@ -20572,7 +20732,7 @@ msgstr ""
 msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
 msgstr ""
 
-msgid "CUGN Nancy - Orthophoto 2012"
+msgid "GrandNancy Orthophotographie 2012"
 msgstr ""
 
 msgid "Géobretagne - Brest 2010 - 10 cm"
@@ -20619,9 +20779,6 @@ msgid ""
 "- 1 m"
 msgstr ""
 
-msgid "Streets NRW Geofabrik.de"
-msgstr ""
-
 msgid "Hike & Bike"
 msgstr ""
 
@@ -20681,6 +20838,9 @@ msgstr ""
 msgid "NRW-Atlas: Topographische Karte 1:10000"
 msgstr ""
 
+msgid "Metropole Ruhr: Luftbilder (10 cm)"
+msgstr ""
+
 msgid "Drone Imagery (Haiti)"
 msgstr ""
 
@@ -20882,6 +21042,9 @@ msgstr ""
 msgid "Stadt Zürich Übersichtsplan (Strassen, Gebäude, Hausnummer)"
 msgstr ""
 
+msgid "Stadt Zürich Luftbild 2011"
+msgstr ""
+
 msgid "Orthofoto Kanton Solothurn RGB (SOGIS 2011/2012/2013)"
 msgstr ""
 
@@ -20900,7 +21063,7 @@ msgstr ""
 msgid "Canton de Fribourg 50cm (2005)"
 msgstr ""
 
-msgid "Stadt Bern 10cm/25cm (2008)"
+msgid "Stadt Bern 10cm/25cm (2012)"
 msgstr ""
 
 msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
@@ -20939,7 +21102,7 @@ msgstr ""
 msgid "OSM US TIGER 2012 Roads Overlay"
 msgstr ""
 
-msgid "New & Misaligned TIGER Roads (TIGER 2013)"
+msgid "New & Misaligned TIGER Roads (TIGER 2014)"
 msgstr ""
 
 msgid "MassGIS L3 Parcels"
@@ -20987,9 +21150,234 @@ msgstr ""
 msgid "NLS - Bartholomew Half Inch, 1897-1907"
 msgstr ""
 
+msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Annan 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgstr ""
+
 msgid "OS Town Plans, Cupar 1854 (NLS)"
 msgstr ""
 
+msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Elgin 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Forres 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Galashiels 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Girvan 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Greenock 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Haddington 1853 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Haddington 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Hamilton 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Irvine 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Jedburgh 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kelso 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Lanark 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Linlithgow 1856 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Musselburgh 1853 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Musselburgh 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Oban 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Peebles 1856 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Perth 1860 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Peterhead 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Selkirk 1865 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, St Andrews 1854 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, St Andrews 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stirling 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stonehaven 1864 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1847 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Strathaven 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wick 1872 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wigtown 1848 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wigtown 1894 (NLS)"
+msgstr ""
+
 msgid "Decreasing house numbers in addresses interpolation"
 msgstr ""
 
@@ -21043,17 +21431,37 @@ msgid "{0}={1} is deprecated. Please use instead a multipolygon."
 msgstr ""
 
 msgid ""
-"{0} is deprecated. Please specify ìnterval by using opening_hours syntax"
+"{0} is deprecated. Please specify interval by using opening_hours syntax"
 msgstr ""
 
 msgid ""
 "{0} is deprecated. Please delete this object and use a private layer instead"
 msgstr ""
 
-msgid "{0} on a node"
+msgid "{0}={1} is unspecific. Please replace ''{1}'' by a specific value."
 msgstr ""
 
-msgid "{0} on a node. Should be drawn as an area"
+msgid "{0} should be replaced with {1}"
+msgstr ""
+
+msgid ""
+"{0}={1} is unspecific. Please replace ''{1}'' by ''left'', ''right'' or "
+"''both''."
+msgstr ""
+
+msgid "{0} on a node. Should be used on a way."
+msgstr ""
+
+msgid "{0} on a node. Should be drawn as an area."
+msgstr ""
+
+msgid "{0}=* on a node. Should be used in a relation"
+msgstr ""
+
+msgid "{0} on a way. Should be used in a relation"
+msgstr ""
+
+msgid "{0} on a node"
 msgstr ""
 
 msgid "Building inside building"
@@ -25727,6 +26135,9 @@ msgstr ""
 msgid "Find"
 msgstr ""
 
+msgid "Show"
+msgstr ""
+
 msgid "Mark"
 msgstr ""
 
diff --git a/i18n/po/hi.po b/i18n/po/hi.po
index 8818294..9f7e0a9 100644
--- a/i18n/po/hi.po
+++ b/i18n/po/hi.po
@@ -1,8 +1,13 @@
+# Hindi translation for josm
+# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
+# This file is distributed under the same license as the josm package.
+# FIRST AUTHOR <EMAIL at ADDRESS>, 2009.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-21 03:38+0200\n"
+"POT-Creation-Date: 2014-12-10 03:42+0100\n"
 "PO-Revision-Date: 2009-11-14 16:28+0000\n"
 "Last-Translator: nipunreddevil <nipunreddevil at gmail.com>\n"
 "Language-Team: Hindi <hi at li.org>\n"
@@ -10,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-10-21 04:56+0000\n"
-"X-Generator: Launchpad (build 17203)\n"
+"X-Launchpad-Export-Date: 2014-12-10 04:51+0000\n"
+"X-Generator: Launchpad (build 17283)\n"
 "Language: hi\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -168,16 +173,6 @@ msgid "About JOSM..."
 msgstr ""
 
 msgid ""
-"Unexpected format of API base URL. Redirection to info or history page for "
-"OSM object will probably fail. API base URL is: ''{0}''"
-msgstr ""
-
-msgid ""
-"Unexpected format of API base URL. Redirection to user page for OSM user "
-"will probably fail. API base URL is: ''{0}''"
-msgstr ""
-
-msgid ""
 "You are about to launch {0} browser window.<br>This may both clutter your "
 "screen with browser windows<br>and take some time to finish."
 msgid_plural ""
@@ -1519,6 +1514,15 @@ msgstr ""
 msgid "Nothing to upload. Get some data first."
 msgstr ""
 
+msgid "Upload note changes to server"
+msgstr ""
+
+msgid "Upload notes"
+msgstr ""
+
+msgid "Uploading notes to server"
+msgstr ""
+
 msgid "Upload selection"
 msgstr ""
 
@@ -1791,10 +1795,16 @@ msgstr ""
 msgid "Click the location where you wish to create a new note"
 msgstr ""
 
-msgid "Enter a comment for a new note"
+msgid "Create new note"
 msgstr ""
 
-msgid "Create new note"
+msgid "Create note"
+msgstr ""
+
+msgid "Enter a detailed comment to create a note"
+msgstr ""
+
+msgid "You must enter a comment to create a new note"
 msgstr ""
 
 msgid "Delete Mode"
@@ -2665,6 +2675,15 @@ msgstr ""
 msgid "Cycling dependencies"
 msgstr ""
 
+msgid "Uploading modified notes"
+msgstr ""
+
+msgid "Note {0} failed: {1}"
+msgstr ""
+
+msgid "Notes failed to upload"
+msgstr ""
+
 msgid ""
 "The following are results of automatic validation. Try fixing these, but be "
 "careful (don''t destroy valid data). When in doubt ignore them.<br>When you "
@@ -4894,6 +4913,12 @@ msgstr ""
 msgid "Conflict foreground: keep all tags"
 msgstr ""
 
+msgid "Conflict background: sum all numeric tags"
+msgstr ""
+
+msgid "Conflict foreground: sum all numeric tags"
+msgstr ""
+
 msgid "Conflict background: keep member"
 msgstr ""
 
@@ -5312,12 +5337,19 @@ msgstr ""
 msgid "all"
 msgstr ""
 
+msgid "sum"
+msgstr ""
+
 msgid "Please decide which values to keep"
 msgstr ""
 
 msgid "Value ''{0}'' is going to be applied for key ''{1}''"
 msgstr ""
 
+msgid ""
+"All numeric values sumed as ''{0}'' are going to be applied for key ''{1}''"
+msgstr ""
+
 msgid "The key ''{0}'' and all its values are going to be removed"
 msgstr ""
 
@@ -5680,24 +5712,6 @@ msgstr[1] ""
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
 
-msgid "Display the history of all selected items."
-msgstr ""
-
-msgid "Object with history"
-msgstr ""
-
-msgid "Reload"
-msgstr ""
-
-msgid "Reload all currently selected objects and refresh the list."
-msgstr ""
-
-msgid "Show"
-msgstr ""
-
-msgid "Display the history of the selected objects."
-msgstr ""
-
 msgid "Advanced object info"
 msgstr ""
 
@@ -6035,6 +6049,9 @@ msgstr ""
 msgid "Comment"
 msgstr ""
 
+msgid "Comment on note"
+msgstr ""
+
 msgid "Add comment to note:"
 msgstr ""
 
@@ -6044,9 +6061,6 @@ msgstr ""
 msgid "Close note with message:"
 msgstr ""
 
-msgid "Close Note"
-msgstr ""
-
 msgid "Create a new note"
 msgstr ""
 
@@ -6119,6 +6133,9 @@ msgstr ""
 msgid "Search for objects"
 msgstr ""
 
+msgid "Display the history of the selected objects."
+msgstr ""
+
 msgid "Zoom to selection"
 msgstr ""
 
@@ -6238,6 +6255,9 @@ msgstr ""
 msgid "Updating map ..."
 msgstr ""
 
+msgid "anonymous"
+msgstr ""
+
 msgid "Display the basic properties of the changeset"
 msgstr ""
 
@@ -6250,6 +6270,12 @@ msgstr ""
 msgid "Display the objects created, updated, and deleted by the changeset"
 msgstr ""
 
+msgid "Discussion"
+msgstr ""
+
+msgid "Display the public discussion around this changeset"
+msgstr ""
+
 msgid "Changeset Management Dialog"
 msgstr ""
 
@@ -6307,9 +6333,6 @@ msgctxt "changeset.state"
 msgid "Closed"
 msgstr ""
 
-msgid "anonymous"
-msgstr ""
-
 msgid "ID"
 msgstr ""
 
@@ -6325,6 +6348,9 @@ msgstr ""
 msgid "Closed at"
 msgstr ""
 
+msgid "Discussions"
+msgstr ""
+
 msgid "Downloading changeset content"
 msgstr ""
 
@@ -6436,6 +6462,15 @@ msgid ""
 "layer"
 msgstr ""
 
+msgid "Update changeset discussion"
+msgstr ""
+
+msgid "Update the changeset discussion from the OSM server"
+msgstr ""
+
+msgid "Date"
+msgstr ""
+
 msgid "Download changesets"
 msgstr ""
 
@@ -6853,7 +6888,7 @@ msgstr ""
 msgid "Set number of recently added tags"
 msgstr ""
 
-msgid "Remember last used tags"
+msgid "Remember last used tags after a restart"
 msgstr ""
 
 msgid "Please enter the number of recently added tags to display"
@@ -7199,6 +7234,9 @@ msgstr ""
 msgid "Load parent relations"
 msgstr ""
 
+msgid "Reload"
+msgstr ""
+
 msgid "Loading parent relations"
 msgstr ""
 
@@ -7321,6 +7359,12 @@ msgstr ""
 msgid "Select to download GPS traces in the selected download area."
 msgstr ""
 
+msgid "Notes"
+msgstr ""
+
+msgid "Select to download notes in the selected download area."
+msgstr ""
+
 msgid "Download as new layer"
 msgstr ""
 
@@ -7626,9 +7670,6 @@ msgstr ""
 msgid "B"
 msgstr ""
 
-msgid "Date"
-msgstr ""
-
 msgid ""
 "Failed to update primitive with id {0} because current edit layer is null"
 msgstr ""
@@ -8483,9 +8524,6 @@ msgstr ""
 msgid "Save Layer"
 msgstr ""
 
-msgid "Notes"
-msgstr ""
-
 msgid "Notes layer"
 msgstr ""
 
@@ -8501,9 +8539,6 @@ msgstr ""
 msgid "outside downloaded area"
 msgstr ""
 
-msgid "version {0}"
-msgstr ""
-
 msgid "Merging layers"
 msgstr ""
 
@@ -12129,6 +12164,15 @@ msgstr ""
 msgid "Open changeset expected. Got closed changeset with id {0}."
 msgstr ""
 
+msgid "Note upload failed"
+msgstr ""
+
+msgid "Error parsing note response from server"
+msgstr ""
+
+msgid "Error encoding string: {0}"
+msgstr ""
+
 msgid "(Code={0})"
 msgstr ""
 
@@ -12177,13 +12221,13 @@ msgstr ""
 msgid "Parsing changeset content ..."
 msgstr ""
 
-msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
-msgid "Illegal numeric value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
-msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal numeric value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
 msgid "Missing mandatory attribute ''{0}'' of XML element {1}."
@@ -12975,9 +13019,6 @@ msgstr ""
 msgid "Failed to scan file ''{0}'' for plugin information. Skipping."
 msgstr ""
 
-msgid "Processing plugin site cache icon files..."
-msgstr ""
-
 msgid "Processing plugin files..."
 msgstr ""
 
@@ -12996,12 +13037,6 @@ msgstr ""
 msgid "Details:"
 msgstr ""
 
-msgid "Plugin icons download error"
-msgstr ""
-
-msgid "JOSM failed to download plugin icons:"
-msgstr ""
-
 msgid ""
 "Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
 "plugin site ''{1}''."
@@ -13887,7 +13922,9 @@ msgid ""
 "Creating and handling address nodes and buildings within Czech Republic."
 msgstr ""
 
-msgid "Allows to import various file formats into JOSM directly."
+msgid ""
+"Allows to import various file formats into JOSM directly. Currently "
+"supported: TangoGPS, Garmin Trainings Center TCX."
 msgstr ""
 
 msgid "Download your GPX tracks from openstreetmap.org"
@@ -13984,6 +14021,11 @@ msgid "A helper for IRS satellite adjustment."
 msgstr ""
 
 msgid ""
+"Provides Java Native Access (JNA) library. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
+msgid ""
 "Provides Java Topology Suite (JTS) library and related utilities. Not meant "
 "to be installed directly by users, but rather as a dependency for other "
 "plugins."
@@ -14339,6 +14381,25 @@ msgstr ""
 msgid "Width (meters)"
 msgstr ""
 
+msgid "Sidewalk"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "both"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "left"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "right"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "no"
+msgstr ""
+
 msgid "Service type"
 msgstr ""
 
@@ -14703,15 +14764,19 @@ msgstr ""
 msgid "May-Sep 09:30-12:30,14:15-19:30"
 msgstr ""
 
+msgctxt "parking"
 msgid "multi-storey"
 msgstr ""
 
+msgctxt "parking"
 msgid "surface"
 msgstr ""
 
+msgctxt "parking"
 msgid "underground"
 msgstr ""
 
+msgctxt "parking"
 msgid "rooftop"
 msgstr ""
 
@@ -15169,15 +15234,26 @@ msgstr ""
 msgid "Overtaking"
 msgstr ""
 
+msgctxt "overtaking"
+msgid "yes"
+msgstr ""
+
+msgctxt "overtaking"
 msgid "both"
 msgstr ""
 
+msgctxt "overtaking"
 msgid "forward"
 msgstr ""
 
+msgctxt "overtaking"
 msgid "backward"
 msgstr ""
 
+msgctxt "overtaking"
+msgid "no"
+msgstr ""
+
 msgid "Roundabout"
 msgstr ""
 
@@ -15471,6 +15547,12 @@ msgstr ""
 msgid "tiger"
 msgstr ""
 
+msgid "Button operated"
+msgstr ""
+
+msgid "Sound signals"
+msgstr ""
+
 msgid "Crossing attendant"
 msgstr ""
 
@@ -15992,9 +16074,6 @@ msgstr ""
 msgid "Traffic lights"
 msgstr ""
 
-msgid "Sound signals"
-msgstr ""
-
 msgid "Barrier"
 msgstr ""
 
@@ -18054,6 +18133,9 @@ msgstr ""
 msgid "Gasometer"
 msgstr ""
 
+msgid "Bunker Silo"
+msgstr ""
+
 msgid "Pipeline"
 msgstr ""
 
@@ -18200,15 +18282,15 @@ msgstr ""
 msgid "Monitoring:"
 msgstr ""
 
-msgid "Weather"
-msgstr ""
-
 msgid "Water level"
 msgstr ""
 
 msgid "Tide Level"
 msgstr ""
 
+msgid "Groundwater"
+msgstr ""
+
 msgid "Traffic"
 msgstr ""
 
@@ -18227,6 +18309,9 @@ msgstr ""
 msgid "Galileo Signals"
 msgstr ""
 
+msgid "Weather"
+msgstr ""
+
 msgid "Radiation"
 msgstr ""
 
@@ -18407,6 +18492,9 @@ msgstr ""
 msgid "pivot_pier"
 msgstr ""
 
+msgid "Bridge outline"
+msgstr ""
+
 msgid "Power Plant"
 msgstr ""
 
@@ -19014,6 +19102,15 @@ msgstr ""
 msgid "Pole"
 msgstr ""
 
+msgid "Pole with Transformer"
+msgstr ""
+
+msgid "Pole Attributes:"
+msgstr ""
+
+msgid "Transformer Attributes:"
+msgstr ""
+
 msgid "Power Line"
 msgstr ""
 
@@ -19063,9 +19160,15 @@ msgstr ""
 msgid "Power Cable"
 msgstr ""
 
+msgctxt "power cable"
+msgid "underground"
+msgstr ""
+
+msgctxt "power cable"
 msgid "underwater"
 msgstr ""
 
+msgctxt "power cable"
 msgid "overground"
 msgstr ""
 
@@ -19093,6 +19196,33 @@ msgstr ""
 msgid "Memorial"
 msgstr ""
 
+msgctxt "memorial"
+msgid "statue"
+msgstr ""
+
+msgctxt "memorial"
+msgid "bust"
+msgstr ""
+
+msgctxt "memorial"
+msgid "plaque"
+msgstr ""
+
+msgctxt "memorial"
+msgid "stele"
+msgstr ""
+
+msgctxt "memorial"
+msgid "stone"
+msgstr ""
+
+msgctxt "memorial"
+msgid "war_memorial"
+msgstr ""
+
+msgid "Inscription"
+msgstr ""
+
 msgid "Wayside Cross"
 msgstr ""
 
@@ -19162,6 +19292,9 @@ msgstr ""
 msgid "Beverages"
 msgstr ""
 
+msgid "Wine"
+msgstr ""
+
 msgid "Boutique"
 msgstr ""
 
@@ -19207,6 +19340,9 @@ msgstr ""
 msgid "Video Games"
 msgstr ""
 
+msgid "Music"
+msgstr ""
+
 msgid "Cash"
 msgstr ""
 
@@ -19234,6 +19370,9 @@ msgstr ""
 msgid "Curtain"
 msgstr ""
 
+msgid "Art"
+msgstr ""
+
 msgid "Frame"
 msgstr ""
 
@@ -19279,6 +19418,9 @@ msgstr ""
 msgid "Beauty"
 msgstr ""
 
+msgid "Tattoo"
+msgstr ""
+
 msgid "Optician"
 msgstr ""
 
@@ -19330,6 +19472,9 @@ msgstr ""
 msgid "Pet"
 msgstr ""
 
+msgid "Funeral Directors"
+msgstr ""
+
 msgid "Vending Machine"
 msgstr ""
 
@@ -19429,6 +19574,15 @@ msgstr ""
 msgid "National Park"
 msgstr ""
 
+msgid "Protected Area"
+msgstr ""
+
+msgid "Protected Class"
+msgstr ""
+
+msgid "Title or type of protection"
+msgstr ""
+
 msgid "Places"
 msgstr ""
 
@@ -20505,7 +20659,13 @@ msgstr ""
 msgid "Estonia Ortho (Maaamet)"
 msgstr ""
 
-msgid "Estonia Multi (Maaamet)"
+msgid "Estonia Hillshade (Maaamet)"
+msgstr ""
+
+msgid "Estonia Cadastre (Maaamet)"
+msgstr ""
+
+msgid "Estonia Forestry (Maaamet)"
 msgstr ""
 
 msgid "Bordeaux - 2012"
@@ -20529,7 +20689,7 @@ msgstr ""
 msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
 msgstr ""
 
-msgid "CUGN Nancy - Orthophoto 2012"
+msgid "GrandNancy Orthophotographie 2012"
 msgstr ""
 
 msgid "Géobretagne - Brest 2010 - 10 cm"
@@ -20576,9 +20736,6 @@ msgid ""
 "- 1 m"
 msgstr ""
 
-msgid "Streets NRW Geofabrik.de"
-msgstr ""
-
 msgid "Hike & Bike"
 msgstr ""
 
@@ -20638,6 +20795,9 @@ msgstr ""
 msgid "NRW-Atlas: Topographische Karte 1:10000"
 msgstr ""
 
+msgid "Metropole Ruhr: Luftbilder (10 cm)"
+msgstr ""
+
 msgid "Drone Imagery (Haiti)"
 msgstr ""
 
@@ -20839,6 +20999,9 @@ msgstr ""
 msgid "Stadt Zürich Übersichtsplan (Strassen, Gebäude, Hausnummer)"
 msgstr ""
 
+msgid "Stadt Zürich Luftbild 2011"
+msgstr ""
+
 msgid "Orthofoto Kanton Solothurn RGB (SOGIS 2011/2012/2013)"
 msgstr ""
 
@@ -20857,7 +21020,7 @@ msgstr ""
 msgid "Canton de Fribourg 50cm (2005)"
 msgstr ""
 
-msgid "Stadt Bern 10cm/25cm (2008)"
+msgid "Stadt Bern 10cm/25cm (2012)"
 msgstr ""
 
 msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
@@ -20896,7 +21059,7 @@ msgstr ""
 msgid "OSM US TIGER 2012 Roads Overlay"
 msgstr ""
 
-msgid "New & Misaligned TIGER Roads (TIGER 2013)"
+msgid "New & Misaligned TIGER Roads (TIGER 2014)"
 msgstr ""
 
 msgid "MassGIS L3 Parcels"
@@ -20944,9 +21107,234 @@ msgstr ""
 msgid "NLS - Bartholomew Half Inch, 1897-1907"
 msgstr ""
 
+msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Annan 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgstr ""
+
 msgid "OS Town Plans, Cupar 1854 (NLS)"
 msgstr ""
 
+msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Elgin 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Forres 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Galashiels 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Girvan 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Greenock 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Haddington 1853 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Haddington 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Hamilton 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Irvine 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Jedburgh 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kelso 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Lanark 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Linlithgow 1856 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Musselburgh 1853 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Musselburgh 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Oban 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Peebles 1856 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Perth 1860 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Peterhead 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Selkirk 1865 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, St Andrews 1854 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, St Andrews 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stirling 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stonehaven 1864 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1847 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Strathaven 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wick 1872 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wigtown 1848 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wigtown 1894 (NLS)"
+msgstr ""
+
 msgid "Decreasing house numbers in addresses interpolation"
 msgstr ""
 
@@ -21000,17 +21388,37 @@ msgid "{0}={1} is deprecated. Please use instead a multipolygon."
 msgstr ""
 
 msgid ""
-"{0} is deprecated. Please specify ìnterval by using opening_hours syntax"
+"{0} is deprecated. Please specify interval by using opening_hours syntax"
 msgstr ""
 
 msgid ""
 "{0} is deprecated. Please delete this object and use a private layer instead"
 msgstr ""
 
-msgid "{0} on a node"
+msgid "{0}={1} is unspecific. Please replace ''{1}'' by a specific value."
 msgstr ""
 
-msgid "{0} on a node. Should be drawn as an area"
+msgid "{0} should be replaced with {1}"
+msgstr ""
+
+msgid ""
+"{0}={1} is unspecific. Please replace ''{1}'' by ''left'', ''right'' or "
+"''both''."
+msgstr ""
+
+msgid "{0} on a node. Should be used on a way."
+msgstr ""
+
+msgid "{0} on a node. Should be drawn as an area."
+msgstr ""
+
+msgid "{0}=* on a node. Should be used in a relation"
+msgstr ""
+
+msgid "{0} on a way. Should be used in a relation"
+msgstr ""
+
+msgid "{0} on a node"
 msgstr ""
 
 msgid "Building inside building"
@@ -25680,6 +26088,9 @@ msgstr ""
 msgid "Find"
 msgstr ""
 
+msgid "Show"
+msgstr ""
+
 msgid "Mark"
 msgstr ""
 
diff --git a/i18n/po/hr.po b/i18n/po/hr.po
index 251ed58..2a23ecc 100644
--- a/i18n/po/hr.po
+++ b/i18n/po/hr.po
@@ -1,8 +1,13 @@
+# Croatian translation for josm
+# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
+# This file is distributed under the same license as the josm package.
+# FIRST AUTHOR <EMAIL at ADDRESS>, 2009.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-21 03:38+0200\n"
+"POT-Creation-Date: 2014-12-10 03:42+0100\n"
 "PO-Revision-Date: 2013-03-05 18:14+0000\n"
 "Last-Translator: gogo <trebelnik2 at gmail.com>\n"
 "Language-Team: Croatian <hr at li.org>\n"
@@ -11,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-10-21 05:20+0000\n"
-"X-Generator: Launchpad (build 17203)\n"
+"X-Launchpad-Export-Date: 2014-12-10 05:10+0000\n"
+"X-Generator: Launchpad (build 17283)\n"
 "Language: hr\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -170,16 +175,6 @@ msgid "About JOSM..."
 msgstr "O JOSM-u..."
 
 msgid ""
-"Unexpected format of API base URL. Redirection to info or history page for "
-"OSM object will probably fail. API base URL is: ''{0}''"
-msgstr ""
-
-msgid ""
-"Unexpected format of API base URL. Redirection to user page for OSM user "
-"will probably fail. API base URL is: ''{0}''"
-msgstr ""
-
-msgid ""
 "You are about to launch {0} browser window.<br>This may both clutter your "
 "screen with browser windows<br>and take some time to finish."
 msgid_plural ""
@@ -1601,6 +1596,15 @@ msgstr "Nema promjena za upload."
 msgid "Nothing to upload. Get some data first."
 msgstr "Ništa za upload. Napravite neke podatke."
 
+msgid "Upload note changes to server"
+msgstr ""
+
+msgid "Upload notes"
+msgstr ""
+
+msgid "Uploading notes to server"
+msgstr ""
+
 msgid "Upload selection"
 msgstr "Uploadajte odabir"
 
@@ -1877,10 +1881,16 @@ msgstr ""
 msgid "Click the location where you wish to create a new note"
 msgstr ""
 
-msgid "Enter a comment for a new note"
+msgid "Create new note"
 msgstr ""
 
-msgid "Create new note"
+msgid "Create note"
+msgstr ""
+
+msgid "Enter a detailed comment to create a note"
+msgstr ""
+
+msgid "You must enter a comment to create a new note"
 msgstr ""
 
 msgid "Delete Mode"
@@ -2766,6 +2776,15 @@ msgstr ""
 msgid "Cycling dependencies"
 msgstr "Cikličke zavisnosti"
 
+msgid "Uploading modified notes"
+msgstr ""
+
+msgid "Note {0} failed: {1}"
+msgstr ""
+
+msgid "Notes failed to upload"
+msgstr ""
+
 msgid ""
 "The following are results of automatic validation. Try fixing these, but be "
 "careful (don''t destroy valid data). When in doubt ignore them.<br>When you "
@@ -5015,6 +5034,12 @@ msgstr ""
 msgid "Conflict foreground: keep all tags"
 msgstr ""
 
+msgid "Conflict background: sum all numeric tags"
+msgstr ""
+
+msgid "Conflict foreground: sum all numeric tags"
+msgstr ""
+
 msgid "Conflict background: keep member"
 msgstr ""
 
@@ -5433,12 +5458,19 @@ msgstr "ništa"
 msgid "all"
 msgstr "sve"
 
+msgid "sum"
+msgstr ""
+
 msgid "Please decide which values to keep"
 msgstr ""
 
 msgid "Value ''{0}'' is going to be applied for key ''{1}''"
 msgstr ""
 
+msgid ""
+"All numeric values sumed as ''{0}'' are going to be applied for key ''{1}''"
+msgstr ""
+
 msgid "The key ''{0}'' and all its values are going to be removed"
 msgstr ""
 
@@ -5804,24 +5836,6 @@ msgstr[1] ""
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
 
-msgid "Display the history of all selected items."
-msgstr "Prikaži povijest svih označenih stvari."
-
-msgid "Object with history"
-msgstr "Objekt sa poviješću"
-
-msgid "Reload"
-msgstr "Ponovno učitati"
-
-msgid "Reload all currently selected objects and refresh the list."
-msgstr "Ponovno učitaj sve trenutno označene objekte i osviježi popis."
-
-msgid "Show"
-msgstr "Pokaži"
-
-msgid "Display the history of the selected objects."
-msgstr "Prikaži povijest označenog objekta."
-
 msgid "Advanced object info"
 msgstr "Napredne informacije o objektu"
 
@@ -6160,6 +6174,9 @@ msgstr ""
 msgid "Comment"
 msgstr "Komentar"
 
+msgid "Comment on note"
+msgstr ""
+
 msgid "Add comment to note:"
 msgstr ""
 
@@ -6169,9 +6186,6 @@ msgstr ""
 msgid "Close note with message:"
 msgstr ""
 
-msgid "Close Note"
-msgstr ""
-
 msgid "Create a new note"
 msgstr ""
 
@@ -6244,6 +6258,9 @@ msgstr "Trenutni odabir"
 msgid "Search for objects"
 msgstr "Pretraži objekte"
 
+msgid "Display the history of the selected objects."
+msgstr "Prikaži povijest označenog objekta."
+
 msgid "Zoom to selection"
 msgstr "Zumiraj na selekciju"
 
@@ -6364,6 +6381,9 @@ msgstr ""
 msgid "Updating map ..."
 msgstr ""
 
+msgid "anonymous"
+msgstr "anoniman"
+
 msgid "Display the basic properties of the changeset"
 msgstr ""
 
@@ -6376,6 +6396,12 @@ msgstr ""
 msgid "Display the objects created, updated, and deleted by the changeset"
 msgstr ""
 
+msgid "Discussion"
+msgstr ""
+
+msgid "Display the public discussion around this changeset"
+msgstr ""
+
 msgid "Changeset Management Dialog"
 msgstr ""
 
@@ -6433,9 +6459,6 @@ msgctxt "changeset.state"
 msgid "Closed"
 msgstr ""
 
-msgid "anonymous"
-msgstr "anoniman"
-
 msgid "ID"
 msgstr "ID"
 
@@ -6451,6 +6474,9 @@ msgstr ""
 msgid "Closed at"
 msgstr ""
 
+msgid "Discussions"
+msgstr ""
+
 msgid "Downloading changeset content"
 msgstr ""
 
@@ -6562,6 +6588,15 @@ msgid ""
 "layer"
 msgstr ""
 
+msgid "Update changeset discussion"
+msgstr ""
+
+msgid "Update the changeset discussion from the OSM server"
+msgstr ""
+
+msgid "Date"
+msgstr "Datum"
+
 msgid "Download changesets"
 msgstr ""
 
@@ -6980,7 +7015,7 @@ msgstr "Molim, označite vrijednost"
 msgid "Set number of recently added tags"
 msgstr ""
 
-msgid "Remember last used tags"
+msgid "Remember last used tags after a restart"
 msgstr ""
 
 msgid "Please enter the number of recently added tags to display"
@@ -7328,6 +7363,9 @@ msgstr ""
 msgid "Load parent relations"
 msgstr ""
 
+msgid "Reload"
+msgstr "Ponovno učitati"
+
 msgid "Loading parent relations"
 msgstr ""
 
@@ -7450,6 +7488,12 @@ msgstr "Raw GPS podaci"
 msgid "Select to download GPS traces in the selected download area."
 msgstr ""
 
+msgid "Notes"
+msgstr ""
+
+msgid "Select to download notes in the selected download area."
+msgstr ""
+
 msgid "Download as new layer"
 msgstr "Preuzmi kao novi sloj"
 
@@ -7755,9 +7799,6 @@ msgstr "A"
 msgid "B"
 msgstr "B"
 
-msgid "Date"
-msgstr "Datum"
-
 msgid ""
 "Failed to update primitive with id {0} because current edit layer is null"
 msgstr ""
@@ -8636,9 +8677,6 @@ msgstr ""
 msgid "Save Layer"
 msgstr "Snimi sloj"
 
-msgid "Notes"
-msgstr ""
-
 msgid "Notes layer"
 msgstr ""
 
@@ -8654,9 +8692,6 @@ msgstr ""
 msgid "outside downloaded area"
 msgstr ""
 
-msgid "version {0}"
-msgstr "verzija {0}"
-
 msgid "Merging layers"
 msgstr "Spajam slojeve"
 
@@ -12286,6 +12321,15 @@ msgstr ""
 msgid "Open changeset expected. Got closed changeset with id {0}."
 msgstr ""
 
+msgid "Note upload failed"
+msgstr ""
+
+msgid "Error parsing note response from server"
+msgstr ""
+
+msgid "Error encoding string: {0}"
+msgstr ""
+
 msgid "(Code={0})"
 msgstr ""
 
@@ -12334,13 +12378,13 @@ msgstr ""
 msgid "Parsing changeset content ..."
 msgstr ""
 
-msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
-msgid "Illegal numeric value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
-msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal numeric value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
 msgid "Missing mandatory attribute ''{0}'' of XML element {1}."
@@ -13132,9 +13176,6 @@ msgstr ""
 msgid "Failed to scan file ''{0}'' for plugin information. Skipping."
 msgstr ""
 
-msgid "Processing plugin site cache icon files..."
-msgstr ""
-
 msgid "Processing plugin files..."
 msgstr ""
 
@@ -13153,12 +13194,6 @@ msgstr ""
 msgid "Details:"
 msgstr ""
 
-msgid "Plugin icons download error"
-msgstr ""
-
-msgid "JOSM failed to download plugin icons:"
-msgstr ""
-
 msgid ""
 "Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
 "plugin site ''{1}''."
@@ -14044,7 +14079,9 @@ msgid ""
 "Creating and handling address nodes and buildings within Czech Republic."
 msgstr ""
 
-msgid "Allows to import various file formats into JOSM directly."
+msgid ""
+"Allows to import various file formats into JOSM directly. Currently "
+"supported: TangoGPS, Garmin Trainings Center TCX."
 msgstr ""
 
 msgid "Download your GPX tracks from openstreetmap.org"
@@ -14141,6 +14178,11 @@ msgid "A helper for IRS satellite adjustment."
 msgstr ""
 
 msgid ""
+"Provides Java Native Access (JNA) library. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
+msgid ""
 "Provides Java Topology Suite (JTS) library and related utilities. Not meant "
 "to be installed directly by users, but rather as a dependency for other "
 "plugins."
@@ -14496,6 +14538,25 @@ msgstr "Rasvjeta"
 msgid "Width (meters)"
 msgstr "Širina (u metrima)"
 
+msgid "Sidewalk"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "both"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "left"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "right"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "no"
+msgstr ""
+
 msgid "Service type"
 msgstr ""
 
@@ -14860,15 +14921,19 @@ msgstr ""
 msgid "May-Sep 09:30-12:30,14:15-19:30"
 msgstr ""
 
+msgctxt "parking"
 msgid "multi-storey"
 msgstr ""
 
+msgctxt "parking"
 msgid "surface"
 msgstr ""
 
+msgctxt "parking"
 msgid "underground"
 msgstr ""
 
+msgctxt "parking"
 msgid "rooftop"
 msgstr ""
 
@@ -15326,14 +15391,25 @@ msgstr "Max. dužina (m)"
 msgid "Overtaking"
 msgstr "Pretjecanje"
 
+msgctxt "overtaking"
+msgid "yes"
+msgstr ""
+
+msgctxt "overtaking"
 msgid "both"
-msgstr "u oba smjera"
+msgstr ""
 
+msgctxt "overtaking"
 msgid "forward"
-msgstr "u smjeru nacrtane linije"
+msgstr ""
 
+msgctxt "overtaking"
 msgid "backward"
-msgstr "u suprotnom smjeru od nacrtane linije"
+msgstr ""
+
+msgctxt "overtaking"
+msgid "no"
+msgstr ""
 
 msgid "Roundabout"
 msgstr "Kružni tok (rotor)"
@@ -15628,6 +15704,12 @@ msgstr ""
 msgid "tiger"
 msgstr ""
 
+msgid "Button operated"
+msgstr ""
+
+msgid "Sound signals"
+msgstr ""
+
 msgid "Crossing attendant"
 msgstr ""
 
@@ -16149,9 +16231,6 @@ msgstr ""
 msgid "Traffic lights"
 msgstr ""
 
-msgid "Sound signals"
-msgstr ""
-
 msgid "Barrier"
 msgstr ""
 
@@ -18211,6 +18290,9 @@ msgstr ""
 msgid "Gasometer"
 msgstr ""
 
+msgid "Bunker Silo"
+msgstr ""
+
 msgid "Pipeline"
 msgstr ""
 
@@ -18357,15 +18439,15 @@ msgstr ""
 msgid "Monitoring:"
 msgstr ""
 
-msgid "Weather"
-msgstr ""
-
 msgid "Water level"
 msgstr ""
 
 msgid "Tide Level"
 msgstr ""
 
+msgid "Groundwater"
+msgstr ""
+
 msgid "Traffic"
 msgstr ""
 
@@ -18384,6 +18466,9 @@ msgstr ""
 msgid "Galileo Signals"
 msgstr ""
 
+msgid "Weather"
+msgstr ""
+
 msgid "Radiation"
 msgstr ""
 
@@ -18564,6 +18649,9 @@ msgstr ""
 msgid "pivot_pier"
 msgstr ""
 
+msgid "Bridge outline"
+msgstr ""
+
 msgid "Power Plant"
 msgstr ""
 
@@ -19171,6 +19259,15 @@ msgstr ""
 msgid "Pole"
 msgstr ""
 
+msgid "Pole with Transformer"
+msgstr ""
+
+msgid "Pole Attributes:"
+msgstr ""
+
+msgid "Transformer Attributes:"
+msgstr ""
+
 msgid "Power Line"
 msgstr ""
 
@@ -19220,9 +19317,15 @@ msgstr ""
 msgid "Power Cable"
 msgstr ""
 
+msgctxt "power cable"
+msgid "underground"
+msgstr ""
+
+msgctxt "power cable"
 msgid "underwater"
 msgstr ""
 
+msgctxt "power cable"
 msgid "overground"
 msgstr ""
 
@@ -19250,6 +19353,33 @@ msgstr ""
 msgid "Memorial"
 msgstr ""
 
+msgctxt "memorial"
+msgid "statue"
+msgstr ""
+
+msgctxt "memorial"
+msgid "bust"
+msgstr ""
+
+msgctxt "memorial"
+msgid "plaque"
+msgstr ""
+
+msgctxt "memorial"
+msgid "stele"
+msgstr ""
+
+msgctxt "memorial"
+msgid "stone"
+msgstr ""
+
+msgctxt "memorial"
+msgid "war_memorial"
+msgstr ""
+
+msgid "Inscription"
+msgstr ""
+
 msgid "Wayside Cross"
 msgstr ""
 
@@ -19319,6 +19449,9 @@ msgstr ""
 msgid "Beverages"
 msgstr ""
 
+msgid "Wine"
+msgstr ""
+
 msgid "Boutique"
 msgstr ""
 
@@ -19364,6 +19497,9 @@ msgstr ""
 msgid "Video Games"
 msgstr ""
 
+msgid "Music"
+msgstr ""
+
 msgid "Cash"
 msgstr ""
 
@@ -19391,6 +19527,9 @@ msgstr ""
 msgid "Curtain"
 msgstr ""
 
+msgid "Art"
+msgstr ""
+
 msgid "Frame"
 msgstr ""
 
@@ -19436,6 +19575,9 @@ msgstr ""
 msgid "Beauty"
 msgstr ""
 
+msgid "Tattoo"
+msgstr ""
+
 msgid "Optician"
 msgstr ""
 
@@ -19487,6 +19629,9 @@ msgstr ""
 msgid "Pet"
 msgstr ""
 
+msgid "Funeral Directors"
+msgstr ""
+
 msgid "Vending Machine"
 msgstr ""
 
@@ -19586,6 +19731,15 @@ msgstr ""
 msgid "National Park"
 msgstr ""
 
+msgid "Protected Area"
+msgstr ""
+
+msgid "Protected Class"
+msgstr ""
+
+msgid "Title or type of protection"
+msgstr ""
+
 msgid "Places"
 msgstr ""
 
@@ -20662,7 +20816,13 @@ msgstr ""
 msgid "Estonia Ortho (Maaamet)"
 msgstr ""
 
-msgid "Estonia Multi (Maaamet)"
+msgid "Estonia Hillshade (Maaamet)"
+msgstr ""
+
+msgid "Estonia Cadastre (Maaamet)"
+msgstr ""
+
+msgid "Estonia Forestry (Maaamet)"
 msgstr ""
 
 msgid "Bordeaux - 2012"
@@ -20686,7 +20846,7 @@ msgstr ""
 msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
 msgstr ""
 
-msgid "CUGN Nancy - Orthophoto 2012"
+msgid "GrandNancy Orthophotographie 2012"
 msgstr ""
 
 msgid "Géobretagne - Brest 2010 - 10 cm"
@@ -20733,9 +20893,6 @@ msgid ""
 "- 1 m"
 msgstr ""
 
-msgid "Streets NRW Geofabrik.de"
-msgstr ""
-
 msgid "Hike & Bike"
 msgstr ""
 
@@ -20795,6 +20952,9 @@ msgstr ""
 msgid "NRW-Atlas: Topographische Karte 1:10000"
 msgstr ""
 
+msgid "Metropole Ruhr: Luftbilder (10 cm)"
+msgstr ""
+
 msgid "Drone Imagery (Haiti)"
 msgstr ""
 
@@ -20996,6 +21156,9 @@ msgstr ""
 msgid "Stadt Zürich Übersichtsplan (Strassen, Gebäude, Hausnummer)"
 msgstr ""
 
+msgid "Stadt Zürich Luftbild 2011"
+msgstr ""
+
 msgid "Orthofoto Kanton Solothurn RGB (SOGIS 2011/2012/2013)"
 msgstr ""
 
@@ -21014,7 +21177,7 @@ msgstr ""
 msgid "Canton de Fribourg 50cm (2005)"
 msgstr ""
 
-msgid "Stadt Bern 10cm/25cm (2008)"
+msgid "Stadt Bern 10cm/25cm (2012)"
 msgstr ""
 
 msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
@@ -21053,7 +21216,7 @@ msgstr ""
 msgid "OSM US TIGER 2012 Roads Overlay"
 msgstr ""
 
-msgid "New & Misaligned TIGER Roads (TIGER 2013)"
+msgid "New & Misaligned TIGER Roads (TIGER 2014)"
 msgstr ""
 
 msgid "MassGIS L3 Parcels"
@@ -21101,9 +21264,234 @@ msgstr ""
 msgid "NLS - Bartholomew Half Inch, 1897-1907"
 msgstr ""
 
+msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Annan 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgstr ""
+
 msgid "OS Town Plans, Cupar 1854 (NLS)"
 msgstr ""
 
+msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Elgin 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Forres 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Galashiels 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Girvan 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Greenock 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Haddington 1853 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Haddington 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Hamilton 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Irvine 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Jedburgh 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kelso 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Lanark 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Linlithgow 1856 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Musselburgh 1853 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Musselburgh 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Oban 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Peebles 1856 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Perth 1860 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Peterhead 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Selkirk 1865 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, St Andrews 1854 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, St Andrews 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stirling 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stonehaven 1864 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1847 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Strathaven 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wick 1872 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wigtown 1848 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wigtown 1894 (NLS)"
+msgstr ""
+
 msgid "Decreasing house numbers in addresses interpolation"
 msgstr ""
 
@@ -21157,17 +21545,37 @@ msgid "{0}={1} is deprecated. Please use instead a multipolygon."
 msgstr ""
 
 msgid ""
-"{0} is deprecated. Please specify ìnterval by using opening_hours syntax"
+"{0} is deprecated. Please specify interval by using opening_hours syntax"
 msgstr ""
 
 msgid ""
 "{0} is deprecated. Please delete this object and use a private layer instead"
 msgstr ""
 
-msgid "{0} on a node"
+msgid "{0}={1} is unspecific. Please replace ''{1}'' by a specific value."
 msgstr ""
 
-msgid "{0} on a node. Should be drawn as an area"
+msgid "{0} should be replaced with {1}"
+msgstr ""
+
+msgid ""
+"{0}={1} is unspecific. Please replace ''{1}'' by ''left'', ''right'' or "
+"''both''."
+msgstr ""
+
+msgid "{0} on a node. Should be used on a way."
+msgstr ""
+
+msgid "{0} on a node. Should be drawn as an area."
+msgstr ""
+
+msgid "{0}=* on a node. Should be used in a relation"
+msgstr ""
+
+msgid "{0} on a way. Should be used in a relation"
+msgstr ""
+
+msgid "{0} on a node"
 msgstr ""
 
 msgid "Building inside building"
@@ -25841,6 +26249,9 @@ msgstr ""
 msgid "Find"
 msgstr "Pronađi"
 
+msgid "Show"
+msgstr "Pokaži"
+
 msgid "Mark"
 msgstr ""
 
diff --git a/i18n/po/ht.po b/i18n/po/ht.po
index 5f857f6..89a25ef 100644
--- a/i18n/po/ht.po
+++ b/i18n/po/ht.po
@@ -1,8 +1,13 @@
+# Haitian; Haitian Creole translation for josm
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the josm package.
+# FIRST AUTHOR <EMAIL at ADDRESS>, 2010.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-21 03:38+0200\n"
+"POT-Creation-Date: 2014-12-10 03:42+0100\n"
 "PO-Revision-Date: 2010-03-11 21:17+0000\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: Haitian; Haitian Creole <ht at li.org>\n"
@@ -10,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-10-21 04:55+0000\n"
-"X-Generator: Launchpad (build 17203)\n"
+"X-Launchpad-Export-Date: 2014-12-10 04:50+0000\n"
+"X-Generator: Launchpad (build 17283)\n"
 "Language: \n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -168,16 +173,6 @@ msgid "About JOSM..."
 msgstr ""
 
 msgid ""
-"Unexpected format of API base URL. Redirection to info or history page for "
-"OSM object will probably fail. API base URL is: ''{0}''"
-msgstr ""
-
-msgid ""
-"Unexpected format of API base URL. Redirection to user page for OSM user "
-"will probably fail. API base URL is: ''{0}''"
-msgstr ""
-
-msgid ""
 "You are about to launch {0} browser window.<br>This may both clutter your "
 "screen with browser windows<br>and take some time to finish."
 msgid_plural ""
@@ -1519,6 +1514,15 @@ msgstr ""
 msgid "Nothing to upload. Get some data first."
 msgstr ""
 
+msgid "Upload note changes to server"
+msgstr ""
+
+msgid "Upload notes"
+msgstr ""
+
+msgid "Uploading notes to server"
+msgstr ""
+
 msgid "Upload selection"
 msgstr ""
 
@@ -1791,10 +1795,16 @@ msgstr ""
 msgid "Click the location where you wish to create a new note"
 msgstr ""
 
-msgid "Enter a comment for a new note"
+msgid "Create new note"
 msgstr ""
 
-msgid "Create new note"
+msgid "Create note"
+msgstr ""
+
+msgid "Enter a detailed comment to create a note"
+msgstr ""
+
+msgid "You must enter a comment to create a new note"
 msgstr ""
 
 msgid "Delete Mode"
@@ -2665,6 +2675,15 @@ msgstr ""
 msgid "Cycling dependencies"
 msgstr ""
 
+msgid "Uploading modified notes"
+msgstr ""
+
+msgid "Note {0} failed: {1}"
+msgstr ""
+
+msgid "Notes failed to upload"
+msgstr ""
+
 msgid ""
 "The following are results of automatic validation. Try fixing these, but be "
 "careful (don''t destroy valid data). When in doubt ignore them.<br>When you "
@@ -4894,6 +4913,12 @@ msgstr ""
 msgid "Conflict foreground: keep all tags"
 msgstr ""
 
+msgid "Conflict background: sum all numeric tags"
+msgstr ""
+
+msgid "Conflict foreground: sum all numeric tags"
+msgstr ""
+
 msgid "Conflict background: keep member"
 msgstr ""
 
@@ -5312,12 +5337,19 @@ msgstr ""
 msgid "all"
 msgstr ""
 
+msgid "sum"
+msgstr ""
+
 msgid "Please decide which values to keep"
 msgstr ""
 
 msgid "Value ''{0}'' is going to be applied for key ''{1}''"
 msgstr ""
 
+msgid ""
+"All numeric values sumed as ''{0}'' are going to be applied for key ''{1}''"
+msgstr ""
+
 msgid "The key ''{0}'' and all its values are going to be removed"
 msgstr ""
 
@@ -5680,24 +5712,6 @@ msgstr[1] ""
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
 
-msgid "Display the history of all selected items."
-msgstr ""
-
-msgid "Object with history"
-msgstr ""
-
-msgid "Reload"
-msgstr ""
-
-msgid "Reload all currently selected objects and refresh the list."
-msgstr ""
-
-msgid "Show"
-msgstr ""
-
-msgid "Display the history of the selected objects."
-msgstr ""
-
 msgid "Advanced object info"
 msgstr ""
 
@@ -6035,6 +6049,9 @@ msgstr ""
 msgid "Comment"
 msgstr ""
 
+msgid "Comment on note"
+msgstr ""
+
 msgid "Add comment to note:"
 msgstr ""
 
@@ -6044,9 +6061,6 @@ msgstr ""
 msgid "Close note with message:"
 msgstr ""
 
-msgid "Close Note"
-msgstr ""
-
 msgid "Create a new note"
 msgstr ""
 
@@ -6119,6 +6133,9 @@ msgstr ""
 msgid "Search for objects"
 msgstr ""
 
+msgid "Display the history of the selected objects."
+msgstr ""
+
 msgid "Zoom to selection"
 msgstr ""
 
@@ -6238,6 +6255,9 @@ msgstr ""
 msgid "Updating map ..."
 msgstr ""
 
+msgid "anonymous"
+msgstr ""
+
 msgid "Display the basic properties of the changeset"
 msgstr ""
 
@@ -6250,6 +6270,12 @@ msgstr ""
 msgid "Display the objects created, updated, and deleted by the changeset"
 msgstr ""
 
+msgid "Discussion"
+msgstr ""
+
+msgid "Display the public discussion around this changeset"
+msgstr ""
+
 msgid "Changeset Management Dialog"
 msgstr ""
 
@@ -6307,9 +6333,6 @@ msgctxt "changeset.state"
 msgid "Closed"
 msgstr ""
 
-msgid "anonymous"
-msgstr ""
-
 msgid "ID"
 msgstr ""
 
@@ -6325,6 +6348,9 @@ msgstr ""
 msgid "Closed at"
 msgstr ""
 
+msgid "Discussions"
+msgstr ""
+
 msgid "Downloading changeset content"
 msgstr ""
 
@@ -6436,6 +6462,15 @@ msgid ""
 "layer"
 msgstr ""
 
+msgid "Update changeset discussion"
+msgstr ""
+
+msgid "Update the changeset discussion from the OSM server"
+msgstr ""
+
+msgid "Date"
+msgstr ""
+
 msgid "Download changesets"
 msgstr ""
 
@@ -6853,7 +6888,7 @@ msgstr ""
 msgid "Set number of recently added tags"
 msgstr ""
 
-msgid "Remember last used tags"
+msgid "Remember last used tags after a restart"
 msgstr ""
 
 msgid "Please enter the number of recently added tags to display"
@@ -7199,6 +7234,9 @@ msgstr ""
 msgid "Load parent relations"
 msgstr ""
 
+msgid "Reload"
+msgstr ""
+
 msgid "Loading parent relations"
 msgstr ""
 
@@ -7321,6 +7359,12 @@ msgstr ""
 msgid "Select to download GPS traces in the selected download area."
 msgstr ""
 
+msgid "Notes"
+msgstr ""
+
+msgid "Select to download notes in the selected download area."
+msgstr ""
+
 msgid "Download as new layer"
 msgstr ""
 
@@ -7626,9 +7670,6 @@ msgstr ""
 msgid "B"
 msgstr ""
 
-msgid "Date"
-msgstr ""
-
 msgid ""
 "Failed to update primitive with id {0} because current edit layer is null"
 msgstr ""
@@ -8483,9 +8524,6 @@ msgstr ""
 msgid "Save Layer"
 msgstr ""
 
-msgid "Notes"
-msgstr ""
-
 msgid "Notes layer"
 msgstr ""
 
@@ -8501,9 +8539,6 @@ msgstr ""
 msgid "outside downloaded area"
 msgstr ""
 
-msgid "version {0}"
-msgstr ""
-
 msgid "Merging layers"
 msgstr ""
 
@@ -12129,6 +12164,15 @@ msgstr ""
 msgid "Open changeset expected. Got closed changeset with id {0}."
 msgstr ""
 
+msgid "Note upload failed"
+msgstr ""
+
+msgid "Error parsing note response from server"
+msgstr ""
+
+msgid "Error encoding string: {0}"
+msgstr ""
+
 msgid "(Code={0})"
 msgstr ""
 
@@ -12177,13 +12221,13 @@ msgstr ""
 msgid "Parsing changeset content ..."
 msgstr ""
 
-msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
-msgid "Illegal numeric value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
-msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal numeric value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
 msgid "Missing mandatory attribute ''{0}'' of XML element {1}."
@@ -12975,9 +13019,6 @@ msgstr ""
 msgid "Failed to scan file ''{0}'' for plugin information. Skipping."
 msgstr ""
 
-msgid "Processing plugin site cache icon files..."
-msgstr ""
-
 msgid "Processing plugin files..."
 msgstr ""
 
@@ -12996,12 +13037,6 @@ msgstr ""
 msgid "Details:"
 msgstr ""
 
-msgid "Plugin icons download error"
-msgstr ""
-
-msgid "JOSM failed to download plugin icons:"
-msgstr ""
-
 msgid ""
 "Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
 "plugin site ''{1}''."
@@ -13887,7 +13922,9 @@ msgid ""
 "Creating and handling address nodes and buildings within Czech Republic."
 msgstr ""
 
-msgid "Allows to import various file formats into JOSM directly."
+msgid ""
+"Allows to import various file formats into JOSM directly. Currently "
+"supported: TangoGPS, Garmin Trainings Center TCX."
 msgstr ""
 
 msgid "Download your GPX tracks from openstreetmap.org"
@@ -13984,6 +14021,11 @@ msgid "A helper for IRS satellite adjustment."
 msgstr ""
 
 msgid ""
+"Provides Java Native Access (JNA) library. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
+msgid ""
 "Provides Java Topology Suite (JTS) library and related utilities. Not meant "
 "to be installed directly by users, but rather as a dependency for other "
 "plugins."
@@ -14339,6 +14381,25 @@ msgstr ""
 msgid "Width (meters)"
 msgstr ""
 
+msgid "Sidewalk"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "both"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "left"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "right"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "no"
+msgstr ""
+
 msgid "Service type"
 msgstr ""
 
@@ -14703,15 +14764,19 @@ msgstr ""
 msgid "May-Sep 09:30-12:30,14:15-19:30"
 msgstr ""
 
+msgctxt "parking"
 msgid "multi-storey"
 msgstr ""
 
+msgctxt "parking"
 msgid "surface"
 msgstr ""
 
+msgctxt "parking"
 msgid "underground"
 msgstr ""
 
+msgctxt "parking"
 msgid "rooftop"
 msgstr ""
 
@@ -15169,15 +15234,26 @@ msgstr ""
 msgid "Overtaking"
 msgstr ""
 
+msgctxt "overtaking"
+msgid "yes"
+msgstr ""
+
+msgctxt "overtaking"
 msgid "both"
 msgstr ""
 
+msgctxt "overtaking"
 msgid "forward"
 msgstr ""
 
+msgctxt "overtaking"
 msgid "backward"
 msgstr ""
 
+msgctxt "overtaking"
+msgid "no"
+msgstr ""
+
 msgid "Roundabout"
 msgstr ""
 
@@ -15471,6 +15547,12 @@ msgstr ""
 msgid "tiger"
 msgstr ""
 
+msgid "Button operated"
+msgstr ""
+
+msgid "Sound signals"
+msgstr ""
+
 msgid "Crossing attendant"
 msgstr ""
 
@@ -15992,9 +16074,6 @@ msgstr ""
 msgid "Traffic lights"
 msgstr ""
 
-msgid "Sound signals"
-msgstr ""
-
 msgid "Barrier"
 msgstr ""
 
@@ -18054,6 +18133,9 @@ msgstr ""
 msgid "Gasometer"
 msgstr ""
 
+msgid "Bunker Silo"
+msgstr ""
+
 msgid "Pipeline"
 msgstr ""
 
@@ -18200,15 +18282,15 @@ msgstr ""
 msgid "Monitoring:"
 msgstr ""
 
-msgid "Weather"
-msgstr ""
-
 msgid "Water level"
 msgstr ""
 
 msgid "Tide Level"
 msgstr ""
 
+msgid "Groundwater"
+msgstr ""
+
 msgid "Traffic"
 msgstr ""
 
@@ -18227,6 +18309,9 @@ msgstr ""
 msgid "Galileo Signals"
 msgstr ""
 
+msgid "Weather"
+msgstr ""
+
 msgid "Radiation"
 msgstr ""
 
@@ -18407,6 +18492,9 @@ msgstr ""
 msgid "pivot_pier"
 msgstr ""
 
+msgid "Bridge outline"
+msgstr ""
+
 msgid "Power Plant"
 msgstr ""
 
@@ -19014,6 +19102,15 @@ msgstr ""
 msgid "Pole"
 msgstr ""
 
+msgid "Pole with Transformer"
+msgstr ""
+
+msgid "Pole Attributes:"
+msgstr ""
+
+msgid "Transformer Attributes:"
+msgstr ""
+
 msgid "Power Line"
 msgstr ""
 
@@ -19063,9 +19160,15 @@ msgstr ""
 msgid "Power Cable"
 msgstr ""
 
+msgctxt "power cable"
+msgid "underground"
+msgstr ""
+
+msgctxt "power cable"
 msgid "underwater"
 msgstr ""
 
+msgctxt "power cable"
 msgid "overground"
 msgstr ""
 
@@ -19093,6 +19196,33 @@ msgstr ""
 msgid "Memorial"
 msgstr ""
 
+msgctxt "memorial"
+msgid "statue"
+msgstr ""
+
+msgctxt "memorial"
+msgid "bust"
+msgstr ""
+
+msgctxt "memorial"
+msgid "plaque"
+msgstr ""
+
+msgctxt "memorial"
+msgid "stele"
+msgstr ""
+
+msgctxt "memorial"
+msgid "stone"
+msgstr ""
+
+msgctxt "memorial"
+msgid "war_memorial"
+msgstr ""
+
+msgid "Inscription"
+msgstr ""
+
 msgid "Wayside Cross"
 msgstr ""
 
@@ -19162,6 +19292,9 @@ msgstr ""
 msgid "Beverages"
 msgstr ""
 
+msgid "Wine"
+msgstr ""
+
 msgid "Boutique"
 msgstr ""
 
@@ -19207,6 +19340,9 @@ msgstr ""
 msgid "Video Games"
 msgstr ""
 
+msgid "Music"
+msgstr ""
+
 msgid "Cash"
 msgstr ""
 
@@ -19234,6 +19370,9 @@ msgstr ""
 msgid "Curtain"
 msgstr ""
 
+msgid "Art"
+msgstr ""
+
 msgid "Frame"
 msgstr ""
 
@@ -19279,6 +19418,9 @@ msgstr ""
 msgid "Beauty"
 msgstr ""
 
+msgid "Tattoo"
+msgstr ""
+
 msgid "Optician"
 msgstr ""
 
@@ -19330,6 +19472,9 @@ msgstr ""
 msgid "Pet"
 msgstr ""
 
+msgid "Funeral Directors"
+msgstr ""
+
 msgid "Vending Machine"
 msgstr ""
 
@@ -19429,6 +19574,15 @@ msgstr ""
 msgid "National Park"
 msgstr ""
 
+msgid "Protected Area"
+msgstr ""
+
+msgid "Protected Class"
+msgstr ""
+
+msgid "Title or type of protection"
+msgstr ""
+
 msgid "Places"
 msgstr ""
 
@@ -20505,7 +20659,13 @@ msgstr ""
 msgid "Estonia Ortho (Maaamet)"
 msgstr ""
 
-msgid "Estonia Multi (Maaamet)"
+msgid "Estonia Hillshade (Maaamet)"
+msgstr ""
+
+msgid "Estonia Cadastre (Maaamet)"
+msgstr ""
+
+msgid "Estonia Forestry (Maaamet)"
 msgstr ""
 
 msgid "Bordeaux - 2012"
@@ -20529,7 +20689,7 @@ msgstr ""
 msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
 msgstr ""
 
-msgid "CUGN Nancy - Orthophoto 2012"
+msgid "GrandNancy Orthophotographie 2012"
 msgstr ""
 
 msgid "Géobretagne - Brest 2010 - 10 cm"
@@ -20576,9 +20736,6 @@ msgid ""
 "- 1 m"
 msgstr ""
 
-msgid "Streets NRW Geofabrik.de"
-msgstr ""
-
 msgid "Hike & Bike"
 msgstr ""
 
@@ -20638,6 +20795,9 @@ msgstr ""
 msgid "NRW-Atlas: Topographische Karte 1:10000"
 msgstr ""
 
+msgid "Metropole Ruhr: Luftbilder (10 cm)"
+msgstr ""
+
 msgid "Drone Imagery (Haiti)"
 msgstr ""
 
@@ -20839,6 +20999,9 @@ msgstr ""
 msgid "Stadt Zürich Übersichtsplan (Strassen, Gebäude, Hausnummer)"
 msgstr ""
 
+msgid "Stadt Zürich Luftbild 2011"
+msgstr ""
+
 msgid "Orthofoto Kanton Solothurn RGB (SOGIS 2011/2012/2013)"
 msgstr ""
 
@@ -20857,7 +21020,7 @@ msgstr ""
 msgid "Canton de Fribourg 50cm (2005)"
 msgstr ""
 
-msgid "Stadt Bern 10cm/25cm (2008)"
+msgid "Stadt Bern 10cm/25cm (2012)"
 msgstr ""
 
 msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
@@ -20896,7 +21059,7 @@ msgstr ""
 msgid "OSM US TIGER 2012 Roads Overlay"
 msgstr ""
 
-msgid "New & Misaligned TIGER Roads (TIGER 2013)"
+msgid "New & Misaligned TIGER Roads (TIGER 2014)"
 msgstr ""
 
 msgid "MassGIS L3 Parcels"
@@ -20944,9 +21107,234 @@ msgstr ""
 msgid "NLS - Bartholomew Half Inch, 1897-1907"
 msgstr ""
 
+msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Annan 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgstr ""
+
 msgid "OS Town Plans, Cupar 1854 (NLS)"
 msgstr ""
 
+msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Elgin 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Forres 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Galashiels 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Girvan 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Greenock 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Haddington 1853 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Haddington 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Hamilton 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Irvine 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Jedburgh 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kelso 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Lanark 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Linlithgow 1856 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Musselburgh 1853 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Musselburgh 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Oban 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Peebles 1856 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Perth 1860 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Peterhead 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Selkirk 1865 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, St Andrews 1854 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, St Andrews 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stirling 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stonehaven 1864 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1847 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Strathaven 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wick 1872 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wigtown 1848 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wigtown 1894 (NLS)"
+msgstr ""
+
 msgid "Decreasing house numbers in addresses interpolation"
 msgstr ""
 
@@ -21000,17 +21388,37 @@ msgid "{0}={1} is deprecated. Please use instead a multipolygon."
 msgstr ""
 
 msgid ""
-"{0} is deprecated. Please specify ìnterval by using opening_hours syntax"
+"{0} is deprecated. Please specify interval by using opening_hours syntax"
 msgstr ""
 
 msgid ""
 "{0} is deprecated. Please delete this object and use a private layer instead"
 msgstr ""
 
-msgid "{0} on a node"
+msgid "{0}={1} is unspecific. Please replace ''{1}'' by a specific value."
 msgstr ""
 
-msgid "{0} on a node. Should be drawn as an area"
+msgid "{0} should be replaced with {1}"
+msgstr ""
+
+msgid ""
+"{0}={1} is unspecific. Please replace ''{1}'' by ''left'', ''right'' or "
+"''both''."
+msgstr ""
+
+msgid "{0} on a node. Should be used on a way."
+msgstr ""
+
+msgid "{0} on a node. Should be drawn as an area."
+msgstr ""
+
+msgid "{0}=* on a node. Should be used in a relation"
+msgstr ""
+
+msgid "{0} on a way. Should be used in a relation"
+msgstr ""
+
+msgid "{0} on a node"
 msgstr ""
 
 msgid "Building inside building"
@@ -25680,6 +26088,9 @@ msgstr ""
 msgid "Find"
 msgstr ""
 
+msgid "Show"
+msgstr ""
+
 msgid "Mark"
 msgstr ""
 
diff --git a/i18n/po/hu.po b/i18n/po/hu.po
index c468acc..b7ed1c8 100644
--- a/i18n/po/hu.po
+++ b/i18n/po/hu.po
@@ -1,17 +1,23 @@
+# Hungarian translation for josm
+# Copyright (c) 2008 Rosetta Contributors and Canonical Ltd 2008
+# This file is distributed under the same license as the josm package.
+#
+# György Balló <ballogy at freestart.hu>, 2009, 2014.
+# HVGY <szupernova at gmail.com>, 2014.
 msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-21 03:38+0200\n"
-"PO-Revision-Date: 2014-10-20 14:45+0000\n"
-"Last-Translator: Báthory Péter <bathory86p at gmail.com>\n"
-"Language-Team: Hungarian <hu at li.org>\n"
+"POT-Creation-Date: 2014-12-10 03:42+0100\n"
+"PO-Revision-Date: 2014-11-24 03:36+0000\n"
+"Last-Translator: HVGY <Unknown>\n"
+"Language-Team: Hungarian <kde-l10n-hu at kde.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2014-10-21 04:57+0000\n"
-"X-Generator: Launchpad (build 17203)\n"
+"X-Launchpad-Export-Date: 2014-12-10 04:52+0000\n"
+"X-Generator: Launchpad (build 17283)\n"
 "Language: hu\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -48,7 +54,7 @@ msgid "Background Terms of Use"
 msgstr "Háttérképek felhasználási feltételei"
 
 msgid "Opening link not supported on current platform (''{0}'')"
-msgstr "A link megnyitása nem támogatott a (''{0}'') platformon"
+msgstr "A link megnyitása nem támogatott az aktuális (''{0}'') platformon"
 
 msgid "ERROR: {0}"
 msgstr "HIBA: {0}"
@@ -172,20 +178,6 @@ msgid "About JOSM..."
 msgstr "A JOSM névjegye..."
 
 msgid ""
-"Unexpected format of API base URL. Redirection to info or history page for "
-"OSM object will probably fail. API base URL is: ''{0}''"
-msgstr ""
-"Nemvárt API alap URL formátum. Az átirányítás az OSM objektum információs "
-"vagy előzmény oldalára valószínűleg sikertelen lesz. API alap URL: \"{0}\""
-
-msgid ""
-"Unexpected format of API base URL. Redirection to user page for OSM user "
-"will probably fail. API base URL is: ''{0}''"
-msgstr ""
-"Nemvárt API alap URL formátum. Az átirányítás az OSM felhasználó adatlapjára "
-"valószínűleg sikertelen lesz. API alap URL: \"{0}\""
-
-msgid ""
 "You are about to launch {0} browser window.<br>This may both clutter your "
 "screen with browser windows<br>and take some time to finish."
 msgid_plural ""
@@ -1669,6 +1661,15 @@ msgstr "Nincsenek feltölthető változtatások."
 msgid "Nothing to upload. Get some data first."
 msgstr "Nincs mit feltölteni. Először szerezz néhány adatot."
 
+msgid "Upload note changes to server"
+msgstr "Jegyzet változások feltöltése a szerverre"
+
+msgid "Upload notes"
+msgstr "Jegyzetek feltöltése"
+
+msgid "Uploading notes to server"
+msgstr "Jegyzetek feltöltése a szerverre"
+
 msgid "Upload selection"
 msgstr "Kijelölt feltöltése"
 
@@ -1957,12 +1958,18 @@ msgstr "Jegyzet hozzáadása mód"
 msgid "Click the location where you wish to create a new note"
 msgstr "Kattints arra a helyre, amihez jegyzetet akarsz írni"
 
-msgid "Enter a comment for a new note"
-msgstr "Add meg az új jegyzet leírását"
-
 msgid "Create new note"
 msgstr "Új jegyzet létrehozása"
 
+msgid "Create note"
+msgstr "Jegyzet készítése"
+
+msgid "Enter a detailed comment to create a note"
+msgstr "Vigyél be részletes leírást a jegyzet létrehozásához"
+
+msgid "You must enter a comment to create a new note"
+msgstr "Új jegyzet létrehozásához megjegyzést kell berögzítened"
+
 msgid "Delete Mode"
 msgstr "Törlési mód"
 
@@ -2932,6 +2939,15 @@ msgstr "... kapcsolatra hivatkozik"
 msgid "Cycling dependencies"
 msgstr "Körkörös hivatkozás"
 
+msgid "Uploading modified notes"
+msgstr "Módosított jegyzetek feltöltése"
+
+msgid "Note {0} failed: {1}"
+msgstr "A jegyzet {0} hibás: {1}"
+
+msgid "Notes failed to upload"
+msgstr "Jegyzetek feltöltése meghiúsult"
+
 msgid ""
 "The following are results of automatic validation. Try fixing these, but be "
 "careful (don''t destroy valid data). When in doubt ignore them.<br>When you "
@@ -3510,8 +3526,8 @@ msgid ""
 "Please report this at {2}. This is not a critical error, it should be safe "
 "to continue in your work."
 msgstr ""
-"A JOSM azt várta, hogy [{0} {1}]  alapelemet talál az adathalmazban, de az "
-"nem volt ott. Kérlek jelentsd a hibát itt: {2}. Ez nem egy kritikus hiba, "
+"A JOSM azt várta, hogy [{0} {1}]  elemet talál az adathalmazban, de az nem "
+"volt ott. Kérlek jelentsd a hibát itt: {2}. Ez nem egy kritikus hiba, "
 "nyugodtan folytathatod a munkát."
 
 msgid "Missing merge target for way with id {0}"
@@ -4114,7 +4130,7 @@ msgid "Role for ''{0}'' should be ''{1}''"
 msgstr "''{0}'' szerepe ''{1}'' kéne legyen"
 
 msgid "No area style for multipolygon"
-msgstr ""
+msgstr "Nincs terület típus a multipoligonban"
 
 msgid ""
 "Multipolygon relation should be tagged with area tags and not the outer way"
@@ -4134,10 +4150,10 @@ msgid "Style for outer way mismatches"
 msgstr "A külső vonal stílusa nem megfelelő"
 
 msgid "Style for outer way mismatches polygon"
-msgstr ""
+msgstr "A külső vonal típusa nem egyezik a poligonéval"
 
 msgid "Area style on outer way"
-msgstr ""
+msgstr "Terület típus van a külső vonalon"
 
 msgid "Multipolygon is not closed"
 msgstr "A multipoligon nem zárt"
@@ -4260,6 +4276,8 @@ msgstr "Kapcsolatok hibáinak keresése."
 msgid ""
 "Route scheme is unspecified. Add {0} ({1}=public_transport; {2}=legacy)"
 msgstr ""
+"Útvonal séma meghatározatlan. Hozzáadandó {0} ({1}=public_transport; "
+"{2}=legacy)"
 
 msgid "Relation type is unknown"
 msgstr "Kapcsolat típusa ismeretlen"
@@ -5299,6 +5317,12 @@ msgstr "Ütközés háttér: összes címke megtartása"
 msgid "Conflict foreground: keep all tags"
 msgstr "Ütközés előtér: összes címke megtartása"
 
+msgid "Conflict background: sum all numeric tags"
+msgstr ""
+
+msgid "Conflict foreground: sum all numeric tags"
+msgstr ""
+
 msgid "Conflict background: keep member"
 msgstr "Ütközés háttér: tag megtartása"
 
@@ -5653,7 +5677,7 @@ msgid "Value"
 msgstr "Érték"
 
 msgid "Cannot apply undecided tag merge item."
-msgstr ""
+msgstr "Eldöntetlen cimke összefésülés elem nem alkalmazható."
 
 msgid "My version (local dataset)"
 msgstr "Én változatom (helyi adathalmaz)"
@@ -5761,12 +5785,19 @@ msgstr "nincs"
 msgid "all"
 msgstr "mind"
 
+msgid "sum"
+msgstr ""
+
 msgid "Please decide which values to keep"
 msgstr "Kérlek döntsd el, melyik értékek legyenek megtartva"
 
 msgid "Value ''{0}'' is going to be applied for key ''{1}''"
 msgstr "''{0}'' érték alkalmazva lesz ''{1}'' kulcsra"
 
+msgid ""
+"All numeric values sumed as ''{0}'' are going to be applied for key ''{1}''"
+msgstr ""
+
 msgid "The key ''{0}'' and all its values are going to be removed"
 msgstr "''{0}'' kulcs és az összes értéke törölve lesz"
 
@@ -5841,7 +5872,7 @@ msgid "Enter a role for all relation memberships"
 msgstr "Írd be az összes kapcsolattagra alkalmazandó szerepet"
 
 msgid "Tag modified relations with "
-msgstr ""
+msgstr "Módosított kapcsolat cimkézése "
 
 msgid ""
 "<html>Select to enable entering a tag which will be applied<br>to all "
@@ -6048,12 +6079,11 @@ msgid ""
 "conflicts.</html>"
 msgstr ""
 "<html>Még nem végeztél a különbségek egyesítésével ebben az "
-"üdközésben.<br>\r\n"
-"Az ütközéskezelés nem lesz alkalmazva, amíg az összes különbség<br>\r\n"
-"meg nem lesz oldva.<br>\r\n"
-"<strong>{0}</strong> gomb: bezárás mindenképp.<strong> A már megoldott "
-"<br>különbségek nem lesznek alkalmazva.</strong><br>Az <strong>{1}</strong> "
-"megnyomásával visszatérhetsz az ütközésmegoldáshoz.</html>"
+"üdközésben.<br>Az ütközéskezelés nem lesz alkalmazva, amíg az összes "
+"különbség<br>meg nem lesz oldva.<br><strong>{0}</strong> gomb: bezárás "
+"mindenképp.<strong> A már megoldott <br>különbségek nem lesznek "
+"alkalmazva.</strong><br>Az <strong>{1}</strong> megnyomásával visszatérhetsz "
+"az ütközésmegoldáshoz.</html>"
 
 msgid "Conflict not resolved completely"
 msgstr "Az ütközések nincsenek teljesen megoldva"
@@ -6161,24 +6191,6 @@ msgstr[1] "<p><b>{0}</b> objektum letiltva"
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr "</p><p>Az összes megjelenítéséhez zárd be a szűrő ablakot.<p></html>"
 
-msgid "Display the history of all selected items."
-msgstr "Az összes kiválasztott objektum történeténk megjelenítése"
-
-msgid "Object with history"
-msgstr "Történettel rendelkező objektumok"
-
-msgid "Reload"
-msgstr "Újratöltés"
-
-msgid "Reload all currently selected objects and refresh the list."
-msgstr "A kiválasztott objektumok újratöltése és a lista frissítése"
-
-msgid "Show"
-msgstr "Mutat"
-
-msgid "Display the history of the selected objects."
-msgstr "A kiválsztott objektumok történetének megjelenítése"
-
 msgid "Advanced object info"
 msgstr "Fejlett objektum infó"
 
@@ -6541,6 +6553,9 @@ msgstr "Megjegyzés hozzáadása"
 msgid "Comment"
 msgstr "Megjegyzés"
 
+msgid "Comment on note"
+msgstr "Hozzászólás a jegyzethez"
+
 msgid "Add comment to note:"
 msgstr "Megjegyzés hozzáadása a jegyzethez:"
 
@@ -6550,9 +6565,6 @@ msgstr "Jegyzet lezárása"
 msgid "Close note with message:"
 msgstr "Jegyzet lezárása üzenettel:"
 
-msgid "Close Note"
-msgstr "Jegyzet lezárása"
-
 msgid "Create a new note"
 msgstr "Új jegyzet létrehozása"
 
@@ -6589,6 +6601,10 @@ msgid ""
 "mixed mode, specify objects like this: {1}<br/>({2} stands for <i>node</i>, "
 "{3} for <i>way</i>, and {4} for <i>relation</i>)"
 msgstr ""
+"Az objektum azonosítók vesszővel vagy szóközzel lehetnek "
+"elválasztva.<br/>Példák: {0}<br/>Vegyes módban így add meg az objektumokat: "
+"{1}<br/>({2} jelenti a <i>pontot</i>, {3} a <i>vonalat</i> és {4} a "
+"<i>kapcsolatot</i>)"
 
 msgid ""
 "Invalid ID list specified\n"
@@ -6627,6 +6643,9 @@ msgstr "Jelenlegi kiválasztás"
 msgid "Search for objects"
 msgstr "Objektumok keresése"
 
+msgid "Display the history of the selected objects."
+msgstr "A kiválsztott objektumok történetének megjelenítése"
+
 msgid "Zoom to selection"
 msgstr "Nagyítás a kijelölésre"
 
@@ -6750,6 +6769,9 @@ msgstr "Javítás ({0}/{1}): ''{2}''"
 msgid "Updating map ..."
 msgstr "Térkép frissítése ..."
 
+msgid "anonymous"
+msgstr "névtelen"
+
 msgid "Display the basic properties of the changeset"
 msgstr "A módosításcsomag alapvető tulajdonságainak megjelenítése"
 
@@ -6763,6 +6785,12 @@ msgid "Display the objects created, updated, and deleted by the changeset"
 msgstr ""
 "A módosításcsomagban lévő létrehozott, frissített és törölt objektumok"
 
+msgid "Discussion"
+msgstr "Vita"
+
+msgid "Display the public discussion around this changeset"
+msgstr "Nyílt vita megjelenítése ehhez a módosítási csomaghoz"
+
 msgid "Changeset Management Dialog"
 msgstr "Módosításcsomag kezelő ablak"
 
@@ -6825,9 +6853,6 @@ msgctxt "changeset.state"
 msgid "Closed"
 msgstr "Lezárt"
 
-msgid "anonymous"
-msgstr "névtelen"
-
 msgid "ID"
 msgstr "Azon"
 
@@ -6843,6 +6868,9 @@ msgstr "Készült"
 msgid "Closed at"
 msgstr "Lezárva"
 
+msgid "Discussions"
+msgstr "Viták"
+
 msgid "Downloading changeset content"
 msgstr "Módosításcsomag-tartalom letöltése"
 
@@ -6859,11 +6887,11 @@ msgid_plural ""
 "<html>None of the selected objects is available in the current<br>edit layer "
 "''{0}''.</html>"
 msgstr[0] ""
-"<html>A kiválasztott objektum nem elérhető a jelenlegi<br>\r\n"
-"''{0}'' szerkesztési rétegen.</html>"
+"<html>A kiválasztott objektum nem elérhető a jelenlegi<br> ''{0}'' "
+"szerkesztési rétegen.</html>"
 msgstr[1] ""
-"<html>A kiválasztott objektumok nem elérhetőek a jelenlegi<br>\r\n"
-"''{0}'' szerkesztési rétegen.</html>"
+"<html>A kiválasztott objektumok nem elérhetőek a jelenlegi<br>''{0}'' "
+"szerkesztési rétegen.</html>"
 
 msgid "Download content"
 msgstr "Tartalom letöltése"
@@ -6953,9 +6981,8 @@ msgid ""
 "<html>None of the objects in the content of changeset {0} is available in "
 "the current<br>edit layer ''{1}''.</html>"
 msgstr ""
-"<html>A {0} módosításcsomag tartalmából egyetlen objektum sem "
-"elérhető<br>\r\n"
-"a jelenlegi ''{1}'' adatrétegen.</html>"
+"<html>A {0} módosításcsomag tartalmából egyetlen objektum sem elérhető<br> a "
+"jelenlegi ''{1}'' adatrétegen.</html>"
 
 msgid ""
 "Zoom to the objects in the content of this changeset in the current data "
@@ -6963,6 +6990,15 @@ msgid ""
 msgstr ""
 "A Módosításcsomag-tartalom elemeire közelítés a jelenlegi adatrétegen."
 
+msgid "Update changeset discussion"
+msgstr "A változtatási csomagról szóló vita frissítése"
+
+msgid "Update the changeset discussion from the OSM server"
+msgstr "A változtatási csomagról szóló vita frissítése az OSM szerverről"
+
+msgid "Date"
+msgstr "Dátum"
+
 msgid "Download changesets"
 msgstr "Módosításcsomag letöltése"
 
@@ -7428,8 +7464,8 @@ msgstr "Válassz egy értéket"
 msgid "Set number of recently added tags"
 msgstr "Nemrég használt címkék száma"
 
-msgid "Remember last used tags"
-msgstr "Utoljára használt címkék megjegyzése"
+msgid "Remember last used tags after a restart"
+msgstr "Emlékezzen a legutóbb használt cimkékre újraindítás után is"
 
 msgid "Please enter the number of recently added tags to display"
 msgstr "Kérlek add meg a megjeleníteni kívánt nemrég használt címkék számát"
@@ -7566,9 +7602,9 @@ msgid ""
 "object ''{0}''<br><br>Do you really want to add another relation "
 "member?</html>"
 msgstr ""
-"<html>A kapcsolatnak már van egy, vagy több olyan tagja, ami a(z)<br>\r\n"
-"''{0}'' objektumra hivatkozik<br><br>\r\n"
-"Biztosan hozzáadod a kapcsolathoz ezt a tagot is?</html>"
+"<html>A kapcsolatnak már van egy, vagy több olyan tagja, ami a(z)<br>''{0}'' "
+"objektumra hivatkozik<br><br> Biztosan hozzáadod a kapcsolathoz ezt a tagot "
+"is?</html>"
 
 msgid "Multiple members referring to same object."
 msgstr "Több tag hivatkozik azonos objektumra."
@@ -7818,6 +7854,9 @@ msgstr "Beleértve a szülő-kapcsolat közvetlen gyerekét"
 msgid "Load parent relations"
 msgstr "Szülő-kapcsolatok letöltése"
 
+msgid "Reload"
+msgstr "Újratöltés"
+
 msgid "Loading parent relations"
 msgstr "Szülő-kapcsolatok letöltése"
 
@@ -7947,6 +7986,12 @@ msgid "Select to download GPS traces in the selected download area."
 msgstr ""
 "Pipáld ki a GPS nyomvonalak letöltéséhez a kijelölt letöltési területről."
 
+msgid "Notes"
+msgstr "Bankjegyek"
+
+msgid "Select to download notes in the selected download area."
+msgstr "Pipáld ki a kijelölt területen lévő jegyzetek letöltéséhez."
+
 msgid "Download as new layer"
 msgstr "Letöltés új rétegre"
 
@@ -8058,13 +8103,13 @@ msgid "Querying name server ..."
 msgstr "Névszerver lekérdezése ..."
 
 msgid "Error occured with query ''{0}'': ''{1}''"
-msgstr ""
+msgstr "Hiba történt a(z) „{0}” lekérdezés közben: „{1}”"
 
 msgid "Name server returned invalid data. Please try again."
-msgstr ""
+msgstr "A névszerver érvénytelen adatot adott vissza. Kérlek próbáld újra."
 
 msgid "Bad response"
-msgstr ""
+msgstr "Rossz válasz"
 
 msgid "Type"
 msgstr "Típus"
@@ -8092,13 +8137,12 @@ msgid ""
 "English</a>.</p></html>"
 msgstr ""
 "<html><p class=\"warning-header\">A témához tartozó súgótartalom "
-"hiányzik</p><p class=\"warning-body\">\r\n"
-"A témához tartozó súgótartalom <strong>{0}</strong>\r\n"
-"jelenleg nem elérhető. Sem a te nyelveden ({1}), sem angolul nem "
-"elérhető.<br><br>\r\n"
-"Kérlek segíts fejleszteni a JOSM súgórendszerét a hiányzó információk "
-"kitöltésével. Szerkesztheted a<a href=\"{2}\">súgótémát a saját nyelveden "
-"({1})</a> vagy <a href=\"{3}\">angol nyelven</a>.</p></html>"
+"hiányzik</p><p class=\"warning-body\"> A témához tartozó súgótartalom "
+"<strong>{0}</strong> jelenleg nem elérhető. Sem a te nyelveden ({1}), sem "
+"angolul nem elérhető.<br><br> Kérlek segíts fejleszteni a JOSM "
+"súgórendszerét a hiányzó információk kitöltésével. Szerkesztheted a<a "
+"href=\"{2}\">súgótémát a saját nyelveden ({1})</a> vagy <a "
+"href=\"{3}\">angol nyelven</a>.</p></html>"
 
 msgid ""
 "<html><p class=\"error-header\">Error when retrieving help information</p><p "
@@ -8296,9 +8340,6 @@ msgstr "A"
 msgid "B"
 msgstr "B"
 
-msgid "Date"
-msgstr "Dátum"
-
 msgid ""
 "Failed to update primitive with id {0} because current edit layer is null"
 msgstr ""
@@ -9159,8 +9200,8 @@ msgid ""
 "<html>Cannot upload {0} objects in one request because the<br>max. changeset "
 "size {1} on server ''{2}'' is exceeded.</html>"
 msgstr ""
-"<html>Nem tölthető fel {0} objektum egy kérésben, mert a<br>\r\n"
-"módosításcsomag mérete elérte a maximumot {1} a ''{2}'' szerveren.</html>"
+"<html>Nem tölthető fel {0} objektum egy kérésben, mert a<br> módosításcsomag "
+"mérete elérte a maximumot {1} a ''{2}'' szerveren.</html>"
 
 msgid "(1 request)"
 msgstr "(1 kérés)"
@@ -9295,9 +9336,6 @@ msgstr ""
 msgid "Save Layer"
 msgstr "Réteg mentése"
 
-msgid "Notes"
-msgstr "Bankjegyek"
-
 msgid "Notes layer"
 msgstr "Jegyzetek réteg"
 
@@ -9313,9 +9351,6 @@ msgstr "Adatréteg {0}"
 msgid "outside downloaded area"
 msgstr "letöltött területen kívül"
 
-msgid "version {0}"
-msgstr "{0} változat"
-
 msgid "Merging layers"
 msgstr "Rétegek egyesítése"
 
@@ -10948,10 +10983,10 @@ msgid "Display the Audio menu."
 msgstr "Audio menü megjelenítése"
 
 msgid "Label audio (and image and web) markers."
-msgstr ""
+msgstr "Hang (kép- és web) jelölők cimkézése."
 
 msgid "Display live audio trace."
-msgstr ""
+msgstr "Élő audio nyomvonal megjelenítése."
 
 msgid "Explicit waypoints with valid timestamps."
 msgstr "Explicit útpontok érvényes időbélyeggel."
@@ -10963,7 +10998,7 @@ msgid "Named trackpoints."
 msgstr "Elnevezett útpontok."
 
 msgid "Modified times (time stamps) of audio files."
-msgstr ""
+msgstr "Hangfájlok idő (időbéllyegek) módosításai."
 
 msgid "Start of track (will always do this if no other markers available)."
 msgstr ""
@@ -10983,6 +11018,8 @@ msgid ""
 "Put text labels against audio (and image and web) markers as well as their "
 "button icons."
 msgstr ""
+"Szövegcímkék elhelyezése a hang (kép- és web) jelölőkkel szemben, az "
+"ikonjaikkal egyetemben."
 
 msgid "When importing audio, make markers from..."
 msgstr "Audio importálásakor készíts jelölőket innen..."
@@ -10994,11 +11031,15 @@ msgid ""
 "Automatically create audio markers from trackpoints (rather than explicit "
 "waypoints) with names or descriptions."
 msgstr ""
+"Automatikus hang jelölők generálása a nyomkövetési pontokból (inkább mint "
+"kifejezett útpontokból) nevekkel vagy leírásokkal."
 
 msgid ""
 "Create audio markers at the position on the track corresponding to the "
 "modified time of each audio WAV file imported."
 msgstr ""
+"Hang jelölők készítése minden egyes beolvasott WAV fájl módosítási ideje "
+"alapján, a nyomvonal adott időpontjában található pozícióhoz."
 
 msgid ""
 "The number of seconds to jump forward or back when the relevant button is "
@@ -11019,9 +11060,11 @@ msgid ""
 "Playback starts this number of seconds before (or after, if negative) the "
 "audio track position requested"
 msgstr ""
+"A kért pozíciónál ennyi másodperccel előbb (vagy később, ha a szám negatív) "
+"kezdődik a kért hangjegyzet visszajátszása"
 
 msgid "Lead-in time (seconds)"
-msgstr ""
+msgstr "Kezdő idő (másodperc)"
 
 msgid "The ratio of voice recorder elapsed time to true elapsed time"
 msgstr "A hangrögzítő eltelt idejének aránya a valós eltelt időhöz"
@@ -11377,10 +11420,11 @@ msgid "Dynamic buttons in side menus"
 msgstr "Dinamikus gombok az oldalmenüben"
 
 msgid "Display ISO dates"
-msgstr ""
+msgstr "Dátomok megjelenítése ISO formátumban"
 
 msgid "Use native file choosers (nicer, but do not support file filters)"
 msgstr ""
+"Natív fájlválasztó használata (szebb, de nem támogatja a fájl szűrést)"
 
 msgid "Show localized name in selection lists, if available"
 msgstr "Lokalizált név megjelenítése a kiválasztási listában, ha elérhető"
@@ -11401,11 +11445,15 @@ msgid ""
 "Format dates according to {0}. Today''s date will be displayed as {1} "
 "instead of {2}"
 msgstr ""
+"Dátumok formázása {0} szabvány szerint. A mai nap {1} formában fog "
+"megjelenni, {2} helyett"
 
 msgid ""
 "Use file choosers that behave more like native ones. They look nicer but do "
 "not support some features like file filters"
 msgstr ""
+"Az operációs rendszer fájlválasztójának használata. Szebben néz ki, de "
+"néhány dolgot, például fájlok szűrését nem támogatja"
 
 msgid "Look and Feel"
 msgstr "Kinézet és működés"
@@ -11725,6 +11773,7 @@ msgstr "JOSM alapértelmezett (MapCSS)"
 msgid ""
 "Internal style to be used as base for runtime switchable overlay styles"
 msgstr ""
+"A futásidőben változtatható fedvény stílusok alapjául szolgáló belső stílus"
 
 msgid "Potlatch 2"
 msgstr "Potlatch 2"
@@ -12177,28 +12226,32 @@ msgstr "Eltávolítás…"
 
 msgid "Install JOSM localhost certificate to system/browser root keystores"
 msgstr ""
+"JOSM localhost tanúsítvány telepítése a rendszer/böngésző gyökér "
+"kulcstartójába"
 
 msgid ""
 "Uninstall JOSM localhost certificate from system/browser root keystores"
 msgstr ""
+"JOSM localhost tanúsítvány eltávolítása a rendszer/böngésző gyökér "
+"kulcstartójából"
 
 msgid "Certificate:"
 msgstr "Tanúsítvány:"
 
 msgid "Certificate has been successfully installed."
-msgstr ""
+msgstr "Tanúsítvány sikeresen telepítve."
 
 msgid "Certificate is already installed. Nothing to do."
-msgstr ""
+msgstr "A tanúsítvány már telepítve van. Nincs vele teendő."
 
 msgid "Removing certificate {0} from root keystore."
-msgstr ""
+msgstr "{0} tanúsítvány eltávolítása a gyökér kulcstartóból"
 
 msgid "Certificate has been successfully uninstalled."
-msgstr ""
+msgstr "A tanúsítvány sikeresen eltávolítva."
 
 msgid "Certificate is not installed. Nothing to do."
-msgstr ""
+msgstr "A tanúsítvány nincsen telepítve. Nincs vele teendő."
 
 msgid "Permitted actions:"
 msgstr "Megengedett műveletek:"
@@ -12313,27 +12366,33 @@ msgid ""
 "You do not have an Access Token yet to access the OSM server using OAuth. "
 "Please authorize first."
 msgstr ""
+"Még nem áll rendelkezésedre OAuth hozzáférési token az OSM szerver "
+"eléréséhez. Kérlek, előbb azonosítsd magad."
 
 msgid ""
 "You already have an Access Token to access the OSM server using OAuth."
 msgstr ""
+"Rendelkezésedre áll egy OAuth hozzáférési token az OSM szerver eléréséhez."
 
 msgid "Save to preferences"
-msgstr ""
+msgstr "Mentés a beállításokhoz"
 
 msgid "Click to step through the OAuth authorization process"
-msgstr ""
+msgstr "Klikkelj az OAuth meghatalmazási folyamat lépéseinek végigviteléhez"
 
 msgid "New Access Token"
-msgstr ""
+msgstr "Új elérési token"
 
 msgid ""
 "Click to step through the OAuth authorization process and generate a new "
 "Access Token"
 msgstr ""
+"Klikkelj az OAuth meghatalmazási folyamat lépéseinek végigviteléhez és egy "
+"új hozzáférési token generálásához"
 
 msgid "Click test access to the OSM server with the current access token"
 msgstr ""
+"Klikkelj az OSM szerver teszt eléréséhez az aktuális hozzáférési tokennel"
 
 msgid "<html>Use the default OSM server URL (<strong>{0}</strong>)</html>"
 msgstr ""
@@ -12403,6 +12462,9 @@ msgid ""
 "JOSM is configured to use proxies from the system setting, but the JVM is "
 "not configured to retrieve them. Resetting preferences to ''No proxy''"
 msgstr ""
+"A JOSM a rendszerbeállításokból kell vegye a proxi beállításokat, de a JVM "
+"nincs úgy beállítva, hogy vissza is adja azokat. A ''Nincs proxy'' "
+"visszaállítandó a beállításoknál."
 
 msgid "Connection Settings"
 msgstr "Kapcsolódás beállításai"
@@ -12417,19 +12479,19 @@ msgid "Shortcut"
 msgstr "Gyorsbillentyű"
 
 msgid "Shortcut Background: User"
-msgstr ""
+msgstr "Gyorsbillentyű háttér: Felhasználó"
 
 msgid "Shortcut Background: Modified"
-msgstr ""
+msgstr "Gyorsbillentyű háttér: Módosított"
 
 msgid "Use default"
-msgstr ""
+msgstr "Alapértelmezett használta"
 
 msgid "Key:"
 msgstr "Kulcs:"
 
 msgid "Attention: Use real keyboard keys only!"
-msgstr ""
+msgstr "Figyelem: Csak valós gyorsbillentyűket használjon!"
 
 msgid "Keyboard Shortcuts"
 msgstr "Gyorsbillentyűk"
@@ -12457,7 +12519,7 @@ msgid "Add a new rule by entering filename or URL"
 msgstr "Adj meg új szabályt fájlnév vagy URL megadásával"
 
 msgid "New rule entry:"
-msgstr ""
+msgstr "Új szabály megadása:"
 
 msgid "Remove the selected rules from the list of active rules"
 msgstr "Kiválasztott szabályok eltávolítása az aktív szabályok közül."
@@ -12469,33 +12531,37 @@ msgid "Add the selected available rules to the list of active rules"
 msgstr "A kiválasztott szabályok hozzáadása az aktív szabályok listájához."
 
 msgid "Reloads the list of available rules from ''{0}''"
-msgstr ""
+msgstr "Az elérhető szabályok listájának újratöltése a ''{0}'' helyről"
 
 msgid "Loading rule sources from ''{0}''"
-msgstr ""
+msgstr "Szabály források betöltése a ''{0}'' helyről"
 
 msgid ""
 "<html>Failed to load the list of rule sources "
 "from<br>''{0}''.<br><br>Details (untranslated):<br>{1}</html>"
 msgstr ""
+"<html>A szabály források listájának betöltése meghiúsult a<br>''{0}'' "
+"helyről.<br><br>Részletek (fordítatlan):<br>{1}</html>"
 
 msgid "Warning: illegal format of entry in rule list ''{0}''. Got ''{1}''"
 msgstr ""
+"Figyelem: helytelen formátumú elem a(z) ''{0}'' szabálylistában. Kapott "
+"''{1}''"
 
 msgid "Checks for errors on addresses"
-msgstr ""
+msgstr "A címek hibaellenőrzése"
 
 msgid "Tag combinations"
-msgstr ""
+msgstr "Cimke kombinációk"
 
 msgid "Checks for missing tag or suspicious combinations"
-msgstr ""
+msgstr "Hiányzó vagy gyanús cimke kombinációk vizsgálata"
 
 msgid "Deprecated features"
-msgstr ""
+msgstr "Eltávolított szolgáltatások"
 
 msgid "Checks for deprecated features"
-msgstr ""
+msgstr "Elavult funkciók utáni vizsgálat"
 
 msgid "Geometry"
 msgstr "Geometria"
@@ -12504,13 +12570,13 @@ msgid "Checks for geometry errors"
 msgstr "Geometriai hibák ellenőrzése"
 
 msgid "Checks for errors on highways"
-msgstr ""
+msgstr "Hibák keresése az országutakon"
 
 msgid "Multiple values"
-msgstr ""
+msgstr "Többszörös értékek"
 
 msgid "Checks for wrong multiple values"
-msgstr ""
+msgstr "Hibás többszörös értékek keresése"
 
 msgid "Numeric values"
 msgstr "Szám értékek"
@@ -12546,10 +12612,10 @@ msgid "Checks for wrong wikipedia tags"
 msgstr "Hibás Wikipédia tagok keresése"
 
 msgid "Tag checker rules"
-msgstr ""
+msgstr "Cimke vizsgálati szabályok"
 
 msgid "Choose Tag checker rules to enable"
-msgstr ""
+msgstr "Cimke ellenörző szabályok kiválasztása az engedélyezéshez"
 
 msgid "Use ignore list."
 msgstr "Kivétellista használata."
@@ -12593,29 +12659,29 @@ msgstr "többszörös"
 
 msgid "Remove old keys from up to {0} object"
 msgid_plural "Remove old keys from up to {0} objects"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Régi kulcsok eltávolítása {0} objektumról"
+msgstr[1] "Régi kulcsok eltávolítása több ({0}) objektumról"
 
 msgid "Delete the selection in the tag table"
-msgstr ""
+msgstr "A kiválasztottak törlése a cimke táblázatból"
 
 msgid "Add a new tag"
 msgstr "Új tag hozzáadása"
 
 msgid "Paste tags from buffer"
-msgstr ""
+msgstr "Cimkék beillesztése a pufferből"
 
 msgid "Use preset ''{0}'' of group ''{1}''"
-msgstr ""
+msgstr "Használd a(z) ''{1}'' csoport ''{0}'' beállítását"
 
 msgid "Use preset ''{0}''"
-msgstr ""
+msgstr "Használd a ''{0}'' beállítást"
 
 msgid "Elements of type {0} are supported."
 msgstr "{0} típus elemei támogatottak."
 
 msgid "Edit also …"
-msgstr ""
+msgstr "Szintén szerkesztendő..."
 
 msgid "Apply Preset"
 msgstr "Címkék alkalmazása"
@@ -12635,16 +12701,16 @@ msgid "Selection unsuitable!"
 msgstr "A kiválasztás alkalmatlan!"
 
 msgid "Change Tags"
-msgstr ""
+msgstr "Cimkék módosítása"
 
 msgid "Add or remove toolbar button"
-msgstr ""
+msgstr "Eszköztár gomb hozzáadása vagy levétele"
 
 msgid "Unknown requisite: {0}"
-msgstr ""
+msgstr "Ismeretlen követelmény: {0}"
 
 msgid "Illegal member expression: {0}"
-msgstr ""
+msgstr "Helytelen tagi kifejezés: {0}"
 
 msgid "More information about this feature"
 msgstr "További információk erről a tulajdonságról"
@@ -12677,26 +12743,36 @@ msgid ""
 "Warning in tagging preset \"{0}-{1}\": Ignoring ''{2}'' attribute as ''{3}'' "
 "elements are given."
 msgstr ""
+"Figyelem a(z) \"{0}-{1}\" cimkézési beállításban: a(z) ''{2}'' beállítás "
+"kihagyva, mivel ''{3}'' elem(ek) lettek megadva."
 
 msgid ""
 "Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' is "
 "not \"{2}\""
 msgstr ""
+"Sérült cimkézési beállítás \"{0}-{1}\" -  a JAVA eljárástól származó "
+"''values_from'' nem \"{2}\""
 
 msgid ""
 "Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' "
 "threw {2} ({3})"
 msgstr ""
+"Sérült cimkézési beállítás \"{0}-{1}\" - a JAVA eljárástól származó "
+"''values_from'' ezt dobta {2} ({3})"
 
 msgid ""
 "Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' "
 "must be the same as in ''values''"
 msgstr ""
+"Sérült cimkézési beállítás \"{0}-{1}\" - az elemek számának egyeznie kell a "
+"''display_values''-ban és a ''values''-ban"
 
 msgid ""
 "Broken tagging preset \"{0}-{1}\" - number of items in "
 "''short_descriptions'' must be the same as in ''values''"
 msgstr ""
+"Sérült cimkézési beállítás \"{0}-{1}\" - az elemek számának egyeznie kell a "
+"''short_descriptions''-ban és a ''values''-ban"
 
 msgid "Unknown type: {0}"
 msgstr "Ismeretlen típus: {0}"
@@ -12709,15 +12785,16 @@ msgstr "Készletcsoport {0}"
 
 msgid "Reference {0} is being used before it was defined"
 msgstr ""
+"A(z) {0} beállítás hamarabb kerülne használatba, mint ahogy definiálva van"
 
 msgid "Roles cannot appear more than once"
-msgstr ""
+msgstr "Szerepek nem jelenhetnek meg egytől többször"
 
 msgid "Preset role element without parent"
-msgstr ""
+msgstr "szerep elem beállítása szülő nélkül"
 
 msgid "Preset sub element without parent"
-msgstr ""
+msgstr "al-elem beállítása szülő nélkül"
 
 msgid "Error parsing {0}: "
 msgstr "Értelmezési hiba {0}: "
@@ -12741,27 +12818,30 @@ msgid "Search in tags"
 msgstr "Keresés címkék között"
 
 msgid "Add toolbar button"
-msgstr ""
+msgstr "Eszköztár gomb hozzáadása"
 
 msgid ""
 "Adjustable {0} not registered yet. Cannot set participation in synchronized "
 "adjustment."
 msgstr ""
+"A(z) {0} kiigazító még nem regisztrált. Nem lehet beállítani a szinkronizált "
+"kiigazításban való részvételt."
 
 msgid "Adjustable {0} not registered yet."
-msgstr ""
+msgstr "A(z) {0} kiigazító még nem regisztrált."
 
 msgid "Some of the key listeners forgot to remove themselves: {0}"
-msgstr ""
+msgstr "Néhány kiemelt figyelő rutin elfelejtette eltávolítani magát: {0}"
 
 msgid "Some of the key modifier listeners forgot to remove themselves: {0}"
 msgstr ""
+"Néhány kiemelt módosító, figyelő rutin elfelejtette eltávolítani magát: {0}"
 
 msgid "All files (*.*)"
 msgstr "Minden fájl (*.*)"
 
 msgid "Received error page:"
-msgstr ""
+msgstr "Visszakapott hibaoldal:"
 
 msgid "Min. latitude"
 msgstr "Min. szélesség"
@@ -12779,6 +12859,8 @@ msgid ""
 "URL from www.openstreetmap.org (you can paste a download URL here to specify "
 "a bounding box)"
 msgstr ""
+"www.openstreetmap.org féle URL (beilleszthetsz egy letöltési URL-t ide a "
+"határvonal négyzet megadásához)"
 
 msgid ""
 "The current value is not a valid changeset ID. Please enter an integer value "
@@ -12799,6 +12881,8 @@ msgstr "Kiválasztott forrás törlése a listából."
 msgid ""
 "The current value is not a valid OSM ID. Please enter an integer value > 0"
 msgstr ""
+"Az aktuális érték nem egy érvényes OSM ID. Kérlek, adj meg olyan számot ami "
+"> 0"
 
 msgid "false: the property is explicitly switched off"
 msgstr "hamis: a tulajdonság explicite kikapcsolva"
@@ -12823,35 +12907,47 @@ msgid "Right click = copy to clipboard"
 msgstr "Jobb klikk = másolás a vágólapra"
 
 msgid "Missing mandatory attribute ''{0}''."
-msgstr ""
+msgstr "Kötelező jellemző hiányzik ''{0}''."
 
 msgid ""
 "Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
 msgstr ""
+"Helytelen érték a(z) ''{0}'' kötelező jellemzőhöz, ez hosszú egész típus (64 "
+"biten). Kapott ''{1}''."
 
 msgid ""
 "Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
 "''{1}''."
 msgstr ""
+"Helytelen érték a(z) ''{0}'' kötelező jellemzőhöz, ez hosszú egész típus "
+"(>=0; 64 biten). Kapott ''{1}''."
 
 msgid "Illegal value for attribute ''{0}'' of type double. Got ''{1}''."
 msgstr ""
+"Helytelen érték a(z) ''{0}'' jellemzőhöz, ez dupla pontosságú lebegőpontos "
+"típus (64 bit; IEEE 754). Kapott ''{1}''."
 
 msgid ""
 "Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
 msgstr ""
+"Helytelen érték a(z) ''{0}'' kötelező jellemzőhöz, ez egy logikai érték "
+"típus (true vagy false). Kapott ''{1}''."
 
 msgid ""
 "Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
 "''{1}''."
 msgstr ""
+"Helytelen érték a(z) ''{0}'' kötelező jellemzőhöz, ez egy OsmPrimitiveType "
+"típus. Kapott ''{1}''."
 
 msgid ""
 "Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
 msgstr ""
+"A(z) ''{0}'' külső azonosítójú vonal befoglal egy ''{1}'' külső azonosítójú "
+"hiányzó pontot."
 
 msgid "Deleted node {0} is part of way {1}"
-msgstr ""
+msgstr "A(z) {0} törölt pont a(z) {1} vonal része."
 
 msgid ""
 "Way {0} with {1} nodes has incomplete nodes because at least one node was "
@@ -12864,9 +12960,11 @@ msgid ""
 "Relation with external id ''{0}'' refers to a missing primitive with "
 "external id ''{1}''."
 msgstr ""
+"A(z) ''{0}'' külső azonosítójú kapcsolat hivatkozik egy ''{1}'' külső "
+"azonosítójú hiányzó elemre."
 
 msgid "Deleted member {0} is used by relation {1}"
-msgstr ""
+msgstr "A(z) {0} törölt kapcsolat-tag a(z) {1} kapcsolat által használt."
 
 msgid "All Formats"
 msgstr "Minden formátum"
@@ -12878,121 +12976,153 @@ msgid "Contacting OSM Server..."
 msgstr "Kapcsolódás az OSM szerverhez..."
 
 msgid "Failed to open input stream for resource ''{0}''"
-msgstr ""
+msgstr "A(z) ''{0}'' erőforrás bejövő adatfolyamánk megnyitása elbukott"
 
 msgid ""
 "Failed to open file with extension ''{2}'' and namepart ''{3}'' in zip file "
 "''{0}''. Exception was: {1}"
 msgstr ""
+"A(z) ''{2}'' kiterjesztésű és ''{3}'' nevű fájl megnyitása meghiúsult a(z) "
+"''{0}'' zip fájlban. A kivétel: {1}"
 
 msgid "Failed to rename file {0} to {1}."
-msgstr ""
+msgstr "A(z) {0} fájl átnevezése {1}-re meghiúsult."
 
 msgid "Failed to load {0}, use cached file and retry next time: {1}"
 msgstr ""
+"A(z) {0} betöltése meghiúsult, a gyorstárazott fájlt használd és próbáld "
+"újra: {1}"
 
 msgid ""
 "Unexpected response from HTTP server. Got {0} response without ''Location'' "
 "header. Can''t redirect. Aborting."
 msgstr ""
+"Nem várt válasz érkezett a HTTP szervertő. A(z) {0} érkezett ''Location'' "
+"fejléc nélkül. Átirányítás nem lehetséges. Megszakítás."
 
 msgid "Too many redirects to the download URL detected. Aborting."
-msgstr ""
+msgstr "Túl sok átirányítás lett észlelve a letöltési URL-hez. Megszakítás."
 
 msgid "Download redirected to ''{0}''"
-msgstr ""
+msgstr "A letöltés átirányításra került a \"{0}\"-hoz"
 
 msgid "Failed to read from ''{0}''. Server responded with status code {1}."
 msgstr ""
+"A(z) ''{0}''-ból történő olvasás meghiúsult. A szerver a(z) {1}-es "
+"állapotkóddal válaszolt."
 
 msgid ""
 "Illegal value of attribute ''{0}'' of element ''{1}'' in server "
 "capabilities. Got ''{2}''"
 msgstr ""
+"A(z) ''{1}'' elem ''{0}'' jellemzőjének értéke helytelen a szerver "
+"képességeihez. ''{2}'' jött"
 
 msgid "Failed to parse date ''{0}'' replied by server."
-msgstr ""
+msgstr "A szerver által válaszolt ''{0}'' dátum értelmezése sikertelen."
 
 msgid ""
 "Unexpected format of error header for conflict in changeset update. Got "
 "''{0}''"
 msgstr ""
+"A frissítendő módosítási csomag konfliktusáról ismeretlen fejlécű hibafejléc "
+"érkezett. ''{0}'' jött"
 
 msgid "Illegal longitude value for parameter ''{0}'', got {1}"
 msgstr ""
+"A(z) ''{0}'' paraméterben helytelen hosszúsági fok érték van, {1} jött"
 
 msgid "Illegal latitude value for parameter ''{0}'', got {1}"
 msgstr ""
+"A(z) ''{0}'' paraméterben helytelen szélességi fok érték van, {1} jött"
 
 msgid "Unexpected value for ''{0}'' in changeset query url, got {1}"
 msgstr ""
+"A módosítási csomag lekérdező URL-ben nem várt érték a(z) ''{0}''-hoz, {1} "
+"jött"
 
 msgid ""
 "Cannot create a changeset query including both the query parameters ''uid'' "
 "and ''display_name''"
 msgstr ""
+"Két paraméterrel egyszerre (''uid'' és ''display_name'') nem lehet "
+"módosítási csomagot lekérdezni"
 
 msgid "Unsupported parameter ''{0}'' in changeset query string"
 msgstr ""
+"A módosítási csomag lekérdező karakterláncban nem támogatott ''{0}'' "
+"paraméter jött"
 
 msgid "Unexpected format for port number in preference ''{0}''. Got ''{1}''."
-msgstr ""
+msgstr "nem várt port szám a ''{0}'' beállításban. ''{1}'' jött."
 
 msgid "The proxy will not be used."
-msgstr ""
+msgstr "A proxy nem lesz használatban."
 
 msgid "Illegal port number in preference ''{0}''. Got {1}."
-msgstr ""
+msgstr "Helytelen port szám a(z) ''{0}'' beállításoknál. {1} jött."
 
 msgid ""
 "Unexpected value for preference ''{0}'' found. Got ''{1}''. Will use no "
 "proxy."
 msgstr ""
+"Nem várt érték található a(z) ''{0}'' beállításnál. ''{1}'' jött. Proxy nem "
+"lesz használva."
 
 msgid ""
 "Unexpected parameters for HTTP proxy. Got host ''{0}'' and port ''{1}''."
 msgstr ""
+"Nem várt paraméterek a HTTP proxy-nál. ''{0}'' kiszolgáló és {1} portszám "
+"jött."
 
 msgid ""
 "Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port ''{1}''."
 msgstr ""
+"Nem várt paraméterek a SOCKS proxy-nál. ''{0}'' kiszolgáló és {1} portszám "
+"jött."
 
 msgid ""
 "Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
 msgstr ""
+"A(z) ''{0}'' proxy ''{1}'' URI-jához való csatlakozás meghiúsult. A kivétel "
+"volt: {2}"
 
 msgid ""
 "The JVM is not configured to lookup proxies from the system settings. The "
 "property ''java.net.useSystemProxies'' was missing at startup time.  Will "
 "not use a proxy."
 msgstr ""
+"A JVM nincs beállítva arra, hogy a rendszerbeállításokból vegye a proxi "
+"beállításokat. A ''java.net.useSystemProxies'' beállítás hiányzott az "
+"indulás során. Proxy nem lesz használatban."
 
 msgid "Parsing response from server..."
-msgstr ""
+msgstr "Szerver válasz feldolgozás..."
 
 msgid "Unexpected XML element with name ''{0}''"
-msgstr ""
+msgstr "Váratlan XML elem ''{0}'' névvel"
 
 msgid "Could not export ''{0}''."
-msgstr ""
+msgstr "A(z) ''{0}'' kiöntése nem lehetséges."
 
 msgid "Could not import ''{0}''."
-msgstr ""
+msgstr "A(z) ''{0}'' beolvasása nem lehetséges."
 
 msgid "Could not import files."
-msgstr ""
+msgstr "A fájlok beolvasása nem lehetséges."
 
 msgid "<html>Could not read file ''{0}''.<br>Error is:<br>{1}</html>"
 msgstr ""
+"<html>A(z) ''{0}'' fájl olvasása nem lehetséges.<br>A hiba:<br>{1}</html>"
 
 msgid "<html>Could not read files.<br>Error is:<br>{0}</html>"
-msgstr ""
+msgstr "<html>A fájlok olvasása nem lehetséges.<br>A hiba:<br>{0}</html>"
 
 msgid "GeoJSON Files"
-msgstr ""
+msgstr "GeoJSON fájlok"
 
 msgid "Layer ''{0}'' not supported"
-msgstr ""
+msgstr "A ''{0}'' réteg nem támogatott"
 
 msgid ""
 "Note: GPL is not compatible with the OSM license. Do not upload GPL licensed "
@@ -13002,7 +13132,7 @@ msgstr ""
 "szerint licencelt nyomvonalakat."
 
 msgid "GPS track description"
-msgstr ""
+msgstr "GPS nyomvonal leírása"
 
 msgid "Add author information"
 msgstr "Szerzői információk hozzáadása"
@@ -13042,29 +13172,33 @@ msgid "Choose a predefined license"
 msgstr "Válassz egy előre definiált licencet"
 
 msgid "GPX Files"
-msgstr ""
+msgstr "GPX fájlok"
 
 msgid "Parsing data for layer ''{0}'' failed"
-msgstr ""
+msgstr "A ''{0}'' réteg feldolgozása sikertelen"
 
 msgid ""
 "Error occurred while parsing gpx data for layer ''{0}''. Only a part of the "
 "file will be available."
 msgstr ""
+"GPX adathiba történt a ''{0}'' réteg feldolgozása során. Csak a fájl egy "
+"része lesz elérhető."
 
 msgid ""
 "Error occurred while parsing gpx file ''{0}''. Only a part of the file will "
 "be available."
 msgstr ""
+"Hiba történt a GPX fájl feldolgozása során ''{0}''. Csak a fájl egy része "
+"lesz elérhető."
 
 msgid "Parse error: invalid document structure for GPX document."
-msgstr ""
+msgstr "Feldolgozási hiba: érvénytelen dokumentum struktúra a GPX fájlban."
 
 msgid "(at line {0}, column {1})"
-msgstr ""
+msgstr "(sorban {0}, oszlopban {1})"
 
 msgid "Unknown mode {0}."
-msgstr ""
+msgstr "Ismeretlen mód {0}."
 
 msgid "Image Files"
 msgstr "Képfájlok"
@@ -13098,6 +13232,8 @@ msgstr "{0} nem elérhető (offline mód)"
 msgid ""
 "No primitive with id {0} in local dataset. Cannot infer primitive type."
 msgstr ""
+"Nincs {0} azonosítójú elem a helyi adathalmazban. Nem lehet elem típust "
+"rendelni hozzá."
 
 msgid "Fetching a package of nodes from ''{0}''"
 msgstr "Pontok egy csomagjának lekérése innen: ''{0}''"
@@ -13110,13 +13246,15 @@ msgstr "Kapcsolatok egy csomagjának lekérése innen: ''{0}''"
 
 msgid "Downloading {0} object from ''{1}''"
 msgid_plural "Downloading {0} objects from ''{1}''"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Objektum {0} letöltése folyamatban innen ''{1}''"
+msgstr[1] "Objektumok {0} letöltése folyamatban innen ''{1}''"
 
 msgid ""
 "Server replied with response code 404, retrying with an individual request "
 "for each object."
 msgstr ""
+"A szerver 404-es hibakóddal válaszolt, minden egyes önálló objektumra önálló "
+"kérés indul."
 
 msgid "Downloading OSM data..."
 msgstr "OSM adatok letöltése..."
@@ -13132,63 +13270,70 @@ msgstr "{0} azonosítójú kapcsolat lekérése innen: \"{1}\""
 
 msgid "Server replied with response code 404 for id {0}. Skipping."
 msgstr ""
+"A szerver a(z) {0} azonosítóra 404-es hibakóddal válaszolt. Kihagyás."
 
 msgid "NMEA-0183 Files"
-msgstr ""
+msgstr "NMEA-0183 fájlok"
 
 msgid "Coordinates imported: {0}"
-msgstr ""
+msgstr "Behozott koordináták: {0}"
 
 msgid "Malformed sentences: {0}"
-msgstr ""
+msgstr "Hibás formátumú mondatok: {0}"
 
 msgid "Checksum errors: {0}"
-msgstr ""
+msgstr "Ellenörző összeg hibák: {0}"
 
 msgid "Unknown sentences: {0}"
-msgstr ""
+msgstr "Ismeretlen mondatok: {0}"
 
 msgid "Zero coordinates: {0}"
-msgstr ""
+msgstr "Nullpont koordináták: {0}"
 
 msgid "NMEA import success:"
-msgstr ""
+msgstr "NMEA beolvasás sikeres:"
 
 msgid "NMEA import failure!"
-msgstr ""
+msgstr "NMEA beolvasás sikertelen!"
 
 msgid "Note Files"
-msgstr ""
+msgstr "Jegyzet fájlok"
 
 msgid "OSM API"
 msgstr "OSM API"
 
 msgid "JOSM website"
-msgstr ""
+msgstr "JOSM honlap"
 
 msgid "Unable to access ''{0}'': {1} not available (offline mode)"
 msgstr ""
+"A(z) ''{0}'' hozzáférés nem lehetséges : {1} nem elérhető (lecsatlakozott "
+"módban)"
 
 msgid "Unable to initialize OSM API."
-msgstr ""
+msgstr "Az OSM API inicializálása nem lehetséges."
 
 msgid "This version of JOSM is incompatible with the configured server."
-msgstr ""
+msgstr "A JOSM ezen verziója nem kompatibilis a bekonfigurált szerverrel."
 
 msgid ""
 "It supports protocol version 0.6, while the server says it supports {0} to "
 "{1}."
 msgstr ""
+"Csak 0.6-os protokoll verzió támogatott itt, amíg a szerver azt mondja, hogy "
+"{0} és {1} közötti szükséges."
 
 msgid "Removed layer {0} because it is not allowed by the configured API."
 msgstr ""
+"A(z) {0} réteg el lett távolítva, mert a beállított API nem engedélyezte."
 
 msgid "Unexpected format of ID replied by the server. Got ''{0}''."
-msgstr ""
+msgstr "Nem várt formátumú ID-t válaszolt a szerver. ''{0}'' jött."
 
 msgid ""
 "Unexpected format of new version of modified primitive ''{0}''. Got ''{1}''."
 msgstr ""
+"A módosított ''{0}'' elem új verziójának formátuma nem ismert. ''{1}'' jött."
 
 msgid "Creating changeset..."
 msgstr "Módosításcsomag készítése..."
@@ -13209,208 +13354,239 @@ msgid "Closing changeset..."
 msgstr "Módosításcsomag lezárása..."
 
 msgid "No changeset present for diff upload."
-msgstr ""
+msgstr "Nincs jelen módosításcsomag a különbözet feltöltéséhez."
 
 msgid "Preparing upload request..."
-msgstr ""
+msgstr "Előkészület a kérés feltöltésére..."
 
 msgid "Waiting 10 seconds ... "
-msgstr ""
+msgstr "Várakozás 10 másodpercig... "
 
 msgid "Starting retry {0} of {1} in {2} seconds ..."
 msgstr "Újrapróbálkozás {0}/{1}, {2} másodperc múlva ..."
 
 msgid "OK - trying again."
-msgstr ""
+msgstr "OK - ismételt próba."
 
 msgid "Starting retry {0} of {1}."
 msgstr "Újrapróbálkozás {0}/{1}."
 
 msgid "Current changeset is null. Cannot upload data."
-msgstr ""
+msgstr "Az aktuális változáscsomag üres. Adatfeltöltés nem lehetséges."
 
 msgid "ID of current changeset > 0 required. Current ID is {0}."
 msgstr ""
+"Az aktuális módosítási csomag ID-jának > 0 kell legyen. Az aktuális ID {0}."
 
 msgid "Open changeset expected. Got closed changeset with id {0}."
 msgstr ""
+"Nyitott módosításcsomag elvárt. A(z) {0} azonosítójú lezárt csomag érkezett."
+
+msgid "Note upload failed"
+msgstr "Jegyzet feltöltése meghiúsult"
+
+msgid "Error parsing note response from server"
+msgstr "A szerver jegyzet válaszának feldolgozása hibás"
+
+msgid "Error encoding string: {0}"
+msgstr "Szöveg titkosítás hibás: {0}"
 
 msgid "(Code={0})"
-msgstr ""
+msgstr "(Kód={0})"
 
 msgid "The server replied an error with code {0}."
-msgstr ""
+msgstr "A szerver a(z) {0} hibakóddal válaszolt."
 
 msgid "OSM Server Files bzip2 compressed"
-msgstr ""
+msgstr "Az OSM szerver fájlok bzip2 tömörítettek"
 
 msgid "Prolog of OsmChange document already written. Please write only once."
 msgstr ""
+"Az OsmChange dokumentum előszava már meg van írva. Kérlek, csak egyet írj."
 
 msgid "Prolog of OsmChange document not written yet. Please write first."
 msgstr ""
+"Az OsmChange dokumentum előszava még nincs megírva. Kérlek, előbb írj egyet."
 
 msgid "OsmChange File"
-msgstr ""
+msgstr "OsmChange fájl"
 
 msgid "File ''{0}'' does not exist."
-msgstr ""
+msgstr "A(z) ''{0}'' fájl nem létezik."
 
 msgid "No data found in file {0}."
-msgstr ""
+msgstr "A(z) {0} fájlban nincs adat."
 
 msgid "Open OsmChange file"
-msgstr ""
+msgstr "OsmChange fájl megnyitása"
 
 msgid "Unsupported version: {0}"
-msgstr ""
+msgstr "Nem támogatott verzió: {0}"
 
 msgid ""
 "Unsupported start element ''{0}'' in changeset content at position "
 "({1},{2}). Skipping."
 msgstr ""
+"Nem támogatott kezdőelem ''{0}'' a módosításcsomag tartalmában, a(z) "
+"({1},{2}) pozícióban. Kihagyás."
 
 msgid ""
 "Illegal document structure. Found node, way, or relation outside of "
 "''create'', ''modify'', or ''delete''."
 msgstr ""
+"Helytelen dokumentum struktúra. Pont, vonal vagy kapcsolat található a "
+"''create'', ''modify'', vagy ''delete'' blokkokon kívül."
 
 msgid ""
 "Unsupported end element ''{0}'' in changeset content at position ({1},{2}). "
 "Skipping."
 msgstr ""
+"Nem támogatott záróelem ''{0}'' a módosításcsomag tartalmában, a(z) "
+"({1},{2}) pozícióban. Kihagyás."
 
 msgid "Parsing changeset content ..."
-msgstr ""
+msgstr "Módosításcsomag tartalmi elemzése..."
+
+msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
+msgstr "Helytelen logikai érték a(z) ''{0}'' jellemzőhöz. Kapott: ''{1}''."
 
 msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
-msgstr ""
+msgstr "Helytelen érték a(z) ''{0}'' jellemzőhöz. Kapott: ''{1}''."
 
 msgid "Illegal numeric value for attribute ''{0}''. Got ''{1}''."
-msgstr ""
-
-msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
-msgstr ""
+msgstr "Helytelen számérték a(z) ''{0}'' jellemzőhöz. Kapott: ''{1}''."
 
 msgid "Missing mandatory attribute ''{0}'' of XML element {1}."
-msgstr ""
+msgstr "Hiányzó kötelező leíró a(z) ''{0}'' XML elemhez {1}."
 
 msgid "Undefined element ''{0}'' found in input stream. Aborting."
-msgstr ""
+msgstr "Nem definiált elem ''{0}'' volt a bejövő adatfolyamban. Megszakítás."
 
 msgid "Parsing list of changesets..."
-msgstr ""
+msgstr "Módosításcsomagok listájának elemzése..."
 
 msgid "Failed to sign a HTTP connection with an OAuth Authentication header"
-msgstr ""
+msgstr "A HTTP kapcsolat aláírása meghiúsult az OAuth hitelesítési fejléccel"
 
 msgid "Unexpected value for preference ''{0}''. Got ''{1}''."
-msgstr ""
+msgstr "Nem várt értékű beállítás ''{0}''. Kapott: ''{1}''."
 
 msgid "<html>An error occurred while saving.<br>Error is:<br>{0}</html>"
-msgstr ""
+msgstr "<html>Egy hiba történt mentés közben.<br>A hiba:<br>{0}</html>"
 
 msgid ""
 "<html>An error occurred while restoring backup file.<br>Error "
 "is:<br>{0}</html>"
 msgstr ""
+"<html>Egy hiba történt a biztonsági másolat visszatöltése közben.<br>A "
+"hiba:<br>{0}</html>"
 
 msgid "OSM Server Files gzip compressed"
-msgstr ""
+msgstr "Az OSM szerver fájlok zip tömörítettek"
 
 msgid "Parsing OSM history data ..."
-msgstr ""
+msgstr "OSM adattörténet feldolgozása..."
 
 msgid "OSM Server Files"
-msgstr ""
+msgstr "OSM szerver fájlok"
 
 msgid "Invalid dataset"
-msgstr ""
+msgstr "Érvénytelen adathalmaz"
 
 msgid "No data found for layer ''{0}''."
-msgstr ""
+msgstr "Nem található adat a(z) ''{0}'' réteghez."
 
 msgid "No data found in file ''{0}''."
-msgstr ""
+msgstr "Nem található adat a(z) ''{0}'' fájlban."
 
 msgid "Open OSM file"
-msgstr ""
+msgstr "OSM fájl megnyitása"
 
 msgid "Reading was canceled"
-msgstr ""
+msgstr "A beolvasás meg lett szakítva"
 
 msgid ""
 "Missing mandatory attributes on element ''bounds''. Got "
 "minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
 msgstr ""
+"A ''bounds'' elemnek vannak hiányzó, de kötelező jellemzői. Kapott: "
+"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
 
 msgid "Deleted way {0} contains nodes"
-msgstr ""
+msgstr "A törölt {0} vonal tartalmaz pontokat"
 
 msgid "Missing mandatory attribute ''{0}'' on <nd> of way {1}."
-msgstr ""
+msgstr "Hiányzó ''{0}'' kötelező jellemző  a(z) {1} vonal <nd> elemén."
 
 msgid "Illegal value of attribute ''ref'' of element <nd>. Got {0}."
-msgstr ""
+msgstr "Az <nd> elem ''ref'' jellemzőjén hibás érték van. Kapott: {0}."
 
 msgid "Deleted relation {0} contains members"
-msgstr ""
+msgstr "A törlendő {0} kapcsolat tartalmaz résztvevő elemeket"
 
 msgid "Missing attribute ''ref'' on member in relation {0}."
-msgstr ""
+msgstr "A(z) {0} kapcsolat ''ref'' tagjának egy jellemzője hiányzik."
 
 msgid ""
 "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}"
 msgstr ""
+"A(z) {0} kapcsolat ''ref'' tagjának egy leíró értéke hibás. Kapott: {1}"
 
 msgid "Missing attribute ''type'' on member {0} in relation {1}."
-msgstr ""
+msgstr "A(z) {1} kapcsolat {0} tagjának ''type'' leírója hiányzik."
 
 msgid ""
 "Illegal value for attribute ''type'' on member {0} in relation {1}. Got {2}."
 msgstr ""
+"Helytelen érték a(z) {1} kapcsolat {0} tagjának ''type'' leíróján. Kapott: "
+"{2}."
 
 msgid "Incomplete <member> specification with ref=0"
-msgstr ""
+msgstr "Befejezetlen <member> specifikáció ref=0 értékkel"
 
 msgid "Missing key or value attribute in tag."
-msgstr ""
+msgstr "Hiányzó kulcs vagy érték leíró a cimkében."
 
 msgid "Undefined element ''{0}'' found in input stream. Skipping."
-msgstr ""
+msgstr "Ismeretlen ''{0}'' elem található a bejövő adatfolyamban. Kihagyva."
 
 msgid "Illegal object with ID=0."
-msgstr ""
+msgstr "Helytelen objektum 0 azonosítóval (ID)."
 
 msgid ""
 "Illegal value for attribute ''version'' on OSM primitive with ID {0}. Got "
 "{1}."
 msgstr ""
+"Helytelen érték az ID {0} OSM elem ''version'' leírójában. Kapott: {1}."
 
 msgid ""
 "Normalizing value of attribute ''version'' of element {0} to {2}, API "
 "version is ''{3}''. Got {1}."
 msgstr ""
+"A(z) {0} elem ''version'' leírójának normalizálása {2}-re, API verzió "
+"''{3}''. Kapott: {1}."
 
 msgid "Unknown or unsupported API version. Got {0}."
-msgstr ""
+msgstr "Ismeretlen vagy nem támogatott API verzió. Kapott: {0}."
 
 msgid "Missing attribute ''version'' on OSM primitive with ID {0}."
-msgstr ""
+msgstr "Hiányzó ''version'' leíró az ID {0} OSM elemen."
 
 msgid ""
 "Illegal value for attribute ''changeset'' on new object {1}. Got {0}. "
 "Resetting to 0."
 msgstr ""
+"A(z) {1} új objektum ''changeset'' leírójában helytelen érték van. Kapott: "
+"{0}."
 
 msgid "Illegal value for attribute ''changeset''. Got {0}."
-msgstr ""
+msgstr "Helytelen érték a ''changeset'' leíróban. Kapott: {0}."
 
 msgid "Missing required attribute ''{0}''."
-msgstr ""
+msgstr "Hiányzó kötelező leíró ''{0}''."
 
 msgid "Illegal long value for attribute ''{0}''. Got ''{1}''."
-msgstr ""
+msgstr "Helytelen hosszúszám érték a(z) ''{0}'' leíróban. Kapott: ''{1}''."
 
 msgid "Prepare OSM data..."
 msgstr "OSM adatok előkészítése…"
@@ -13460,50 +13636,55 @@ msgid "Contacting Server..."
 msgstr "Kapcsolódás a szerverhez..."
 
 msgid "Downloading OSM notes..."
-msgstr ""
+msgstr "OSM jegyzetek letöltése..."
 
 msgid "Failed to open connection to API {0}."
-msgstr ""
+msgstr "Kapcsolat nyitás a(z) {0} API-hoz megiúsult."
 
 msgid ""
 "Could not connect to the OSM server. Please check your internet connection."
 msgstr ""
+"Nem sikerült csatlakozni az OSM szerverhez. Kérlek, ellenőrizd az internet "
+"kapcsolatot."
 
 msgid "Reading error text failed."
-msgstr ""
+msgstr "Hibaszöveg beolvasása meghiúsult."
 
 msgid "XML tag <user> is missing."
-msgstr ""
+msgstr "A <user> XML elem hiányzik."
 
 msgid "Missing attribute ''{0}'' on XML tag ''{1}''."
-msgstr ""
+msgstr "Hiányzó ''{0}'' jellemző a(z) ''{1}'' XML elemben."
 
 msgid "Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}."
 msgstr ""
+"A(z) ''{0}'' jellemző nem megengedett értékű a(z) ''{1}'' XML elemben. "
+"Kapott {2}."
 
 msgid "Reading user info ..."
 msgstr "Felhasználói adatok olvasása…"
 
 msgid "Starting to upload with one request per primitive ..."
-msgstr ""
+msgstr "Elemenként egy kérés felküldésének megkezdése..."
 
 msgid "{0}% ({1}/{2}), {3} left. Uploading node ''{4}'' (id: {5})"
-msgstr ""
+msgstr "{0}% ({1}/{2}), {3} maradt. Pont feltöltése ''{4}'' (id: {5})"
 
 msgid "{0}% ({1}/{2}), {3} left. Uploading way ''{4}'' (id: {5})"
-msgstr ""
+msgstr "{0}% ({1}/{2}), {3} maradt. Vonal feltöltése ''{4}'' (id: {5})"
 
 msgid "{0}% ({1}/{2}), {3} left. Uploading relation ''{4}'' (id: {5})"
-msgstr ""
+msgstr "{0}% ({1}/{2}), {3} maradt. Kapcsolat feltöltése ''{4}'' (id: {5})"
 
 msgid "Starting to upload in one request ..."
-msgstr ""
+msgstr "Feltöltés megkezdése egyetlen kérésként..."
 
 msgid "Value >0 expected for parameter ''{0}'', got {1}"
 msgstr ""
+"Nullától nagyobb (>0) érték elvárt a(z) ''{0}'' paraméterhez, {1} érkezett"
 
 msgid "Starting to upload in chunks..."
-msgstr ""
+msgstr "Feltöltés megkezdése nagy darabokban..."
 
 msgid "({0}/{1}) Uploading {2} object..."
 msgid_plural "({0}/{1}) Uploading {2} objects..."
@@ -13514,13 +13695,13 @@ msgid "Uploading data ..."
 msgstr "Adatok feltöltése…"
 
 msgid "Unexpected id 0 for osm primitive found"
-msgstr ""
+msgstr "Nem várt (0) azonosító egy OSM elemhez"
 
 msgid "OSM Server Files zip compressed"
-msgstr ""
+msgstr "Az OSM szerver fájlok ZIP tömörítettek"
 
 msgid "WMS Files (*.wms)"
-msgstr ""
+msgstr "WMS fájlok (*.wms)"
 
 msgid ""
 "<html><body><p class=\"warning-body\"><strong>Warning:</strong> The password "
@@ -13528,277 +13709,304 @@ msgid ""
 "transferred <strong>unencrypted</strong> in every request sent to the OSM "
 "server. <strong>Do not use a valuable password.</strong></p></body></html>"
 msgstr ""
+"<html><body><p class=\"warning-body\"><strong>Figyelem:</strong> A jelszó "
+"titkosítatlanul van tárolva a JOSM beállítások közt. Továbbá "
+"<strong>titkosítatlanul</strong> kerül továbbításra minden egyes kérésben az "
+"OSM szerver felé. <strong>Ne használjon értékes/fontos/máshol is használt "
+"jelszót itt!</strong></p></body></html>"
 
 msgid "Save user and password (unencrypted)"
 msgstr "Felhasználónév és jelszó mentése (tikosítatlanul)"
 
 msgid "<delete from {0} objects>"
-msgstr ""
+msgstr "<törlés a(z) {0} objektumból>"
 
 msgid "Old values of"
-msgstr ""
+msgstr "A régi értékek"
 
 msgid "Add tags to selected objects"
-msgstr ""
+msgstr "Cimkék hozzáadása a kiválasztott objektumokhoz"
 
 msgid "Add selected tags"
-msgstr ""
+msgstr "Kiválasztott cimkék hozzáadása"
 
 msgid "Add all tags"
-msgstr ""
+msgstr "Az összes címke hozzáadása"
 
 msgid "Add checked tags to selected objects"
-msgstr ""
+msgstr "A kijelölt címkék hozzáadása a kiválasztott objektumokhoz"
 
 msgid "Shift+Enter: Add all tags to selected objects"
-msgstr ""
+msgstr "Shift+Enter: Minden címke hozzáadása a kiválasztott objektumokhoz"
 
 msgid "Assume"
-msgstr ""
+msgstr "Feltételezés"
 
 msgid "Existing values"
-msgstr ""
+msgstr "Meglévő értékek"
 
 msgid "Enable the checkbox to accept the value"
-msgstr ""
+msgstr "Fogadd el az értéket a jelölődoboz engedélyezésével"
 
 msgid "Accept all tags from {0} for this session"
-msgstr ""
+msgstr "Ebben a munkamenetben az összes címke elfogadása a(z) {0}-tól"
 
 msgid "Load data from API"
-msgstr ""
+msgstr "Adat betöltése az API-ból"
 
 msgid "Import data from URL"
-msgstr ""
+msgstr "URL-adatok importálása"
 
 msgid "Open local files"
-msgstr ""
+msgstr "Helyi fájlok megnyitása"
 
 msgid "Load imagery layers"
 msgstr "Légifelvétel-rétegek betöltése"
 
 msgid "Change the selection"
-msgstr ""
+msgstr "Kijelölés megváltoztatása"
 
 msgid "Change the viewport"
-msgstr ""
+msgstr "Nézőpont változtatása"
 
 msgid "Create new objects"
-msgstr ""
+msgstr "Új objektumok létrehozása"
 
 msgid "Read protocol version"
-msgstr ""
+msgstr "Olvasási protokollverzió"
 
 msgid "Cannot start remotecontrol server on port {0}: {1}"
-msgstr ""
+msgstr "Nem indul el a távvezérlő szerver a(z) {0} porton: {1}"
 
 msgid "RemoteControl::Accepting connections on port {0}"
-msgstr ""
+msgstr "Távirányító::Kapcsolatok fogadása a(z) {0} porton"
 
 msgid "RemoteControl::Server stopped."
-msgstr ""
+msgstr "Távirányító::Szerver megállítva."
 
 msgid "Cannot start remotecontrol https server on port {0}: {1}"
-msgstr ""
+msgstr "A távirányító https szerver nem indítható el a(z) {0} porton: {1}"
 
 msgid "Unable to initialize Remote Control HTTPS Server"
-msgstr ""
+msgstr "Nem sikerül inicializálni a Távirányító HTTPS szervert"
 
 msgid "RemoteControl::Accepting secure connections on port {0}"
-msgstr ""
+msgstr "Távirányító::Biztonságos kapcsolatok fogadása a(z) {0} porton"
 
 msgid "RemoteControl::Server (https) stopped."
-msgstr ""
+msgstr "Távirányító::Szerver (https) megállítva."
 
 msgid "Remote Control has been asked to create a new node."
-msgstr ""
+msgstr "A Távirányítóhoz kérés érkezett, egy új pont létrehozására."
 
 msgid "There is no layer opened to add node"
-msgstr ""
+msgstr "Nincs nyitott réteg a pont hozzáadásához"
 
 msgid "Remote Control has been asked to create a new way."
-msgstr ""
+msgstr "A Távirányítóhoz kérés érkezett, egy új vonal létrehozására."
 
 msgid "Invalid coordinates: {0}"
-msgstr ""
+msgstr "Helytelen koordináták: {0}"
 
 msgid "There is no layer opened to add way"
-msgstr ""
+msgstr "Nincs nyitott réteg a vonal hozzáadásához"
 
 msgid "Add way"
-msgstr ""
+msgstr "Út hozzáadása"
 
 msgid ""
 "Remote Control has been asked to report its supported features. This enables "
 "web sites to guess a running JOSM version"
 msgstr ""
+"A Távirányítóhoz kérés érkezett, hogy adja meg a támogatott funkcióit. Ez "
+"lehetővé teszi a weboldalaknak, hogy kitalálják a futó JOSM verzióját"
 
 msgid ""
 "Remote Control has been asked to load an imagery layer from the following "
 "URL:"
 msgstr ""
+"A Távirányítóhoz kérés érkezett, hogy töltsön be egy ábrázoló réteget a "
+"következő URL-ről:"
 
 msgid "Remote imagery"
-msgstr ""
+msgstr "Táv ábrázolás"
 
 msgid "Remote Control has been asked to import data from the following URL:"
 msgstr ""
+"A Távirányítóhoz kérés érkezett, hogy töltsön be adatokat a következő URL-"
+"ről:"
 
 msgid "Remote Control has been asked to load data from the API."
 msgstr ""
+"A Távirányítóhoz kérés érkezett, hogy töltsön be adatokat az API-ről."
 
 msgid "The latitudes must be between {0} and {1}"
-msgstr ""
+msgstr "A szélességi foknak {0} és {1} között kell lennie"
 
 msgid "The longitudes must be between {0} and {1}"
-msgstr ""
+msgstr "A hosszúsági foknak {0} és {1} között kell lennie"
 
 msgid "The minima must be less than the maxima"
-msgstr ""
+msgstr "A minimumnak kissebbnek kell lennie mint a maximum"
 
 msgid "Remote Control has been asked to load the following data:"
 msgstr ""
+"A Távirányítóhoz kérés érkezett, hogy töltsön be a következő adatokat:"
 
 msgid "Loading data"
-msgstr ""
+msgstr "Adatok betöltése"
 
 msgid ""
 "Remote Control has been asked to load objects (specified by their id) from "
 "the API."
 msgstr ""
+"A Távirányítóhoz kérés érkezett, hogy töltsön be objektumokat (az "
+"azonosítójuk alapján), az API-ről."
 
 msgid "Remote Control has been asked to open a local file."
-msgstr ""
+msgstr "A Távirányítóhoz kérés érkezett, hogy töltsön be egy helyi fájlt."
 
 msgid "Do you want to allow this?"
-msgstr ""
+msgstr "Jóvá akarod ezt hagyni?"
 
 msgid "Confirm Remote Control action"
-msgstr ""
+msgstr "Távirányító aktivitás jóváhagyása"
 
 msgid ""
 "Remote Control has been asked to report its protocol version. This enables "
 "web sites to detect a running JOSM."
 msgstr ""
+"A Távirányítóhoz kérés érkezett, hogy jelentse a protokoll verzióját. Ez "
+"lehetővé teszi a weboldalaknak, hogy érzékeljék a futó JOSM-t."
 
 msgid ""
 "Version ''{0}'' of meta data for geoimage layer is not supported. Expected: "
 "0.1"
 msgstr ""
+"A geokép réteghez ''{0}'' verziójú metaadatok nem támogatottak. Elvárt: 0.1"
 
 msgid "Data:"
-msgstr ""
+msgstr "Adat:"
 
 msgid "local file"
-msgstr ""
+msgstr "helyi fájl"
 
 msgid "Link to a GPX file on your local disk."
-msgstr ""
+msgstr "Hivatkozás egy GPX fájlra a helyi lemezeden."
 
 msgid "include"
-msgstr ""
+msgstr "befoglal"
 
 msgid "Include GPX data in the .joz session file."
-msgstr ""
+msgstr "GPX adatok beillesztése a .joz munkafolyam fájlba."
 
 msgid "No file association"
-msgstr ""
+msgstr "Nincs fájl társítás"
 
 msgid "GPX data will be included in the session file."
-msgstr ""
+msgstr "A GPX adatok be lesznek illesztve a munkafolyam fájlba."
 
 msgid ""
 "Version ''{0}'' of meta data for gpx track layer is not supported. Expected: "
 "0.1"
 msgstr ""
+"A gpx nyomvonal réteghez ''{0}'' verziójú metaadatok nem támogatottak. "
+"Elvárt: 0.1"
 
 msgid "File name expected for layer no. {0}"
-msgstr ""
+msgstr "Fájlnév elvárt a(z) {0} számú réteghez."
 
 msgid ""
 "Version ''{0}'' of meta data for imagery layer is not supported. Expected: "
 "0.1"
 msgstr ""
+"A kép réteghez ''{0}'' verziójú metaadatok nem támogatottak. Elvárt: 0.1"
 
 msgid ""
 "Version ''{0}'' of meta data for marker layer is not supported. Expected: 0.1"
 msgstr ""
+"A jelölő réteghez ''{0}'' verziójú metaadatok nem támogatottak. Elvárt: 0.1"
 
 msgid "Layer contains unsaved data - save to file."
-msgstr ""
+msgstr "A réteg nem mentett adatokat tartalmaz - fájlba mentés."
 
 msgid "Layer does not contain unsaved data."
-msgstr ""
+msgstr "A réteg nem tartalmaz mentetlen adatokat."
 
 msgid "Link to a OSM data file on your local disk."
-msgstr ""
+msgstr "OSM adatfájl hivatkozás a helyi lemezen."
 
 msgid "Include OSM data in the .joz session file."
-msgstr ""
+msgstr "OSM adatok beágyazása a .joz munkamenet fájlba."
 
 msgid "OSM data will be included in the session file."
-msgstr ""
+msgstr "A(z) OSM adatok be lesznek ágyazva a munkamenet fájlba."
 
 msgid ""
 "Version ''{0}'' of meta data for osm data layer is not supported. Expected: "
 "0.1"
 msgstr ""
+"Az OSM adatréteghez ''{0}'' verziójú metaadatok nem támogatottak. Elvárt: 0.1"
 
 msgid "Session file (*.jos, *.joz)"
 msgstr "Munkamenet fájl (*.jos, *.joz)"
 
 msgid "Unable to locate file  ''{0}''."
-msgstr ""
+msgstr "A(z) ''{0}'' fájl nem található."
 
 msgid "Unsupported scheme ''{0}'' in URI ''{1}''."
-msgstr ""
+msgstr "Nem támogatott ''{0}'' séma a(z) ''{1}'' URI-ban."
 
 msgid "Unexpected root element ''{0}'' in session file"
-msgstr ""
+msgstr "Nem várt ''{0}'' gyökér-elem a munkamenet fájlban"
 
 msgid "Version ''{0}'' of session file is not supported. Expected: 0.1"
-msgstr ""
+msgstr "A(z) ''{0}'' verziójú munkamenet fájl nem támogatott. Elvárt: 0.1"
 
 msgid "missing mandatory attribute ''index'' for element ''layer''"
-msgstr ""
+msgstr "hiányzó kötelező ''index'' leíró a ''layer'' elemhez"
 
 msgid "unexpected format of attribute ''index'' for element ''layer''"
-msgstr ""
+msgstr "nem várt formátumú ''index'' leíró a ''layer'' elemhez"
 
 msgid "attribute ''index'' ({0}) for element ''layer'' must be unique"
-msgstr ""
+msgstr "a ''layer'' elem ''index'' leírójának ({0}) egyedinek kell lennie"
 
 msgid "missing layer with index {0}"
-msgstr ""
+msgstr "hiányzó réteg {0} indexel"
 
 msgid "missing mandatory attribute ''name'' for element ''layer''"
-msgstr ""
+msgstr "hiányzó kötelező ''name'' leíró a ''layer'' elemhez"
 
 msgid "missing mandatory attribute ''type'' for element ''layer''"
-msgstr ""
+msgstr "hiányzó kötelező ''type'' leíró a ''layer'' elemhez"
 
 msgid "Unable to load layer"
-msgstr ""
+msgstr "Nem lehet betölteni a réteget"
 
 msgid ""
 "Cannot load layer of type ''{0}'' because no suitable importer was found."
 msgstr ""
+"A(z) {0} típusú réteget nem lehet betölteni, mert nem található megfelelő "
+"betöltő."
 
 msgid ""
 "Cannot load layer {0} because it depends on layer {1} which has been skipped."
 msgstr ""
+"A(z) {0} réteget nem lehet betölteni, mert függ a kihagyott {1} rétegtől."
 
 msgid "Error loading layer"
-msgstr ""
+msgstr "Hiba a réteg betöltésekor"
 
 msgid "<html>Could not load layer {0} ''{1}''.<br>Error is:<br>{2}</html>"
 msgstr ""
+"<html>Nem lehet betölteni a(z) {0} réteget ''{1}''.<br>A hiba:<br>{2}</html>"
 
 msgid "Skip layer and continue"
-msgstr ""
+msgstr "Réteg kihagyása és folytatás"
 
 msgid "expected .jos file inside .joz archive"
-msgstr ""
+msgstr "a .jos fájl elvárt a .joz arhívumon belül"
 
 msgid "Skip download"
 msgstr "Letöltés kihagyása"
@@ -13819,11 +14027,15 @@ msgid ""
 "Cannot download plugin ''{0}''. Its download link is not known. Skipping "
 "download."
 msgstr ""
+"Nem lehet a(z) ''{0}'' bővítményt letölteni. A letöltési linkje nem ismert. "
+"Letöltés kihagyása."
 
 msgid ""
 "Cannot download plugin ''{0}''. Its download link ''{1}'' is not a valid "
 "URL. Skipping download."
 msgstr ""
+"Nem lehet a(z) ''{0}'' bővítményt letölteni. A letöltési linkje ''{1}'' egy "
+"helytelen URL. Letöltés kihagyása."
 
 msgid "Failed to create plugin directory ''{0}''"
 msgstr "''{0}'' bővítménykönyvtár létrehozása sikertelen."
@@ -13860,7 +14072,7 @@ msgstr ""
 "tiltani.<br>Törlöd a beállításokból?</html>"
 
 msgid "Plugin update"
-msgstr ""
+msgstr "Bővítmény frissítés"
 
 msgid ""
 "You updated your JOSM software.<br>To prevent problems the plugins should be "
@@ -13997,10 +14209,10 @@ msgid "Plugin update failed"
 msgstr "Bővítmény frissítése sikertelen"
 
 msgid "Failed to find plugin {0}"
-msgstr ""
+msgstr "A(z) {0} bővítmény megtalálása sikertelen."
 
 msgid "Failed to download plugin information list"
-msgstr ""
+msgstr "Bővítmény információs lista letöltése sikertelen."
 
 msgid "Disable plugin"
 msgstr "Bövítmény letiltása"
@@ -14015,27 +14227,33 @@ msgid "Click to keep the plugin ''{0}''"
 msgstr "Kattints a(z) ''{0}'' bővítmény megtartásához"
 
 msgid "Failed to delete outdated plugin ''{0}''."
-msgstr ""
+msgstr "A(z) elavult ''{0}'' bővítmény törlése sikertelen."
 
 msgid ""
 "Failed to install already downloaded plugin ''{0}''. Skipping installation. "
 "JOSM is still going to load the old plugin version."
 msgstr ""
+"A sikeresen letöltött ''{0}'' bővítmény telepítése sikertelen. Telepítés "
+"kihagyása. A JOSM továbbra is a régi bővítmény verziót tölti be."
 
 msgid ""
 "Failed to install plugin ''{0}'' from temporary download file ''{1}''. {2}"
 msgstr ""
+"A(z) ''{0}'' bővítmény telepítése a letöltött ideiglenes fájlból ''{1}'' "
+"sikeretelen. {2}"
 
 msgid ""
 "Failed to install plugin ''{0}'' from temporary download file ''{1}''. "
 "Renaming failed."
 msgstr ""
+"A(z) ''{0}'' bővítmény telepítése a letöltött ideiglenes fájlból ''{1}'' "
+"sikeretelen. Átnevezés sikertelen."
 
 msgid "Update plugin"
-msgstr ""
+msgstr "Bővítmény frissítése"
 
 msgid "Click to update the plugin ''{0}''"
-msgstr ""
+msgstr "Kattints a(z) ''{0}'' bővítméy frissítéséhez"
 
 msgid "Click to disable the plugin ''{0}''"
 msgstr "Kattints a(z) ''{0}'' bővítméy letiltásához"
@@ -14086,10 +14304,10 @@ msgid "Invalid plugin description ''{0}'' in plugin {1}"
 msgstr "Érvénytelen ''{0}'' bővítményleírás a(z) {1} bővítményben"
 
 msgid "Invalid plugin main version ''{0}'' in plugin {1}"
-msgstr ""
+msgstr "Érvénytelen fő verziószám ''{0}'' a(z) {1} bővítményben"
 
 msgid "Missing plugin main version in plugin {0}"
-msgstr ""
+msgstr "A bővítményből hiányzik a fő verziószám {0}"
 
 msgid "More info..."
 msgstr "További információ…"
@@ -14116,9 +14334,7 @@ msgstr "Fájl feldolgozása: ''{0}''"
 
 msgid "Failed to scan file ''{0}'' for plugin information. Skipping."
 msgstr ""
-
-msgid "Processing plugin site cache icon files..."
-msgstr "Bővítmény site cache ikon fájl feldolgozása…"
+"Fájl átvizsgálása a beépülő információi után sikertelen ''{0}''. Kihagyás."
 
 msgid "Processing plugin files..."
 msgstr "Bővítmény fájlok feldolgozása…"
@@ -14130,24 +14346,20 @@ msgid "Downloading plugin list from ''{0}''"
 msgstr "Bővítménylista letöltése innen: ''{0}''"
 
 msgid "Plugin list download error"
-msgstr ""
+msgstr "Hiba a beépülő lista letöltésekor"
 
 msgid "JOSM failed to download plugin list:"
-msgstr ""
+msgstr "A JOSM nem tudta a beépülő listát letölteni:"
 
 msgid "Details:"
-msgstr ""
-
-msgid "Plugin icons download error"
-msgstr ""
-
-msgid "JOSM failed to download plugin icons:"
-msgstr ""
+msgstr "Részletek:"
 
 msgid ""
 "Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
 "plugin site ''{1}''."
 msgstr ""
+"A beépülők könyvtár létrehozása sikertelen ''{0}''. Nem sikerült betárazni a "
+"beépülő listát a beépülők helyéről ''{1}''."
 
 msgid "Writing plugin list to local cache ''{0}''"
 msgstr "Bővítménylista írása helyi gyorsítótárba ''{0}''"
@@ -14190,7 +14402,7 @@ msgstr ""
 "weblapunkon."
 
 msgid "Update JOSM"
-msgstr ""
+msgstr "JOSM frissítés"
 
 msgid ""
 "An unexpected exception occurred. This is always a coding "
@@ -14199,6 +14411,10 @@ msgid ""
 "(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
 "bug report."
 msgstr ""
+"Nem várt hiba (kivétel) történt. Ez mindig programozási hibát "
+"jelent.<br><br>Mindazonáltal a JOSM egy régi verzióját futtatod({0}),<br>az "
+"aktuális tesztelt verzió helyett (<b>{1}</b>).<br><br><b>Kérlek, frissítsd a "
+"JOSM-t,</b> mielőtt hibabejelentésben gondolkodnál."
 
 msgid "Unexpected Exception"
 msgstr "Nemvárt kivétel"
@@ -14210,33 +14426,45 @@ 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 ""
+"Egy hibával találkoztál a JOSM-ban. Kérlek, győződj meg róla, hogy a JOSM "
+"legújabb verzióját használod; mielőtt egy hibajelentést küldenél ide:"
 
 msgid ""
 "You should also update your plugins. If neither of those help please file a "
 "bug report in our bugtracker using this link:"
 msgstr ""
+"A bővítményeket szintén frissíteni kellene. Ha egyik sem segít ezek közül, "
+"küldj egy hibajelentést a nyilvántartásunkba ezen a linken keresztül:"
 
 msgid ""
 "There the error information provided below should already be filled in for "
 "you. Please include information on how to reproduce the error and try to "
 "supply as much detail as possible."
 msgstr ""
+"Az alábbiakban kellene már legyen kitöltött hibainformáció segítségül. "
+"Kérlek, ezt további információkkal bővítsd; hogyan is idézhető elő újra ez a "
+"hiba, próbáld az összes lehetséges részletet beküldeni."
 
 msgid ""
 "Alternatively, if that does not work you can manually fill in the "
 "information below at this URL:"
 msgstr ""
+"Alternatívaként, ha nem működik, akkor kézzel is be tudod tölteni az "
+"információkat a lenti URL-en:"
 
 msgid "(The text has already been copied to your clipboard.)"
 msgstr "(A szöveg átmásolása a vágólapra már megtörtént.)"
 
 msgid "You have encountered a bug in JOSM"
-msgstr ""
+msgstr "Egy hibával találkoztál a JOSM-ban"
 
 msgid ""
 "<html>Failed to initialize communication with the OSM server {0}.<br>Check "
 "the server URL in your preferences and your internet connection."
 msgstr ""
+"<html>A(z) {0} OSM szerverrel való kommunikáció inicializálása "
+"meghiúsult.<br>Ellenőrizd a szerver URL-t a beállításokban és az internet "
+"kapcsolatot."
 
 msgid ""
 "<html>Failed to authenticate at the OSM server ''{0}''.<br>You are using "
@@ -14244,6 +14472,10 @@ msgid ""
 "configured.<br>Please open the Preferences Dialog and generate or enter an "
 "Access Token.</html>"
 msgstr ""
+"<html>A(z) ''{0}'' OSM szerverrel való hitelesítés meghiúsult.<br>Ugyan "
+"oAuth hitelesítést használsz a hitelesítéshez, de jelenleg nincs<br>OAuth "
+"hozzáférési token beállítva.<br>Kérlek, nyisd meg a Beállítások "
+"párbeszédpanelt és generálj vagy adj meg egy hozzáférési tokent.</html>"
 
 msgid ""
 "<strong>Failed</strong> to delete <strong>node {0}</strong>. It is still "
@@ -14254,7 +14486,13 @@ msgid_plural ""
 "referred to by nodes {1}.<br>Please load the nodes, remove the reference to "
 "the node, and upload again."
 msgstr[0] ""
+"<strong>Meghiúsult</strong> a(z) <strong>{0} pont</strong> törlése. A(z) {1} "
+"pont továbbra is hivatkozik rá.<br>Kérlek, töltsd be a pontot, távolítsd el "
+"az ide mutató hivatkozást és töltsd fel újra."
 msgstr[1] ""
+"<strong>Meghiúsult</strong> a(z) <strong>{0} pont</strong> törlése. {1} pont "
+"továbbra is hivatkozik rá.<br>Kérlek, töltsd be a pontokat, távolítsd el az "
+"ide mutató hivatkozásokat és töltsd fel őket újra."
 
 msgid ""
 "<strong>Failed</strong> to delete <strong>node {0}</strong>. It is still "
@@ -14265,7 +14503,13 @@ msgid_plural ""
 "referred to by ways {1}.<br>Please load the ways, remove the reference to "
 "the node, and upload again."
 msgstr[0] ""
+"<strong>Meghiúsult</strong> a(z) <strong>{0} pont</strong> törlése. A(z) {1} "
+"vonal továbbra is hivatkozik rá.<br>Kérlek, töltsd be a vonalat, távolítsd "
+"el a pontra mutató hivatkozást és töltsd fel újra."
 msgstr[1] ""
+"<strong>Meghiúsult</strong> a(z) <strong>{0} pont</strong> törlése. A(z) {1} "
+"vonalak továbbra is hivatkoznak rá.<br>Kérlek, töltsd be a vonalakat, "
+"távolítsd el a pontra mutató hivatkozásokat és töltsd fel őket újra."
 
 msgid ""
 "<strong>Failed</strong> to delete <strong>node {0}</strong>. It is still "
@@ -14276,7 +14520,14 @@ msgid_plural ""
 "referred to by relations {1}.<br>Please load the relations, remove the "
 "reference to the node, and upload again."
 msgstr[0] ""
+"<strong>Meghiúsult</strong> a(z) <strong>{0} pont</strong> törlése. A(z) {1} "
+"kapcsolat továbbra is hivatkozik rá.<br>Kérlek, töltsd be a kapcsolatot, "
+"távolítsd el a pontra mutató hivatkozást és töltsd fel újra."
 msgstr[1] ""
+"<strong>Meghiúsult</strong> a(z) <strong>{0} pont</strong> törlése. A(z) {1} "
+"kapcsolatok továbbra is hivatkoznak rá.<br>Kérlek, töltsd be a "
+"kapcsolatokat, távolítsd el a pontra mutató hivatkozásokat és töltsd fel "
+"őket újra."
 
 msgid ""
 "<strong>Failed</strong> to delete <strong>way {0}</strong>. It is still "
@@ -14287,7 +14538,13 @@ msgid_plural ""
 "referred to by nodes {1}.<br>Please load the nodes, remove the reference to "
 "the way, and upload again."
 msgstr[0] ""
+"<strong>Meghiúsult</strong> a(z) <strong>{0} vonal</strong> törlése. A(z) "
+"{1} pont továbbra is hivatkozik rá.<br>Kérlek, töltsd be a pontot, távolítsd "
+"el az ide mutató hivatkozást és töltsd fel újra."
 msgstr[1] ""
+"<strong>Meghiúsult</strong> a(z) <strong>{0} vonal</strong> törlése. {1} "
+"pont továbbra is hivatkozik rá.<br>Kérlek, töltsd be a pontokat, távolítsd "
+"el az ide mutató hivatkozásokat és töltsd fel őket újra."
 
 msgid ""
 "<strong>Failed</strong> to delete <strong>way {0}</strong>. It is still "
@@ -14298,7 +14555,13 @@ msgid_plural ""
 "referred to by ways {1}.<br>Please load the ways, remove the reference to "
 "the way, and upload again."
 msgstr[0] ""
+"<strong>Meghiúsult</strong> a(z) <strong>{0} vonal</strong> törlése. A(z) "
+"{1} vonal továbbra is hivatkozik rá.<br>Kérlek, töltsd be a vonalat, "
+"távolítsd el a vonalra mutató hivatkozást és töltsd fel újra."
 msgstr[1] ""
+"<strong>Meghiúsult</strong> a(z) <strong>{0} vonal</strong> törlése. A(z) "
+"{1} vonalak továbbra is hivatkoznak rá.<br>Kérlek, töltsd be a vonalakat, "
+"távolítsd el a vonalra mutató hivatkozásokat és töltsd fel őket újra."
 
 msgid ""
 "<strong>Failed</strong> to delete <strong>way {0}</strong>. It is still "
@@ -14309,7 +14572,14 @@ msgid_plural ""
 "referred to by relations {1}.<br>Please load the relations, remove the "
 "reference to the way, and upload again."
 msgstr[0] ""
+"<strong>Meghiúsult</strong> a(z) <strong>{0} vonal</strong> törlése. A(z) "
+"{1} kapcsolat továbbra is hivatkozik rá.<br>Kérlek, töltsd be a kapcsolatot, "
+"távolítsd el a vonalra mutató hivatkozást és töltsd fel újra."
 msgstr[1] ""
+"<strong>Meghiúsult</strong> a(z) <strong>{0} vonal</strong> törlése. A(z) "
+"{1} kapcsolatok továbbra is hivatkoznak rá.<br>Kérlek, töltsd be a "
+"kapcsolatokat, távolítsd el a vonalra mutató hivatkozásokat és töltsd fel "
+"őket újra."
 
 msgid ""
 "<strong>Failed</strong> to delete <strong>relation {0}</strong>. It is still "
@@ -14320,7 +14590,13 @@ msgid_plural ""
 "referred to by nodes {1}.<br>Please load the nodes, remove the reference to "
 "the relation, and upload again."
 msgstr[0] ""
+"<strong>Meghiúsult</strong> a(z) <strong>{0} kapcsolat</strong> törlése. "
+"A(z) {1} pont továbbra is hivatkozik rá.<br>Kérlek, töltsd be a pontot, "
+"távolítsd el az ide mutató hivatkozást és töltsd fel újra."
 msgstr[1] ""
+"<strong>Meghiúsult</strong> a(z) <strong>{0} kapcsolat</strong> törlése. {1} "
+"pont továbbra is hivatkozik rá.<br>Kérlek, töltsd be a pontokat, távolítsd "
+"el az ide mutató hivatkozásokat és töltsd fel őket újra."
 
 msgid ""
 "<strong>Failed</strong> to delete <strong>relation {0}</strong>. It is still "
@@ -14331,7 +14607,14 @@ msgid_plural ""
 "referred to by ways {1}.<br>Please load the ways, remove the reference to "
 "the relation, and upload again."
 msgstr[0] ""
+"<strong>Meghiúsult</strong> a(z) <strong>{0} kapcsolat</strong> törlése. "
+"A(z) {1} vonal továbbra is hivatkozik rá.<br>Kérlek, töltsd be a vonalat, "
+"távolítsd el a kapcsolatra mutató hivatkozást és töltsd fel újra."
 msgstr[1] ""
+"<strong>Meghiúsult</strong> a(z) <strong>{0} kapcsolat</strong> törlése. "
+"A(z) {1} vonalak továbbra is hivatkoznak rá.<br>Kérlek, töltsd be a "
+"vonalakat, távolítsd el a kapcsolatra mutató hivatkozásokat és töltsd fel "
+"őket újra."
 
 msgid ""
 "<strong>Failed</strong> to delete <strong>relation {0}</strong>. It is still "
@@ -14342,14 +14625,22 @@ msgid_plural ""
 "referred to by relations {1}.<br>Please load the relations, remove the "
 "reference to the relation, and upload again."
 msgstr[0] ""
+"<strong>Meghiúsult</strong> a(z) <strong>{0} kapcsolat</strong> törlése. "
+"A(z) {1} kapcsolat továbbra is hivatkozik rá.<br>Kérlek, töltsd be a "
+"kapcsolatot, távolítsd el a kapcsolatra mutató hivatkozást és töltsd fel "
+"újra."
 msgstr[1] ""
+"<strong>Meghiúsult</strong> a(z) <strong>{0} kapcsolat</strong> törlése. "
+"A(z) {1} kapcsolatok továbbra is hivatkoznak rá.<br>Kérlek, töltsd be a "
+"kapcsolatokat, távolítsd el a kapcsolatra mutató hivatkozásokat és töltsd "
+"fel őket újra."
 
 msgid ""
 "<html>Uploading to the server <strong>failed</strong> because your "
 "current<br>dataset violates a precondition.<br>The error message "
 "is:<br>{0}</html>"
 msgstr ""
-"<html>A szerverre történő feltöltés <strong>sikertelen</strong>, mert a "
+"<html>A szerverre történő feltöltés <strong>meghiúsult</strong>, mert a "
 "jelenlegi<br>adathalmaz nem teljesít<br>egy előfeltételt.<br>A hibaüzenet az "
 "alábbi:<br>{0}</html>"
 
@@ -14358,20 +14649,28 @@ msgid ""
 "failed.<br>Please check the username and the password in the JOSM "
 "preferences.</html>"
 msgstr ""
+"<html>A(z) ''{0}'' felhasználónév és jelszó hitelesítése az OSM szervernél "
+"meghiúsult.<br>Kérem, ellenőrizd a felhasználói nevet és jelszót a JOSM "
+"beállításoknál.</html>"
 
 msgid ""
 "<html>Authentication at the OSM server with the OAuth token ''{0}'' "
 "failed.<br>Please launch the preferences dialog and retrieve another OAuth "
 "token.</html>"
 msgstr ""
+"<html>A(z) ''{0}'' OAuth token hitelesítése az OSM szervernél "
+"meghiúsult.<br>Kérem, futtasd a JOSM beállítás dialógust és kérj le egy "
+"másik OAuth tokent.</html>"
 
 msgid ""
 "<html>Authorisation at the OSM server failed.<br>The server reported the "
 "following error:<br>''{0}''</html>"
 msgstr ""
+"<html>A hitelesítés az OSM szervernél meghiúsult.<br>A szerver a következő "
+"hibát jelentette:<br>''{0}''</html>"
 
 msgid "<html>Authorisation at the OSM server failed.<br></html>"
-msgstr ""
+msgstr "<html>A hitelesítés az OSM szervernél meghiúsult.<br></html>"
 
 msgid ""
 "<html>Authorisation at the OSM server with the OAuth token ''{0}'' "
@@ -14379,14 +14678,20 @@ msgid ""
 "resource<br>''{1}''.<br>Please launch the preferences dialog and retrieve "
 "another OAuth token.</html>"
 msgstr ""
+"<html>A(z) ''{0}'' OAuth token hitelesítése az OSM szervernél "
+"meghiúsult.<br>A token nem hitelesített, hogy hozzáférjen a védett "
+"erőforráshoz<br>''{1}''.<br>Kérem, futtasd a JOSM beállítás dialógust és "
+"kérj le egy másik OAuth tokent.</html>"
 
 msgid ""
 "<html>Communication with the OSM server ''{0}'' timed out. Please retry "
 "later.</html>"
 msgstr ""
+"<html>A(z) ''{0}'' OSM szerverrel való kummunikáció túllépte az időkorlátot. "
+"Kérem, próbálkozz később.</html>"
 
 msgid "no error message available"
-msgstr ""
+msgstr "hibaüzenet nem elérhető"
 
 msgid ""
 "<html>Communication with the OSM server ''{0}''failed. The server "
@@ -14394,16 +14699,23 @@ msgid ""
 "message:<br><strong>Error code:<strong> {1}<br><strong>Error message "
 "(untranslated)</strong>: {2}</html>"
 msgstr ""
+"<html>A(z) ''{0}'' OSM szerverrel való kummunikáció meghiúsult. A szerver az "
+"alábbi<br>hibakóddal és hibaüzenettel válaszolt:<br><strong>Hibakód:<strong> "
+"{1}<br><strong>Hibaüzenet (nem fordított)</strong>: {2}</html>"
 
 msgid ""
 "<html>Closing of changeset <strong>{0}</strong> failed <br>because it has "
 "already been closed."
 msgstr ""
+"<html>A módosítási csomag lezárása <strong>{0}</strong> meghiúsult, <br>mert "
+"már rendben le lett zárva."
 
 msgid ""
 "<html>Closing of changeset <strong>{0}</strong> failed<br> because it has "
 "already been closed on {1}."
 msgstr ""
+"<html>A módosítási csomag lezárása <strong>{0}</strong> meghiúsult, <br>mert "
+"már rendben le lett zárva, {1}."
 
 msgid ""
 "<html>The server reported that it has detected a conflict.<br>Error message "
@@ -14442,14 +14754,18 @@ 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>Egy adatátviteli probléma miatt az adat fel- és/vagy letöltés "
+"meghiúsult a<br>''{0}''<br> helyről.<br>Részletek (nem fordított): {1}</html>"
 
 msgid ""
 "<html>Failed to download data. Its format is either unsupported, ill-formed, "
 "and/or inconsistent.<br><br>Details (untranslated): {0}</html>"
 msgstr ""
+"<html>Az adatletöltés meghiúsult. A formátuma egyaránt nem támogatott, rossz "
+"formátumú és/vagy inkonzisztens.<br><br>Részletek (nem fordított): {0}</html>"
 
 msgid "<html>Failed to download data.<br><br>Details: {0}</html>"
-msgstr ""
+msgstr "<html>Az adatletöltés meghiúsult.<br><br>Részletek: {0}</html>"
 
 msgid ""
 "<html>The OSM server<br>''{0}''<br>reported an internal server "
@@ -14459,16 +14775,19 @@ msgstr ""
 "valószínűleg átmeneti probléma. Kérlek, próbáld újra később."
 
 msgid "The OSM server ''{0}'' reported a bad request.<br>"
-msgstr ""
+msgstr "A(z) ''{0}'' OSM szerver hibás kérést jelentett.<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 ""
+"A terület amit próbálsz letölteni túl nagy vagy a kérés volt maga volt túl "
+"nagy.<br>Egyfelől kissebb terület is kérhető vagy használható egy "
+"adatkiöntési fájl is, amit az OSM közösség tud szolgáltatni."
 
 msgid "<br>Error message(untranslated): {0}"
-msgstr ""
+msgstr "<br>Hibaüzenet (fordítatlan): {0}"
 
 msgid ""
 "The OSM server ''{0}'' does not know about an object<br>you tried to read, "
@@ -14476,6 +14795,10 @@ msgid ""
 "server or you are using an invalid URL to access<br>it. Please carefully "
 "check the server''s address ''{0}'' for typos."
 msgstr ""
+"A(z) ''{0}'' OSM szerver nem ismeri az objektumot<br>amit olvasni, "
+"frissíteni vagy törölni próbálsz. Lehet, hogy a megfelelő objektum<br>nem "
+"létezik a szerveren vagy helytelen az URL a hozzáféréshez.<br>Kérlek, "
+"alaposan ellenőrizd a szerver címét ''{0}'' a gépelési hibákra is."
 
 msgid ""
 "<html>Failed to open a connection to the remote server<br>''{0}''.<br>Host "
@@ -14492,98 +14815,122 @@ msgid ""
 "<strong>Downloading failed</strong> if you tried to download this "
 "object.<br><br>The error message is:<br>{0}</html>"
 msgstr ""
+"<html>A szerver jelentette, hogy egy objektum törlődött.<br><strong>A "
+"feltöltés meghiúsult</strong> ha éppen frissíteni vagy törölni próbáltad ezt "
+"az objektumot.<br> <strong>A letöltés meghiúsult</strong> ha éppen letölteni "
+"próbáltad ezt az objektumot.<br><br>A hibaüzenet:<br>{0}</html>"
 
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
-msgstr ""
+msgstr "Nem található fordítás a helyi {0} nyelvre. Visszatérés ehhez: {1}."
 
 msgid ""
 "Fatal: failed to locate image ''{0}''. This is a serious configuration "
 "problem. JOSM will stop working."
 msgstr ""
+"Kritikus: a kép nem található ''{0}''. Ez egy komoly konfigurációs probléma. "
+"A JOSM meg fog állni."
 
 msgid "Failed to locate image ''{0}''"
-msgstr ""
+msgstr "A kép nem található ''{0}''"
 
 msgid "Failed to handle zip file ''{0}''. Exception was: {1}"
-msgstr ""
+msgstr "A(z) ''{0}'' zip fájl kezelése hibás lett. A kivétel ez volt: {1}"
 
 msgid ""
 "Failed to access directory ''{0}'' for security reasons. Exception was: {1}"
 msgstr ""
+"A(z) ''{0}'' könyvtárhoz való hozzáférésbiztonsági okokból meghiúsult. A "
+"kivétel ez volt: {1}"
 
 msgid "{0}... [please type its number]"
-msgstr ""
+msgstr "{0}... [kérlek, gépeld be a számát]"
 
 msgid ""
 "Failed to open URL. There is currently no platform set. Please set a "
 "platform first."
 msgstr ""
+"Az URL megnyitása meghiúsult. Jelenleg nincs platform beállítva. Kérlek, "
+"előbb a platformot állítsd be."
 
 msgid "Opening URL: {0}"
-msgstr ""
+msgstr "URL megnyitása: {0}"
 
 msgid "zoom"
-msgstr ""
+msgstr "nagyítás"
 
 msgid "latitude"
-msgstr ""
+msgstr "szélességi fok"
 
 msgid "longitude"
-msgstr ""
+msgstr "hosszúsági fok"
 
 msgid "URL does not contain {0}/{1}/{2}"
-msgstr ""
+msgstr "Az URL nem tartalmaz {0}/{1}/{2}"
 
 msgid "URL does not contain valid {0}"
-msgstr ""
+msgstr "URL nem tartalmaz helyes {0}-t"
 
 msgid "reserved"
-msgstr ""
+msgstr "fenntartott"
 
 msgid "Outdated Java version"
-msgstr ""
+msgstr "Elavult JAVA verzió"
 
 msgid "Update Java"
-msgstr ""
+msgstr "Java frissítés"
 
 msgid "You are running version {0} of Java."
-msgstr ""
+msgstr "A(z) {0} verziójú Java-t futtatod."
 
 msgid "April 2015"
-msgstr ""
+msgstr "2015 április"
 
 msgid ""
 "This version is no longer supported by {0} since {1} and is not recommended "
 "for use."
 msgstr ""
+"Ezt a verziót {1} óta nem tartja karban a(z) {0} és már nem támogatott a "
+"további használata."
 
 msgid ""
 "JOSM will soon stop working with this version; we highly recommend you to "
 "update to Java {0}."
 msgstr ""
+"Hamarosan a JOSM már nem fog működni ezzel a verzióval; erősen javasolt "
+"frissítened a {0} Java verzióra."
 
 msgid "Would you like to update now ?"
-msgstr ""
+msgstr "Szeretnél most frissíteni?"
 
 msgid ""
 "A previous version of JOSM has installed a custom certificate in order to "
 "provide HTTPS support for Remote Control:"
 msgstr ""
+"A JOSM előző verziója egyedi tanúsítványt telepített annak érdekében, hogy "
+"HTTPS-el támogassa a Távirányítót:"
 
 msgid ""
 "It appears it could be an important <b>security risk</b>.<br><br>You are now "
 "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 ""
+"Ez egy fontos <b>biztonsági kockázat</b>nak tűnik.<br><br>Most a Windows "
+"szólni fog, hogy a megbízhatatlan tanúsítványt el kell távolítani.<br>A "
+"saját biztonságod érdekében, <b>kérlek, kattints az Igen</b>re a következő "
+"párbeszédablakban!"
 
 msgid "Removing insecure certificate from {0} keystore: {1}"
 msgstr ""
+"A megbízhatatlan tanúsítvány eltávolítása a(z) {0} kulcskarikáról: {1}"
 
 msgid "Unable to remove insecure certificate from keystore: {0}"
 msgstr ""
+"Nem lehetséges eltávolítani a megbízhatatlan tanúsítványt a kulcskarikáról: "
+"{0}"
 
 msgid "JOSM localhost certificate found in {0} keystore: {1}"
 msgstr ""
+"JOSM helyi kiszolgáló tanúsítvány található a(z) {0} kulcskarikán: {1}"
 
 msgid ""
 "Remote Control is configured to provide HTTPS support.<br>This requires to "
@@ -14593,38 +14940,48 @@ msgid ""
 "next dialog.<br><br>If unsure, you can also click No then disable HTTPS "
 "support in Remote Control preferences."
 msgstr ""
+"A Távirányító be van konfigurálva a HTTPS támogatására.<br>Ehhez még "
+"szükséges, hogy a Windows Root CA tárolóhoz a JOSM által generált egyedi "
+"tanusítvány legyen hozzáadva.<br><br>A Windows megerősítést fog kérni ehhez "
+"a művelethez.<br>A helyes HTTPS működéshez <b>kérlek, kattints az Igenre</b> "
+"a következő dialógus ablakba.<br><br>Ha bizonytalan vagy, a Nem-re is lehet "
+"kattintani ahhoz, hogy a Távirányító HTTPS támogatása le legyen tiltva a "
+"beállításokban."
 
 msgid "HTTPS support in Remote Control"
-msgstr ""
+msgstr "A Távirányító HTTPS támogatása"
 
 msgid "Adding JOSM localhost certificate to {0} keystore"
 msgstr ""
+"A JOSM helyi kiszolgáló tanúsítvány hozzáadása a(z) {0} kulcskarikához"
 
 msgid "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
 msgstr ""
+"Csendes gyorsbillentyű konfliktus: ''{0}'' átmozgatásra került ''{1}''-ről "
+"''{2}''-re."
 
 msgid "There was {0} tag found in the buffer, it is suspicious!"
 msgid_plural "There were {0} tags found in the buffer, it is suspicious!"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "A pufferben egy {0} cimke volt található, ez gyanús!"
+msgstr[1] "A pufferben több {0} cimke is megtalálható volt, ez gyanús!"
 
 msgid "Key is too long (max {0} characters):"
-msgstr ""
+msgstr "A kulcs túl hosszú (max {0} karakter):"
 
 msgid "Suspicious characters in key:"
-msgstr ""
+msgstr "Gyanús karakterek a kulcsban:"
 
 msgid "Value is too long (max {0} characters):"
-msgstr ""
+msgstr "Az érték túl hosszú (max {0} karakter):"
 
 msgid "Do you want to paste these tags?"
-msgstr ""
+msgstr "Be akarod illeszteni ezeket a cimkéket?"
 
 msgid "Clear buffer"
-msgstr ""
+msgstr "Puffer kiürítése"
 
 msgid "Ignore warnings"
-msgstr ""
+msgstr "Figyelmeztetések figyelmen kívül hagyása"
 
 msgid ""
 "<html><p> Sorry, it is impossible to paste tags from buffer. It does not "
@@ -14634,397 +14991,432 @@ msgstr ""
 "mert az nem tartalmaz JOSM objektumot vagy  alkalmas szöveget. </p></html>"
 
 msgid "Invalid bz2 file."
-msgstr ""
+msgstr "Érvénytelen bz2 fájl."
 
 msgid "ms"
-msgstr ""
+msgstr "ms"
 
 msgid "s"
-msgstr ""
+msgstr "s"
 
 msgid "min"
-msgstr ""
+msgstr "min"
 
 msgid "h"
-msgstr ""
+msgstr "h"
 
 msgid "day"
 msgid_plural "days"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "nap"
+msgstr[1] "napok"
 
 msgid ""
 "Preference with key ''{0}'' does not include ''{1}''. Cannot restore window "
 "geometry from preferences."
 msgstr ""
+"A(z) ''{0}'' kulcsú beállítás nem foglal magában ''{1}''-t. Nem lehet "
+"visszaállítani a geometriát a beállításokból."
 
 msgid ""
 "Preference with key ''{0}'' does not provide an int value for ''{1}''. Got "
 "{2}. Cannot restore window geometry from preferences."
 msgstr ""
+"A(z) ''{0}'' kulcsú beállítás nem ad int értéket a(z) ''{1}''-nek. Kapott: "
+"{2}. Nem lehet visszaállítani a geometriát a beállításokból."
 
 msgid ""
 "Failed to parse field ''{1}'' in preference with key ''{0}''. Exception was: "
 "{2}. Cannot restore window geometry from preferences."
 msgstr ""
+"A(z) ''{1}'' mező értelmezése meghiúsult a(z) ''{0}'' kulcs beállításokban. "
+"Ez volt a kivétel: {2}. Nem lehet visszaállítani a geometriát a "
+"beállításokból."
 
 msgid ""
 "Preference with key ''{0}'' does not exist. Cannot restore window geometry "
 "from preferences."
 msgstr ""
+"A(z) ''{0}'' kulcsú beállítás nem létezik. Nem lehet visszaállítani a "
+"geometriát a beállításokból."
 
 msgid "Ignoring malformed geometry: {0}"
-msgstr ""
+msgstr "Hibás formátumú geometria figyelmen kívül hagyása: {0}"
 
 msgid "Failed to load XML schema."
-msgstr ""
+msgstr "Nem sikerült betölteni az XML sémát."
 
 msgid ""
 "Error in search expression on position {0} - right side of or(|) expression "
 "must return set of primitives"
 msgstr ""
+"A kereső kifejezés {0} pozíciójában hiba van - az or(|) kifejezés jobb "
+"oldalának az elemek egy halmazával kell visszatérnie"
 
 msgid ""
 "Error in search expression on position {0} - left side of or(|) expression "
 "must return set of primitives"
 msgstr ""
+"A kereső kifejezés {0} pozíciójában hiba van - az or(|) kifejezés bal "
+"oldalának az elemek egy halmazával kell visszatérnie"
 
 msgid ""
 "Error in search expression on position {0} - not(-) cannot be used in this "
 "context"
 msgstr ""
+"A kereső kifejezés {0} pozíciójában hiba van - a not(-) nem használható "
+"ebben az összefüggésben"
 
 msgid ""
 "Error in search expression on position {0} - expression must return "
 "different then current primitive"
 msgstr ""
+"A kereső kifejezés {0} pozíciójában hiba van - a kifejezésnek a jelenlegitől "
+"eltérő elemmel kell visszatérnie"
 
 msgid "Unexpected token ({0}) on position {1}"
-msgstr ""
+msgstr "Nem várt token ({0}) a(z) {1} pozíción"
 
 msgid "Unexpected token on position {0}. Expected {1}, found {2}"
-msgstr ""
+msgstr "Nem várt token a(z) {0} pozíción. Várt {1}, talált {2}"
 
 msgid "Error while parsing search expression on position {0}"
-msgstr ""
+msgstr "Hiba a kereső kifejezés értelmezése során, a(z) {0} pozíción"
 
 msgid "Unexpected char on {0}. Expected {1} found {2}"
-msgstr ""
+msgstr "Nem várt karakter a(z) {0} pozíción. Várt {1}, talált {2}"
 
 msgid "Expected search expression"
-msgstr ""
+msgstr "Keresőkifejezés szükséges"
 
 msgid ""
 "You requested too many nodes (limit is 50,000). Either request a smaller "
 "area, or use planet.osm"
 msgstr ""
+"Túl sok pontot kértél (a korlát 50 000). Kérhető kissebb terület vagy "
+"használható a planet.osm is."
 
 msgid "Database offline for maintenance"
-msgstr ""
+msgstr "Karbantartás miatt az adatbázis nem elérhető"
 
 msgid "You have downloaded too much data. Please try again later."
-msgstr ""
+msgstr "Túl sok adatot töltöttél le. Kérlek, később próbálkozz újra."
 
 msgid ""
 "The maximum bbox size is 0.25, and your request was too large. Either "
 "request a smaller area, or use planet.osm"
 msgstr ""
+"A maximális bbox méret 0.25, így a kérésed túl nagy volt ehhez képest. "
+"Kérhető kissebb terület vagy használható a planet.osm is."
 
 msgid "JOSM-Trac login at josm.openstreetmap.de"
-msgstr ""
+msgstr "Bejelentkezés a JOSM-Trac josm.openstreetmap.de helyen"
 
 msgid "could not get audio input stream from input URL"
-msgstr ""
+msgstr "nem érkezik bejövő hang adás az URL-től"
 
 msgid "Audio Device Unavailable"
-msgstr ""
+msgstr "Hangeszköz nem elérhető"
 
 msgid "You must make your edits public to upload new data"
 msgstr ""
+"A szerkesztéseidet nyilvánossá kell tegyed az új adatok feltöltéséhez"
 
 msgid "town"
-msgstr ""
+msgstr "kisváros"
 
 msgctxt "landuse"
 msgid "forest"
-msgstr ""
+msgstr "erdő"
 
 msgctxt "landuse"
 msgid "meadow"
-msgstr ""
+msgstr "rét"
 
 msgctxt "landuse"
 msgid "farmland"
-msgstr ""
+msgstr "tanya"
 
 msgctxt "landuse"
 msgid "residential"
-msgstr ""
+msgstr "lakóterület"
 
 msgctxt "natural"
 msgid "scrub"
-msgstr ""
+msgstr "bozót"
 
 msgctxt "Relation type"
 msgid "associatedStreet"
-msgstr ""
+msgstr "kapcsolódó utca"
 
 msgctxt "Relation type"
 msgid "boundary"
-msgstr ""
+msgstr "határvonal"
 
 msgctxt "Relation type"
 msgid "bridge"
-msgstr ""
+msgstr "híd"
 
 msgctxt "Relation type"
 msgid "destination_sign"
-msgstr ""
+msgstr "célállomás jelzés"
 
 msgctxt "Relation type"
 msgid "enforcement"
-msgstr ""
+msgstr "kikényszerítés"
 
 msgctxt "Relation type"
 msgid "multipolygon"
-msgstr ""
+msgstr "multipoligon"
 
 msgctxt "Relation type"
 msgid "network"
-msgstr ""
+msgstr "hálózat"
 
 msgctxt "Relation type"
 msgid "public_transport"
-msgstr ""
+msgstr "tömegközlekedés"
 
 msgctxt "Relation type"
 msgid "restriction"
-msgstr ""
+msgstr "korlátozás"
 
 msgctxt "Relation type"
 msgid "route"
-msgstr ""
+msgstr "útvonal"
 
 msgctxt "Relation type"
 msgid "route_master"
-msgstr ""
+msgstr "Mester útvonal"
 
 msgctxt "Relation type"
 msgid "site"
-msgstr ""
+msgstr "telephely"
 
 msgctxt "Relation type"
 msgid "street"
-msgstr ""
+msgstr "utca"
 
 msgctxt "Relation type"
 msgid "tunnel"
-msgstr ""
+msgstr "alagút"
 
 msgctxt "Relation type"
 msgid "waterway"
-msgstr ""
+msgstr "vizi út"
 
 msgctxt "Place type"
 msgid "city"
-msgstr ""
+msgstr "nagyváros"
 
 msgctxt "Place type"
 msgid "locality"
-msgstr ""
+msgstr "helyszín"
 
 msgctxt "Place type"
 msgid "village"
-msgstr ""
+msgstr "falu"
 
 msgctxt "Place type"
 msgid "town"
-msgstr ""
+msgstr "kisváros"
 
 msgctxt "Place type"
 msgid "borough"
-msgstr ""
+msgstr "választókerület"
 
 msgctxt "Place type"
 msgid "municipality"
-msgstr ""
+msgstr "önkormányzat"
 
 msgctxt "Place type"
 msgid "island"
-msgstr ""
+msgstr "sziget"
 
 msgctxt "Place type"
 msgid "county"
-msgstr ""
+msgstr "megye"
 
 msgctxt "Place type"
 msgid "hamlet"
-msgstr ""
+msgstr "falucska"
 
 msgctxt "Place type"
 msgid "suburb"
-msgstr ""
+msgstr "külváros"
 
 msgid "All Files"
-msgstr ""
+msgstr "Minden fájl"
 
 msgid "Attributes"
-msgstr ""
+msgstr "Tulajdonságok"
 
 msgid "Abort file chooser dialog"
-msgstr ""
+msgstr "Fájl választó dialógus megszakítása"
 
 msgid "Abort file chooser dialog."
-msgstr ""
+msgstr "Fájl választó dialógus megszakítása."
 
 msgid "Create New Folder"
-msgstr ""
+msgstr "Új mappa létrehozása"
 
 msgid "Delete File"
-msgstr ""
+msgstr "Fájl törlése"
 
 msgid "Enter file name:"
-msgstr ""
+msgstr "Fájl név megadása:"
 
 msgid "Enter path or folder name:"
-msgstr ""
+msgstr "Útvonal vagy mappa megadása:"
 
 msgid "Error "
-msgstr ""
+msgstr "Hiba "
 
 msgid "Error renaming file \"{0}\" to \"{1}\""
-msgstr ""
+msgstr "Fájl átnevezés hiba \"{0}\"-ról \"{1}\"-re"
 
 msgid "File name:"
-msgstr ""
+msgstr "Fájl név:"
 
 msgid "File Name:"
-msgstr ""
+msgstr "Fájl név:"
 
 msgid "FileChooser help."
-msgstr ""
+msgstr "Fájl választó súgója."
 
 msgid "Files"
-msgstr ""
+msgstr "Fájlok"
 
 msgid "Files of type:"
-msgstr ""
+msgstr "Típusfájlok:"
 
 msgid "Files of Type:"
-msgstr ""
+msgstr "Típusfájlok:"
 
 msgid "Filter:"
-msgstr ""
+msgstr "Szűrő"
 
 msgid "Folders"
-msgstr ""
+msgstr "Mappák"
 
 msgid "Home"
-msgstr ""
+msgstr "Otthon"
 
 msgid "Look in:"
-msgstr ""
+msgstr "Keresés itt:"
 
 msgid "Look In:"
-msgstr ""
+msgstr "Keresés itt:"
 
 msgid "Modified"
-msgstr ""
+msgstr "Módosított"
 
 msgid "New Folder"
-msgstr ""
+msgstr "Új mappa"
 
 msgid "Open selected file"
-msgstr ""
+msgstr "Kiválasztott fájl megnyitása"
 
 msgid "Open selected file."
-msgstr ""
+msgstr "Kiválasztott fájl megnyitása."
 
 msgid "Refresh"
-msgstr ""
+msgstr "Frissítés"
 
 msgid "Rename File"
-msgstr ""
+msgstr "Fájl átnevezés"
 
 msgid "Rename file \"{0}\" to"
-msgstr ""
+msgstr "Fájl átnevezés \"{0}\"-ról"
 
 msgid "Save in:"
-msgstr ""
+msgstr "Mentés ide:"
 
 msgid "Save In:"
-msgstr ""
+msgstr "Mentés ide:"
 
 msgid "Save selected file."
-msgstr ""
+msgstr "Kijelölt fájl mentése."
 
 msgid "Selection:"
-msgstr ""
+msgstr "Kijelölés:"
 
 msgid "Size"
-msgstr ""
+msgstr "Méret"
 
 msgid "Up One Level"
-msgstr ""
+msgstr "Egy szinttel feljebb"
 
 msgid "Update"
-msgstr ""
+msgstr "Frissítés"
 
 msgid "Update directory listing."
-msgstr ""
+msgstr "Könyvtár lista frissítés."
 
 msgid "Blue:"
-msgstr ""
+msgstr "Kék:"
 
 msgid "Color Name:"
-msgstr ""
+msgstr "Szín neve:"
 
 msgid "Green:"
-msgstr ""
+msgstr "Zöld:"
 
 msgid "Hue:"
-msgstr ""
+msgstr "Színárnyalat:"
 
 msgid "GTK Color Chooser"
-msgstr ""
+msgstr "GTK szín választó"
 
 msgid "Red:"
-msgstr ""
+msgstr "Piros:"
 
 msgid "Saturation:"
-msgstr ""
+msgstr "Telítettség:"
 
 msgid ""
 "Allows to edit traffic information and export it to the urban mobility "
 "simulator SUMO"
 msgstr ""
+"Lehetővé teszi a közlekedési információk szerkesztését és kiöntését a városi "
+"mobilitás szimulátor (SUMO) részére"
 
 msgid ""
 "Group common Address Interpolation inputs in a single dialog, as well as an "
 "option to automatically generate individual house number nodes from a Way."
 msgstr ""
+"Egyszerűsített dialógus ablakba csoportosítja a Cím Interpoláció bemeneteit, "
+"valamint lehetőséget ad egy útból egyedülálló házszámokat generálni, "
+"automatikusan."
 
 msgid ""
 "Makes a pair of selected way segments parallel by rotating one of them "
 "around a chosen pivot."
 msgstr ""
+"Két kijelölt vonalszakaszt párhuzamosít úgy, hogy az egyiket annak egy "
+"kijelölt pontja körül párhuzamosba fordítja."
 
 msgid ""
 "Allows selection of areas in an layer and automatic creation of a way as "
 "polygon. Built to ease mapping of building from background layers. Optimized "
 "for basemap.at."
 msgstr ""
+"Elősegíti egy rétegben a területek kijelölését és egy vonal poligon "
+"automatikus létrehozását. Épületek könnyű feltérképezésére készült a háttér "
+"rétegekre építve. A basemap.at-ra van optimalizálva."
 
 msgid "Tools for drawing buildings."
-msgstr ""
+msgstr "Eszköz épületek rajzolásához."
 
 msgid "A special handler for the French land registry WMS server."
-msgstr ""
+msgstr "A Fracia földhivatal WMS szerverének speciális kezelő modulja."
 
 msgid ""
 "Overlays the canvec tile grid on the map and prints URL''s to the .zip "
 "files. Future goals: allow auto-downloading and loading of canvec .osm files"
 msgstr ""
+"CanVec csempe hálózattal fedi le a térképet és kinyomtatja az URL-eket a "
+".zip fájlokba. További célok: a CanVec .osm fájlok betöltésének és automata "
+"betöltésének lehetővé tétele"
 
 msgid ""
 "Allows the user to create different color schemes and to switch between "
@@ -15032,121 +15424,168 @@ msgid ""
 "white background with matching colors for better visibility in bright "
 "sunlight. See dialog in display preferences."
 msgstr ""
+"Lehetővé teszi a felhasználó számára, hogy különböző szín sémákat hozzon "
+"létre és váltson közöttük. A színeket csak meg kell változtatni és új sémát "
+"készíteni. Arra is használható, hogy fehér háttérre és illeszkedő színekre "
+"váltva jobb láthatóságot érjünk el napfényben. Nézd a dialógust a kijelző "
+"beállításoknál."
 
 msgid ""
 "Imports proprietary CSV files of the Columbus/Visiontac V-900 GPS logger "
 "into a GPX layer."
 msgstr ""
+"A Columbus/Visiontac V-900 GPS nyomkövető saját CVS fájljait importálja egy "
+"GPX rétegre."
 
 msgid ""
 "Implements a command line and enables to create your commands. See link for "
 "standard commands (arc, circle etc.)"
 msgstr ""
+"Egy parancssort valósít meg és lehetővé teszi a saját parancsok létrehozását "
+"is. Nézd meg a hivatkozást a szabvány parancsokhoz (arc, circle stb.)"
 
 msgid "(Warning: Experimental!) Tool for conflating (merging) data."
 msgstr ""
+"(Figyelem! Kísérleti!) Eszöz az adatok egyesítésére (összefésülésére)."
 
 msgid "Create a grid of ways."
-msgstr ""
+msgstr "Vonalak hálózatát hozza létre."
 
 msgid ""
 "Creating and handling address nodes and buildings within Czech Republic."
 msgstr ""
+"Létrehozza és kezeli a címmel ellátott pontokat és épületeket a Cseh "
+"Köztársaságban."
 
-msgid "Allows to import various file formats into JOSM directly."
+msgid ""
+"Allows to import various file formats into JOSM directly. Currently "
+"supported: TangoGPS, Garmin Trainings Center TCX."
 msgstr ""
+"Lehetővé teszi különféle fájlformátumok betöltését, közvetlenül a JOSM-ba. "
+"Jelenleg támogatva: TangoGPS, Garmin Trainings Center TCX."
 
 msgid "Download your GPX tracks from openstreetmap.org"
-msgstr ""
+msgstr "Letölti a GPX nyomvonalaid az openstreetmap.org-ról"
 
 msgid ""
 "This plugin directly upload GPS Traces from current active layer in JOSM to "
 "openstreetmap.org."
 msgstr ""
+"Ez a bővítmény feltölti a GPS nyomvonalaid a JOSM aktuális aktív rétegéről "
+"közvetlenül az openstreetmap.org-ra."
 
 msgid "Downloads OSM data along a way"
-msgstr ""
+msgstr "OSM adatokat tölt le egy vonal mentén."
 
 msgid ""
 "Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
 "very fast."
 msgstr ""
+"Lehetővé teszi a felhasználónak, hogy anonimizálja az időbéllyegeket és "
+"nagyon gyorsan törölhesse nagy GPX nyomvonalak részleteit."
 
 msgid "Shows the elevation profile and some statistical data of a GPX track."
 msgstr ""
+"Egy GPX nyomvonal tengerszint feletti magasság profilját és néhány "
+"statisztikai adatot mutat meg."
 
 msgid "Handling of French EPCIs (boundary=local_authority)"
-msgstr ""
+msgstr "A Francia EPCI-k kezelése (boundary=local_authority)"
 
 msgid "Use external scripts in JOSM"
-msgstr ""
+msgstr "Külső szkriptek használata a JOSM-ban"
 
 msgid "Fast drawing ways by mouse"
-msgstr ""
+msgstr "Vonalak gyors rajzolása egérrel"
 
 msgid "Finds and fixes invalid street addresses in a comfortable way."
-msgstr ""
+msgstr "Megtalálja és javítja a helytelen utca címeket, kényelmesen."
 
 msgid ""
 "Talk with users editing the map nearby, be notified when someone comes close."
 msgstr ""
+"Társalgás a közelben térképet szerkesztő felhasználókkal, értesítsen amikor "
+"valaki közelebb jön."
 
 msgid ""
 "Provides parts of the GeoTools library for other JOSM plugins. Not meant to "
 "be installed directly by users, but rather as a dependency for other plugins."
 msgstr ""
+"A GeoTools gyűjtemény egyes részeit teszi elérhetővé más JOSM bővítmények "
+"számára. Ez nem jelenti azt, hogy a felhasználónak közvetlenül kell "
+"telepítenie, mivel ez inkább egy működési előfeltétel, függőség más "
+"bővítmények részére."
 
 msgid ""
 "Download GPS points from Globalsat dg100 data logger directly in JOSM."
 msgstr ""
+"GPS pontok letöltése a Globalsat dg100 nyomvonal rögzítőről, közvetlenül a "
+"JOSM-ba."
 
 msgid ""
 "Analyse a set of GPS points to obtain its centre and direction of spread."
 msgstr ""
+"A GPS pontok egy halmazát elemzi, hogy meghatározza a halmaz középpontját és "
+"a szórás irányát."
 
 msgid "Allows to filter out unnecessary GPS tracks"
-msgstr ""
+msgstr "Lehetővé teszi a szükségtelen GPS nyomvonalak kiszűrését"
 
 msgid "Visualizes routing information as a routing graph."
-msgstr ""
+msgstr "Útvonal grafikonként jelenít meg útvonal információkat."
 
 msgid "Simple tool to tag house numbers."
-msgstr ""
+msgstr "Egyszerűsítő eszköz a házszámok címkézéséhez."
 
 msgid "Generate Imagery XML bounds from a multipolygon"
-msgstr ""
+msgstr "Imagery XML határvonalakat generál multipoligonból"
 
 msgid ""
 "Database of imagery offsets: share and aquire imagery offsets with one "
 "button."
 msgstr ""
+"Az ábra eltolások adatbázisa: egy gombnyomásra gyűjti és megosztja az ábra "
+"eltolásokat."
 
 msgid "WMSPlugin-style imagery adjustment mapmode"
-msgstr ""
+msgstr "WMSPlugin stílusú ábra beállító térképmód"
 
 msgid ""
 "This experimental plugin allows JOSM to store tile cache in database files, "
 "not in huge cache directories"
 msgstr ""
+"Ez a kísérleti bővítmény lehetővé teszi a JOSM számára, hogy a csempe "
+"gyorsítótárat adatbázis fájlokba tegye, ne hatalmas gyorsítótár "
+"könyvtárakba/mappákba"
 
 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 ""
+"Egy újabb bővítmény a képek GPX útpontokhoz való párosításához. Találat "
+"akkor jön létre, amikor egy útpont ''name'', ''cmt'' vagy ''desc'' leírója "
+"egyezik egy kép fájlnevével."
 
 msgid "Plugin for importing spatial referenced images"
-msgstr ""
+msgstr "Bővítmény a térbeli hivatkozásokkal ellátott képek betöltésére"
 
 msgid "Import vector graphics (SVG)"
-msgstr ""
+msgstr "Vektorgrafikák importálása (SVG)"
 
 msgid ""
 "Extra information about current layer objects pop ups - currently GPX "
 "trackpoint info"
 msgstr ""
+"Extra információk az aktuális réteg felbukkanó objektumairól - jelenleg ez "
+"egy GPX nyomvonal információ"
 
 msgid "A helper for IRS satellite adjustment."
+msgstr "Segítség az IRS műhold kalibrálásához."
+
+msgid ""
+"Provides Java Native Access (JNA) library. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
 msgstr ""
 
 msgid ""
@@ -15154,125 +15593,163 @@ msgid ""
 "to be installed directly by users, but rather as a dependency for other "
 "plugins."
 msgstr ""
+"A Java Topology Suite (JTS) könyvtárat és kapcsolódó segédeszközöket tesz "
+"elérhetővé. Ez nem jelenti azt, hogy a felhasználónak közvetlenül kell "
+"telepítenie, mivel ez inkább egy működési előfeltétel, függőség más "
+"bővítmények részére."
 
 msgid ""
 "creates a channel digraph and checks a subset of channels if it is a "
 "junction or searches in a subset of channels for junctions"
 msgstr ""
+"útvonal digrammát készít és ellenőrzi az utak részhalmazának kereszteződését "
+"vagy az utak részhalmazában kereszteződések után keres"
 
 msgid "Helps vectorizing WMS images."
-msgstr ""
+msgstr "WMS képek vektorizálását segíti."
 
 msgid ""
 "Support live GPS input (moving dot) through a connection to gpsd server."
 msgstr ""
+"Támogatja az élő GPS bemenetet (mozgó pont), egy GPSD szerver kapcsolaton "
+"keresztül."
 
 msgid ""
 "Provides the Log4j library for other JOSM plugins. Not meant to be installed "
 "directly by users, but rather as a dependency for other plugins."
 msgstr ""
+"A Log4j könyvtárat teszi elérhetővé más JOSM bővítmények számára. Ez nem "
+"jelenti azt, hogy a felhasználónak közvetlenül kell telepítenie, mivel ez "
+"inkább egy működési előfeltétel, függőség más bővítmények részére."
 
 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 ""
+"A MapDust bővítmény MapDust hibajelentéseket jelenít meg a térképen. "
+"Létrehozhatja, lezárhatja, érvénytelenítheti, újranyithatja ezeket és hozzá "
+"is szólhat a hibajelentésekhez ennek a bővítménynek a használatával."
 
 msgid ""
 "Provide a measurement dialog and a layer to measure length and angle of "
 "segments, area surrounded by a (simple) closed way and create measurement "
 "paths (which also can be imported from a gps layer)."
 msgstr ""
+"Mérési dialógus ablakot, réteget nyújt a szakaszok hosszának és szögének "
+"méréséhez valamint területekhez, amelyek zárt vonalakkal (egyszerű poligon) "
+"vannak körbehatárolva, mérési útvonalat hoz létre (amely szintén lehet GPS "
+"rétegből importált is)."
 
 msgid "Merge overlapping part of ways."
-msgstr ""
+msgstr "Utak átfedő szakaszait fésüli össze."
 
 msgid "Adds no left turn for sets of 4 or 5 ways"
-msgstr ""
+msgstr "Balra kanyarodási korlátozást ad hozzá 4 vagy 5 út halmazához."
 
 msgid "Simplifies download from different read-only APIs."
-msgstr ""
+msgstr "A különféle csak olvasható API-kból való letöltéseket egyszerűsíti."
 
 msgid "Allows to attribute tags to all objects in any selected area at once"
 msgstr ""
+"Lehetővé teszi bármely kiválasztott terület összes objektumának címkézését, "
+"egyszerre."
 
 msgid "NanoLog adjustment and browsing layer"
-msgstr ""
+msgstr "NanoLog beállító és böngésző réteg"
 
 msgid ""
 "Use your system''s password manager to store the API username and password. "
 "(KWallet and gnome-keyring are supported.)"
 msgstr ""
+"Használd a rendszered jelszókezelőjét az API felhasználónév és jelszó "
+"tárolására. (a KWallet és a gnome-keyring vannak támogatva.)"
 
 msgid ""
 "Disallow using JOSM forever (WARNING: this plugin prevents JOSM from loading "
 "and is hard to rid of)"
 msgstr ""
+"Örökre ellehetetleníti a JOSM használatát (FIGYELEM: ez a bővítmény megelőzi "
+"a JOSM betöltését és igen nehéz tőle megszabadulni)"
 
 msgid "Convert data from Open Data portals to OSM layer"
-msgstr ""
+msgstr "Adatokat konvertál be az Open Data portálokról egy OSM rétegre"
 
 msgid "extended options for editing opening_hours"
-msgstr ""
+msgstr "A nyitvatartási idő szerkesztés lehetőségeinek kiterjesztése"
 
 msgid ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
 msgstr ""
+"Lehetővé teszi az éppen látható képernyő területet keresztező GPX/OSM fájlok "
+"megnyitását"
 
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
 msgstr ""
+"Elindítja a FireFox-ot az éppen látható képernyőterület csinos SVG képként "
+"való megjelenítéséhez."
 
 msgid ""
 "Bring in errors from Osm Inspector and display it on the current JOSM "
 "bounding box"
 msgstr ""
+"Hibákat hív be az OSM Inspector-ból és megjeleníti az aktuális JOSM "
+"kijelölési területen."
 
 msgid "Import/export OSM data in PBF format"
-msgstr ""
+msgstr "OSM adatok betöltése és kiöntése PBF formátumban."
 
 msgid "Import PDF file and convert to ways."
-msgstr ""
+msgstr "PDF fájl importálása és vonalakká konvertálása."
 
 msgid ""
 "Write gps position info to the image file header. Run this feature from the "
 "right click menu of the image layer."
 msgstr ""
+"A képfájl fejlécébe ír információt a GPS pozícióról. Ezt a funkciót a kép "
+"réteg jobb klikk menüjéből lehet futtatni."
 
 msgid "Make photos movable and position them on the map."
-msgstr ""
+msgstr "A fotókat mozgathatóvá teszi és pozícionálja őket a térképen."
 
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
 "align it with the map."
 msgstr ""
+"Ez a bővítmény lehetővé teszi bármely kép háttérként való megjelenítését a "
+"szerkesztőben és annak térképhez igazítását."
 
 msgid "The great JGoodies Plastic Look and Feel."
-msgstr ""
+msgstr "A nagyszerű JGoodies Plastic Look and Feel."
 
 msgid ""
 "Shows an additional information about point on map. There is only a Czech "
 "RUIAN module available at this moment."
 msgstr ""
+"További információkat mutat meg egy pontról a térképen. Jelenleg csak egy "
+"Cseh RUIAN modul érhető el."
 
 msgid "Read and write osmosis poly filter files"
-msgstr ""
+msgstr "Osmosis poligon szűrő fájlok olvasása és írása"
 
 msgid "Adds map printing to JOSM"
-msgstr ""
+msgstr "Térképnyomtatást ad a JOSM-hoz"
 
 msgid "adds projections from Proj4J"
-msgstr ""
+msgstr "Vetületeket ad hozzá a Proj4J-ből"
 
 msgid ""
 "This plugin simplifies the mapping and editing of public transport routes."
 msgstr ""
+"Ez a bővítmény egyszerűsíti a tömegközlekedési útvonalak térképezését és "
+"szerkesztését."
 
 msgid "Relation and multipolygon creating and editing panel."
-msgstr ""
+msgstr "Kapcsolat és multipoligon készítő, szerkesztő panel."
 
 msgid "Plugin for reverting changesets"
-msgstr ""
+msgstr "Bővítmény a módosítási csomagok visszahozására"
 
 msgid ""
 "Plugin for tagging of objects based on a selection of road signs. The dialog "
@@ -15280,36 +15757,51 @@ msgid ""
 "properties window. Available country presets: Germany, Poland, Slovakia, "
 "Spain."
 msgstr ""
+"Az útjelző táblák kiválasztásán alapuló, objektum címkéző bővítmény. A "
+"dialógus ablak megnyitható a tulajdonságok ablak jobb felső sarkában "
+"található kis ikonra kattintva. Az elérhető országbeállítások: Németország, "
+"Lengyelország, Szlovákia, Spanyolország."
 
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
 "defined in routes.xml file in plugin directory"
 msgstr ""
+"Útvonalakat generál (busz, túraútvonal, kerékpárutak, ...). Az útvonal "
+"típusoknak a bővítmény könyvtárban található routes.xml-ben kell definiálva "
+"lenniük."
 
 msgid "Provides routing capabilities."
-msgstr ""
+msgstr "Útvonal tervezési képességet nyújt"
 
 msgid "Loads data from SDS"
-msgstr ""
+msgstr "Adatbetöltés az SDS-ből"
 
 msgid ""
 "Simplify area by removing nodes on very obtuse angles. This can be "
 "constrained by maximum removed area size. Also average nearby nodes."
 msgstr ""
+"Területeket egyszerűsít azáltal, hogy a nagyon tompa szögekben lévő pontokat "
+"távolít el. Ez korlátok közé szorítható az így eltávolított terület méret "
+"maximalizálásával. A közeli pontokat is átlagolja."
 
 msgid "Edit features for OpenSeaMap"
-msgstr ""
+msgstr "OpenSeaMap tulajdonságok szerkesztése"
 
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr ""
+"Lehetővé teszi jelölők/pontok hozzáadását az aktuális GPS pozícióhoz."
 
 msgid ""
 "Launch browser to a Web resource about a selected object having known tags, "
 "such as Wikipedia"
 msgstr ""
+"A kiválasztott objektummal kapcsolatos webes erőforrást hív be a böngészőbe "
+"az ismert címkék alapján, mint például a Wikipédia"
 
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr ""
+"Dialógus ablakot nyújt a címkék négyzethálós elrendezésben való "
+"szerkesztéséhez."
 
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -15318,32 +15810,41 @@ msgid ""
 msgstr ""
 
 msgid "Make terraced houses out of single blocks."
-msgstr ""
+msgstr "Szimpla blokkokból készít teraszos házakat."
 
 msgid ""
 "Provides helper buttons to allow working with single button mouse (stylus). "
 "Activate by holding T and slip map with left mouse button"
 msgstr ""
+"Egygombos egérrel (stylus) való munkát tesz lehetővé azáltal, hogy segítő "
+"gombot ad ehhez. A T billentyű nyomva tartásával aktiválható és így a térkép "
+"a bal egérgombbal is csúsztatható lesz."
 
 msgid ""
 "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
 "to be running."
 msgstr ""
+"A Cseh kataszteri térkép alapján épületeket rajzol át. TracerServer (.NET "
+"vagy Mono) szükséges a futtatásához."
 
 msgid ""
 "Traces buildings and other shapes from a map. Needs Tracer2Server to be "
 "running."
 msgstr ""
+"Épületeket és más alakzatokat rajzol át egy térképről. Tracer2Server "
+"szükséges a futtatásához."
 
 msgid "Plugin to digital sign OSM-Data"
-msgstr ""
+msgstr "Bővítmény az OSM adatok digitális aláírására"
 
 msgid "${plugin.description}"
-msgstr ""
+msgstr "${plugin.description}"
 
 msgid ""
 "Provides a straightforward GUI for adding, editing and deleting turn lanes."
 msgstr ""
+"Egyszerű kezelőfelületet nyújt kanyarodó sávok hozzáadásához, "
+"szerkesztéséhez és törléséhez."
 
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -15362,28 +15863,36 @@ msgid ""
 "georeferenced video against a GPS track, to use it for identify visible "
 "objects."
 msgstr ""
+"(Ez a bővítmény jelenleg még fejlesztés alatt van!!!) Összekapcsol és "
+"szinkronizál egy földrajzi hivatkozásokkal ellátott videót egy GPS "
+"nyomvonallal, így használható vizuálisan azonosítható objektumokhoz."
 
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
 "plugin is still under early development and may be buggy."
 msgstr ""
+"Felcsempézett, szkennelt térképek letöltését támogatja a walking-papers.org-"
+"ról. Ez a bővímény még a korai fejlesztési fázisban tart és esetleges "
+"hibákat tartalmazhat."
 
 msgid "Easy downloading along a long set of interconnected ways"
-msgstr ""
+msgstr "Nagy halom, hosszában kapcsolódó vonal könnyített letöltése."
 
 msgid "Enables searching for waypoint imported from gpx file."
-msgstr ""
+msgstr "Lehetővé teszi GPX fájlból betöltött útpontok keresését."
 
 msgid "Select a sequence of non-branching connected ways"
-msgstr ""
+msgstr "Kijelöl egy szekvenciális, elágazás nélküli vonalsorozatot"
 
 msgid "Simplifies linking OSM objects to Wikipedia articles"
-msgstr ""
+msgstr "Egyszerűsíti a Wikipedia cikkek behivatkozását az OSM objektumokba"
 
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
 "behind."
 msgstr ""
+"Vezess egy versenyautót az A pontból a B pontba egy légifelvételen haladva, "
+"hagyj kaktuszt magad mögött."
 
 msgid "Surface"
 msgstr "Felület"
@@ -15434,32 +15943,32 @@ msgid "ground"
 msgstr "föld"
 
 msgid "sett"
-msgstr ""
+msgstr "kockakő"
 
 msgctxt "riding"
 msgid "pitch"
-msgstr ""
+msgstr "sportpálya"
 
 msgctxt "riding"
 msgid "sports_centre"
-msgstr ""
+msgstr "sportközpont"
 
 msgctxt "riding"
 msgid "stadium"
-msgstr ""
+msgstr "stadion"
 
 msgctxt "riding"
 msgid "track"
-msgstr ""
+msgstr "nyomvonal"
 
 msgid "clay"
-msgstr ""
+msgstr "agyag"
 
 msgid "dirt"
-msgstr ""
+msgstr "sár"
 
 msgid "fine_gravel"
-msgstr ""
+msgstr "finom sóder"
 
 msgid "mud"
 msgstr "mocsár"
@@ -15506,11 +16015,30 @@ msgstr "Kivilágítás"
 msgid "Width (meters)"
 msgstr "Szélesség (méter)"
 
-msgid "Service type"
-msgstr ""
+msgid "Sidewalk"
+msgstr "Járda"
 
-msgid "yard"
-msgstr "rakodó"
+msgctxt "sidewalk"
+msgid "both"
+msgstr "bal és jobb"
+
+msgctxt "sidewalk"
+msgid "left"
+msgstr "bal"
+
+msgctxt "sidewalk"
+msgid "right"
+msgstr "jobb"
+
+msgctxt "sidewalk"
+msgid "no"
+msgstr "nincs"
+
+msgid "Service type"
+msgstr "Szolgáltatás típus"
+
+msgid "yard"
+msgstr "rakodó"
 
 msgid "siding"
 msgstr "mellékvágány"
@@ -15534,20 +16062,20 @@ msgid "rail"
 msgstr "sín"
 
 msgid "Voltage in Volts (V)"
-msgstr ""
+msgstr "Feszültség Volt-ban (V)"
 
 msgid "Frequency in Hertz (Hz)"
-msgstr ""
+msgstr "Frekvencia  Hertz-ben (Hz)"
 
 msgid "16.67"
-msgstr ""
+msgstr "16.67"
 
 msgid "16.7"
 msgstr "16,7"
 
 msgctxt "railway"
 msgid "Tracks"
-msgstr ""
+msgstr "Nyomvonalak"
 
 msgid "Gauge (mm)"
 msgstr "Nyomtáv (mm)"
@@ -15586,29 +16114,30 @@ msgid "Service Times"
 msgstr "Szolgáltatás ideje"
 
 msgid "18:00"
-msgstr ""
+msgstr "18:00"
 
 msgid "sunset,sunrise"
-msgstr ""
+msgstr "napnyugta, napkelte"
 
 msgid "Su 09:30,11:00"
-msgstr ""
+msgstr "Su 09:30,11:00"
 
 msgid "Sa,Su,PH 09:00"
-msgstr ""
+msgstr "Sa,Su,PH 09:00"
 
 msgid "Sa 18:00; Su 10:45"
-msgstr ""
+msgstr "Sa 18:00; Su 10:45"
 
 msgid ""
 "Fr 08:00-18:00; Apr 10-15 off; Jun 07:00-20:00; Aug off; Dec 24 08:00-24:00"
 msgstr ""
+"Fr 08:00-18:00; Apr 10-15 off; Jun 07:00-20:00; Aug off; Dec 24 08:00-24:00"
 
 msgid "Sa 10:00+"
-msgstr ""
+msgstr "Sa 10:00+"
 
 msgid "week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00"
-msgstr ""
+msgstr "week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00"
 
 msgid "Opening Hours"
 msgstr "Nyitva tartás"
@@ -15617,26 +16146,27 @@ msgid "24/7"
 msgstr "éjjel-nappali"
 
 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 ""
+msgstr "Sa-Su 00:00-24:00"
 
 msgid "Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off"
-msgstr ""
+msgstr "Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off"
 
 msgid "Mo-Fr 08:30-20:00, Tu-Su 08:00-15:00; Sa 08:00-12:00"
-msgstr ""
+msgstr "Mo-Fr 08:30-20:00, Tu-Su 08:00-15:00; Sa 08:00-12:00"
 
 msgid ""
 "Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off"
 msgstr ""
+"Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off"
 
 msgid "sunrise-sunset"
-msgstr ""
+msgstr "napkelte-napnyugta"
 
 msgid "Su 10:00+"
-msgstr ""
+msgstr "Su 10:00+"
 
 msgid "Brand"
 msgstr "Márka"
@@ -15681,7 +16211,7 @@ msgid "Max. height (meters)"
 msgstr "Max. magasság (méter)"
 
 msgid "pitch"
-msgstr "pálya"
+msgstr "sportpálya"
 
 msgid "sports_centre"
 msgstr "sportközpont"
@@ -15690,158 +16220,158 @@ msgid "stadium"
 msgstr "stadion"
 
 msgid "Select sport:"
-msgstr ""
+msgstr "Sport kiválasztás:"
 
 msgid "Sport"
 msgstr "Sport"
 
 msgctxt "sport"
 msgid "multi"
-msgstr ""
+msgstr "többféle"
 
 msgctxt "sport"
 msgid "archery"
-msgstr ""
+msgstr "íjászat"
 
 msgctxt "sport"
 msgid "athletics"
-msgstr ""
+msgstr "atlétika"
 
 msgctxt "sport"
 msgid "american_football"
-msgstr ""
+msgstr "amerikai foci"
 
 msgctxt "sport"
 msgid "australian_football"
-msgstr ""
+msgstr "ausztrál foci"
 
 msgctxt "sport"
 msgid "baseball"
-msgstr ""
+msgstr "baseball"
 
 msgctxt "sport"
 msgid "basketball"
-msgstr ""
+msgstr "kosárlabda"
 
 msgctxt "sport"
 msgid "boules"
-msgstr ""
+msgstr "petang"
 
 msgctxt "sport"
 msgid "bowls"
-msgstr ""
+msgstr "teke/kugli/bowling"
 
 msgctxt "sport"
 msgid "canadian_football"
-msgstr ""
+msgstr "kanadai foci"
 
 msgctxt "sport"
 msgid "canoe"
-msgstr ""
+msgstr "kenuzás"
 
 msgctxt "sport"
 msgid "climbing"
-msgstr ""
+msgstr "sziklamászás"
 
 msgctxt "sport"
 msgid "cricket"
-msgstr ""
+msgstr "krikett"
 
 msgctxt "sport"
 msgid "cricket_nets"
-msgstr ""
+msgstr "krikett gyakorló"
 
 msgctxt "sport"
 msgid "croquet"
-msgstr ""
+msgstr "gyeplabda"
 
 msgctxt "sport"
 msgid "cycling"
-msgstr ""
+msgstr "kerékpározás"
 
 msgctxt "sport"
 msgid "dog_racing"
-msgstr ""
+msgstr "kutyaverseny"
 
 msgctxt "sport"
 msgid "equestrian"
-msgstr ""
+msgstr "díjugratás"
 
 msgctxt "sport"
 msgid "gaelic_games"
-msgstr ""
+msgstr "kelta játékok"
 
 msgctxt "sport"
 msgid "golf"
-msgstr ""
+msgstr "golf"
 
 msgctxt "sport"
 msgid "gymnastics"
-msgstr ""
+msgstr "torna"
 
 msgctxt "sport"
 msgid "handball"
-msgstr ""
+msgstr "kézilabda"
 
 msgctxt "sport"
 msgid "hockey"
-msgstr ""
+msgstr "jégkorong"
 
 msgctxt "sport"
 msgid "horse_racing"
-msgstr ""
+msgstr "lóverseny"
 
 msgctxt "sport"
 msgid "motor"
-msgstr ""
+msgstr "motorozás"
 
 msgctxt "sport"
 msgid "pelota"
-msgstr ""
+msgstr "pelota"
 
 msgctxt "sport"
 msgid "racquet"
-msgstr ""
+msgstr "teniszütő"
 
 msgctxt "sport"
 msgid "rugby_league"
-msgstr ""
+msgstr "ligarögbi"
 
 msgctxt "sport"
 msgid "rugby_union"
-msgstr ""
+msgstr "(unió) rögbi"
 
 msgctxt "sport"
 msgid "shooting"
-msgstr ""
+msgstr "lövészet"
 
 msgctxt "sport"
 msgid "skateboard"
-msgstr ""
+msgstr "gördeszka"
 
 msgctxt "sport"
 msgid "skating"
-msgstr ""
+msgstr "korcsolya"
 
 msgctxt "sport"
 msgid "skiing"
-msgstr ""
+msgstr "síelés"
 
 msgctxt "sport"
 msgid "soccer"
-msgstr ""
+msgstr "futball"
 
 msgctxt "sport"
 msgid "swimming"
-msgstr ""
+msgstr "úszás"
 
 msgctxt "sport"
 msgid "table_tennis"
-msgstr ""
+msgstr "asztalitenisz"
 
 msgctxt "sport"
 msgid "tennis"
-msgstr ""
+msgstr "tenisz"
 
 msgid "Coins"
 msgstr "Érmék"
@@ -15862,25 +16392,29 @@ msgid "Fee"
 msgstr "Fizetős"
 
 msgid "06:00-20:00"
-msgstr ""
+msgstr "06:00-20:00"
 
 msgid "Mo-Fr 09:00-18:00,Sa 08:00-14:00"
-msgstr ""
+msgstr "Mo-Fr 09:00-18:00,Sa 08:00-14:00"
 
 msgid "May-Sep 09:30-12:30,14:15-19:30"
-msgstr ""
+msgstr "May-Sep 09:30-12:30,14:15-19:30"
 
+msgctxt "parking"
 msgid "multi-storey"
 msgstr "többszintes"
 
+msgctxt "parking"
 msgid "surface"
-msgstr "felszíni"
+msgstr "felszín"
 
+msgctxt "parking"
 msgid "underground"
 msgstr "mélygarázs"
 
+msgctxt "parking"
 msgid "rooftop"
-msgstr ""
+msgstr "háztető"
 
 msgid "Reference number"
 msgstr "Azonosítószám"
@@ -15928,43 +16462,43 @@ msgid "Distance (km)"
 msgstr "Távolság (km)"
 
 msgid "Ascent (m)"
-msgstr ""
+msgstr "Emelkedő (m)"
 
 msgid "Descent (m)"
-msgstr ""
+msgstr "Lejtő (m)"
 
 msgid "Roundtrip"
-msgstr ""
+msgstr "Körutazás"
 
 msgid "Symbol description"
 msgstr "Szimbólum leírása"
 
 msgid "broadleaved"
-msgstr ""
+msgstr "széles levelű"
 
 msgid "needleleaved"
-msgstr ""
+msgstr "tűlevelű"
 
 msgid "mixed"
 msgstr "vegyes"
 
 msgid "leafless"
-msgstr ""
+msgstr "lombtalan (fa)"
 
 msgid "Cycle"
-msgstr ""
+msgstr "Kör"
 
 msgid "deciduous"
 msgstr "lombhullató"
 
 msgid "evergreen"
-msgstr ""
+msgstr "örökzöld"
 
 msgid "semi_deciduous"
-msgstr ""
+msgstr "félig lombhullató"
 
 msgid "semi_evergreen"
-msgstr ""
+msgstr "félig örökzöld"
 
 msgid "bahai"
 msgstr "bahái"
@@ -15988,7 +16522,7 @@ msgid "muslim"
 msgstr "muzulmán"
 
 msgid "shinto"
-msgstr ""
+msgstr "sintó"
 
 msgid "sikh"
 msgstr "szikh"
@@ -16054,57 +16588,57 @@ msgid "sunni"
 msgstr "szunnita"
 
 msgid "high"
-msgstr ""
+msgstr "magas"
 
 msgid "medium"
-msgstr ""
+msgstr "közepes"
 
 msgid "low"
 msgstr "alacsony"
 
 msgid "750000;200000"
-msgstr ""
+msgstr "750000;200000"
 
 msgid "110000;20000"
-msgstr ""
+msgstr "110000;20000"
 
 msgid "Branch operator"
-msgstr ""
+msgstr "Üzemeltető"
 
 msgid "Amount of Cables"
 msgstr "Kábelek száma"
 
 msgid "Amount of circuits"
-msgstr ""
+msgstr "Körök mennyisége"
 
 msgid "Location"
 msgstr "Elhelyezkedés"
 
 msgctxt "power"
 msgid "outdoor"
-msgstr ""
+msgstr "kültéri"
 
 msgctxt "power"
 msgid "indoor"
-msgstr ""
+msgstr "beltéri"
 
 msgctxt "power"
 msgid "underground"
-msgstr ""
+msgstr "földalatti"
 
 msgctxt "power"
 msgid "platform"
-msgstr ""
+msgstr "emelvény"
 
 msgctxt "power"
 msgid "kiosk"
-msgstr ""
+msgstr "pavilon"
 
 msgid "Start date"
-msgstr ""
+msgstr "Kezdő dátum"
 
 msgid "Output forms of energy:"
-msgstr ""
+msgstr "Az energia kimeneti formái:"
 
 msgid "biogas"
 msgstr "biogáz"
@@ -16164,7 +16698,7 @@ msgid "Trunk"
 msgstr "Autóút"
 
 msgid "Motorroad"
-msgstr ""
+msgstr "Autópálya"
 
 msgid "Trunk Link"
 msgstr "Autóútfelhajtó"
@@ -16179,13 +16713,13 @@ msgid "Secondary"
 msgstr "Összekötő út"
 
 msgid "Secondary Link"
-msgstr ""
+msgstr "Összekötő út lehajtó"
 
 msgid "Tertiary"
 msgstr "Bekötőút"
 
 msgid "Tertiary Link"
-msgstr ""
+msgstr "Bekötőút lehajtó"
 
 msgid "Unclassified"
 msgstr "Egyéb közút"
@@ -16197,36 +16731,36 @@ msgid "Residential"
 msgstr "Lakóút"
 
 msgid "Bicycle Road"
-msgstr ""
+msgstr "Kerékpárút"
 
 msgid "Highway type"
-msgstr ""
+msgstr "Közút típusa"
 
 msgctxt "Highway"
 msgid "residential"
-msgstr ""
+msgstr "Lakóterületi"
 
 msgctxt "Highway"
 msgid "service"
-msgstr ""
+msgstr "Szervízút"
 
 msgctxt "Highway"
 msgid "unclassified"
-msgstr ""
+msgstr "osztályozatlan"
 
 msgctxt "Highway"
 msgid "path"
-msgstr ""
+msgstr "sáv"
 
 msgctxt "Highway"
 msgid "cycleway"
-msgstr ""
+msgstr "kerékpárút"
 
 msgid "Vehicle access"
-msgstr ""
+msgstr "Jármű hozzáférés"
 
 msgid "Oneway for bicycle"
-msgstr ""
+msgstr "Kerékpárnak egyirányú"
 
 msgid "Living Street"
 msgstr "Pihenőút"
@@ -16241,7 +16775,7 @@ msgid "Service"
 msgstr "Szervizút"
 
 msgid "Service way type"
-msgstr ""
+msgstr "Szervíz út típus"
 
 msgid "alley"
 msgstr "átjáró"
@@ -16253,7 +16787,7 @@ msgid "parking_aisle"
 msgstr "parkolóút"
 
 msgid "drive-through"
-msgstr ""
+msgstr "Áthajtó"
 
 msgid "Parking Aisle"
 msgstr "parkolóút"
@@ -16271,7 +16805,7 @@ msgid "roundabout"
 msgstr "körforgalom"
 
 msgid "jughandle"
-msgstr ""
+msgstr "fordító (jughandle)"
 
 msgid "Road Restrictions"
 msgstr "Behajtási korlátozások"
@@ -16295,7 +16829,7 @@ msgid "All vehicles"
 msgstr "Minden jármű"
 
 msgid "use_sidepath"
-msgstr ""
+msgstr "Oldalsáv használat"
 
 msgid "Motor vehicles"
 msgstr "Gépjárművek"
@@ -16322,7 +16856,7 @@ msgid "Public Service Vehicles (psv)"
 msgstr "Közszolgáltatási járművek (tömegközl.)"
 
 msgid "Tourist buses"
-msgstr ""
+msgstr "Túrista buszok"
 
 msgid "Min. speed (km/h)"
 msgstr "Min. sebesség (km/h)"
@@ -16334,16 +16868,27 @@ msgid "Max. length (meters)"
 msgstr "Max. hosszúság (méter)"
 
 msgid "Overtaking"
-msgstr ""
+msgstr "Előzés"
 
+msgctxt "overtaking"
+msgid "yes"
+msgstr "igen"
+
+msgctxt "overtaking"
 msgid "both"
-msgstr ""
+msgstr "bal és jobb"
 
+msgctxt "overtaking"
 msgid "forward"
-msgstr ""
+msgstr "előre"
 
+msgctxt "overtaking"
 msgid "backward"
-msgstr ""
+msgstr "hátra"
+
+msgctxt "overtaking"
+msgid "no"
+msgstr "nem"
 
 msgid "Roundabout"
 msgstr "Körforgalom"
@@ -16463,6 +17008,8 @@ msgid ""
 "sometimes need for hand use to get ahead. Terrain quite exposed, precarious "
 "grassy acclivities, jagged rocks, facile snow-free glaciers"
 msgstr ""
+"néha kéz is szükséges az előre haladáshoz. A terep egészen nyílt (védtelen), "
+"nem túl stabil füves meredek, csorba sziklák, hómentes gleccser felület"
 
 msgid "T5 - difficult alpine trail with climbing"
 msgstr "T5 - nehéz alpesi túraút mászással"
@@ -16485,27 +17032,27 @@ msgstr "Láthatóság"
 
 msgctxt "trail_visibility"
 msgid "excellent"
-msgstr ""
+msgstr "kiváló"
 
 msgctxt "trail_visibility"
 msgid "good"
-msgstr ""
+msgstr "jó"
 
 msgctxt "trail_visibility"
 msgid "intermediate"
-msgstr ""
+msgstr "közepes"
 
 msgctxt "trail_visibility"
 msgid "bad"
-msgstr ""
+msgstr "rossz"
 
 msgctxt "trail_visibility"
 msgid "horrible"
-msgstr ""
+msgstr "szörnyű"
 
 msgctxt "trail_visibility"
 msgid "no"
-msgstr ""
+msgstr "nem"
 
 msgid "Ski"
 msgstr "Sí"
@@ -16517,7 +17064,7 @@ msgid "Dedicated Bridleway"
 msgstr "Kijelölt lovaglóút"
 
 msgid "Cycle Lane/Track"
-msgstr ""
+msgstr "Kerékpár sáv/Nyomvonal"
 
 msgid "Cycleway"
 msgstr "Kerékpárút"
@@ -16553,7 +17100,7 @@ msgid "Oneway (bicycle)"
 msgstr "Egyirányú (kerékpár)"
 
 msgid "Edit Highway Attributes:"
-msgstr ""
+msgstr "Közút jellemzők szerkesztése:"
 
 msgid "Highway"
 msgstr "Közút"
@@ -16607,7 +17154,7 @@ msgid "Traffic Signal"
 msgstr "Jelzőlámpa"
 
 msgid "Optional crossing attributes:"
-msgstr ""
+msgstr "Opcionális gyalogos átkelő jellemzők:"
 
 msgid "Pedestrian crossing type"
 msgstr "Gyalogátkelő típusa"
@@ -16631,20 +17178,26 @@ msgid "zebra"
 msgstr "zebra"
 
 msgid "pelican"
-msgstr ""
+msgstr "pelikán"
 
 msgid "toucan"
-msgstr ""
+msgstr "tukánmadár"
 
 msgid "puffin"
-msgstr ""
+msgstr "lunda"
 
 msgid "pegasus"
-msgstr ""
+msgstr "pegazus"
 
 msgid "tiger"
+msgstr "tigris"
+
+msgid "Button operated"
 msgstr ""
 
+msgid "Sound signals"
+msgstr "Hangjelzések"
+
 msgid "Crossing attendant"
 msgstr "felügyelt"
 
@@ -16658,10 +17211,10 @@ msgid "Stop"
 msgstr "Stoptábla"
 
 msgid "Give Way"
-msgstr ""
+msgstr "Elsőbbségadás kötelező"
 
 msgid "Mini-Roundabout"
-msgstr ""
+msgstr "Mini-körforgalom"
 
 msgid "clockwise"
 msgstr "óramutatóval megegyező"
@@ -16688,7 +17241,7 @@ msgid "hump"
 msgstr "hosszú fekvőrendőr"
 
 msgid "rumble_strip"
-msgstr ""
+msgstr "morajló csík"
 
 msgid "table"
 msgstr "lapos fekvőrendőr"
@@ -16700,7 +17253,7 @@ msgid "Turning Circle"
 msgstr "Fordulóhely"
 
 msgid "Turning Loop"
-msgstr ""
+msgstr "Forduló hurok"
 
 msgid "City Limit"
 msgstr "Településhatár"
@@ -16712,7 +17265,7 @@ msgid "Speed Camera"
 msgstr "Traffipax"
 
 msgid "Elevator"
-msgstr ""
+msgstr "Felvonó"
 
 msgid "Grit Bin"
 msgstr "Útszóróanyag láda"
@@ -16739,13 +17292,13 @@ msgid "Bollard"
 msgstr "Oszlop"
 
 msgid "Bollard type"
-msgstr ""
+msgstr "Oszlop típus"
 
 msgid "rising"
-msgstr ""
+msgstr "kiemelkedő"
 
 msgid "removable"
-msgstr ""
+msgstr "eltávolítható"
 
 msgid "plastic"
 msgstr "műanyag"
@@ -16772,13 +17325,13 @@ msgid "Hedge"
 msgstr "Sövény"
 
 msgid "Genus"
-msgstr ""
+msgstr "Nemzetség"
 
 msgid "Species"
-msgstr ""
+msgstr "Fajok"
 
 msgid "Taxon"
-msgstr ""
+msgstr "Életközösség"
 
 msgid "Fence"
 msgstr "Kerítés"
@@ -16787,7 +17340,7 @@ msgid "barbed_wire"
 msgstr "szögesdrót"
 
 msgid "chain_link"
-msgstr ""
+msgstr "drótháló"
 
 msgid "electric"
 msgstr "elektromos"
@@ -16799,10 +17352,10 @@ msgid "split_rail"
 msgstr "hasított gerenda"
 
 msgid "wire"
-msgstr ""
+msgstr "sodrony"
 
 msgid "Guard Rail"
-msgstr ""
+msgstr "Szallagkorlát"
 
 msgid "Wall"
 msgstr "Fal"
@@ -16815,16 +17368,16 @@ msgstr "Támfal"
 
 msgctxt "Barrier"
 msgid "Ditch"
-msgstr ""
+msgstr "Vizesárok"
 
 msgid "Kerb"
-msgstr ""
+msgstr "Szegély"
 
 msgid "limited"
 msgstr "korlátozott"
 
 msgid "Entrance (Barrier Opening)"
-msgstr ""
+msgstr "Sorompós bejárat"
 
 msgid "Gate"
 msgstr "Kapu"
@@ -16833,15 +17386,15 @@ msgid "Lift Gate"
 msgstr "Sorompó"
 
 msgid "Swing Gate"
-msgstr ""
+msgstr "Kétszárnyú kapu"
 
 msgctxt "swing_gate"
 msgid "single"
-msgstr ""
+msgstr "egyszeres"
 
 msgctxt "swing_gate"
 msgid "double"
-msgstr ""
+msgstr "dupla"
 
 msgid "Hampshire Gate"
 msgstr "Drótkapu"
@@ -16850,55 +17403,55 @@ msgid "Bump Gate"
 msgstr "Lökőkapu"
 
 msgid "Kissing Gate"
-msgstr ""
+msgstr "U vagy V kapu (Kissing gate)"
 
 msgid "Chain"
-msgstr ""
+msgstr "Lánc"
 
 msgid "Stile"
 msgstr "Létra"
 
 msgid "ladder"
-msgstr ""
+msgstr "létra"
 
 msgid "squeezer"
-msgstr ""
+msgstr "átjáró rés"
 
 msgid "stepover"
-msgstr ""
+msgstr "átlépő"
 
 msgid "Turnstile"
 msgstr "Forgókapu"
 
 msgid "Sally Port"
-msgstr ""
+msgstr "Erődített kapu"
 
 msgid "Passageways"
-msgstr ""
+msgstr "Átjárók"
 
 msgid "Building Passage"
-msgstr ""
+msgstr "Épület átjáró"
 
 msgid "Arcade"
-msgstr ""
+msgstr "Árkádsor"
 
 msgid "Open on left side"
-msgstr ""
+msgstr "Megnyitás bal oldalon"
 
 msgid "Open on right side"
-msgstr ""
+msgstr "Megnyitás jobb oldalon"
 
 msgid "Colonnade"
-msgstr ""
+msgstr "Oszlopsor"
 
 msgid "Avalanche Protector"
-msgstr ""
+msgstr "Lavina védelem"
 
 msgid "Water"
 msgstr "Víz"
 
 msgid "Drain"
-msgstr ""
+msgstr "Dréncső"
 
 msgid "Ditch"
 msgstr "Árok"
@@ -16907,7 +17460,7 @@ msgid "Stream"
 msgstr "Patak"
 
 msgid "Wadi"
-msgstr ""
+msgstr "Kiapadt folyómeder"
 
 msgid "Canal"
 msgstr "Csatorna"
@@ -16922,6 +17475,8 @@ msgid ""
 "A point where groundwater naturally flows to the surface of the earth from "
 "underground."
 msgstr ""
+"A pont ahol a talajvíz magától előbukkan a föld alól, hogy a föld felszínén "
+"folyjon tovább."
 
 msgid "Waterfall"
 msgstr "Vízesés"
@@ -16936,10 +17491,10 @@ msgid "Groyne"
 msgstr "Hullámtörő"
 
 msgid "Breakwater"
-msgstr ""
+msgstr "Hullámtörő gát"
 
 msgid "Culvert"
-msgstr ""
+msgstr "Áteresz"
 
 msgid "Basin"
 msgstr "Vízgyűjtő"
@@ -16951,37 +17506,37 @@ msgid "Covered Reservoir"
 msgstr "Fedett víztározó"
 
 msgid "A body of standing water, such as a lake or pond."
-msgstr ""
+msgstr "Álló víztömeg, mint egy tó vagy tavacska."
 
 msgid "Water Body"
-msgstr ""
+msgstr "Víztömeg"
 
 msgid "canal"
 msgstr "csatorna"
 
 msgid "lake"
-msgstr ""
+msgstr "tó"
 
 msgid "lagoon"
-msgstr ""
+msgstr "lagúna"
 
 msgid "oxbow"
-msgstr ""
+msgstr "holtág"
 
 msgid "pond"
-msgstr ""
+msgstr "tavacska"
 
 msgid "reservoir"
-msgstr ""
+msgstr "Víztározó"
 
 msgid "river"
 msgstr "folyó"
 
 msgid "Salt Water"
-msgstr ""
+msgstr "Sós víz"
 
 msgid "Is the water body intermittent (disappears seasonally)?"
-msgstr ""
+msgstr "A víztömeg jelenléte időszakos  (szezonálisan eltűnik)?"
 
 msgid "Coastline"
 msgstr "Partvonal"
@@ -16989,6 +17544,7 @@ msgstr "Partvonal"
 msgid ""
 "Line between the sea and land (with the water on the right side of the way)."
 msgstr ""
+"A tenger és a föld közötti elválasztó vonal (a vízzel a vonal jobb oldalán)."
 
 msgid "Riverbank"
 msgstr "Folyópart"
@@ -17024,7 +17580,7 @@ msgid "Mud"
 msgstr "Sár"
 
 msgid "Large area covered with mud."
-msgstr ""
+msgstr "Nagy terület sárral fedve."
 
 msgid "Beach"
 msgstr "Tengerpart"
@@ -17033,10 +17589,10 @@ msgid "A flat area of sand, gravel or pebble next to water."
 msgstr ""
 
 msgid "swimming"
-msgstr ""
+msgstr "úszás"
 
 msgid "surfing"
-msgstr ""
+msgstr "Szörfözés"
 
 msgid "Bay"
 msgstr "Öböl"
@@ -17044,6 +17600,8 @@ msgstr "Öböl"
 msgid ""
 "A large body of water partially enclosed by land but with a wide mouth."
 msgstr ""
+"Nagyobb víztömeg részben szárazfölddel körbefogva, de még nagy nyitottsággal "
+"a nyílt víz felé is."
 
 msgid "Cliff"
 msgstr "Szikla"
@@ -17064,23 +17622,24 @@ msgstr "Szállítmány"
 
 msgctxt "cargo"
 msgid "passengers"
-msgstr ""
+msgstr "utasok"
 
 msgctxt "cargo"
 msgid "vehicle"
-msgstr ""
+msgstr "jármű"
 
 msgctxt "cargo"
 msgid "bicycle"
-msgstr ""
+msgstr "kerékpár"
 
+# (HVG) - Heavy Goods Vehicle
 msgctxt "cargo"
 msgid "hgv"
-msgstr ""
+msgstr "Nehézjármű"
 
 msgctxt "cargo"
 msgid "passengers;vehicle"
-msgstr ""
+msgstr "utasok; járművek"
 
 msgid "Ferry Route"
 msgstr "Kompútvonal"
@@ -17116,10 +17675,10 @@ msgid "Rail"
 msgstr "Vasútvonal"
 
 msgid "main"
-msgstr ""
+msgstr "fő"
 
 msgid "branch"
-msgstr ""
+msgstr "elágazás"
 
 msgid "industrial"
 msgstr "ipari"
@@ -17131,7 +17690,7 @@ msgid "tourism"
 msgstr "turisztika"
 
 msgid "freight"
-msgstr ""
+msgstr "áruszállítás"
 
 msgid "Narrow Gauge Rail"
 msgstr "Keskeny nyomtávú vasút"
@@ -17164,33 +17723,30 @@ msgid "Level Crossing"
 msgstr "Vasúti átjáró"
 
 msgid "Traffic lights"
-msgstr ""
-
-msgid "Sound signals"
-msgstr ""
+msgstr "Közlekedési lámpák"
 
 msgid "Barrier"
 msgstr "Akadály"
 
 msgctxt "crossing:barrier"
 msgid "yes"
-msgstr ""
+msgstr "igen"
 
 msgctxt "crossing:barrier"
 msgid "no"
-msgstr ""
+msgstr "nem"
 
 msgctxt "crossing:barrier"
 msgid "half"
-msgstr ""
+msgstr "fél"
 
 msgctxt "crossing:barrier"
 msgid "full"
-msgstr ""
+msgstr "teli"
 
 msgctxt "crossing:barrier"
 msgid "double_half"
-msgstr ""
+msgstr "dupla félsorompó"
 
 msgid "Crossing"
 msgstr "Vasúti gyalogátkelő"
@@ -17205,7 +17761,7 @@ msgid "Buffer Stop"
 msgstr "Ütközőbak"
 
 msgid "Railway Switch"
-msgstr ""
+msgstr "Vasúti váltó"
 
 msgid "Aerialway"
 msgstr "Felvonó"
@@ -17265,14 +17821,14 @@ msgid "Magic Carpet"
 msgstr "Szállítószalag"
 
 msgid "Goods"
-msgstr ""
+msgstr "Áruk"
 
 msgctxt "aerialway"
 msgid "Station"
 msgstr "Felvonóállomás"
 
 msgid "Pylon"
-msgstr ""
+msgstr "Villanyoszlop"
 
 msgid "Parking"
 msgstr "Parkoló"
@@ -17290,7 +17846,7 @@ msgid "tram"
 msgstr "villamos"
 
 msgid "metro"
-msgstr ""
+msgstr "Földalatti/metró"
 
 msgid "ferry"
 msgstr "komp"
@@ -17311,7 +17867,7 @@ msgid "See the Wiki for other capacity:[types]=*."
 msgstr "További capacity:[típus]=* lehetőségekért lásd a Wikit."
 
 msgid "Parking Space"
-msgstr ""
+msgstr "Parkoló terület"
 
 msgid "Capacity"
 msgstr "Férőhely"
@@ -17320,7 +17876,7 @@ msgid "Covered (with roof)"
 msgstr "Fedett (tetővel)"
 
 msgid "Parking Entrance"
-msgstr ""
+msgstr "Parkoló bejárat"
 
 msgid "Fuel"
 msgstr "Benzinkút"
@@ -17473,13 +18029,13 @@ msgid "Parts"
 msgstr "Alkatrészek"
 
 msgid "Tires"
-msgstr ""
+msgstr "Gumik"
 
 msgid "Rental"
 msgstr "Kölcsönző"
 
 msgid "Second hand"
-msgstr ""
+msgstr "Használt"
 
 msgid "only"
 msgstr "kizárólag"
@@ -17536,7 +18092,7 @@ msgid "lockers"
 msgstr "szekrény"
 
 msgid "rack"
-msgstr ""
+msgstr "keret"
 
 msgid "shed"
 msgstr "fészer"
@@ -17578,7 +18134,7 @@ msgid "Public Transport"
 msgstr "Tömegközlekedés"
 
 msgid "Public Transport Route"
-msgstr ""
+msgstr "Tömegközlekedési útvonal"
 
 msgid "Route type"
 msgstr "Útvonal típusa"
@@ -17590,7 +18146,7 @@ msgid "monorail"
 msgstr "egysínű"
 
 msgid "light_rail"
-msgstr ""
+msgstr "HÉV"
 
 msgid "trolleybus"
 msgstr "trolibusz"
@@ -17605,13 +18161,13 @@ msgid "To (terminal stop)"
 msgstr "Hova (végállomás)"
 
 msgid "Via (intermediate stops)"
-msgstr ""
+msgstr "Keresztül (köztes megállók)"
 
 msgid "Network"
 msgstr "Hálózat"
 
 msgid "Color (HTML name or hexadecimal code)"
-msgstr ""
+msgstr "Szín (HTML név vagy hexadecimális kód)"
 
 msgctxt "color"
 msgid "black"
@@ -17643,82 +18199,82 @@ msgstr "fehér"
 
 msgctxt "color"
 msgid "#CD853F"
-msgstr ""
+msgstr "#CD853F"
 
 msgid "route segment"
 msgstr "útszakasz"
 
 msgid "stop position"
-msgstr ""
+msgstr "állóhely"
 
 msgid "stop position (exit only)"
-msgstr ""
+msgstr "állóhely (csak kijárat)"
 
 msgid "stop position (entry only)"
-msgstr ""
+msgstr "állóhely (csak bejárat)"
 
 msgid "platform"
-msgstr ""
+msgstr "peron"
 
 msgid "platform (exit only)"
-msgstr ""
+msgstr "peron (csak kijárat)"
 
 msgid "platform (entry only)"
-msgstr ""
+msgstr "peron (csak bejárat)"
 
 msgid "Route Master"
-msgstr ""
+msgstr "Mester útvonal"
 
 msgid "route variant/direction (at least 2)"
 msgstr "útváltozat/útirány (legalább 2)"
 
 msgid "Stop Area"
-msgstr ""
+msgstr "Állomás"
 
 msgid "UIC reference"
-msgstr ""
+msgstr "UIC referencia"
 
 msgid "UIC name"
-msgstr ""
+msgstr "UIC név"
 
 msgid "Stop Position"
-msgstr ""
+msgstr "Állóhely"
 
 msgid "Platform"
-msgstr ""
+msgstr "Peron"
 
 msgid "Station or amenities"
-msgstr ""
+msgstr "Megálló vagy komfort-szolgáltatók"
 
 msgid "Bus"
-msgstr ""
+msgstr "Busz"
 
 msgid "Bus stop (legacy)"
-msgstr ""
+msgstr "Buszmegálló (örökség)"
 
 msgid "Tram stop (legacy)"
-msgstr ""
+msgstr "Villamosmegálló (örökség)"
 
 msgid "Train"
-msgstr ""
+msgstr "Vasúti szerelvény"
 
 msgid "Railway station (legacy)"
-msgstr ""
+msgstr "Vasútállomás (örökség)"
 
 msgid "Railway halt (legacy)"
-msgstr ""
+msgstr "Vasúti megálló (örökség)"
 
 msgid "Trolleybus"
-msgstr ""
+msgstr "Trolibusz"
 
 msgid "Share taxi"
-msgstr ""
+msgstr "Megosztott taxi"
 
 msgid "Funicular"
-msgstr ""
+msgstr "Sikló"
 
 msgid "Ferry"
-msgstr ""
+msgstr "Komp"
 
 msgid "Bench"
 msgstr "Pad"
@@ -17730,13 +18286,13 @@ msgid "Wheelchair"
 msgstr "Kerekesszék"
 
 msgid "Highway platform (legacy)"
-msgstr ""
+msgstr "Közúti peron (örökség)"
 
 msgid "Railway platform (legacy)"
-msgstr ""
+msgstr "Peron (örökség)"
 
 msgid "funicular"
-msgstr ""
+msgstr "sikló"
 
 msgctxt "railway"
 msgid "Station"
@@ -17755,10 +18311,10 @@ msgid "Reference Number"
 msgstr "Azonosítószám"
 
 msgid "Public Transport (Legacy)"
-msgstr ""
+msgstr "Tömegközlekedés (örökség)"
 
 msgid "Public transport route (Legacy)"
-msgstr ""
+msgstr "Tömegközlekedési útvonal (örökség)"
 
 msgid "forward segment"
 msgstr "előre szakasz"
@@ -17861,7 +18417,7 @@ msgid "Motel"
 msgstr "Motel"
 
 msgid "Guest House/Bed & Breakfast"
-msgstr ""
+msgstr "Vendégház/Magánszálláshely reggelivel"
 
 msgid "Chalet"
 msgstr "Apartman"
@@ -17872,8 +18428,9 @@ msgstr "Hostel"
 msgid "Alpine Hut"
 msgstr "Menedékház"
 
+# RV / Recreational Vehicle
 msgid "Caravan Site/RV Park"
-msgstr ""
+msgstr "Lakókocsipark/Lakóautó parkoló"
 
 msgid "Number of places"
 msgstr "Helyek száma"
@@ -17972,16 +18529,16 @@ msgid "Pub"
 msgstr "Kocsma"
 
 msgid "Beer Garden"
-msgstr ""
+msgstr "Sörkert"
 
 msgid "Bar"
 msgstr "Bár"
 
 msgid "Night Club"
-msgstr ""
+msgstr "Éjszakai klub"
 
 msgid "Strip Club"
-msgstr ""
+msgstr "Sztriptízbár"
 
 msgid "Tourism"
 msgstr "Turizmus"
@@ -17999,13 +18556,13 @@ msgid "Information Office"
 msgstr "Információs iroda"
 
 msgid "An office where you can get information about a town or region."
-msgstr ""
+msgstr "Iroda, ahol egy városról vagy régióról lehet információt kapni."
 
 msgid "Map"
 msgstr "Térkép"
 
 msgid "A board with a map."
-msgstr ""
+msgstr "Egy asztal/tábla térképpel."
 
 msgid "Detail Grade"
 msgstr "Kategória"
@@ -18019,8 +18576,9 @@ msgstr "utca"
 msgid "scheme"
 msgstr "vázlat"
 
+# Irányjelző táblának fordítják, de félrevezető lenne. talán a panoráma térkép beszédesebb. Kérdéses.
 msgid "toposcope"
-msgstr ""
+msgstr "panoráma térkép"
 
 msgid "Shown Area"
 msgstr "Mutatott terület"
@@ -18062,7 +18620,7 @@ msgid "Information Board"
 msgstr "Információs tábla"
 
 msgid "A board with information."
-msgstr ""
+msgstr "Információs tábla."
 
 msgid "Board Content"
 msgstr "Tábla tartalma"
@@ -18083,7 +18641,7 @@ msgid "plants"
 msgstr "növényvilág"
 
 msgid "geology"
-msgstr ""
+msgstr "földtan"
 
 msgid "Guidepost"
 msgstr "Útjelző"
@@ -18091,21 +18649,23 @@ msgstr "Útjelző"
 msgid ""
 "A Signpost/Guidepost to indicate the directions to different destinations."
 msgstr ""
+"Irányjelző/útjelző tábla a különféle uticélok irányainak meghatározásához."
 
 msgid "Information Terminal"
 msgstr "Információs terminál"
 
 msgid "Information access via electronic methods."
-msgstr ""
+msgstr "Elektronikus csatornákon hozzáférhető információk."
 
 msgid "Closer description"
 msgstr "Pontosabb leírás"
 
 msgid "Audio Guide"
-msgstr ""
+msgstr "Tárlatvezetés hangfelvétellel"
 
 msgid "Information using headphones or a mobile phone."
 msgstr ""
+"Információk fejhallgatókkal vagy mobiltelefon használattal érhetőek el."
 
 msgid "Audioguide via mobile phone?"
 msgstr "Tárlatvezetés mobiltelefonnal?"
@@ -18114,13 +18674,13 @@ msgid "Phone number"
 msgstr "Telefonszám"
 
 msgid "Other Information Point"
-msgstr ""
+msgstr "Egyéb információs pont"
 
 msgid "Leisure"
 msgstr "Szabadidő"
 
 msgid "Movie Theater/Cinema"
-msgstr ""
+msgstr "Filmszinház/Mozi"
 
 msgid "Zoo"
 msgstr "Állatkert"
@@ -18135,7 +18695,7 @@ msgid "wall"
 msgstr "fal"
 
 msgid "Amusement/Theme Park"
-msgstr ""
+msgstr "Szórakozás/Vidámpark"
 
 msgid "Water Park"
 msgstr "Akvapark"
@@ -18144,10 +18704,10 @@ msgid "Sauna"
 msgstr "Szauna"
 
 msgid "Horse Riding"
-msgstr ""
+msgstr "Lovaglás"
 
 msgid "Brothel"
-msgstr ""
+msgstr "Bordélyház"
 
 msgid "Playground"
 msgstr "Játszótér"
@@ -18169,7 +18729,7 @@ msgid "charcoal"
 msgstr "faszén"
 
 msgid "Firepit"
-msgstr ""
+msgstr "tűzrakóhely"
 
 msgid "Fishing"
 msgstr "Horgászat"
@@ -18196,16 +18756,18 @@ msgid "Artwork"
 msgstr "Műalkotás"
 
 msgid "mural"
-msgstr ""
+msgstr "falfestmény"
 
+# Bármely anaygból készült kissebb-nagyobb szobor, művészei alkotás. Pl. lehet fából is vagy üvegből stb.
 msgid "sculpture"
-msgstr ""
+msgstr "szobor"
 
+# Főleg fém vagy kő és nagyobb méretű általában, emlékmű jellegű központi elem.
 msgid "statue"
-msgstr ""
+msgstr "szobor (emlékmű)"
 
 msgid "Artist Name"
-msgstr ""
+msgstr "Művész neve"
 
 msgid "Recording Studio"
 msgstr "Stúdió"
@@ -18223,164 +18785,164 @@ msgid "Church"
 msgstr "Templom"
 
 msgid "Building type"
-msgstr ""
+msgstr "Épület típusa"
 
 msgid "basilica"
-msgstr ""
+msgstr "bazilika"
 
 msgid "cathedral"
-msgstr ""
+msgstr "katedrális"
 
 msgid "chapel"
-msgstr ""
+msgstr "kápolna"
 
 msgid "church"
 msgstr "templom"
 
 msgid "temple"
-msgstr ""
+msgstr "Istenháza (templom)"
 
 msgctxt "christian"
 msgid "anglican"
-msgstr ""
+msgstr "anglikán"
 
 msgctxt "christian"
 msgid "baptist"
-msgstr ""
+msgstr "baptista"
 
 msgctxt "christian"
 msgid "catholic"
-msgstr ""
+msgstr "katolikus"
 
 msgctxt "christian"
 msgid "evangelical"
-msgstr ""
+msgstr "evangélikus"
 
 msgctxt "christian"
 msgid "greek_catholic"
-msgstr ""
+msgstr "görög katolikus"
 
 msgctxt "christian"
 msgid "greek_orthodox"
-msgstr ""
+msgstr "görög ortodox"
 
 msgctxt "christian"
 msgid "jehovahs_witness"
-msgstr ""
+msgstr "jehova tanúi"
 
 msgctxt "christian"
 msgid "lutheran"
-msgstr ""
+msgstr "lutheránus"
 
 msgctxt "christian"
 msgid "methodist"
-msgstr ""
+msgstr "metodista"
 
 msgctxt "christian"
 msgid "mormon"
-msgstr ""
+msgstr "mormon"
 
 msgctxt "christian"
 msgid "new_apostolic"
-msgstr ""
+msgstr "apostoli"
 
 msgctxt "christian"
 msgid "orthodox"
-msgstr ""
+msgstr "ortodox"
 
 msgctxt "christian"
 msgid "pentecostal"
-msgstr ""
+msgstr "pünkösdi"
 
 msgctxt "christian"
 msgid "presbyterian"
-msgstr ""
+msgstr "presbiteriánus"
 
 msgctxt "christian"
 msgid "protestant"
-msgstr ""
+msgstr "protestáns"
 
 msgctxt "christian"
 msgid "quaker"
-msgstr ""
+msgstr "kvéker"
 
 msgctxt "christian"
 msgid "roman_catholic"
-msgstr ""
+msgstr "római katolikus"
 
 msgctxt "christian"
 msgid "russian_orthodox"
-msgstr ""
+msgstr "orosz ortodox"
 
 msgctxt "christian"
 msgid "seventh_day_adventist"
-msgstr ""
+msgstr "hetednapi adventista"
 
 msgid "Mosque"
-msgstr ""
+msgstr "Mecset"
 
 msgid "mosque"
-msgstr ""
+msgstr "mecset"
 
 msgid "ibadi"
-msgstr ""
+msgstr "ibadi"
 
 msgid "Synagogue"
-msgstr ""
+msgstr "Zsinagóga"
 
 msgid "synagogue"
-msgstr ""
+msgstr "zsinagóga"
 
 msgctxt "jewish"
 msgid "orthodox"
-msgstr ""
+msgstr "ortodox"
 
 msgctxt "jewish"
 msgid "conservative"
-msgstr ""
+msgstr "konzervatív"
 
 msgctxt "jewish"
 msgid "reform"
-msgstr ""
+msgstr "reform"
 
 msgid "Buddhist Temple"
-msgstr ""
+msgstr "Buddhista Templom"
 
 msgid "theravada"
-msgstr ""
+msgstr "théraváda buddhizmus"
 
 msgid "mahayana"
-msgstr ""
+msgstr "mahájána buddhizmus"
 
 msgid "vajrayana"
-msgstr ""
+msgstr "vadzsrajána buddhizmus"
 
 msgid "Hindu Temple"
-msgstr ""
+msgstr "Hindu Templom"
 
 msgid "vaishnavism"
-msgstr ""
+msgstr "vaishnava"
 
 msgid "shaivism"
-msgstr ""
+msgstr "shaivism (hindu)"
 
 msgid "shaktism"
-msgstr ""
+msgstr "shaktism (hindu)"
 
 msgid "smartism"
-msgstr ""
+msgstr "smartism (hindu)"
 
 msgid "Shinto Shrine"
-msgstr ""
+msgstr "Sintoista szentély"
 
 msgid "Other Place of Worship"
-msgstr ""
+msgstr "Egyéb templom"
 
 msgid "Public Building"
 msgstr "Nyilvános épület"
 
 msgid "Town Hall"
-msgstr ""
+msgstr "Városháza"
 
 msgid "Community Centre"
 msgstr "Közösségi ház"
@@ -18416,7 +18978,7 @@ msgid "University"
 msgstr "Egyetem"
 
 msgid "College"
-msgstr ""
+msgstr "Főiskola"
 
 msgid "Driving School"
 msgstr "Autósiskola"
@@ -18425,10 +18987,10 @@ msgid "License Classes"
 msgstr "Jogosítvány kategóriái"
 
 msgid "A;A1;B;BE;C"
-msgstr ""
+msgstr "A;A1;B;BE;C"
 
 msgid "A;A1;B;B1;C;C1;D;D1;BE;CE;C1E;DE;D1E"
-msgstr ""
+msgstr "A;A1;B;B1;C;C1;D;D1;BE;CE;C1E;DE;D1E"
 
 msgid "Health"
 msgstr "Egészség"
@@ -18437,10 +18999,10 @@ msgid "Hospital"
 msgstr "Kórház"
 
 msgid "Clinic"
-msgstr ""
+msgstr "Klinika"
 
 msgid "Doctor''s Office"
-msgstr ""
+msgstr "Orvosi rendelő"
 
 msgid "Dentist"
 msgstr "Fogorvos"
@@ -18449,7 +19011,7 @@ msgid "Nursing Home"
 msgstr "Idősek otthona"
 
 msgid "Retirement Home"
-msgstr ""
+msgstr "Nyugdíjas otthon"
 
 msgid "Pharmacy"
 msgstr "Gyógyszertár"
@@ -18461,7 +19023,7 @@ msgid "Hearing Aids"
 msgstr "Hallókészülék"
 
 msgid "Baby Hatch/Safe Haven"
-msgstr ""
+msgstr "Babamentő inkubátor/Menedék"
 
 msgid "Emergency Access Point"
 msgstr "Vészhelyzeti hozzáférési pont"
@@ -18479,64 +19041,64 @@ msgid "Veterinary"
 msgstr "Állatorvos"
 
 msgid "Toilets/Restrooms"
-msgstr ""
+msgstr "Mosdók/WC"
 
 msgid "Access rights"
-msgstr ""
+msgstr "Használati jogok"
 
 msgid "public"
 msgstr "nyilvános"
 
 msgid "seasonal"
-msgstr ""
+msgstr "szezonális"
 
 msgid "flush"
-msgstr ""
+msgstr "öblítéses"
 
 msgid "pitlatrine"
-msgstr ""
+msgstr "árnyékszék/guggolós"
 
 msgid "chemical"
-msgstr ""
+msgstr "kémiai"
 
 msgid "bucket"
-msgstr ""
+msgstr "vödrös"
 
 msgid "Usage Position"
-msgstr ""
+msgstr "Használati pozíció"
 
 msgid "seated"
-msgstr ""
+msgstr "ülő"
 
 msgid "seated;urinal"
-msgstr ""
+msgstr "ülő, vizelő"
 
 msgid "squat"
-msgstr ""
+msgstr "guggoló"
 
 msgid "urinal"
-msgstr ""
+msgstr "vizelő"
 
 msgid "Shower"
-msgstr ""
+msgstr "Zuhanyzó"
 
 msgid "Post Box"
 msgstr "Postaláda"
 
 msgid "Collection times"
-msgstr ""
+msgstr "Begyűjtési időpontok"
 
 msgid "11:30"
-msgstr ""
+msgstr "11:30"
 
 msgid "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
-msgstr ""
+msgstr "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
 
 msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; Su,PH off"
-msgstr ""
+msgstr "Mo-Fr 09:00-12:00,17:15; Sa 14:00; Su,PH off"
 
 msgid "Drive through"
-msgstr ""
+msgstr "Áthajtó (autós)"
 
 msgid "Telephone"
 msgstr "Telefon"
@@ -18548,19 +19110,19 @@ msgid "Emergency Phone"
 msgstr "Segélykérő telefon"
 
 msgid "Internet Access"
-msgstr ""
+msgstr "Internet hozzáférés"
 
 msgid "Automated Defibrillator"
-msgstr ""
+msgstr "Automata defibrillátor"
 
 msgid "Located inside a building?"
-msgstr ""
+msgstr "Épületen belül van elhelyezve?"
 
 msgid "Last check date (YYYY-MM-DD)"
-msgstr ""
+msgstr "Utolsó vizsgálat dátuma (YYYY-MM-DD)"
 
 msgid "Last check note"
-msgstr ""
+msgstr "Utolsó vizsgálati jegyzet"
 
 msgid "Clock"
 msgstr "Óra"
@@ -18569,35 +19131,35 @@ msgid "Display"
 msgstr "Kijelző"
 
 msgid "analog"
-msgstr ""
+msgstr "analóg"
 
 msgid "digital"
-msgstr ""
+msgstr "digitális"
 
 msgid "sundial"
-msgstr ""
+msgstr "napóra"
 
 msgid "unorthodox"
-msgstr ""
+msgstr "liberális szellemű"
 
 msgid "Support"
-msgstr "Tartó"
+msgstr "Tartója"
 
 msgctxt "mounting/support"
 msgid "pole"
-msgstr ""
+msgstr "oszlopos"
 
 msgctxt "mounting/support"
 msgid "wall_mounted"
-msgstr ""
+msgstr "Falra szerelt"
 
 msgctxt "mounting/support"
 msgid "billboard"
-msgstr ""
+msgstr "Hirdetőtáblás"
 
 msgctxt "mounting/support"
 msgid "ground"
-msgstr ""
+msgstr "Álló"
 
 msgid "Visibility/readability"
 msgstr "Láthatóság/olvashatóság"
@@ -18648,10 +19210,10 @@ msgid "centre"
 msgstr "hulladékudvar"
 
 msgid "Waste Basket/Trash Can"
-msgstr ""
+msgstr "Szemétkosár/Szemetes"
 
 msgid "Waste Disposal/Dumpster"
-msgstr ""
+msgstr "Hulladék leadó/Kuka"
 
 msgid "Backrest"
 msgstr "Háttámla"
@@ -18664,11 +19226,11 @@ msgstr "Esőbeálló típusa"
 
 msgctxt "shelter"
 msgid "basic_hut"
-msgstr ""
+msgstr "egyszerű kunyhó"
 
 msgctxt "shelter"
 msgid "lean_to"
-msgstr ""
+msgstr "fekvőhely"
 
 msgctxt "shelter"
 msgid "picnic_shelter"
@@ -18694,15 +19256,15 @@ msgstr "Magasság"
 
 msgctxt "height"
 msgid "low"
-msgstr ""
+msgstr "alacsony"
 
 msgctxt "height"
 msgid "half"
-msgstr ""
+msgstr "fél"
 
 msgctxt "height"
 msgid "full"
-msgstr ""
+msgstr "teljes"
 
 msgid "Hide"
 msgstr "Rejtett"
@@ -18711,7 +19273,7 @@ msgid "Lock"
 msgstr "Zárható"
 
 msgid "Indoor"
-msgstr ""
+msgstr "Beltéri"
 
 msgid "Fire Hydrant"
 msgstr "Tűzcsap"
@@ -18736,7 +19298,7 @@ msgid "Diameter (in mm)"
 msgstr "Átmérő (mm-ben)"
 
 msgid "Hydrant Position"
-msgstr ""
+msgstr "Tűzcsap pozíció"
 
 msgctxt "hydrant position"
 msgid "lane"
@@ -18792,53 +19354,53 @@ msgstr "Többféle"
 
 msgctxt "running"
 msgid "pitch"
-msgstr ""
+msgstr "sportpálya"
 
 msgctxt "running"
 msgid "sports_centre"
-msgstr ""
+msgstr "sportközpont"
 
 msgctxt "running"
 msgid "stadium"
-msgstr ""
+msgstr "stadion"
 
 msgctxt "running"
 msgid "track"
-msgstr ""
+msgstr "futósáv"
 
 msgid "Nine-pin Bowling"
-msgstr ""
+msgstr "9 bábus bowling"
 
 msgid "Ten-pin Bowling"
-msgstr ""
+msgstr "10 bábus bowling"
 
 msgid "Archery"
 msgstr "Íjászat"
 
 msgid "Track and Field Athletics"
-msgstr ""
+msgstr "Klasszikus atlétika"
 
 msgid "Climbing"
 msgstr "Falmászás"
 
 msgid "Canoeing/Kayaking"
-msgstr ""
+msgstr "Kenuzás/Kajakozás"
 
 msgctxt "racing"
 msgid "pitch"
-msgstr ""
+msgstr "sportpálya"
 
 msgctxt "racing"
 msgid "sports_centre"
-msgstr ""
+msgstr "sportközpont"
 
 msgctxt "racing"
 msgid "stadium"
-msgstr ""
+msgstr "stadion"
 
 msgctxt "racing"
 msgid "track"
-msgstr ""
+msgstr "nyomvonal"
 
 msgid "Dog Racing"
 msgstr "Kutyaverseny"
@@ -18871,7 +19433,7 @@ msgid "water_park"
 msgstr "akvapark"
 
 msgid "Scuba Diving"
-msgstr ""
+msgstr "Búvárkodás"
 
 msgid "Piste type"
 msgstr "Pálya típusa"
@@ -18893,54 +19455,54 @@ msgstr "Nehézség"
 
 msgctxt "piste:difficulty"
 msgid "novice"
-msgstr ""
+msgstr "kezdő"
 
 msgctxt "piste:difficulty"
 msgid "easy"
-msgstr ""
+msgstr "könnyű"
 
 msgctxt "piste:difficulty"
 msgid "intermediate"
-msgstr ""
+msgstr "középerős"
 
 msgctxt "piste:difficulty"
 msgid "advanced"
-msgstr ""
+msgstr "tapasztalt"
 
 msgctxt "piste:difficulty"
 msgid "expert"
-msgstr ""
+msgstr "szakértő"
 
 msgctxt "piste:difficulty"
 msgid "freeride"
-msgstr ""
+msgstr "pálya nélküli"
 
 msgid "Grooming"
 msgstr "Karbantartás"
 
 msgctxt "piste:grooming"
 msgid "classic"
-msgstr ""
+msgstr "klasszikus"
 
 msgctxt "piste:grooming"
 msgid "mogul"
-msgstr ""
+msgstr "Mogul síelés"
 
 msgctxt "piste:grooming"
 msgid "skating"
-msgstr ""
+msgstr "korcsolya"
 
 msgctxt "piste:grooming"
 msgid "classic;skating"
-msgstr ""
+msgstr "Klasszikus korcsolya"
 
 msgctxt "piste:grooming"
 msgid "scooter"
-msgstr ""
+msgstr "roller"
 
 msgctxt "piste:grooming"
 msgid "backcountry"
-msgstr ""
+msgstr "hátországi (vadon)"
 
 msgid "Shooting"
 msgstr "Lövészet"
@@ -18961,19 +19523,20 @@ msgid "Canadian Football"
 msgstr "Kanadai foci"
 
 msgid "Gaelic Games"
-msgstr ""
+msgstr "Kelta játékok"
 
 msgid "Hurling"
-msgstr ""
+msgstr "Hajítás"
 
 msgid "Football"
-msgstr ""
+msgstr "Kelta futball"
 
+# Reméljük akad malyd hozzá magyar megfelelő is idővel...
 msgid "Camogie"
-msgstr ""
+msgstr "Camogie"
 
 msgid "Rounders"
-msgstr ""
+msgstr "Méta játék"
 
 msgid "Rugby League"
 msgstr "Ligarögbi"
@@ -18991,7 +19554,7 @@ msgid "Volleyball"
 msgstr "Röplabda"
 
 msgid "Beach Volleyball"
-msgstr ""
+msgstr "Strand röplabda"
 
 msgid "Golf"
 msgstr "Golf"
@@ -19003,13 +19566,13 @@ msgid "Boule"
 msgstr "Petanque"
 
 msgid "Lawn Bowling"
-msgstr ""
+msgstr "Gyepteke"
 
 msgid "Cricket"
 msgstr "Krikett"
 
 msgid "Cricket Nets"
-msgstr ""
+msgstr "Krikett gyakorló"
 
 msgid "Croquet"
 msgstr "Croquet"
@@ -19018,13 +19581,13 @@ msgid "Hockey"
 msgstr "Jégkorong"
 
 msgid "Pelota"
-msgstr ""
+msgstr "Pelota"
 
 msgid "Racquetball"
-msgstr ""
+msgstr "Racquetball"
 
 msgid "Table Tennis/Ping-Pong"
-msgstr ""
+msgstr "Asztalitenisz/Ping-Pong"
 
 msgid "Tennis"
 msgstr "Tenisz"
@@ -19033,7 +19596,7 @@ msgid "Motorsport"
 msgstr "Motorsport"
 
 msgid "Kart Racing"
-msgstr ""
+msgstr "Gokart versenyzés"
 
 msgid "Motocross"
 msgstr "Motokrossz"
@@ -19046,160 +19609,160 @@ msgstr "Modelrepülőtér"
 
 msgctxt "aerialway"
 msgid "pitch"
-msgstr ""
+msgstr "sportpálya"
 
 msgctxt "aerialway"
 msgid "sports_centre"
-msgstr ""
+msgstr "sportközpont"
 
 msgctxt "aerialway"
 msgid "track"
-msgstr ""
+msgstr "pálya"
 
 msgid "RC Car"
 msgstr "Távirányítós autó"
 
 msgid "Raceway"
-msgstr ""
+msgstr "Versenypálya"
 
 msgid "Man Made"
 msgstr "Építmények"
 
 msgctxt "building"
 msgid "yes"
-msgstr ""
+msgstr "igen"
 
 msgctxt "building"
 msgid "roof"
-msgstr ""
+msgstr "tető"
 
 msgctxt "building"
 msgid "garage"
-msgstr ""
+msgstr "garázs"
 
 msgctxt "building"
 msgid "garages"
-msgstr ""
+msgstr "garázsok"
 
 msgctxt "building"
 msgid "industrial"
-msgstr ""
+msgstr "ipari"
 
 msgctxt "building"
 msgid "school"
-msgstr ""
+msgstr "iskola"
 
 msgctxt "building"
 msgid "hangar"
-msgstr ""
+msgstr "hangár"
 
 msgctxt "building"
 msgid "commercial"
-msgstr ""
+msgstr "kereskedelmi"
 
 msgctxt "building"
 msgid "farm"
-msgstr ""
+msgstr "farm"
 
 msgctxt "building"
 msgid "transportation"
-msgstr ""
+msgstr "szállítmányozás"
 
 msgctxt "building"
 msgid "greenhouse"
-msgstr ""
+msgstr "üvegház"
 
 msgctxt "building"
 msgid "office"
-msgstr ""
+msgstr "iroda"
 
 msgctxt "building"
 msgid "university"
-msgstr ""
+msgstr "egyetem"
 
 msgctxt "building"
 msgid "hospital"
-msgstr ""
+msgstr "kórház"
 
 msgctxt "building"
 msgid "warehouse"
-msgstr ""
+msgstr "raktár"
 
 msgctxt "building"
 msgid "retail"
-msgstr ""
+msgstr "kiskereskedelem"
 
 msgctxt "building"
 msgid "shed"
-msgstr ""
+msgstr "pajta/gépszín"
 
 msgctxt "building"
 msgid "cowshed"
-msgstr ""
+msgstr "tehénistálló"
 
 msgctxt "building"
 msgid "construction"
-msgstr ""
+msgstr "építkezés"
 
 msgid "Residential Building"
 msgstr "Lakóépület"
 
 msgctxt "building"
 msgid "residential"
-msgstr ""
+msgstr "lakóépület"
 
 msgctxt "building"
 msgid "apartments"
-msgstr ""
+msgstr "apartmanok"
 
 msgctxt "building"
 msgid "house"
-msgstr ""
+msgstr "ház"
 
 msgctxt "building"
 msgid "hut"
-msgstr ""
+msgstr "kunyhó"
 
 msgctxt "building"
 msgid "dormitory"
-msgstr ""
+msgstr "kollégium"
 
 msgctxt "building"
 msgid "terrace"
-msgstr ""
+msgstr "terasz"
 
 msgctxt "building"
 msgid "detached"
-msgstr ""
+msgstr "magában álló"
 
 msgid "Entrance"
 msgstr "Bejárat"
 
 msgctxt "entrance"
 msgid "yes"
-msgstr ""
+msgstr "igen"
 
 msgctxt "entrance"
 msgid "main"
-msgstr ""
+msgstr "fő"
 
 msgctxt "entrance"
 msgid "service"
-msgstr ""
+msgstr "szolgálati"
 
 msgctxt "entrance"
 msgid "exit"
-msgstr ""
+msgstr "kijárat"
 
 msgctxt "entrance"
 msgid "emergency"
-msgstr ""
+msgstr "vészkijárat"
 
 msgid "Entrance number"
-msgstr ""
+msgstr "Bejárat száma"
 
 msgid "Flat numbers"
-msgstr ""
+msgstr "Lakás számok"
 
 msgid "Tower"
 msgstr "Torony"
@@ -19228,6 +19791,9 @@ msgstr "Szélmalom"
 msgid "Gasometer"
 msgstr "Gáztározó"
 
+msgid "Bunker Silo"
+msgstr "Falközi siló"
+
 msgid "Pipeline"
 msgstr "Csővezeték"
 
@@ -19345,7 +19911,7 @@ msgid "Water Works"
 msgstr "Vízmű"
 
 msgid "Wastewater Treatment Plant"
-msgstr ""
+msgstr "Víztisztító telep"
 
 msgid "Watermill"
 msgstr "Vízimalom"
@@ -19369,70 +19935,73 @@ msgid "Mo-Fr 22:00-05:00"
 msgstr "H-P 22:00-05:00"
 
 msgid "Monitoring Station"
-msgstr ""
+msgstr "Mérőállomás"
 
 msgid "Monitoring:"
-msgstr ""
-
-msgid "Weather"
-msgstr ""
+msgstr "Felügyelet:"
 
 msgid "Water level"
-msgstr ""
+msgstr "Vízszint"
 
 msgid "Tide Level"
+msgstr "Árapály szint"
+
+msgid "Groundwater"
 msgstr ""
 
 msgid "Traffic"
-msgstr ""
+msgstr "Közlekedés"
 
 msgid "Air Quality"
-msgstr ""
+msgstr "Levegő minőség"
 
 msgid "Noise"
-msgstr ""
+msgstr "Zaj"
 
 msgid "GPS Signals"
-msgstr ""
+msgstr "GPS jelek"
 
 msgid "GLONASS Signals"
-msgstr ""
+msgstr "GLONASS jelek"
 
 msgid "Galileo Signals"
-msgstr ""
+msgstr "Galileo jelek"
+
+msgid "Weather"
+msgstr "Időjárás"
 
 msgid "Radiation"
-msgstr ""
+msgstr "Sugárzás"
 
 msgid "Seismic Activity"
-msgstr ""
+msgstr "Szeizmikus aktivitás"
 
 msgid "Recording:"
-msgstr ""
+msgstr "Felvétel:"
 
 msgid "Automated"
-msgstr ""
+msgstr "Automata"
 
 msgid "Manually"
-msgstr ""
+msgstr "Manuális"
 
 msgid "Remote"
-msgstr ""
+msgstr "Távvezérelt"
 
 msgid "Display:"
-msgstr ""
+msgstr "Kijelző:"
 
 msgid "Analog"
-msgstr ""
+msgstr "Analóg"
 
 msgid "Digital"
-msgstr ""
+msgstr "Digitális"
 
 msgid "Survey Point"
 msgstr "Földmérési alappont"
 
 msgid "Surveillance Camera"
-msgstr ""
+msgstr "Megfigyelő kamera"
 
 msgid "indoor"
 msgstr "beltéri"
@@ -19441,175 +20010,178 @@ msgid "outdoor"
 msgstr "kültéri"
 
 msgid "Zone"
-msgstr ""
+msgstr "Zóna"
 
 msgid "parking"
-msgstr ""
+msgstr "parkoló"
 
 msgid "traffic"
-msgstr ""
+msgstr "közlekedési"
 
 msgid "shop"
 msgstr "bolt"
 
 msgid "bank"
-msgstr ""
+msgstr "bank"
 
 msgid "Camera"
-msgstr ""
+msgstr "Kamera"
 
 msgctxt "camera:type"
 msgid "fixed"
-msgstr ""
+msgstr "rögzített"
 
 msgctxt "camera:type"
 msgid "panning"
-msgstr ""
+msgstr "pásztázó"
 
 msgctxt "camera:type"
 msgid "dome"
-msgstr ""
+msgstr "kupola"
 
 msgid "Mounted on"
-msgstr ""
+msgstr "Rögzítés helye"
 
 msgctxt "camera:mount"
 msgid "wall"
-msgstr ""
+msgstr "fal"
 
 msgctxt "camera:mount"
 msgid "pole"
-msgstr ""
+msgstr "oszlop"
 
 msgctxt "camera:mount"
 msgid "ceiling"
-msgstr ""
+msgstr "plafon"
 
 msgid "Direction in degrees"
-msgstr ""
+msgstr "Irány fokban"
 
 msgid "Inclination in degrees"
-msgstr ""
+msgstr "Dőlésszög"
 
 msgid "Height in meter (m)"
-msgstr ""
+msgstr "Magasság méterben (m)"
 
 msgid "Bridges"
-msgstr ""
+msgstr "Hidak"
 
 msgid "aqueduct"
 msgstr "akvadukt"
 
 msgid "boardwalk"
-msgstr ""
+msgstr "sétány"
 
 msgid "cantilever"
-msgstr ""
+msgstr "tartókaros"
 
 msgid "covered"
-msgstr ""
+msgstr "fedett"
 
 msgid "low_water_crossing"
-msgstr ""
+msgstr "gázló"
 
 msgid "trestle"
-msgstr ""
+msgstr "állványhíd"
 
 msgid "viaduct"
 msgstr "viadukt"
 
 msgid "Structure"
-msgstr ""
+msgstr "Szerkezet"
 
 msgid "arch"
-msgstr ""
+msgstr "boltív"
 
 msgid "beam"
-msgstr ""
+msgstr "gerenda"
 
 msgid "truss"
-msgstr ""
+msgstr "rácsos"
 
 msgid "floating"
-msgstr ""
+msgstr "úszó"
 
 msgid "suspension"
-msgstr ""
+msgstr "függő"
 
 msgid "cable-stayed"
-msgstr ""
+msgstr "kábeltartós"
 
 msgid "simple-suspension"
-msgstr ""
+msgstr "egyszerű függőhíd"
 
 msgid "humpback"
-msgstr ""
+msgstr "púpos"
 
 msgid "Movable Bridge"
-msgstr ""
+msgstr "Felvonóhíd"
 
 msgid "bascule"
-msgstr ""
+msgstr "felnyíló"
 
 msgid "drawbridge"
-msgstr ""
+msgstr "felvonóhíd"
 
 msgid "lift"
-msgstr ""
+msgstr "felemelkedő"
 
 msgid "submersible"
-msgstr ""
+msgstr "merülő"
 
 msgid "swing"
-msgstr "nyitható"
+msgstr "keresztbeforduló"
 
 msgid "transporter"
-msgstr ""
+msgstr "átszállító"
 
 msgid "Bridge Support"
-msgstr ""
+msgstr "Hídtámasz"
 
 msgid "pier"
-msgstr ""
+msgstr "hídoszlop"
 
 msgid "abutment"
-msgstr ""
+msgstr "támfal"
 
 msgid "lift_pier"
-msgstr ""
+msgstr "emelő oszlop"
 
 msgid "pivot_pier"
-msgstr ""
+msgstr "forgóoszlop"
+
+msgid "Bridge outline"
+msgstr "Híd körvonal"
 
 msgid "Power Plant"
-msgstr ""
+msgstr "Feszültségelosztó telep"
 
 msgid "Output forms of energy (optional):"
-msgstr ""
+msgstr "Az energia kimenő formái (opcionális):"
 
 msgid "Power Generator"
 msgstr "Generátor"
 
 msgid "Biofuel Power Generator"
-msgstr ""
+msgstr "Bioüzemanyag generátor"
 
 msgid "Generator Type"
-msgstr ""
+msgstr "Generátor típus"
 
 msgid "gas_turbine"
-msgstr ""
+msgstr "gázturbina"
 
 msgid "reciprocating_engine"
 msgstr ""
 
 msgid "steam_generator"
-msgstr ""
+msgstr "Gőz generátor"
 
 msgid "Biogas Power Generator"
-msgstr ""
+msgstr "Biogáz generátor"
 
 msgid "Biomass Power Generator"
-msgstr ""
+msgstr "Biomassza generátor"
 
 msgid "Method"
 msgstr "Mód"
@@ -19620,204 +20192,205 @@ msgstr ""
 
 msgctxt "generator method"
 msgid "combustion"
-msgstr ""
+msgstr "égés"
 
 msgctxt "generator method"
 msgid "gasification"
-msgstr ""
+msgstr "gázosítás"
 
 msgid "bioreactor"
-msgstr ""
+msgstr "bioreaktor"
 
 msgid "anaerobic_digestion / combustion"
 msgstr ""
 
 msgid "pyrolysis"
-msgstr ""
+msgstr "a pirolízis"
 
 msgid "combustion"
-msgstr ""
+msgstr "égés"
 
 msgid "steam_turbine"
-msgstr ""
+msgstr "sugár turbina"
 
 msgid "Coal Power Generator"
-msgstr ""
+msgstr "Szenes generátor"
 
 msgid "Gas Power Generator"
-msgstr ""
+msgstr "Gáz generátor"
 
 msgid "combined_cycle"
 msgstr ""
 
 msgid "Oil Power Generator"
-msgstr ""
+msgstr "Olaj generátor"
 
 msgid "Diesel Power Generator"
-msgstr ""
+msgstr "Diesel generátor"
 
 msgid "Gasoline Power Generator"
-msgstr ""
+msgstr "Benzines generátor"
 
 msgid "Nuclear Reactor"
-msgstr ""
+msgstr "Atomreaktor"
 
 msgctxt "generator method"
 msgid "fission"
-msgstr ""
+msgstr "maghasadás"
 
 msgctxt "generator method"
 msgid "fusion"
-msgstr ""
+msgstr "fúzió"
 
 msgid "Boiling Water Reactor 1 (BWR-1)"
-msgstr ""
+msgstr "Forralóvizes reaktor 1 (BWR-1)"
 
 msgid "fission"
-msgstr ""
+msgstr "maghasadás"
 
 msgid "Boiling Water Reactor 2 (BWR-2)"
-msgstr ""
+msgstr "Forralóvizes reaktor 2 (BWR-2)"
 
 msgid "Boiling Water Reactor 3 (BWR-3)"
-msgstr ""
+msgstr "Forralóvizes reaktor 3 (BWR-3)"
 
 msgid "Boiling Water Reactor 4 (BWR-4)"
-msgstr ""
+msgstr "Forralóvizes reaktor 4 (BWR-4)"
 
 msgid "Boiling Water Reactor 5 (BWR-5)"
-msgstr ""
+msgstr "Forralóvizes reaktor 5 (BWR-5)"
 
 msgid "Boiling Water Reactor 6 (BWR-6)"
-msgstr ""
+msgstr "Forralóvizes reaktor 6 (BWR-6)"
 
 msgid "CANada Deuterium Uranium reactor (CANDU)"
-msgstr ""
+msgstr "Kanadai nehézhidrogénes urán reaktor (CANDU)"
 
 msgid "cold-fusion"
-msgstr ""
+msgstr "hideg-fúzió"
 
 msgid "fusion"
-msgstr ""
+msgstr "fúzió"
 
 msgid "China Pressurized Reactor (CPR-1000)"
-msgstr ""
+msgstr "Kínai nyomóvizes reaktor (CPR-1000)"
 
 msgid "European Pressurized Reactor (EPR)"
-msgstr ""
+msgstr "Európai nyomóvizes reaktor (EPR)"
 
 msgid "Inertial Confinement Fusion (ICF)"
 msgstr ""
 
 msgid "Pressurized water reactor (PWR)"
-msgstr ""
+msgstr "Nyomóvizes reaktor (PWR)"
 
 msgid "Reactor Bolshoy Moshchnosti Kanalniy 1000 (RBMK-1000)"
-msgstr ""
+msgstr "Bolshoy Moshchnosti Kanalniy 1000 (RBMK-1000) reaktor"
 
 msgid "Reactor Bolshoy Moshchnosti Kanalniy 1500 (RBMK-1500)"
-msgstr ""
+msgstr "Bolshoy Moshchnosti Kanalniy 1500 (RBMK-1500) reaktor"
 
 msgid "stellarator"
-msgstr ""
+msgstr "sztellarátor"
 
+# Olyan fúziós berendezés, melyben a mágneses tér helikális szerkezetét külsőleg, induktív módon hajtott plazmaáram hozza létre.
 msgid "tokamak"
-msgstr ""
+msgstr "tokamak"
 
 msgid "Vodo-Vodyanoi Energetichesky Reactor (VVER)"
-msgstr ""
+msgstr "Vodo-Vodyanoi Energetichesky Reaktor (VVER)"
 
 msgid "Solar Power Generator"
-msgstr ""
+msgstr "Napenergia generátor"
 
 msgctxt "generator method"
 msgid "photovoltaic"
-msgstr ""
+msgstr "fotovoltaikus"
 
 msgctxt "generator method"
 msgid "thermal"
-msgstr ""
+msgstr "termál"
 
 msgid "solar_photovoltaic_panel"
-msgstr ""
+msgstr "elektrovoltos napkollektor"
 
 msgid "photovoltaic"
-msgstr ""
+msgstr "fotovoltaikus"
 
 msgid "solar_thermal_collector"
-msgstr ""
+msgstr "hőtároló napkollektor"
 
 msgid "thermal"
-msgstr ""
+msgstr "termál"
 
 msgid "Waste Power Generator"
-msgstr ""
+msgstr "Hulladék energia generátor"
 
 msgctxt "generator method"
 msgid "pyrolysis"
-msgstr ""
+msgstr "pirolízis"
 
 msgid "gasification"
-msgstr ""
+msgstr "gázosítás"
 
 msgid "Water Turbine"
-msgstr ""
+msgstr "Víz turbina"
 
 msgctxt "generator method"
 msgid "run-of-the-river"
-msgstr ""
+msgstr "folyami átfolyó"
 
 msgctxt "generator method"
 msgid "water-pumped-storage"
-msgstr ""
+msgstr "vízpumpás tároló"
 
 msgctxt "generator method"
 msgid "water-storage"
-msgstr ""
+msgstr "víztározó"
 
 msgid "francis_turbine"
-msgstr ""
+msgstr "francis-turbina"
 
 msgid "all methods"
-msgstr ""
+msgstr "minden módszer"
 
 msgid "hydrodynamic_screw"
-msgstr ""
+msgstr "hidrodinamikus csavar"
 
 msgid "run-of-the-river"
-msgstr ""
+msgstr "folyami átfolyó"
 
 msgid "kaplan_turbine"
-msgstr ""
+msgstr "Kaplan-turbina"
 
 msgid "run-of-the-river / water-storage"
-msgstr ""
+msgstr "folyami átfolyó / víztározó"
 
 msgid "pelton_turbine"
-msgstr ""
+msgstr "pelton turbina"
 
 msgid "Tidal Water Turbine"
-msgstr ""
+msgstr "Tidal Vízturbina"
 
 msgctxt "generator method"
 msgid "barrage"
-msgstr ""
+msgstr "duzzasztógát"
 
 msgctxt "generator method"
 msgid "stream"
-msgstr ""
+msgstr "áramoltató"
 
 msgid "horizontal_axis"
-msgstr ""
+msgstr "vízszintes tengely"
 
 msgid "barrage"
-msgstr ""
+msgstr "duzzasztógát"
 
 msgid "vertical_axis"
-msgstr ""
+msgstr "függőleges tengely"
 
 msgid "Wave Energy Converter"
-msgstr ""
+msgstr "Hullámenergia átalakító"
 
 msgid "Osmotic Power Generator"
 msgstr ""
@@ -19826,83 +20399,83 @@ msgid "Geothermal Power Generator"
 msgstr ""
 
 msgid "heat_pump"
-msgstr ""
+msgstr "hőszivattyú"
 
 msgid "Wind Turbine"
-msgstr ""
+msgstr "Szélturbina"
 
 msgid "Power Substation"
-msgstr ""
+msgstr "Feszültségelosztó"
 
 msgid "Type of substation"
-msgstr ""
+msgstr "Elosztó típusa"
 
 msgctxt "power"
 msgid "transmission"
-msgstr ""
+msgstr "átvitel"
 
 msgctxt "power"
 msgid "distribution"
-msgstr ""
+msgstr "elosztó"
 
 msgctxt "power"
 msgid "minor_distribution"
-msgstr ""
+msgstr "kis elosztó"
 
 msgctxt "power"
 msgid "converter"
-msgstr ""
+msgstr "átalakító"
 
 msgctxt "power"
 msgid "compensation"
-msgstr ""
+msgstr "kiegyenlítő"
 
 msgctxt "power"
 msgid "transition"
-msgstr ""
+msgstr "átmenet"
 
 msgctxt "power"
 msgid "traction"
-msgstr ""
+msgstr "tapadási"
 
 msgctxt "power"
 msgid "industrial"
-msgstr ""
+msgstr "ipari"
 
 msgid "Power rating (kVA/MVA)"
-msgstr ""
+msgstr "Feszültség fokozat (kVA/MVA)"
 
 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 ""
+msgstr "Gáz szigetelt"
 
 msgid "Power Transformer"
-msgstr ""
+msgstr "Feszültség transzformátor"
 
 msgid "Type of transformer"
-msgstr ""
+msgstr "Transzformátor típus"
 
 msgctxt "power"
 msgid "generator"
-msgstr ""
+msgstr "generátor"
 
 msgctxt "power"
 msgid "auto"
-msgstr ""
+msgstr "automata"
 
 msgctxt "power"
 msgid "phase_angle_regulator"
@@ -19910,10 +20483,10 @@ msgstr ""
 
 msgctxt "power"
 msgid "yes"
-msgstr ""
+msgstr "igen"
 
 msgid "Phases"
-msgstr ""
+msgstr "Fázisok"
 
 msgid "Power Switchgear"
 msgstr ""
@@ -19933,40 +20506,42 @@ msgid "Power Switch"
 msgstr ""
 
 msgid "Power Converter"
-msgstr ""
+msgstr "Feszültség átalakító"
 
 msgid "Type of converter"
-msgstr ""
+msgstr "Átalakító típusa"
 
+# LCC: Leaded Chip Carrier
 msgctxt "power"
 msgid "lcc"
-msgstr ""
+msgstr "Grafit CHIP hordozó (LCC)"
 
+# voltage source converter (VSC).
 msgctxt "power"
 msgid "vsc"
-msgstr ""
+msgstr "Forrás feszültség konverter (VSC)"
 
 msgctxt "power"
 msgid "back-to-back"
 msgstr ""
 
 msgid "Amount of poles"
-msgstr ""
+msgstr "Pólusok mennyisége"
 
 msgid "monopole"
-msgstr ""
+msgstr "egypólusú"
 
 msgid "bipole"
-msgstr ""
+msgstr "kétpólusú"
 
 msgid "Power rating (MVA)"
 msgstr ""
 
 msgid "Power Compensator"
-msgstr ""
+msgstr "feszültség kiegyenlítő"
 
 msgid "Type of compensator"
-msgstr ""
+msgstr "Kiegyenlítő típusa"
 
 msgctxt "power"
 msgid "shunt_reactor"
@@ -19990,7 +20565,7 @@ msgstr ""
 
 msgctxt "power"
 msgid "filter"
-msgstr ""
+msgstr "szűrő"
 
 msgctxt "power"
 msgid "series_reactor"
@@ -20001,16 +20576,16 @@ msgid "series_capacitor"
 msgstr ""
 
 msgid "Power rating (kvar/Mvar)"
-msgstr ""
+msgstr "Feszültség kategória (kvar/Mvar)"
 
 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 "Elosztó szekrény"
@@ -20019,137 +20594,137 @@ msgid "Power Tower"
 msgstr "Kábeltartó torony"
 
 msgid "Type of construction"
-msgstr ""
+msgstr "Szerkezet típusa"
 
 msgid "lattice"
-msgstr ""
+msgstr "rácsos"
 
 msgid "tubular"
-msgstr ""
+msgstr "csöves"
 
 msgid "solid "
-msgstr ""
+msgstr "szilárd "
 
 msgid "steel"
-msgstr ""
+msgstr "acél"
 
 msgctxt "color"
 msgid "red/white"
-msgstr ""
+msgstr "piros/fehér"
 
 msgctxt "power"
 msgid "suspension"
-msgstr ""
+msgstr "felfüggesztés"
 
 msgctxt "power"
 msgid "anchor"
-msgstr ""
+msgstr "horgony"
 
 msgctxt "power"
 msgid "termination"
-msgstr ""
+msgstr "felmondás"
 
 msgctxt "power"
 msgid "branch"
-msgstr ""
+msgstr "elágazás"
 
 msgctxt "power"
 msgid "transposing"
-msgstr ""
+msgstr "átültető"
 
 msgctxt "power"
 msgid "crossing"
-msgstr ""
+msgstr "átkelés"
 
 msgid "Branch tower type"
-msgstr ""
+msgstr "Elágaztató torony típus"
 
 msgctxt "power"
 msgid "tap"
-msgstr ""
+msgstr "elágazó"
 
 msgctxt "power"
 msgid "split"
-msgstr ""
+msgstr "leválasztó"
 
 msgctxt "power"
 msgid "loop"
-msgstr ""
+msgstr "hurok"
 
 msgctxt "power"
 msgid "cross"
-msgstr ""
+msgstr "kereszt"
 
 msgid "Tower design"
-msgstr ""
+msgstr "Torony kialakítás"
 
 msgctxt "power"
 msgid "one-level"
-msgstr ""
+msgstr "egyszintes"
 
 msgctxt "power"
 msgid "two-level"
-msgstr ""
+msgstr "kétszintes"
 
 msgctxt "power"
 msgid "donau"
-msgstr ""
+msgstr "dunai"
 
 msgctxt "power"
 msgid "three-level"
-msgstr ""
+msgstr "háromszintes"
 
 msgctxt "power"
 msgid "barrel"
-msgstr ""
+msgstr "henger"
 
 msgctxt "power"
 msgid "asymmetric"
-msgstr ""
+msgstr "asszimetrikus"
 
 msgctxt "power"
 msgid "triangle"
-msgstr ""
+msgstr "háromszög"
 
 msgctxt "power"
 msgid "flag"
-msgstr ""
+msgstr "jelölés"
 
 msgctxt "power"
 msgid "donau;one-level"
-msgstr ""
+msgstr "dunai;egyszintes"
 
 msgctxt "power"
 msgid "four-level"
-msgstr ""
+msgstr "négyszintes"
 
 msgctxt "power"
 msgid "six-level"
-msgstr ""
+msgstr "hatszintes"
 
 msgctxt "power"
 msgid "nine-level"
-msgstr ""
+msgstr "kilencszintes"
 
 msgctxt "power"
 msgid "delta"
-msgstr ""
+msgstr "delta"
 
 msgctxt "power"
 msgid "delta_two-level"
-msgstr ""
+msgstr "kétszintes delta"
 
 msgctxt "power"
 msgid "y-frame"
-msgstr ""
+msgstr "y-keret"
 
 msgctxt "power"
 msgid "x-frame"
-msgstr ""
+msgstr "x-keret"
 
 msgctxt "power"
 msgid "h-frame"
-msgstr ""
+msgstr "h-keret"
 
 msgctxt "power"
 msgid "guyed_h-frame"
@@ -20173,20 +20748,29 @@ msgstr ""
 
 msgctxt "power"
 msgid "bipole"
-msgstr ""
+msgstr "kétpólusú"
 
 msgctxt "power"
 msgid "monopolar"
-msgstr ""
+msgstr "egypólusú"
 
 msgid "Triple tower"
-msgstr ""
+msgstr "Hármas torony"
 
 msgid "Incomplete tower"
-msgstr ""
+msgstr "Félkész torony"
 
 msgid "Pole"
-msgstr "Villanyoszlop"
+msgstr "Pózna"
+
+msgid "Pole with Transformer"
+msgstr "Pózna transzformátorral"
+
+msgid "Pole Attributes:"
+msgstr "Pózna tulajdonságok:"
+
+msgid "Transformer Attributes:"
+msgstr "Transzformátor jellemzők:"
 
 msgid "Power Line"
 msgstr "Távvezeték"
@@ -20195,51 +20779,57 @@ msgid "Line type"
 msgstr "Vezeték típusa"
 
 msgid "line"
-msgstr ""
+msgstr "vonal"
 
 msgid "minor_line"
-msgstr ""
+msgstr "mellékvonal"
 
 msgid "Number of conductors/wires per cable"
-msgstr ""
+msgstr "Vezetők/szálak száma a vezetékben"
 
 msgctxt "power"
 msgid "single"
-msgstr ""
+msgstr "szimpla"
 
 msgctxt "power"
 msgid "double"
-msgstr ""
+msgstr "dupla"
 
 msgctxt "power"
 msgid "triple"
-msgstr ""
+msgstr "tripla"
 
 msgctxt "power"
 msgid "quad"
-msgstr ""
+msgstr "négyes"
 
 msgctxt "power"
 msgid "fivefold"
-msgstr ""
+msgstr "ötszörös"
 
 msgctxt "power"
 msgid "sixfold"
-msgstr ""
+msgstr "hatszoros"
 
 msgctxt "power"
 msgid "eightfold"
-msgstr ""
+msgstr "nyolcszoros"
 
 msgid "Used for data communications"
-msgstr ""
+msgstr "Adatkommunikációra használt"
 
 msgid "Power Cable"
-msgstr ""
+msgstr "Hálózati kábel"
 
+msgctxt "power cable"
+msgid "underground"
+msgstr "föld alatti"
+
+msgctxt "power cable"
 msgid "underwater"
-msgstr ""
+msgstr "víz alatti"
 
+msgctxt "power cable"
 msgid "overground"
 msgstr ""
 
@@ -20267,6 +20857,33 @@ msgstr "Műemlék"
 msgid "Memorial"
 msgstr "Emlékmű"
 
+msgctxt "memorial"
+msgid "statue"
+msgstr "szobor"
+
+msgctxt "memorial"
+msgid "bust"
+msgstr "mellszobor"
+
+msgctxt "memorial"
+msgid "plaque"
+msgstr "emléktábla"
+
+msgctxt "memorial"
+msgid "stele"
+msgstr "sztélé"
+
+msgctxt "memorial"
+msgid "stone"
+msgstr "kő/szikla"
+
+msgctxt "memorial"
+msgid "war_memorial"
+msgstr "Háborús emlékmű"
+
+msgid "Inscription"
+msgstr "Felirat"
+
 msgid "Wayside Cross"
 msgstr "Útmenti kereszt"
 
@@ -20292,7 +20909,7 @@ msgid "Kiosk"
 msgstr "Trafik"
 
 msgid "Bakery"
-msgstr ""
+msgstr "Pékség"
 
 msgid "Butcher"
 msgstr "Hentes"
@@ -20304,16 +20921,16 @@ msgid "Deli (Fine Food)"
 msgstr "Delikatesz bolt"
 
 msgid "Candy Store"
-msgstr ""
+msgstr "Édességbolt"
 
 msgid "Tea"
-msgstr ""
+msgstr "Tea"
 
 msgid "Coffee"
-msgstr ""
+msgstr "Kávé"
 
 msgid "Public Market"
-msgstr ""
+msgstr "Piac"
 
 msgid "Organic"
 msgstr "Biobolt"
@@ -20322,7 +20939,7 @@ msgid "Greengrocer"
 msgstr "Zöldséges"
 
 msgid "Farm Stand"
-msgstr ""
+msgstr "Tanyasi pult"
 
 msgid "Organic/Bio"
 msgstr "Biobolt"
@@ -20336,6 +20953,9 @@ msgstr "Alkohol"
 msgid "Beverages"
 msgstr "Italbolt"
 
+msgid "Wine"
+msgstr "Bor"
+
 msgid "Boutique"
 msgstr "Butik"
 
@@ -20376,10 +20996,13 @@ msgid "Hifi"
 msgstr "Hi-fi bolt"
 
 msgid "Video"
-msgstr ""
+msgstr "Videó"
 
 msgid "Video Games"
-msgstr ""
+msgstr "Videójátékok"
+
+msgid "Music"
+msgstr "Zene"
 
 msgid "Cash"
 msgstr "Pénzügy"
@@ -20394,10 +21017,10 @@ msgid "Money Exchange"
 msgstr "Pénzváltó"
 
 msgid "Pawnbroker"
-msgstr ""
+msgstr "Zálogkölcsönző"
 
 msgid "Home decoration"
-msgstr ""
+msgstr "Lakberendezés"
 
 msgid "Furniture"
 msgstr "Bútorbolt"
@@ -20408,35 +21031,38 @@ msgstr "Konyhafelszerelés bolt"
 msgid "Curtain"
 msgstr "Függönybolt"
 
+msgid "Art"
+msgstr "Művészeti"
+
 msgid "Frame"
 msgstr "Képkeret bolt"
 
 msgid "Bed"
-msgstr ""
+msgstr "Ágy"
 
 msgid "Interior Decoration"
-msgstr ""
+msgstr "Belső díszítés"
 
 msgid "Antiques"
-msgstr ""
+msgstr "Régiségek"
 
 msgid "Printed Material"
-msgstr ""
+msgstr "Nyomtatott cikkek"
 
 msgid "Stationery"
 msgstr "Irodaszer bolt"
 
 msgid "Copy Shop"
-msgstr ""
+msgstr "Másoló üzlet"
 
 msgid "Book Store"
 msgstr "Könyvesbolt"
 
 msgid "Newspaper Stand"
-msgstr ""
+msgstr "Újságárus bódé"
 
 msgid "Ticket"
-msgstr ""
+msgstr "Jegy"
 
 msgid "Department Store"
 msgstr "Áruház"
@@ -20448,19 +21074,22 @@ msgid "Chemist"
 msgstr "Drogéria"
 
 msgid "Hairdresser/Barber"
-msgstr ""
+msgstr "Fodrász/Borbély"
 
 msgid "Beauty"
-msgstr ""
+msgstr "Szépségszalon"
+
+msgid "Tattoo"
+msgstr "Tetoválás"
 
 msgid "Optician"
 msgstr "Optikus"
 
 msgid "Jewellery"
-msgstr ""
+msgstr "Ékszerész"
 
 msgid "Gift/Souvenir"
-msgstr ""
+msgstr "Ajándékbolt"
 
 msgid "Erotic"
 msgstr "Szex shop"
@@ -20472,7 +21101,7 @@ msgid "Garden Centre"
 msgstr "Kertészet"
 
 msgid "Do-It-Yourself Store"
-msgstr ""
+msgstr "Barkácsbolt"
 
 msgid "Hardware"
 msgstr "Háztartási bolt"
@@ -20493,19 +21122,22 @@ msgid "Variety Store"
 msgstr "100 forintos bolt"
 
 msgid "Bookmaker"
-msgstr ""
+msgstr "Fogadóiroda"
 
 msgid "Lottery"
-msgstr ""
+msgstr "Lottó"
 
 msgid "Bag"
-msgstr ""
+msgstr "Táska"
 
 msgid "Pet"
-msgstr ""
+msgstr "Kisállat"
+
+msgid "Funeral Directors"
+msgstr "Temetkezési vállalkozás"
 
 msgid "Vending Machine"
-msgstr ""
+msgstr "Árusító automata"
 
 msgid "Vending products"
 msgstr "Árusított termékek"
@@ -20559,13 +21191,13 @@ msgid "tampons"
 msgstr "tampon"
 
 msgid "telephone_vouchers"
-msgstr ""
+msgstr "telefon utalványok"
 
 msgid "toys"
 msgstr "játék"
 
 msgid "vouchers"
-msgstr ""
+msgstr "utalványok"
 
 msgid "Note"
 msgstr "Megjegyzés"
@@ -20586,22 +21218,31 @@ msgid "Political"
 msgstr "Politikai"
 
 msgid "Division"
-msgstr ""
+msgstr "Osztály"
 
 msgid "canton"
-msgstr ""
+msgstr "Kanton"
 
 msgid "linguistic_community"
-msgstr ""
+msgstr "Nyelvi közösség"
 
 msgid "ward"
-msgstr ""
+msgstr "őrség"
 
 msgid "Postal Code"
-msgstr ""
+msgstr "Irányítószám"
 
 msgid "National Park"
-msgstr ""
+msgstr "Nemzeti park"
+
+msgid "Protected Area"
+msgstr "Védett Terület"
+
+msgid "Protected Class"
+msgstr "Védelmi Osztály"
+
+msgid "Title or type of protection"
+msgstr "Felirat vagy a védelem típusa"
 
 msgid "Places"
 msgstr "Helyek"
@@ -20637,10 +21278,10 @@ msgid "Hamlet"
 msgstr "Falu"
 
 msgid "Farm"
-msgstr ""
+msgstr "Tanya"
 
 msgid "A farm within a bigger settlement"
-msgstr ""
+msgstr "Farm egy nagyobb telepen belül"
 
 msgid "(please use isolated_dwelling for an isolated farm)"
 msgstr ""
@@ -20658,13 +21299,13 @@ msgid "Peak"
 msgstr "Csúcs"
 
 msgid "The top (summit) of a mountain or hill."
-msgstr ""
+msgstr "Hegy vagy a dombtető (csúcs)."
 
 msgid "Saddle"
-msgstr ""
+msgstr "Nyereg"
 
 msgid "A saddle point between mountains or hills."
-msgstr ""
+msgstr "Egy nyereg a hegyek vagy dombok közt."
 
 msgid "Glacier"
 msgstr "Gleccser"
@@ -20672,37 +21313,37 @@ msgstr "Gleccser"
 msgid ""
 "A persistent body of dense ice that is constantly moving under its own "
 "weight."
-msgstr ""
+msgstr "A sűrű jég állandó tömege, ami állandóan mozog a saját súlya alatt."
 
 msgid "Volcano"
 msgstr "Vulkán"
 
 msgid "A volcano, either dormant, extinct or active."
-msgstr ""
+msgstr "Egy vulkán, akár alvó, kialudt vagy aktív."
 
 msgid "Current Status"
-msgstr ""
+msgstr "Aktuális állapot"
 
 msgid "dormant"
-msgstr ""
+msgstr "alvó"
 
 msgid "extinct"
-msgstr ""
+msgstr "kialudt"
 
 msgid "stratovolcano"
-msgstr ""
+msgstr "rétegvulkán"
 
 msgid "shield"
-msgstr ""
+msgstr "pajzs"
 
 msgid "scoria"
-msgstr ""
+msgstr "vulkáni salak"
 
 msgid "Cave Entrance"
 msgstr "Barlangbejárat"
 
 msgid "The entrance to a cave."
-msgstr ""
+msgstr "Barlang bejárata."
 
 msgid "Island"
 msgstr "Sziget"
@@ -20711,10 +21352,10 @@ msgid "Islet"
 msgstr "Szigetecske"
 
 msgid "Ridge"
-msgstr ""
+msgstr "Gerinc"
 
 msgid "A mountain or hill ridge."
-msgstr ""
+msgstr "Egy domb- vagy hegygerinc."
 
 msgid "Nature"
 msgstr "Természet"
@@ -20723,28 +21364,28 @@ msgid "Tree"
 msgstr "Fa"
 
 msgid "A single tree."
-msgstr ""
+msgstr "Egyedülálló fa."
 
 msgid "Botanical Name"
 msgstr "Botanikai név"
 
 msgid "Tree Row"
-msgstr ""
+msgstr "Fasor"
 
 msgid "A line of trees."
-msgstr ""
+msgstr "Fák egyvonalban."
 
 msgid "Wood"
 msgstr "Őserdő"
 
 msgid "Woodland where timber production does not dominate use."
-msgstr ""
+msgstr "Erdőség, ahol a fa előállítás nem uralja a használatot."
 
 msgid "Forest"
 msgstr "Ültetett erdő"
 
 msgid "Grassland"
-msgstr ""
+msgstr "Füves terület"
 
 msgid ""
 "Where vegetation is dominated by grasses (Poaceae) and other herbaceous (non-"
@@ -20752,22 +21393,22 @@ msgid ""
 msgstr ""
 
 msgid "pampas"
-msgstr ""
+msgstr "pampa"
 
 msgid "prairie"
-msgstr ""
+msgstr "préri"
 
 msgid "puszta"
-msgstr ""
+msgstr "puszta"
 
 msgid "savanna"
-msgstr ""
+msgstr "szavanna"
 
 msgid "steppe"
-msgstr ""
+msgstr "sztyeppe"
 
 msgid "veld"
-msgstr ""
+msgstr "dél-afrikai préri"
 
 msgid "Nature Reserve"
 msgstr "Természetvédelmi terület"
@@ -20776,10 +21417,10 @@ msgid "Scree"
 msgstr "Törmeléklejtő"
 
 msgid "An accumulation of loose rocks."
-msgstr ""
+msgstr "Sziklák felhalmozódása."
 
 msgid "Fell"
-msgstr ""
+msgstr "Kopár hegyoldal"
 
 msgid ""
 "Bare upper lying uncultivated land principally covered with grass and often "
@@ -20803,13 +21444,13 @@ msgid ""
 msgstr ""
 
 msgid "Sand"
-msgstr ""
+msgstr "Homok"
 
 msgid "Large area covered with sand."
-msgstr ""
+msgstr "Nagyobb homokos terület."
 
 msgid "Bare Rock"
-msgstr ""
+msgstr "Csupasz szikla"
 
 msgid ""
 "For areas of solid visible rock that is sparsely vegetated or not vegetated "
@@ -20817,12 +21458,14 @@ msgid ""
 msgstr ""
 
 msgid "Stone"
-msgstr ""
+msgstr "Kő"
 
 msgid ""
 "A single notable free-standing rock, which may differ from the composition "
 "of the terrain it lies in."
 msgstr ""
+"Egyedül és szabadon álló, megjegyezhető szikla, amely akár el is térhet az "
+"alatta lévő talaj összetételétől is."
 
 msgid "Land use"
 msgstr "Területfunkció"
@@ -20837,7 +21480,7 @@ msgid "Meadow"
 msgstr "Mező"
 
 msgid "Orchard"
-msgstr ""
+msgstr "Gyümölcsös"
 
 msgid "Vineyard"
 msgstr "Szőlőültetvény"
@@ -20846,7 +21489,7 @@ msgid "Greenhouse Horticulture"
 msgstr "Melegház"
 
 msgid "Plant Nursery"
-msgstr ""
+msgstr "Növény nevelde"
 
 msgid "Allotments"
 msgstr "Telkek"
@@ -20861,7 +21504,7 @@ msgid "Village Green"
 msgstr "Közös mező"
 
 msgid "Common"
-msgstr ""
+msgstr "Közös"
 
 msgid "Park"
 msgstr "Park"
@@ -20870,7 +21513,7 @@ msgid "Recreation Ground"
 msgstr "Szabadidő park"
 
 msgid "Residential Area"
-msgstr ""
+msgstr "Lakóterület"
 
 msgid "Graveyard"
 msgstr "Sírkert"
@@ -20879,7 +21522,7 @@ msgid "Cemetery"
 msgstr "Temető"
 
 msgid "Religious"
-msgstr ""
+msgstr "Vallási"
 
 msgid "Retail"
 msgstr "Kereskedelmi"
@@ -20894,13 +21537,13 @@ msgid "Garages"
 msgstr "Garázsok"
 
 msgid "Railway Land"
-msgstr ""
+msgstr "Vasúti terület"
 
 msgid "Military"
 msgstr "Katonai"
 
 msgid "Construction Area"
-msgstr ""
+msgstr "Építési terület"
 
 msgid "Brownfield"
 msgstr "Bontási"
@@ -20918,28 +21561,28 @@ msgid "Annotation"
 msgstr "Annotáció"
 
 msgid "Alternative name"
-msgstr ""
+msgstr "Alternatív név"
 
 msgid "Historical name"
-msgstr ""
+msgstr "Történelmi név"
 
 msgid "Local name"
-msgstr ""
+msgstr "Helyi elnevezés"
 
 msgid "Regional name"
-msgstr ""
+msgstr "Regionális név"
 
 msgid "National name"
-msgstr ""
+msgstr "Nemzeti név"
 
 msgid "International name"
-msgstr ""
+msgstr "Nemzetközi név"
 
 msgid "Official name"
-msgstr ""
+msgstr "Hivatalos név"
 
 msgid "Common name abbreviation"
-msgstr ""
+msgstr "Közismert név rövidítés"
 
 msgid "House number"
 msgstr "Házszám"
@@ -20963,13 +21606,13 @@ msgid "Optional values for specific countries"
 msgstr "Opcionális értékek az adott országokhoz"
 
 msgid "Subdistrict"
-msgstr ""
+msgstr "Alkörzet"
 
 msgid "District"
-msgstr ""
+msgstr "Körzet"
 
 msgid "Province"
-msgstr ""
+msgstr "Tartomány"
 
 msgid "AL"
 msgstr "AL"
@@ -21131,7 +21774,7 @@ msgid "UM"
 msgstr "UM"
 
 msgid "VI"
-msgstr ""
+msgstr "VI"
 
 msgid "Address Interpolation"
 msgstr "Lakcím-interpoláció"
@@ -21224,7 +21867,7 @@ msgid "members of site"
 msgstr "a hely tagjai"
 
 msgid "Turn Restriction"
-msgstr ""
+msgstr "Kanyarodási korlátozás"
 
 msgid "Restriction"
 msgstr "Korlátozás"
@@ -21302,43 +21945,43 @@ msgid "traffic light or barrier that stops you"
 msgstr "jelzőlámpa, vagy akadály, ami megállít"
 
 msgid "Routes"
-msgstr ""
+msgstr "Útvonalak"
 
 msgid "Bicycle Route"
-msgstr ""
+msgstr "Kerékpár útvonal"
 
 msgid "icn"
-msgstr ""
+msgstr "Nemzetközi kerékpárút hálózat (ICN)"
 
 msgid "ncn"
-msgstr ""
+msgstr "Országos kerékpárút hálózat (NCN)"
 
 msgid "rcn"
-msgstr ""
+msgstr "Regionális kerékpárút hálózat (RCN)"
 
 msgid "lcn"
-msgstr ""
+msgstr "Londoni kerékpárút hálózat (LCN)"
 
 msgid "Mountain Biking Route"
-msgstr ""
+msgstr "Hegyikerékpár útvonal"
 
 msgid "Hiking Route"
-msgstr ""
+msgstr "Túraútvonal"
 
 msgid "iwn"
-msgstr ""
+msgstr "Nemzetközi túraútvonal hálózat (IWN)"
 
 msgid "nwn"
-msgstr ""
+msgstr "Országos túraútvonal hálózat (NWR)"
 
 msgid "rwn"
-msgstr ""
+msgstr "Regionális túraútvonal hálózat (NWR)"
 
 msgid "lwn"
-msgstr ""
+msgstr "Helyi túraútvonal hálózat (LWR)"
 
 msgid "infrastructure"
-msgstr ""
+msgstr "infrastruktúra"
 
 msgid "natural"
 msgstr "természet"
@@ -21356,43 +21999,43 @@ msgid "variant segment"
 msgstr ""
 
 msgid "entry points"
-msgstr ""
+msgstr "belépési pontok"
 
 msgid "Ski Route"
-msgstr ""
+msgstr "Síelési útvonal"
 
 msgid "alpine"
-msgstr ""
+msgstr "hegyi"
 
 msgid "Detour Route"
 msgstr ""
 
 msgid "Destination"
-msgstr ""
+msgstr "Célforgalom"
 
 msgid "Ref of the way this is a detour to"
 msgstr ""
 
 msgid "fork node for alternative routes"
-msgstr ""
+msgstr "elágazási pont alternatív útvonalakhoz"
 
 msgid "Power Route"
 msgstr ""
 
 msgid "Railway Route"
-msgstr ""
+msgstr "Vasúti Útvonal"
 
 msgid "Road Route"
-msgstr ""
+msgstr "Közúti Útvonal"
 
 msgid "Route Network"
-msgstr ""
+msgstr "Útvonal Hálózat"
 
 msgid "member"
 msgstr "tag"
 
 msgid "Associated Street"
-msgstr ""
+msgstr "Kapcsolódó Utca"
 
 msgid "house"
 msgstr "ház"
@@ -21413,7 +22056,7 @@ msgid "anything related to the street"
 msgstr "az utcához tartozó egyéb dolgok"
 
 msgid "Destination Sign"
-msgstr ""
+msgstr "Úticél Jelzés"
 
 msgid "Destination written on sign (w/o distance)"
 msgstr "A táblán jelzett célpont (táv nélkül)"
@@ -21452,13 +22095,13 @@ msgid "stream"
 msgstr "patak"
 
 msgid "drain"
-msgstr ""
+msgstr "száraz"
 
 msgid "ditch"
 msgstr "árok"
 
 msgid "Name of river/lake/sea/ocean it runs into"
-msgstr ""
+msgstr "A folyó/tó/tenger/óceán neve, ahova belefolyik"
 
 msgid "Reference Sandre (FR)"
 msgstr "Sandre azonosító (FR)"
@@ -21530,626 +22173,864 @@ msgid "Test"
 msgstr "Próba"
 
 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 (Humanitárius OpenStreetMap Csapat)"
 
 msgid "MapBox Satellite"
-msgstr ""
+msgstr "MapBox Műhold"
 
 msgid "MapQuest Open Aerial"
-msgstr ""
+msgstr "MapQuest Nyílt Légifelvétel"
 
 msgid "OpenStreetMap GPS Traces"
-msgstr ""
+msgstr "OpenStreetMap GPS Nyomvonalak"
 
 msgid "OpenStreetMap (Mapnik)"
-msgstr ""
+msgstr "OpenStreetMap (Mapnik)"
 
 msgid "OpenStreetMap (Mapnik Black & White)"
-msgstr ""
+msgstr "OpenStreetMap (Mapnik fekete-fehér)"
 
 msgid "OpenStreetMap (Mapnik, no labels)"
-msgstr ""
+msgstr "OpenStreetMap (Mapnik, feliratok nélkül)"
 
 msgid "skobbler"
-msgstr ""
+msgstr "skobbler"
 
 msgid "skobbler heatmap"
-msgstr ""
+msgstr "skobbler hőtérkép"
 
 msgid "OpenCycleMap"
-msgstr ""
+msgstr "OpenCycleMap"
 
 msgid "MapQuest OSM"
-msgstr ""
+msgstr "MapQuest OSM"
 
 msgid "Public Transport (ÖPNV)"
-msgstr ""
+msgstr "Tömegközlekedés (ÖPNV)"
 
 msgid "OpenStreetMap (German Style)"
-msgstr ""
+msgstr "OpenStreetMap (Német stílusú)"
 
 msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
-msgstr ""
+msgstr "Cambodia, Laos, Thailand, Vietnam kétnyelvű"
 
 msgid "osmfr"
-msgstr ""
+msgstr "OSM Fr"
 
 msgid "OpenPT Map (overlay)"
-msgstr ""
+msgstr "OpenPT map (fedettség)"
 
 msgid "Strava cycling heatmap"
-msgstr ""
+msgstr "Strava kerékpáros hőtérkép"
 
 msgid "Strava running heatmap"
-msgstr ""
+msgstr "Strava futó hőtérkép"
 
 msgid "AGRI black-and-white 2.5m"
-msgstr ""
+msgstr "AGRI fekete-fehér 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 (alaptérkép)"
 
 msgid "Tiris: DGM (Terrain model)"
-msgstr ""
+msgstr "Tiris: DGM (Domborzati modell)"
 
 msgid "Tiris: DOM (Surface model)"
-msgstr ""
+msgstr "Tiris: DOM (Felületi model)"
 
 msgid "Vienna: Mehrzweckkarte (general purpose)"
-msgstr ""
+msgstr "Vienna: Mehrzweckkarte (általános célú)"
 
 msgid "Vienna: Beschriftungen (annotations)"
-msgstr ""
+msgstr "Vienna: Beschriftungen (jegyzetekkel)"
 
 msgid "Vienna: Orthofoto (aerial image)"
-msgstr ""
+msgstr "Vienna: Orthofoto (légifelvétel)"
 
 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 (Domborzati modell)"
 
 msgid "VoGIS: DOM (Surface model)"
-msgstr ""
+msgstr "VoGIS: DGM (Felületi modell)"
 
 msgid "IBGE Mapa de Setores Urbanos"
-msgstr ""
+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 Hidrológiai"
 
 msgid "Geobase Roads"
-msgstr ""
+msgstr "Geobase utak"
 
 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 épített"
 
 msgid "Czech RUIAN parcely"
-msgstr ""
+msgstr "Czech RUIAN parcellák"
 
 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 Alaptérkép (Maaamet)"
 
 msgid "Estonia Ortho (Maaamet)"
+msgstr "Estonia Ortofotó (Maaamet)"
+
+msgid "Estonia Hillshade (Maaamet)"
 msgstr ""
 
-msgid "Estonia Multi (Maaamet)"
+msgid "Estonia Cadastre (Maaamet)"
 msgstr ""
 
-msgid "Bordeaux - 2012"
+msgid "Estonia Forestry (Maaamet)"
 msgstr ""
 
+msgid "Bordeaux - 2012"
+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 "CUGN Nancy - Orthophoto 2012"
-msgstr ""
+msgid "GrandNancy Orthophotographie 2012"
+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 - Ortofotók 2000"
 
 msgid "Géolittoral V2 - Orthophotos 2010-2012"
-msgstr ""
+msgstr "Géolittoral V2 - Ortofotók 2010-2012"
 
 msgid "Géolittoral - Sentiers"
-msgstr ""
+msgstr "Géolittoral - Gyalogutak"
 
 msgid "Grand Lyon - Orthophotographie 2012 - 10cm"
-msgstr ""
+msgstr "Grand Lyon - Ortofotók 2012 - 10cm"
 
 msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
-msgstr ""
+msgstr "Loire-Atlantique - Ortofotók 2012 - 20 cm"
 
 msgid "Toulouse - Orthophotoplan 2013"
-msgstr ""
+msgstr "Toulouse - Ortofotó tervek 2013"
 
 msgid "Toulouse - Orthophotoplan 2011"
-msgstr ""
+msgstr "Toulouse - Ortofotó tervek 2011"
 
 msgid "Toulouse - Orthophotoplan 2007"
-msgstr ""
+msgstr "Toulouse - Ortofotó tervek 2007"
 
 msgid "Tours - Orthophotos 2013"
-msgstr ""
+msgstr "Tours - Ortofotók 2013"
 
 msgid "Tours - Orthophotos 2008-2010"
-msgstr ""
+msgstr "Tours - Ortofotók 2008-2010"
 
 msgid "Tours - Orthophotos 2008"
-msgstr ""
+msgstr "Tours - Ortofotók 2008"
 
 msgid ""
 "Vercors - Réserve naturelle des Hauts-Plateaux du Vercors - Orthophotos 1999 "
 "- 1 m"
 msgstr ""
-
-msgid "Streets NRW Geofabrik.de"
-msgstr ""
+"Vercors - Réserve naturelle des Hauts-Plateaux du Vercors - Ortofotók 1999 - "
+"1 m"
 
 msgid "Hike & Bike"
-msgstr ""
+msgstr "Túra és kerékpár"
 
 msgid "OpenStreetMap (Sorbian Language)"
-msgstr ""
+msgstr "OpenStreetMap (Szorb nyelvű)"
 
 msgid "Hamburg (40 cm)"
-msgstr ""
+msgstr "Hamburg (40 cm)"
 
 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 "Zwenkau régi térképe - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
 
 msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
-msgstr ""
+msgstr "Pegau régi térképe - 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 (Vektoros)"
 
 msgid "NRW-Atlas: Automatisierte Liegenschaftskarte (Raster)"
-msgstr ""
+msgstr "NRW-Atlas: Automatisierte Liegenschaftskarte (Raszteres)"
 
 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 "NRW-Atlas: Topographische Karte 1:10000"
+
+msgid "Metropole Ruhr: Luftbilder (10 cm)"
 msgstr ""
 
 msgid "Drone Imagery (Haiti)"
-msgstr ""
+msgstr "Drón ábrázolás (Haiti)"
 
 msgid "Drone Imagery 2014 (Haiti)"
-msgstr ""
+msgstr "Drón ábrázolás 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 Városi Atlasz"
 
 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 ortofotó - Latvia"
 
 msgid "20cm ortho - Latvia - Coastline"
-msgstr ""
+msgstr "20cm ortofotó - Latvia - Coastline"
 
 msgid "ORT10LT (Lithuania)"
-msgstr ""
+msgstr "ORT10LT (Lithuania)"
 
 msgid "Luxembourg Inspire Ortho 2010"
-msgstr ""
+msgstr "Luxembourg Inspire Ortoforó 2010"
 
 msgid "Luxembourg Inspire Ortho 2013"
-msgstr ""
+msgstr "Luxembourg Inspire Ortofotó 2013"
 
 msgid "Luxembourg Inspire Railway"
-msgstr ""
+msgstr "Luxembourg Inspire Vasúti"
 
 msgid "Luxembourg Inspire Roads"
-msgstr ""
+msgstr "Luxembourg Inspire Utak"
 
 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 (légifelvétel)"
 
 msgid "Geoportal 2: PRNG (geo names)"
-msgstr ""
+msgstr "Geoportal 2: PRNG (földrajzi nevek)"
 
 msgid "Będzin: Ortofotomapa 2013 (aerial image)"
-msgstr ""
+msgstr "Będzin: Ortofotomapa 2013 (légifelvétel)"
 
 msgid "Będzin: Budynki (buildings)"
-msgstr ""
+msgstr "Będzin: Budynki (épületek)"
 
 msgid "Bytom: Ortofotomapa 2012 (aerial image)"
-msgstr ""
+msgstr "Bytom: Ortofotomapa 2012 (légifelvétel)"
 
 msgid "Bytom: Budynki (buildings)"
-msgstr ""
+msgstr "Bytom: Budynki (épületek)"
 
 msgid "Chorzów: Budynki (buildings)"
-msgstr ""
+msgstr "Chorzów: Budynki (épületek)"
 
 msgid "Częstochowa: Ortofotomapa 2011 (aerial image)"
-msgstr ""
+msgstr "Częstochowa: Ortofotomapa 2011 (légifelvétel)"
 
 msgid "Gliwice: Ortofotomapa 2013 (aerial image)"
-msgstr ""
+msgstr "Gliwice: Ortofotomapa 2013 (légifelvétel)"
 
 msgid "Gliwice: Budynki (buildings)"
-msgstr ""
+msgstr "Gliwice: Budynki (épületek)"
 
 msgid "Katowice: Ortofotomapa (aerial image)"
-msgstr ""
+msgstr "Katowice: Ortofotomapa (légifelvétel)"
 
 msgid "Łódź: Ortofotomapa (aerial image)"
-msgstr ""
+msgstr "Łódź: Ortofotomapa (légifelvétel)"
 
 msgid "Ruda Śląska: Ortofotomapa (aerial image)"
-msgstr ""
+msgstr "Ruda Śląska: Ortofotomapa (légifelvétel)"
 
 msgid "Rzeszów: Ortofotomapa (aerial image)"
-msgstr ""
+msgstr "Rzeszów: Ortofotomapa (légifelvétel)"
 
 msgid "Rzeszów: Budynki (buildings)"
-msgstr ""
+msgstr "Rzeszów: Budynki (épületek)"
 
 msgid "Siemianowice Śląskie: Ortofotomapa (aerial image)"
-msgstr ""
+msgstr "Siemianowice Śląskie: Ortofotomapa (légifelvétel)"
 
 msgid "Świętochłowice: Ortofotomapa 2009 (aerial image)"
-msgstr ""
+msgstr "Świętochłowice: Ortofotomapa 2009 (légifelvétel)"
 
 msgid "Zabrze: Ortofotomapa 2011 (aerial image)"
-msgstr ""
+msgstr "Zabrze: Ortofotomapa 2011 (légifelvétel)"
 
 msgid "trail.pl: Szlaki (paths)"
-msgstr ""
+msgstr "trail.pl: Szlaki (útvonalak)"
 
 msgid "ScanEx IRS"
-msgstr ""
+msgstr "ScanEx IRS"
 
 msgid "ScanEx SPOT"
-msgstr ""
+msgstr "ScanEx SPOT"
 
 msgid "Freemap.sk Car"
-msgstr ""
+msgstr "Freemap.sk Autó"
 
 msgid "Freemap.sk Hiking"
-msgstr ""
+msgstr "Freemap.sk Túra"
 
 msgid "Freemap.sk Cyclo"
-msgstr ""
+msgstr "Freemap.sk Kerékpár"
 
 msgid "Freemap.sk Ski"
-msgstr ""
+msgstr "Freemap.sk Sí"
 
 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 Városi Atlasz"
 
 msgid "Slovakia EEA CORINE 2006"
-msgstr ""
+msgstr "Slovakia EEA CORINE 2006"
 
 msgid "Slovakia Historic Maps"
-msgstr ""
+msgstr "Slovakia Történelmi Térképek"
 
 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 "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 "Stadt Zürich Luftbild 2011"
 
 msgid "Orthofoto Kanton Solothurn RGB (SOGIS 2011/2012/2013)"
-msgstr ""
+msgstr "Ortofotó Kanton Solothurn RGB (SOGIS 2011/2012/2013)"
 
 msgid "Orthofoto Kanton Solothurn Infrarot (SOGIS 2011/2012/2013)"
-msgstr ""
+msgstr "Ortofotó 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 (2008)"
-msgstr ""
+msgid "Stadt Bern 10cm/25cm (2012)"
+msgstr "Stadt Bern 10cm/25cm (2012)"
 
 msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
-msgstr ""
+msgstr "HEIG-VD / Ortofotó Yverdon-les-Bains 25cm (2007)"
 
 msgid "Ville de Nyon - Orthophoto 2010 HD 5cm/pi"
-msgstr ""
+msgstr "Ville de Nyon - Ortofotó 2010 HD 5cm/pi"
 
 msgid "Cartoriviera - Orthophoto 2012"
-msgstr ""
+msgstr "Cartoriviera - Ortofotó 2012"
 
 msgid "SIGIP - Orthophoto 2012"
-msgstr ""
+msgstr "SIGIP - Ortofotó 2012"
 
 msgid "Lausanne - Orthophoto technique 2012"
-msgstr ""
+msgstr "Lausanne - Ortofotó 2012"
 
 msgid "Bonvillars Orthophoto 2013"
-msgstr ""
+msgstr "Bonvillars Ortofotó 2013"
 
 msgid "Fiez Orthophoto 2013"
-msgstr ""
+msgstr "Fiez Ortofotó 2013"
 
 msgid "MSR Maps Topo"
-msgstr ""
+msgstr "MSR Topográfiai Térképek"
 
 msgid "MSR Maps Urban"
-msgstr ""
+msgstr "MSR Városi Térképek"
 
 msgid "USGS Scanned Topographic Maps"
-msgstr ""
+msgstr "USGS Szkennelt Topográfiai Térképek"
 
 msgid "USGS Large Scale Imagery"
-msgstr ""
+msgstr "USGS Large Scale Imagery"
 
 msgid "OSM US TIGER 2012 Roads Overlay"
-msgstr ""
+msgstr "OSM US TIGER 2012 Út lefedettség"
 
-msgid "New & Misaligned TIGER Roads (TIGER 2013)"
+msgid "New & Misaligned TIGER Roads (TIGER 2014)"
 msgstr ""
 
 msgid "MassGIS L3 Parcels"
-msgstr ""
+msgstr "MassGIS L3 Parcellák"
 
 msgid "NC Latest Orthoimagery"
-msgstr ""
+msgstr "NC Latest Ortofotó"
 
 msgid "Ukraine - Orthophotomaps 2012"
-msgstr ""
+msgstr "Ukraine - Ortofotó térkép 2012"
 
 msgid "7th Series (OS7)"
-msgstr ""
+msgstr "7. sorozat (OS7)"
 
 msgid "OS New Popular Edition historic"
-msgstr ""
+msgstr "OS New Popular Edition történelmi"
 
 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 Légifelmérés"
 
 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 történelmi (OSM-Limited)"
 
 msgid "OS Scottish Popular historic"
-msgstr ""
+msgstr "OS Scottish Popular történelmi"
 
 msgid "NLS - Bartholomew Half Inch, 1897-1907"
-msgstr ""
+msgstr "NLS - Bartholomew Half Inch, 1897-1907"
+
+msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgstr "Angol (OS) városrendezési tervek, Aberdeen 1866-1867 (NLS)"
+
+msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgstr "Angol (OS) városrendezési tervek, Airdrie 1858 (NLS)"
+
+msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgstr "Angol (OS) városrendezési tervek, Alexandria 1859 (NLS)"
+
+msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgstr "Angol (OS) városrendezési tervek, Alloa 1861-1862 (NLS)"
+
+msgid "OS Town Plans, Annan 1859 (NLS)"
+msgstr "Angol (OS) városrendezési tervek, Annan 1859 (NLS)"
+
+msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgstr "Angol (OS) városrendezési tervek, Arbroath 1858 (NLS)"
+
+msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgstr "Angol (OS) városrendezési tervek, Ayr 1855 (NLS)"
+
+msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgstr "Angol (OS) városrendezési tervek, Berwick-upon-Tweed 1852 (NLS)"
+
+msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgstr "Angol (OS) városrendezési tervek, Brechin 1862 (NLS)"
+
+msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgstr "Angol (OS) városrendezési tervek, Burntisland 1894 (NLS)"
+
+msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgstr "Angol (OS) városrendezési tervek, Campbelton 1865 (NLS)"
+
+msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgstr "Angol (OS) városrendezési tervek, Coatbridge 1858 (NLS)"
 
 msgid "OS Town Plans, Cupar 1854 (NLS)"
-msgstr ""
+msgstr "Angol (OS) városrendezési tervek, Cupar 1854 (NLS)"
+
+msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgstr "Angol (OS) városrendezési tervek, Cupar 1893-1894 (NLS)"
+
+msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgstr "Angol (OS) városrendezési tervek, Dalkeith 1852 (NLS)"
+
+msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgstr "Angol (OS) városrendezési tervek, Dalkeith 1893 (NLS)"
+
+msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgstr "Angol (OS) városrendezési tervek, Dumbarton 1859 (NLS)"
+
+msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgstr "Angol (OS) városrendezési tervek, Dumfries 1850 (NLS)"
+
+msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgstr "Angol (OS) városrendezési tervek, Dumfries 1893 (NLS)"
+
+msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgstr "Angol (OS) városrendezési tervek, Dundee 1857-1858 (NLS)"
+
+msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgstr "Angol (OS) városrendezési tervek, Dundee 1870-1872 (NLS)"
+
+msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgstr "Angol (OS) városrendezési tervek, Dunfermline 1854 (NLS)"
+
+msgid "OS Town Plans, Dunfermline 1894 (NLS)"
+msgstr "Angol (OS) városrendezési tervek, Dunfermline 1894 (NLS)"
+
+msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
+msgstr "Angol (OS) városrendezési tervek, Edinburgh 1849-1851 (NLS)"
+
+msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
+msgstr "Angol (OS) városrendezési tervek, Edinburgh 1876-1877 (NLS)"
+
+msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
+msgstr "Angol (OS) városrendezési tervek, Edinburgh 1893-1894 (NLS)"
+
+msgid "OS Town Plans, Elgin 1868 (NLS)"
+msgstr "Angol (OS) városrendezési tervek, Elgin 1868 (NLS)"
+
+msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
+msgstr "Angol (OS) városrendezési tervek, Falkirk 1858-1859 (NLS)"
+
+msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
+msgstr "Angol (OS) városrendezési tervek, Forfar 1860-1861 (NLS)"
+
+msgid "OS Town Plans, Forres 1868 (NLS)"
+msgstr "Angol (OS) városrendezési tervek, Forres 1868 (NLS)"
+
+msgid "OS Town Plans, Galashiels 1858 (NLS)"
+msgstr "Angol (OS) városrendezési tervek, Galashiels 1858 (NLS)"
+
+msgid "OS Town Plans, Girvan 1857 (NLS)"
+msgstr "Angol (OS) városrendezési tervek, Girvan 1857 (NLS)"
+
+msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
+msgstr "Angol (OS) városrendezési tervek, Glasgow 1857-1858 (NLS)"
+
+msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
+msgstr "Angol (OS) városrendezési tervek, Glasgow 1892-1894 (NLS)"
+
+msgid "OS Town Plans, Greenock 1857 (NLS)"
+msgstr "Angol (OS) városrendezési tervek, Greenock 1857 (NLS)"
+
+msgid "OS Town Plans, Haddington 1853 (NLS)"
+msgstr "Angol (OS) városrendezési tervek, Haddington 1853 (NLS)"
+
+msgid "OS Town Plans, Haddington 1893 (NLS)"
+msgstr "Angol (OS) városrendezési tervek, Haddington 1893 (NLS)"
+
+msgid "OS Town Plans, Hamilton 1858 (NLS)"
+msgstr "Angol (OS) városrendezési tervek, Hamilton 1858 (NLS)"
+
+msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
+msgstr "Angol (OS) városrendezési tervek, Hawick 1857-1858 (NLS)"
+
+msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
+msgstr "Angol (OS) városrendezési tervek, Inverness 1867-1868 (NLS)"
+
+msgid "OS Town Plans, Irvine 1859 (NLS)"
+msgstr "Angol (OS) városrendezési tervek, Irvine 1859 (NLS)"
+
+msgid "OS Town Plans, Jedburgh 1858 (NLS)"
+msgstr "Angol (OS) városrendezési tervek, Jedburgh 1858 (NLS)"
+
+msgid "OS Town Plans, Kelso 1857 (NLS)"
+msgstr "Angol (OS) városrendezési tervek, Kelso 1857 (NLS)"
+
+msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
+msgstr "Angol (OS) városrendezési tervek, Kilmarnock 1857-1859 (NLS)"
+
+msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
+msgstr "Angol (OS) városrendezési tervek, Kirkcaldy 1855 (NLS)"
+
+msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
+msgstr "Angol (OS) városrendezési tervek, Kirkcaldy 1894 (NLS)"
+
+msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
+msgstr "Angol (OS) városrendezési tervek, Kirkcudbright 1850 (NLS)"
+
+msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
+msgstr "Angol (OS) városrendezési tervek, Kirkcudbright 1893 (NLS)"
+
+msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
+msgstr "Angol (OS) városrendezési tervek, Kirkintilloch 1859 (NLS)"
+
+msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
+msgstr "Angol (OS) városrendezési tervek, Kirriemuir 1861 (NLS)"
+
+msgid "OS Town Plans, Lanark 1858 (NLS)"
+msgstr "Angol (OS) városrendezési tervek, Lanark 1858 (NLS)"
+
+msgid "OS Town Plans, Linlithgow 1856 (NLS)"
+msgstr "Angol (OS) városrendezési tervek, Linlithgow 1856 (NLS)"
+
+msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
+msgstr "Angol (OS) városrendezési tervek, Mayole 1856-1857 (NLS)"
+
+msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
+msgstr "Angol (OS) városrendezési tervek, Montrose 1861-1862 (NLS)"
+
+msgid "OS Town Plans, Musselburgh 1853 (NLS)"
+msgstr "Angol (OS) városrendezési tervek, Musselburgh 1853 (NLS)"
+
+msgid "OS Town Plans, Musselburgh 1893 (NLS)"
+msgstr "Angol (OS) városrendezési tervek, Musselburgh 1893 (NLS)"
+
+msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
+msgstr "Angol (OS) városrendezési tervek, Nairn 1867-1868 (NLS)"
+
+msgid "OS Town Plans, Oban 1867-1868 (NLS)"
+msgstr "Angol (OS) városrendezési tervek, Oban 1867-1868 (NLS)"
+
+msgid "OS Town Plans, Peebles 1856 (NLS)"
+msgstr "Angol (OS) városrendezési tervek, Peebles 1856 (NLS)"
+
+msgid "OS Town Plans, Perth 1860 (NLS)"
+msgstr "Angol (OS) városrendezési tervek, Perth 1860 (NLS)"
+
+msgid "OS Town Plans, Peterhead 1868 (NLS)"
+msgstr "Angol (OS) városrendezési tervek, Peterhead 1868 (NLS)"
+
+msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
+msgstr "Angol (OS) városrendezési tervek, Port Glasgow 1856-1857 (NLS)"
+
+msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
+msgstr "Angol (OS) városrendezési tervek, Portobello 1893-1894 (NLS)"
+
+msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
+msgstr "Angol (OS) városrendezési tervek, Rothesay 1862-1863 (NLS)"
+
+msgid "OS Town Plans, Selkirk 1865 (NLS)"
+msgstr "Angol (OS) városrendezési tervek, Selkirk 1865 (NLS)"
+
+msgid "OS Town Plans, St Andrews 1854 (NLS)"
+msgstr "Angol (OS) városrendezési tervek, St Andrews 1854 (NLS)"
+
+msgid "OS Town Plans, St Andrews 1893 (NLS)"
+msgstr "Angol (OS) városrendezési tervek, St Andrews 1893 (NLS)"
+
+msgid "OS Town Plans, Stirling 1858 (NLS)"
+msgstr "Angol (OS) városrendezési tervek, Stirling 1858 (NLS)"
+
+msgid "OS Town Plans, Stonehaven 1864 (NLS)"
+msgstr "Angol (OS) városrendezési tervek, Stonehaven 1864 (NLS)"
+
+msgid "OS Town Plans, Stranraer 1847 (NLS)"
+msgstr "Angol (OS) városrendezési tervek, Stranraer 1847 (NLS)"
+
+msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
+msgstr "Angol (OS) városrendezési tervek, Stranraer 1863-1877 (NLS)"
+
+msgid "OS Town Plans, Stranraer 1893 (NLS)"
+msgstr "Angol (OS) városrendezési tervek, Stranraer 1893 (NLS)"
+
+msgid "OS Town Plans, Strathaven 1858 (NLS)"
+msgstr "Angol (OS) városrendezési tervek, Strathaven 1858 (NLS)"
+
+msgid "OS Town Plans, Wick 1872 (NLS)"
+msgstr "Angol (OS) városrendezési tervek, Wick 1872 (NLS)"
+
+msgid "OS Town Plans, Wigtown 1848 (NLS)"
+msgstr "Angol (OS) városrendezési tervek, Wigtown 1848 (NLS)"
+
+msgid "OS Town Plans, Wigtown 1894 (NLS)"
+msgstr "Angol (OS) városrendezési tervek, Wigtown 1894 (NLS)"
 
 msgid "Decreasing house numbers in addresses interpolation"
 msgstr "Házszám csökkentése a lakcím interpolációban"
 
 msgid "{0} without {1}"
-msgstr ""
+msgstr "{0} {1} nélkül"
 
 msgid "{0} without {1} or {2}"
-msgstr ""
+msgstr "{0} {1} vagy {2} nélkül"
 
 msgid "{0} without {1}, {2} or {3}"
-msgstr ""
+msgstr "{0} {1}, {2} vagy {3} nélkül"
 
 msgid "{0} on suspicious object"
-msgstr ""
+msgstr "{0} gyanús objektumon"
 
 msgid "restaurant without name"
-msgstr ""
+msgstr "étterem név nélkül"
 
 msgid "{0} used with {1}"
-msgstr ""
+msgstr "{0} együtt használva {1}-el"
 
 msgid "natural water used for swimming pool"
-msgstr ""
+msgstr "úszómedencéhez használt természetes víz"
 
 msgid "sport without physical feature"
-msgstr ""
+msgstr "sport fizikai tulajdonság nélkül"
 
 msgid "{0} should be on the node where {1} and {2} intersect"
-msgstr ""
+msgstr "{0} azon a ponton kellene legyen ahol {1} és {2} kereszteződnek"
 
 msgid "{0}={1} is deprecated"
 msgstr "{0}={1} elavult"
@@ -22159,34 +23040,61 @@ msgstr "{0} elavult"
 
 msgid "''{0}'' is meaningless, use more specific tags, e.g. ''{1}''"
 msgstr ""
+"A(z) ''{0}'' semmitmondó, használj még specifikusabb címkéket, például "
+"''{1}''"
 
 msgid ""
 "''{0}'' does not specify the official mode of transportation, use ''{1}'' "
 "for example"
 msgstr ""
+"A(z) ''{0}'' nem határozza meg a szállítmányozás hivatalos módját, használd "
+"a(z) ''{1}''-t például"
 
 msgid ""
 "{0}={1} is unspecific. Instead of ''{1}'' please give more information about "
 "what exactly should be fixed."
 msgstr ""
 
-msgid "{0}={1} is deprecated. Please use instead a multipolygon."
-msgstr "{0}={1} elavult. Használj helyette multipolygont."
+msgid "{0}={1} is deprecated. Please use instead a multipolygon."
+msgstr "{0}={1} elavult. Használj helyette multipolygont."
+
+msgid ""
+"{0} is deprecated. Please specify interval by using opening_hours syntax"
+msgstr ""
+
+msgid ""
+"{0} is deprecated. Please delete this object and use a private layer instead"
+msgstr ""
+
+msgid "{0}={1} is unspecific. Please replace ''{1}'' by a specific value."
+msgstr ""
+"A(z)z {0}={1} semmitmondó. Kérlek, helyettesítsd ''{1}''-et konkrét értékkel."
+
+msgid "{0} should be replaced with {1}"
+msgstr "a(z) {0}-t {1}-el kellene cserélni"
 
 msgid ""
-"{0} is deprecated. Please specify ìnterval by using opening_hours syntax"
+"{0}={1} is unspecific. Please replace ''{1}'' by ''left'', ''right'' or "
+"''both''."
 msgstr ""
+"{0}={1} semmitmondó. Kérlek, cseréld a(z) ''{1}''-et valamelyikkel ''left'', "
+"''right'' vagy ''both''."
 
-msgid ""
-"{0} is deprecated. Please delete this object and use a private layer instead"
+msgid "{0} on a node. Should be used on a way."
 msgstr ""
 
+msgid "{0} on a node. Should be drawn as an area."
+msgstr ""
+
+msgid "{0}=* on a node. Should be used in a relation"
+msgstr "{0}=* egy ponton van. Egy kapcsolatban kellene használni"
+
+msgid "{0} on a way. Should be used in a relation"
+msgstr "{0} egy vonalon van. Egy kapcsolatban kellene használni"
+
 msgid "{0} on a node"
 msgstr "{0} egy ponton"
 
-msgid "{0} on a node. Should be drawn as an area"
-msgstr "{0} egy ponton. Területként kell rajzolni"
-
 msgid "Building inside building"
 msgstr "Épületen belüli épület"
 
@@ -22197,62 +23105,67 @@ msgid "Overlapping Areas"
 msgstr "Átfedésben lévő területek"
 
 msgid "{0} inside {1}"
-msgstr ""
+msgstr "{0} az {1}-en belül"
 
 msgid "Overlapping Identical Natural Areas"
-msgstr ""
+msgstr "Különböző természeti területek átfednek"
 
 msgid "Overlapping Identical Landuses"
-msgstr ""
+msgstr "Különböző területhasználatok átfednek"
 
 msgid "abbreviated street name"
-msgstr ""
+msgstr "rövidített utca név"
 
 msgid "wrong highway tag on a node"
-msgstr ""
+msgstr "közút cimke egy ponton van, hibásan"
 
 msgid "wrong crossing tag on a way"
-msgstr ""
+msgstr "kereszteződés cimke egy vonalon van, hibásan"
 
 msgid "Unnamed unclassified highway"
-msgstr ""
+msgstr "Név és kategória nélküli közút"
 
 msgid "highway without a reference"
-msgstr ""
+msgstr "közút hivatkozás nélkül"
 
 msgid "temporary highway type"
-msgstr ""
+msgstr "ideiglenes közút típus"
 
 msgid "street name contains ss"
-msgstr ""
+msgstr "az utcanév ss-t tartalmaz"
 
 msgid "{0} with multiple values"
-msgstr ""
+msgstr "{0}, töbszörös értékekkel"
 
 msgid "numerical key"
-msgstr ""
+msgstr "numerikus kulcs"
 
 msgid "layer tag with + sign"
-msgstr ""
+msgstr "réteg címke + jellel"
 
 msgid "layer should be between -5 and 5"
-msgstr ""
+msgstr "a rétegnek -5 és 5 között kell lennie"
 
 msgid "level should be numbers with optional .5 increments"
 msgstr ""
+"a szinteknek számoknak kell lenniük, opcionálisan 0.5-ös emelkedéssel"
 
 msgid ""
 "{0}: meters is default; period is separator; if units, put space then unit"
 msgstr ""
+"{0}: a méter az alapértelmezett; a pont az elválasztó; ha egységek vannak, "
+"szóköz kell a mértékegység után"
 
 msgid "unusual {0} format"
-msgstr ""
+msgstr "furcsa {0} formátum"
 
 msgid "voltage should be in volts with no units/delimiter/spaces"
 msgstr ""
+"a feszültségnek voltban kellene lennie, mértékenység, határoló vagy szóköz "
+"nélkül"
 
 msgid "unusual {0} specification"
-msgstr ""
+msgstr "furcsa {0} meghatározás"
 
 msgid "unusual train track gauge; use mm with no separator"
 msgstr ""
@@ -22261,34 +23174,34 @@ msgid "unusual incline; use percentages/degrees or up/down"
 msgstr ""
 
 msgid "{0} must be a numeric value"
-msgstr ""
+msgstr "a(z) {0}-nak szám értéket kell adni"
 
 msgid "relation without type"
-msgstr ""
+msgstr "kapcsolat típus nélkül"
 
 msgid "{0} relation without {0} tag"
-msgstr ""
+msgstr "{0} kapcsolat {0} cimke nélkül"
 
 msgid "religion without denomination"
-msgstr ""
+msgstr "vallás felekezet nélkül"
 
 msgid "unknown christian denomination"
-msgstr ""
+msgstr "ismeretlen keresztény gyülekezet"
 
 msgid "unknown muslim denomination"
-msgstr ""
+msgstr "ismeretlen muszlim gyülekezet"
 
 msgid "unknown jewish denomination"
-msgstr ""
+msgstr "ismeretlen zsidó gyülekezet"
 
 msgid "{0} is unnecessary"
-msgstr ""
+msgstr "{0} szükségtelen"
 
 msgid "{0} is unnecessary for {1}"
-msgstr ""
+msgstr "{0} szükségtelen a(z) {1} részére"
 
 msgid "{0}={1} makes no sense"
-msgstr ""
+msgstr "{0}={1} értelmetlen"
 
 msgid "Nodes duplicating parent way tags"
 msgstr "Pont duplikálja a szülővonal címkéit"
@@ -22296,87 +23209,89 @@ msgstr "Pont duplikálja a szülővonal címkéit"
 msgid ""
 "no wikipedia-language given, use ''wikipedia''=''language:page title''"
 msgstr ""
+"nincs megadott wikipédia nyelv, használandó a ''wikipedia''=''language:page "
+"title''"
 
 msgid "unknown language prefix in wikipedia tag"
-msgstr ""
+msgstr "ismeretlen nyelv azonosító a wikipédia cimkében"
 
 msgid "deprecated format for wikipedia tag"
-msgstr ""
+msgstr "elavult Wikipédia címke formátum"
 
 msgid "''wikipedia''=''language:page title''"
-msgstr ""
+msgstr "''wikipedia''=''language:page title''"
 
 msgid "Hide icons at low zoom"
-msgstr ""
+msgstr "Ikonok elrejtése alacsony nagytáson"
 
 msgid "Less obtrusive node symbols at low zoom"
-msgstr ""
+msgstr "Kevésbé tolakodó pont szimbólumok alacsony nagyításnál"
 
 msgid "Display street labels (at high zoom)"
-msgstr ""
+msgstr "Utca feliratok megjelenítése (magas nagyításnál)"
 
 msgid "OSM Export"
-msgstr ""
+msgstr "OSM kiöntés"
 
 msgid "Export traffic data to SUMO network file."
-msgstr ""
+msgstr "Forgalmi adatok kiöntése SUMO hálózati fájlba."
 
 msgid "SUMO Export"
-msgstr ""
+msgstr "SUMO kiöntés"
 
 msgid "Export"
-msgstr ""
+msgstr "Kiöntés"
 
 msgid "Port:"
-msgstr ""
+msgstr "Port:"
 
 msgid "refresh the port list"
-msgstr ""
+msgstr "port lista frissítése"
 
 msgid "Configure"
-msgstr ""
+msgstr "Konfiguráció"
 
 msgid "Connection Error."
-msgstr ""
+msgstr "Kapcsolat hiba."
 
 msgid "configure the connected DG100"
-msgstr ""
+msgstr "a csatlakozó DG100 konfigurálása"
 
 msgid "delete data after import"
-msgstr ""
+msgstr "adat törlése betöltés után"
 
 msgid "Columbus V-900 CSV Files"
 msgstr "Columbus V-900 CSV Files"
 
 msgid "Importing CSV file ''%s''..."
-msgstr ""
+msgstr "CSV fájl betöltése ''%s''..."
 
 msgid "Markers of "
-msgstr ""
+msgstr "Jelölői a "
 
 msgid "Show summary after import"
-msgstr ""
+msgstr "Összefoglaló megjelenítése a betöltés után"
 
 msgid "Do not zoom after import"
-msgstr ""
+msgstr "Ne nagyítson a betöltés után"
 
 msgid "Ignore hdop/vdop/pdop entries"
-msgstr ""
+msgstr "A hdop/vdop/pdop bemenetek kihagyása"
 
 msgid "Warn on missing audio files"
-msgstr ""
+msgstr "Figyelmeztessen a hiányzó hagfájlokra"
 
 msgid "Warn on conversion errors"
-msgstr ""
+msgstr "Figyelmeztessen a konverziós hibákra"
 
 msgid "Error in line "
-msgstr ""
+msgstr "Hiba a sorban "
 
 msgid "Missing audio file"
-msgstr ""
+msgstr "Hiányzó hangfájl"
 
 msgid "Commands"
-msgstr ""
+msgstr "Parancsok"
 
 msgid ""
 "No command has been found. Would you like to download and install default "
@@ -22384,40 +23299,43 @@ msgid ""
 msgstr ""
 
 msgid "No command found"
-msgstr ""
+msgstr "Parancs nem található"
 
 msgid "Default commands have been successfully installed"
-msgstr ""
+msgstr "Az alapértelmezett parancsok sikeresen telepítve lettek"
 
 msgid ""
 "Failed to download and install default commands.\n"
 "\n"
 "Error: {0}"
 msgstr ""
+"Az alapértelmezett parancsok letöltése és telepítése meghiúsult.\n"
+"\n"
+"Hiba: {0}"
 
 msgid "Processing..."
-msgstr ""
+msgstr "Feldolgozás..."
 
 msgid "Aborted"
-msgstr ""
+msgstr "Megszakított"
 
 msgid "Error executing the script: "
-msgstr ""
+msgstr "Hiba a szkript futtatásakor: "
 
 msgid "Command line"
-msgstr ""
+msgstr "Parancssor"
 
 msgid "Set input focus to the command line."
-msgstr ""
+msgstr "Kijelölés/beviteli fókusz beállítása a parancssorra."
 
 msgid "Point on the start"
-msgstr ""
+msgstr "Kezdőpont"
 
 msgid "Point on the end"
-msgstr ""
+msgstr "Végpont"
 
 msgid "Missing definition of new object with id {0}."
-msgstr ""
+msgstr "Hiányzó definíció a(z) {0} azonosítójú új objektumhoz."
 
 msgid "Missing mandatory attribute ''{0}'' on <member> of relation {1}."
 msgstr ""
@@ -22435,13 +23353,13 @@ msgid "relations"
 msgstr "kapcsolatok"
 
 msgid "OSM objects"
-msgstr ""
+msgstr "OSM objektumok"
 
 msgid "Can not draw outside of the world."
-msgstr ""
+msgstr "Nem lehet a földön kívül rajzolni."
 
 msgid "Create grid of ways"
-msgstr ""
+msgstr "Vonalhálózat létrehozása"
 
 msgid ""
 "Forms a grid of ways in base to two existing that have various nodes and one "
@@ -22449,161 +23367,167 @@ msgid ""
 msgstr ""
 
 msgid "Select two ways with a node in common"
-msgstr ""
+msgstr "Válassz ki két vonalat egy közös ponttal"
 
 msgid "Select two ways with alone a node in common"
-msgstr ""
+msgstr "Válassz ki két vonalat csakis egyetlen közös ponttal"
 
 msgid "Create a grid of ways"
-msgstr ""
+msgstr "Úthálózat létrehozása"
 
 msgid "Download Track ..."
-msgstr ""
+msgstr "Nyomvonal letöltése..."
 
 msgid "Download GPX track from openstreetmap.org"
-msgstr ""
+msgstr "GPX nyomvonal letöltése az openstreetmap.org-ról"
 
 msgid ""
 "Error occurred while parsing gpx file {0}. Only a part of the file will be "
 "available."
 msgstr ""
+"Hiba történt a(z) {0} GPX fájl feldolgozása során. Csak egy része lesz "
+"elérhető a fájl tartalmának."
 
 msgid "Invalid URL {0}"
-msgstr ""
+msgstr "Hibás URL {0}"
 
 msgid "Error fetching URL {0}"
 msgstr "Hiba a következő URL lekérésekor: {0}"
 
 msgid "Error parsing data from URL {0}"
-msgstr ""
+msgstr "Hiba az URL adatok feldolgozása során {0}"
 
 msgid "Download Track"
-msgstr ""
+msgstr "Nyomvonal letöltése"
 
 msgid "Filename"
-msgstr ""
+msgstr "Fájlnév"
 
 msgid "Private (only shared as anonymous, unordered points)"
-msgstr ""
+msgstr "Személyes (csak névtelenül megosztva, rendezetlen pontok)"
 
 msgid "Public (shown in trace list and as anonymous, unordered points)"
 msgstr ""
+"Nyilvános (névtelenül látszik a nyomvonal listában, rendezetlen pontok)"
 
 msgid "Trackable (only shared as anonymous, ordered points with timestamps)"
 msgstr ""
+"Követhető (csak névtelenül megosztva, rendezett pontok időbélyegekkel)"
 
 msgid ""
 "Identifiable (shown in trace list and as identifiable, ordered points with "
 "timestamps)"
 msgstr ""
+"Azonosítható (azonosíthatóan látszik a nyomvonal listában, rendezett pontok "
+"időbélyegekkel)"
 
 msgid "Upload Trace"
-msgstr ""
+msgstr "Nyomvonal feltöltés"
 
 msgid "Upload Traces"
-msgstr ""
+msgstr "Nyomvonalak feltöltése"
 
 msgid "Defines the visibility of your trace for other OSM users."
-msgstr ""
+msgstr "Meghatározza a nyomvonalaid láthatóságát más OSM felhasználók felé."
 
 msgid "http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces"
-msgstr ""
+msgstr "http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces"
 
 msgid "(What does that mean?)"
-msgstr ""
+msgstr "(Az mit jelent?)"
 
 msgid "Please enter Description about your trace."
-msgstr ""
+msgstr "Kérlek, adj meg Leírást is a nyomvonaladról."
 
 msgid "Tags (comma delimited)"
-msgstr ""
+msgstr "Címkék (vesszővel elválasztva)"
 
 msgid "Please enter tags about your trace."
-msgstr ""
+msgstr "Kérlek, adj meg címkéket is a nyomvonaladról."
 
 msgid "Selected track: {0}"
-msgstr ""
+msgstr "Kiválasztott nyomvonal: {0}"
 
 msgid "No GPX layer selected. Cannot upload a trace."
-msgstr ""
+msgstr "Nincs GPX réteg kiválasztva. A nyomvonalat nem lehet feltölteni."
 
 msgid "Uploading trace ..."
-msgstr ""
+msgstr "Nyomvonal feltöltés..."
 
 msgid "Connecting..."
-msgstr ""
+msgstr "Kapcsolódás..."
 
 msgid "Upload canceled"
-msgstr ""
+msgstr "Feltöltés megszakítva"
 
 msgid "Error while uploading"
-msgstr ""
+msgstr "Hiba a feltöltés során"
 
 msgid "GPX upload was successful"
-msgstr ""
+msgstr "A GPX feltöltés sikeres volt"
 
 msgid "Upload failed. Server returned the following message: "
-msgstr ""
+msgstr "A feltöltés meghiúsult. A szerver az alábbi üzenettel válaszolt: "
 
 msgid "Uploading GPX track: {0}% ({1} of {2})"
-msgstr ""
+msgstr "GPX nyomvonal feltöltés: {0}% ({1} / {2})"
 
 msgid "No description provided. Please provide some description."
-msgstr ""
+msgstr "Nincs leírás megadva. Kérlek, adj némi leírást."
 
 msgid "Uploading GPX Track"
-msgstr ""
+msgstr "GPX nyomvonal feltöltés"
 
 msgid "Uploads traces to openstreetmap.org"
-msgstr ""
+msgstr "Nyomvonal feltöltése az openstreetmap.org-ra"
 
 msgid "Shows elevation profile"
-msgstr ""
+msgstr "A magassági profil mutatása"
 
 msgid "Elevation Profile"
-msgstr ""
+msgstr "Magassági Profil"
 
 msgid "Elevation Grid Layer (experimental!)"
-msgstr ""
+msgstr "Magassági Rács Réteg (kísérleti!)"
 
 msgid "Shows elevation grid layer"
-msgstr ""
+msgstr "A magassági rács réteget mutatja"
 
 msgid "Elevation Grid"
-msgstr ""
+msgstr "Magassági Rács"
 
 msgid "No SRTM data"
-msgstr ""
+msgstr "Nincs SRTM adat"
 
 msgid "Open the elevation profile window."
-msgstr ""
+msgstr "A magassági profil ablakának megnyitása."
 
 msgid "Min"
-msgstr ""
+msgstr "Minimum"
 
 msgid "Avrg"
-msgstr ""
+msgstr "Átlag"
 
 msgid "Max"
-msgstr ""
+msgstr "Maximum"
 
 msgid "Dist"
-msgstr ""
+msgstr "Távolság"
 
 msgid "Gain"
-msgstr ""
+msgstr "Emelkedés"
 
 msgid "Tracks"
-msgstr ""
+msgstr "Nyomvonalak"
 
 msgid "Elevation profile for track ''{0}''."
-msgstr ""
+msgstr "A(z) ''{0}'' nyomvonal magassági profilja."
 
 msgid "Elevation profile"
-msgstr ""
+msgstr "Magassági profil"
 
 msgid "(No elevation data)"
-msgstr ""
+msgstr "(Nincs magassági adat)"
 
 msgid "Can not save preferences"
 msgstr ""
@@ -22665,10 +23589,10 @@ msgid ""
 msgstr ""
 
 msgid "FastDrawing"
-msgstr ""
+msgstr "Gyorsrajzolás"
 
 msgid "Fast drawing mode"
-msgstr ""
+msgstr "Gyorsrajzoló mód"
 
 msgid "Please move the mouse to draw new way"
 msgstr ""
@@ -22682,9 +23606,13 @@ msgid ""
 "{2} points per km (maximum)\n"
 "{3} points per km (average)"
 msgstr ""
+"{0} m - vonalhossz\n"
+"{1} pont\n"
+"{2} pont/km (maximum)\n"
+"{3} pont/km (átlag)"
 
 msgid "Line information"
-msgstr ""
+msgstr "Vonal információ"
 
 msgid "Cannot place node outside of the world."
 msgstr ""
@@ -22702,7 +23630,7 @@ msgid "Eps={0}, {1} points, {2} p/km"
 msgstr ""
 
 msgid "Fix addresses"
-msgstr ""
+msgstr "lakcímek javítása"
 
 msgid "Show dialog with incomplete addresses"
 msgstr ""
@@ -22717,80 +23645,80 @@ msgid "Find and fix addresses without (valid) streets."
 msgstr ""
 
 msgid "Address Edit"
-msgstr ""
+msgstr "Cím szerkesztés"
 
 msgid "Searching"
-msgstr ""
+msgstr "Keresés"
 
 msgid "Guess values for "
-msgstr ""
+msgstr "Vélt értékek "
 
 msgid "Address has no street"
-msgstr ""
+msgstr "A címhez nincs utca"
 
 msgid "Address has no valid street"
-msgstr ""
+msgstr "A címhez nincs helyes utca"
 
 msgid "Address has no post code"
-msgstr ""
+msgstr "A címhez nincs irányítószám"
 
 msgid "Address has no city"
-msgstr ""
+msgstr "A címhez nincs település"
 
 msgid "Address has no country"
-msgstr ""
+msgstr "A címhez nincs ország"
 
 msgid "Assign to"
-msgstr ""
+msgstr "Hozzárendelés"
 
 msgid "Remove all address tags"
-msgstr ""
+msgstr "Minden címelem eltávolítása"
 
 msgid "No name"
-msgstr ""
+msgstr "Nincs név"
 
 msgid "Unresolved Addresses"
-msgstr ""
+msgstr "Megoldatlan címek"
 
 msgid "Select and close"
-msgstr ""
+msgstr "Kiválaszt és bezár"
 
 msgid "Fix unresolved addresses"
-msgstr ""
+msgstr "Megoldatlan címek javítása"
 
 msgid "Complete Addresses"
-msgstr ""
+msgstr "Teljes címek"
 
 msgid "Incomplete Addresses"
-msgstr ""
+msgstr "Befejezetlen címek"
 
 msgid "Selected Addresses"
-msgstr ""
+msgstr "Kiválasztott címek"
 
 msgid "Selected Street"
-msgstr ""
+msgstr "Kiválasztott utca"
 
 msgid "(No data)"
-msgstr ""
+msgstr "(Nincs adat)"
 
 msgid "Segments"
-msgstr ""
+msgstr "Szelvények"
 
 msgid "Show incomplete addresses"
-msgstr ""
+msgstr "Befejezetlen címek mutatása"
 
 msgid "items"
-msgstr ""
+msgstr "elemek"
 
 msgid "no items"
-msgstr ""
+msgstr "nincsenek elemek"
 
 msgctxt "address"
 msgid "City"
-msgstr ""
+msgstr "Település"
 
 msgid "Postcode"
-msgstr ""
+msgstr "Irányítószám"
 
 msgid "Turns all guesses into the corresponding tag values."
 msgstr ""
@@ -22808,7 +23736,7 @@ msgid "Assign the selected address(es) to the selected street."
 msgstr ""
 
 msgid "Set street name"
-msgstr ""
+msgstr "Utcanév megadás"
 
 msgid "Convert ALL streets."
 msgstr ""
@@ -22918,7 +23846,7 @@ msgid "Correlate entries with GPS trace"
 msgstr ""
 
 msgid "Save layer..."
-msgstr ""
+msgstr "Réteg mentése..."
 
 msgid "Save NanoLog layer"
 msgstr ""
@@ -22939,25 +23867,25 @@ msgid "Edit time-tag of selected element in a graphical interface"
 msgstr ""
 
 msgid "edit existing tag"
-msgstr ""
+msgstr "létező címke szerkesztése"
 
 msgid "edit new tag"
-msgstr ""
+msgstr "új címke szerkesztése"
 
 msgid "Display clock in 12h mode."
 msgstr ""
 
 msgid "Choose key"
-msgstr ""
+msgstr "Kulcs választás"
 
 msgid "apply {0}"
-msgstr ""
+msgstr "{0} alkalmazása"
 
 msgid "There is something wrong in the value near:"
 msgstr ""
 
 msgid "Info: {0}"
-msgstr ""
+msgstr "Információ: {0}"
 
 msgid "Correct the value manually and than press Enter."
 msgstr ""
@@ -23008,46 +23936,46 @@ msgid "Define Address Interpolation"
 msgstr ""
 
 msgid "Odd"
-msgstr ""
+msgstr "Furcsa"
 
 msgid "Even"
-msgstr ""
+msgstr "Még"
 
 msgid "Alphabetic"
-msgstr ""
+msgstr "ABC"
 
 msgid "Numeric"
-msgstr ""
+msgstr "Numerikus"
 
 msgid "Actual"
-msgstr ""
+msgstr "Aktuális"
 
 msgid "Estimate"
-msgstr ""
+msgstr "Becslés"
 
 msgid "Potential"
-msgstr ""
+msgstr "Potenciális"
 
 msgid "Relation: {0}"
-msgstr ""
+msgstr "Kapcsolat: {0}"
 
 msgid "Associate with street using:"
 msgstr ""
 
 msgid "Numbering Scheme:"
-msgstr ""
+msgstr "Számozási rend:"
 
 msgid "Increment:"
-msgstr ""
+msgstr "Növekedés:"
 
 msgid "Starting #:"
-msgstr ""
+msgstr "Induló #:"
 
 msgid "Ending #:"
-msgstr ""
+msgstr "Befejező #:"
 
 msgid "Accuracy:"
-msgstr ""
+msgstr "Pontosság:"
 
 msgid "Convert way to individual house numbers."
 msgstr ""
@@ -23056,22 +23984,22 @@ msgid "Will associate {0} additional house number nodes"
 msgstr ""
 
 msgid "City:"
-msgstr ""
+msgstr "Város:"
 
 msgid "State:"
-msgstr ""
+msgstr "Állam:"
 
 msgid "Post Code:"
-msgstr ""
+msgstr "Irányítószám:"
 
 msgid "Country:"
-msgstr ""
+msgstr "Ország:"
 
 msgid "Full Address:"
-msgstr ""
+msgstr "Teljes cím:"
 
 msgid "Optional Information:"
-msgstr ""
+msgstr "Opcionális információk:"
 
 msgid "Please select a street to associate with address interpolation way"
 msgstr ""
@@ -23175,7 +24103,7 @@ msgid "Angle preserved"
 msgstr ""
 
 msgid "Align with:"
-msgstr ""
+msgstr "Igazítás ezzel:"
 
 msgid ""
 "<html>Aligns the way segment to the reference so that its length is "
@@ -23189,7 +24117,7 @@ msgid ""
 msgstr ""
 
 msgid "I''m ready!"
-msgstr ""
+msgstr "Kész vagyok!"
 
 msgid "AlignWays Tips"
 msgstr ""
@@ -23243,6 +24171,12 @@ msgid ""
 "...or it rather should be called <br>\n"
 "<span style=\"font-size: large;\">AlignWayS(egments)</span> Plugin..."
 msgstr ""
+"Üdvözöllek az </span><br>\n"
+"<span style=\"font-size: xx-large;\">AlignWay<span style=\"color: rgb(204, "
+"85, 0);\">S</span> Bővítmény<br>\n"
+"</span><span style=\"font-size: medium;\"><br>\n"
+"...vagy inkább ahogy hívni kellene <br>\n"
+"<span style=\"font-size: large;\">AlignWayS(zegmensek)</span> Bővítmény..."
 
 msgid ""
 "<html>\n"
@@ -23330,55 +24264,55 @@ msgid ""
 msgstr ""
 
 msgid "Don''t show this again"
-msgstr ""
+msgstr "Ne mutassa újra"
 
 msgid "What''s new..."
-msgstr ""
+msgstr "Újdonságok..."
 
 msgid "Added <b>angle preserving</b> aligning mode"
 msgstr ""
 
 msgid "Various improvements and bugfixes"
-msgstr ""
+msgstr "Különféle továbbfejlesztések és hibajavítások"
 
 msgid "Errr..."
-msgstr ""
+msgstr "Hiba..."
 
 msgid "Browser not supported."
-msgstr ""
+msgstr "A böngésző nem támogatott."
 
 msgid "Building address"
 msgstr "Épület címe"
 
 msgid "empty"
-msgstr ""
+msgstr "üres"
 
 msgid "skip"
-msgstr ""
+msgstr "kihagy"
 
 msgid "House number:"
 msgstr "Házszám:"
 
 msgid "Street:"
-msgstr ""
+msgstr "Utca:"
 
 msgid "Post code:"
-msgstr ""
+msgstr "Irányítószám:"
 
 msgid "Building:"
-msgstr ""
+msgstr "Épület:"
 
 msgid "Tags:"
-msgstr ""
+msgstr "Cimkék:"
 
 msgid "Name:"
-msgstr ""
+msgstr "Név:"
 
 msgid "updated building info"
-msgstr ""
+msgstr "frissített épület információ"
 
 msgid "Tag Element"
-msgstr ""
+msgstr "elem cimke"
 
 msgid "Select an item to tag."
 msgstr ""
@@ -23387,7 +24321,7 @@ msgid "Tag Building"
 msgstr ""
 
 msgid "Tools: {0}"
-msgstr ""
+msgstr "Eszközök: {0}"
 
 msgid "Area Selection"
 msgstr ""
@@ -23405,10 +24339,10 @@ msgid "Unable to detect a polygon where you clicked."
 msgstr ""
 
 msgid "Error Report"
-msgstr ""
+msgstr "Hibajelentés"
 
 msgid "Something went wrong!"
-msgstr ""
+msgstr "Valami hibára futott!"
 
 msgid "Please file a bug report on the github project page under"
 msgstr ""
@@ -23459,7 +24393,7 @@ msgid "Merge nodes with neighbors"
 msgstr ""
 
 msgid "merge nodes"
-msgstr ""
+msgstr "pontok egyesítése"
 
 msgid "Street Name:"
 msgstr "Utca:"
@@ -23516,28 +24450,31 @@ msgid "Set width of the building"
 msgstr "Állítsd be az épület szélességét"
 
 msgid "on polygon"
-msgstr ""
+msgstr "poligonon"
 
 msgid "Add address"
-msgstr ""
+msgstr "Cím hozzáadása"
 
 msgid "Helping tool for tag address"
-msgstr ""
+msgstr "Címek címkézését segítő eszköz"
 
 msgid "CadastreFR - Buildings"
-msgstr ""
+msgstr "CadastreFR - Épületek"
 
 msgid "Next no"
 msgstr ""
 
 msgid "Enter addresses"
-msgstr ""
+msgstr "Címek megadása"
 
 msgid ""
 "Location \"{0}\" found in cache.\n"
 "Load cache first ?\n"
 "(No = new cache)"
 msgstr ""
+"A(z) \"{0}\" hely megtalálható a gyorsítótárban.\n"
+"Előbb a gyorsítótár betöltése?\n"
+"(Nem = új gyorsítótár)"
 
 msgid "Select Feuille"
 msgstr ""
@@ -23626,7 +24563,7 @@ msgid "Set background transparent."
 msgstr ""
 
 msgid "Draw boundaries of downloaded data."
-msgstr ""
+msgstr "A letöltött adatok határvonalainak kirajzolása."
 
 msgid "Disable image cropping during georeferencing."
 msgstr ""
@@ -23644,37 +24581,37 @@ msgid "Don''t use relation for addresses (but \"addr:street\" on elements)."
 msgstr ""
 
 msgid "off"
-msgstr ""
+msgstr "kikapcsol"
 
 msgid "25 m"
-msgstr ""
+msgstr "25 m"
 
 msgid "50 m"
-msgstr ""
+msgstr "50 m"
 
 msgid "100 m"
-msgstr ""
+msgstr "100 m"
 
 msgid "symbol"
-msgstr ""
+msgstr "szimbólum"
 
 msgid "parcel"
-msgstr ""
+msgstr "parcella"
 
 msgid "parcel number"
-msgstr ""
+msgstr "parcella szám"
 
 msgid "address"
 msgstr "cím"
 
 msgid "locality"
-msgstr ""
+msgstr "helyszín"
 
 msgid "section"
 msgstr ""
 
 msgid "commune"
-msgstr ""
+msgstr "közösség"
 
 msgid "Enable automatic caching."
 msgstr ""
@@ -23757,7 +24694,7 @@ msgid "Fixed size (from 25 to 1000 meters)"
 msgstr ""
 
 msgid "Layers:"
-msgstr ""
+msgstr "Rétegek:"
 
 msgid "Sea, rivers, swimming pools."
 msgstr ""
@@ -23877,7 +24814,7 @@ msgid "Cadastre grab"
 msgstr ""
 
 msgid "Download Image from French Cadastre WMS"
-msgstr ""
+msgstr "Kép letöltése a Francia Kataszteri WMS-ből"
 
 msgid "Cadastre: {0}"
 msgstr ""
@@ -23897,10 +24834,10 @@ msgid ""
 msgstr ""
 
 msgid "Load layer from cache"
-msgstr ""
+msgstr "Réteg betöltése gyorsítótárból"
 
 msgid "Load location from cache (only if cache is enabled)"
-msgstr ""
+msgstr "Hely betöltése gyorsítótárból (csak ha a gyorsítótár engedélyezett)"
 
 msgid "{0} not allowed with the current projection"
 msgstr ""
@@ -23914,13 +24851,13 @@ msgid ""
 msgstr ""
 
 msgid "The location {0} is already on screen. Cache not loaded."
-msgstr ""
+msgstr "A {0} hely már a képernyőn van. Nincs gyorsítótár betöltés."
 
 msgid "(optional)"
-msgstr ""
+msgstr "(opcionális)"
 
 msgid "Change location"
-msgstr ""
+msgstr "Hely váltása"
 
 msgid "Set a new location for the next request"
 msgstr ""
@@ -23964,13 +24901,13 @@ msgid "Save image as..."
 msgstr ""
 
 msgid "PNG files (*.png)"
-msgstr ""
+msgstr "PNG fájlok (*.png)"
 
 msgid "GeoTiff files (*.tif)"
-msgstr ""
+msgstr "GeoTiff fájlok (*.tif)"
 
 msgid "Export image (only raster images)"
-msgstr ""
+msgstr "Kép kiírása (csak raszteres képek)"
 
 msgid ""
 "Click first corner for image cropping\n"
@@ -24002,13 +24939,13 @@ msgid "Enter cadastre east,north position"
 msgstr ""
 
 msgid "(Warning: verify north with arrow !!)"
-msgstr ""
+msgstr "(Figyelem: igazold északot nyíllal !!)"
 
 msgid "East"
 msgstr "Kelet"
 
 msgid "I use the mouse"
-msgstr ""
+msgstr "Egeret használok"
 
 msgid "Set {0} Lambert coordinates"
 msgstr ""
@@ -24031,69 +24968,73 @@ msgid ""
 msgstr ""
 
 msgid "Reset offset"
-msgstr ""
+msgstr "Eltolás nullázás"
 
 msgid "Reset offset (only vector images)"
-msgstr ""
+msgstr "Eltolás nullázás (csak vektor képek)"
 
 msgid "WMS layer ({0}), {1} tile(s) loaded"
-msgstr ""
+msgstr "WMS réteg ({0}), {1} csempe/csempék betöltve"
 
 msgid "Is not vectorized."
-msgstr ""
+msgstr "Nem vektorizált."
 
 msgid "Bounding box: {0}"
-msgstr ""
+msgstr "Határoló doboz: {0}"
 
 msgid "Image size (px): {0}/{1}"
-msgstr ""
+msgstr "Képméret (px): {0}/{1}"
 
 msgid "Is vectorized."
-msgstr ""
+msgstr "Vektorizált."
 
 msgid "Commune bbox: {0}"
-msgstr ""
+msgstr "Közösségi bbox: {0}"
 
 msgid ""
 "Unsupported cache file version; found {0}, expected {1}\n"
 "Create a new one."
 msgstr ""
+"Nem támogatott gyorsítótár-fájl verzió; talált {0}, elvárt {1}\n"
+"Készíts egy újat."
 
 msgid "Cache Format Error"
-msgstr ""
+msgstr "Gyorsítótár Formátum Hiba"
 
 msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
 msgstr ""
+"A gyorsítótárban lévő Lambert zóna {0} nem kompatibilis az aktuális Lambert "
+"zónával {1}"
 
 msgid "Cache Lambert Zone Error"
-msgstr ""
+msgstr "Gyorsítótár Lambert Zóna Hiba"
 
 msgid "canvec tile helper"
 msgstr ""
 
 msgid "Use"
-msgstr ""
+msgstr "Használ"
 
 msgid "Please select a scheme to use."
-msgstr ""
+msgstr "Kérlek, válassz egy sémát a használathoz."
 
 msgid "Color Scheme"
 msgstr "Színséma"
 
 msgid "Please select the scheme to delete."
-msgstr ""
+msgstr "Kérlek, válassz egy sémát a törléshez."
 
 msgid "Use the selected scheme from the list."
-msgstr ""
+msgstr "Használd a listából kiválasztott sémát."
 
 msgid "Use the current colors as a new color scheme."
-msgstr ""
+msgstr "Használd a jelenlegi színeket, mint egy új színsémát."
 
 msgid "Delete the selected scheme from the list."
-msgstr ""
+msgstr "Töröld a listából a kiválasztott sémát."
 
 msgid "Color Schemes"
-msgstr ""
+msgstr "Színsémák"
 
 msgid "Conflate object pair"
 msgstr ""
@@ -24185,7 +25126,7 @@ msgid "Generate matches"
 msgstr ""
 
 msgid "Subject"
-msgstr ""
+msgstr "Tárgy"
 
 msgid "Selections must be made for both reference and subject."
 msgstr ""
@@ -24218,7 +25159,7 @@ msgid "Invalid reference or subject"
 msgstr ""
 
 msgid "Address"
-msgstr ""
+msgstr "Cím"
 
 msgid "Split area"
 msgstr ""
@@ -24233,37 +25174,37 @@ msgid ""
 msgstr ""
 
 msgid "TangoGPS Files (*.log)"
-msgstr ""
+msgstr "TangoGPS Fájlok (*.log)"
 
 msgid "Coordinates imported: "
-msgstr ""
+msgstr "Importált koordináták: "
 
 msgid "Format errors: "
-msgstr ""
+msgstr "Formátum hibák: "
 
 msgid "TangoGPS import success"
-msgstr ""
+msgstr "A TangoGPS import sikeres"
 
 msgid "TangoGPS import failure!"
-msgstr ""
+msgstr "A TangoGPS import meghiúsult!"
 
 msgid "TCX Files (*.tcx)"
-msgstr ""
+msgstr "TCX Fájlok (*.tcx)"
 
 msgid "Download along..."
-msgstr ""
+msgstr "Letöltés valami mentén..."
 
 msgid "Download OSM data along the selected ways."
-msgstr ""
+msgstr "OSM adat letöltése a kiválasztott vonalak mentén."
 
 msgid "Download Along"
-msgstr ""
+msgstr "Letöltés valami mentén"
 
 msgid "Please select 1 or more ways to download along"
 msgstr ""
 
 msgid "Download from OSM along selected ways"
-msgstr ""
+msgstr "OSM adat letöltése a kiválasztott vonalak mentén"
 
 msgid "{0} intermediate nodes to download."
 msgstr ""
@@ -24272,7 +25213,7 @@ msgid "between {0} {1} and {2} {3}"
 msgstr ""
 
 msgid "  adding {0} {1}"
-msgstr ""
+msgstr "  hozzáadás {0} {1}"
 
 msgid "Layer for editing GPX tracks"
 msgstr ""
@@ -24284,7 +25225,7 @@ msgid "EditGpx"
 msgstr ""
 
 msgid "edit gpx tracks"
-msgstr ""
+msgstr "GPX nyomvonalak szerkesztése"
 
 msgid "Import path from GPX layer"
 msgstr ""
@@ -24299,7 +25240,7 @@ msgid "External tool error"
 msgstr ""
 
 msgid "Error executing the script:"
-msgstr ""
+msgstr "Hiba a szkript futtatásakor:"
 
 msgid ""
 "Child script have returned invalid data.\n"
@@ -24308,99 +25249,99 @@ msgid ""
 msgstr ""
 
 msgid "exttool:{0}"
-msgstr ""
+msgstr "exttool:{0}"
 
 msgid "External Tool: {0}"
-msgstr ""
+msgstr "Külső Eszköz: {0}"
 
 msgid "Edit tool"
-msgstr ""
+msgstr "Szerkesztő eszköz"
 
 msgid "CmdLine:"
-msgstr ""
+msgstr "Parancssor:"
 
 msgid "External tools"
-msgstr ""
+msgstr "Külső eszközök"
 
 msgid "Delete tool \"{0}\"?"
-msgstr ""
+msgstr "A(z) \"{0}\" eszköz törlése?"
 
 msgid "Are you sure?"
-msgstr ""
+msgstr "Biztos vagy benne?"
 
 msgid "New tool..."
-msgstr ""
+msgstr "Új eszköz..."
 
 msgid "Install"
-msgstr ""
+msgstr "Telepítés"
 
 msgid "Public"
-msgstr ""
+msgstr "Nyilvános"
 
 msgid "Could not get server response, check logs"
-msgstr ""
+msgstr "Nem sikerül fogadni a szerver választ, ellenőrizd a naplókat"
 
 msgid "Failed to login as {0}:"
-msgstr ""
+msgstr "Bejelentkezés mint {0}, meghiúsult:"
 
 msgid "The server did not return user ID"
-msgstr ""
+msgstr "A szerver nem adott vissza felhasználó ID-t"
 
 msgid "Failed to get messages as {0}:"
-msgstr ""
+msgstr "Üzenet fogadás mint {0}, meghiúsult:"
 
 msgid "GeoChat"
-msgstr ""
+msgstr "GeoChat"
 
 msgid "Open GeoChat panel"
-msgstr ""
+msgstr "GeoChat panel megnyitása"
 
 msgid "Zoom in to see messages"
-msgstr ""
+msgstr "Nagyítás az üzenetek megtekintéséhez"
 
 msgid "Login"
-msgstr ""
+msgstr "Belépés"
 
 msgid "Enable autologin"
-msgstr ""
+msgstr "Automata beléptetés engedélyezése"
 
 msgid "{0} user"
 msgid_plural "{0} users"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "{0} felhasználó"
+msgstr[1] "{0} felhasználók"
 
 msgid "not logged in"
-msgstr ""
+msgstr "nincs bejelentkezve"
 
 msgid "Failed to log in to GeoChat:"
-msgstr ""
+msgstr "Bejelentkezés a GeoChat-ba meghiúsult:"
 
 msgid "Failed to send message:"
-msgstr ""
+msgstr "Üzenet küldése meghiúsult:"
 
 msgid "User {0} has left"
-msgstr ""
+msgstr "A {0} felhasználó kilépett"
 
 msgid "User {0} is mapping nearby"
-msgstr ""
+msgstr "A(z) {0} felhasználó a közelben térképez"
 
 msgid "Users mapping nearby:"
-msgstr ""
+msgstr "Közelben térképező felhasználók:"
 
 msgid "Private chat"
-msgstr ""
+msgstr "Privát beszélgetés"
 
 msgid "Close tab"
-msgstr ""
+msgstr "Fül becsukása"
 
 msgid "Logout"
-msgstr ""
+msgstr "Kijelentkezés"
 
 msgid "Clear log"
-msgstr ""
+msgstr "Napló törlése"
 
 msgid "Show users on map"
-msgstr ""
+msgstr "Felhasználók mutatása a térképen"
 
 msgid "Position only"
 msgstr ""
@@ -24610,40 +25551,40 @@ msgid "Couldn''t find built-in ruleset {0}"
 msgstr ""
 
 msgid "height (m)"
-msgstr ""
+msgstr "magasság (m)"
 
 msgid "width (m)"
-msgstr ""
+msgstr "szélesség (m)"
 
 msgid "length (m)"
-msgstr ""
+msgstr "hossz (m)"
 
 msgid "speed (km/h)"
-msgstr ""
+msgstr "sebesség (km/h)"
 
 msgid "weight (t)"
-msgstr ""
+msgstr "tömeg (t)"
 
 msgid "axleload (t)"
-msgstr ""
+msgstr "tengelyterhelés (t)"
 
 msgid "Bookmark name"
-msgstr ""
+msgstr "Könyvjelző neve"
 
 msgid "Bookmark name already exists!"
-msgstr ""
+msgstr "Ilyen nevű könyvjelző már létezik!"
 
 msgid "Bookmark name must not contain ''{0}''!"
-msgstr ""
+msgstr "A könyvjelző elnevezése nem tartalmazhat ''{0}''-t!"
 
 msgid "Access class"
-msgstr ""
+msgstr "Hozzáférési kategória"
 
 msgid "Access class must not contain ''{0}''!"
 msgstr ""
 
 msgid "Access types"
-msgstr ""
+msgstr "Hozzáférés típusok"
 
 msgid "Vehicle properties"
 msgstr ""
@@ -24690,13 +25631,13 @@ msgid "Open the dialog for graph view configuration."
 msgstr ""
 
 msgid "default"
-msgstr ""
+msgstr "alapértelmezett"
 
 msgid "end nodes"
-msgstr ""
+msgstr "pontok vége"
 
 msgid "incline"
-msgstr ""
+msgstr "lejtés"
 
 msgid "Ruleset:"
 msgstr ""
@@ -24729,7 +25670,7 @@ msgid "Select directory"
 msgstr ""
 
 msgid "Vehicle"
-msgstr ""
+msgstr "Jármű"
 
 msgid "Restore defaults"
 msgstr ""
@@ -24822,7 +25763,7 @@ msgid ""
 msgstr ""
 
 msgid "Imagery XML Files"
-msgstr ""
+msgstr "Ábrázoló XML Fájlok"
 
 msgid "Save Imagery XML file"
 msgstr ""
@@ -24897,28 +25838,28 @@ msgid ""
 msgstr ""
 
 msgid "Loading imagery offsets..."
-msgstr ""
+msgstr "Kép"
 
 msgid "Error processing XML response: {0}"
 msgstr ""
 
 msgid "Offset"
-msgstr ""
+msgstr "Eltolás"
 
 msgid "Imagery Offset Database"
-msgstr ""
+msgstr "Ábra-eltolások Adatbázisa"
 
 msgid "mm"
-msgstr ""
+msgstr "mm"
 
 msgid "cm"
-msgstr ""
+msgstr "cm"
 
 msgid "m"
-msgstr ""
+msgstr "m"
 
 msgid "km"
-msgstr ""
+msgstr "km"
 
 msgid "Calibration geometries"
 msgstr ""
@@ -25036,79 +25977,79 @@ msgid "Please select the imagery layer to adjust."
 msgstr ""
 
 msgid "Start adjusting"
-msgstr ""
+msgstr "Igazítás megkezdése"
 
 msgid "There are currently no imagery layer to adjust."
-msgstr ""
+msgstr "Jelenleg nincs ábrázoló réteg az igazításhoz."
 
 msgid "No layers to adjust"
-msgstr ""
+msgstr "Nincs igazítandó réteg"
 
 msgid "Normal"
-msgstr ""
+msgstr "Normál"
 
 msgid "Rotate 90"
-msgstr ""
+msgstr "Forgatás 90"
 
 msgid "Rotate 180"
-msgstr ""
+msgstr "Forgatás 180"
 
 msgid "Rotate 270"
-msgstr ""
+msgstr "Forgatás 270"
 
 msgid "Previous image"
-msgstr ""
+msgstr "Korábbi kép"
 
 msgid "Next image"
-msgstr ""
+msgstr "Következő kép"
 
 msgid "Rotate left"
-msgstr ""
+msgstr "Balra forgatás"
 
 msgid "Rotate image left"
-msgstr ""
+msgstr "Képi balra forgatás"
 
 msgid "Rotate right"
-msgstr ""
+msgstr "Jobbra forgatás"
 
 msgid "Rotate image right"
-msgstr ""
+msgstr "Képi jobbra forgatás"
 
 msgid "WayPoint Image"
-msgstr ""
+msgstr "WayPoint kép"
 
 msgid "Display non-geotagged photos"
-msgstr ""
+msgstr "Nem geo-cimkézett fotók mutatása"
 
 msgid "Imported Images"
-msgstr ""
+msgstr "betöltött képek"
 
 msgid "Image files (*.jpg, *.jpeg, *.png, *.gif)"
-msgstr ""
+msgstr "Képfájlok (*.jpg, *.jpeg, *.png, *.gif)"
 
 msgid "Import vector graphics"
-msgstr ""
+msgstr "Vektorgrafikák betöltés"
 
 msgid "Scale:"
-msgstr ""
+msgstr "Skála:"
 
 msgid "unit(s) = "
-msgstr ""
+msgstr "mértékegység(ek): "
 
 msgid "Importing..."
-msgstr ""
+msgstr "Betöltés..."
 
 msgid "SVG files [ImportVec plugin] (*.svg)"
-msgstr ""
+msgstr "SVG fájlok [ImportVec plugin] (*.svg)"
 
 msgid "Please open or create data layer before importing"
-msgstr ""
+msgstr "Kérlek, nyiss vagy készíts adatréteget a betöltés előtt"
 
 msgid "InfoMode"
-msgstr ""
+msgstr "InfoMode"
 
 msgid "GPX info mode"
-msgstr ""
+msgstr "GPX információs mód"
 
 msgid ""
 "Move the mouse to show trackpoint info for current layer. Hold shift to "
@@ -25116,19 +26057,19 @@ msgid ""
 msgstr ""
 
 msgid "Delete this"
-msgstr ""
+msgstr "Töröld ezt"
 
 msgid "Delete this&older"
-msgstr ""
+msgstr "Töröld ezt és a régebbieket"
 
 msgid "km/h"
-msgstr ""
+msgstr "km/h"
 
 msgid "Track name: "
-msgstr ""
+msgstr "Nyomvonal neve: "
 
 msgid "Update IRS adjustment layer"
-msgstr ""
+msgstr "IRS igazítási réteg frissítése"
 
 msgid ""
 "This option creates IRS adjustment layer and a little way inside it. You "
@@ -25153,7 +26094,7 @@ msgid "Converting OSM graph into Channel Digraph"
 msgstr ""
 
 msgid "filtering ways"
-msgstr ""
+msgstr "vonalak szűrése"
 
 msgid "creating Channel-Digraph"
 msgstr ""
@@ -25202,13 +26143,13 @@ msgid "create the channel digraph"
 msgstr ""
 
 msgid "Check "
-msgstr ""
+msgstr "Ellenőrzés "
 
 msgid "check the subust for junction properties"
 msgstr ""
 
 msgid "Search "
-msgstr ""
+msgstr "Keresés "
 
 msgid "search for junctions in the channel subset"
 msgstr ""
@@ -25276,31 +26217,31 @@ msgid "An unknown error has occurred"
 msgstr ""
 
 msgid "east"
-msgstr ""
+msgstr "kelet"
 
 msgid "northeast"
 msgstr ""
 
 msgid "north"
-msgstr ""
+msgstr "észak"
 
 msgid "northwest"
 msgstr ""
 
 msgid "west"
-msgstr ""
+msgstr "nyugat"
 
 msgid "southwest"
 msgstr ""
 
 msgid "south"
-msgstr ""
+msgstr "dél"
 
 msgid "southeast"
 msgstr ""
 
 msgid "coastline"
-msgstr ""
+msgstr "partvonal"
 
 msgid "land"
 msgstr ""
@@ -25336,7 +26277,7 @@ msgid "Tag ways as"
 msgstr ""
 
 msgid "WMS Layer"
-msgstr ""
+msgstr "WMS Réteg"
 
 msgid "Maximum cache size (MB)"
 msgstr ""
@@ -25417,13 +26358,13 @@ msgid "Not connected"
 msgstr ""
 
 msgid "Connecting"
-msgstr ""
+msgstr "Kapcsolódás"
 
 msgid "Connected"
 msgstr ""
 
 msgid "no name"
-msgstr ""
+msgstr "nincs név"
 
 msgid "Live GPS"
 msgstr ""
@@ -25533,13 +26474,13 @@ msgstr ""
 "vonalra<br>Ellenőrizd és javítsd, ha szükséges.</html>"
 
 msgid "Split way"
-msgstr ""
+msgstr "Vonal kettévágása"
 
 msgid "Michigan Left"
 msgstr ""
 
 msgid "Adds no left turn for sets of 4 or 5 ways."
-msgstr ""
+msgstr "Balra kanyarodási korlátozást ad hozzá 4 vagy 5 út halmazához."
 
 msgid "Please select 4 or 5 ways to assign no left turns."
 msgstr ""
@@ -25562,13 +26503,13 @@ msgid ""
 msgstr ""
 
 msgid "Download from OSM mirror..."
-msgstr ""
+msgstr "Letöltés OSM tükörről..."
 
 msgid "This XAPI query seems to be invalid, please doublecheck"
 msgstr ""
 
 msgid "Object type: "
-msgstr ""
+msgstr "Objektum típus: "
 
 msgid "OSM object type to download (''*'' stands for any)"
 msgstr ""
@@ -25577,10 +26518,10 @@ msgid "XAPI query: "
 msgstr ""
 
 msgid "Download from Overpass API ..."
-msgstr ""
+msgstr "Letöltés Overpass API-ról ..."
 
 msgid "Download map data from Overpass API server."
-msgstr ""
+msgstr "Térképadatok letöltése az Overpass API szerverről."
 
 msgid "Overpass query: "
 msgstr ""
@@ -25632,78 +26573,81 @@ msgid "Proceed and go to the next page"
 msgstr ""
 
 msgid "Finish"
-msgstr ""
+msgstr "Befejezés"
 
 msgid "Confirm the setup and close this dialog"
 msgstr ""
 
 msgid "JOSM/OSM API/Username"
-msgstr ""
+msgstr "JOSM/OSM API/Felhasználónév"
 
 msgid "JOSM/OSM API/Password"
-msgstr ""
+msgstr "JOSM/OSM API/Jelszó"
 
 msgid "{0}/Username"
-msgstr ""
+msgstr "{0}/Felhasználónév"
 
 msgid "{0}/Password"
-msgstr ""
+msgstr "{0}/Jelszó"
 
 msgid "JOSM/Proxy/Username"
-msgstr ""
+msgstr "JOSM/Proxy/Felhasználónév"
 
 msgid "JOSM/Proxy/Password"
-msgstr ""
+msgstr "JOSM/Proxy/Jelszó"
 
 msgid "JOSM/OAuth/OSM API/Key"
-msgstr ""
+msgstr "JOSM/OAuth/OSM API/Kulcs"
 
 msgid "JOSM/OAuth/OSM API/Secret"
-msgstr ""
+msgstr "JOSM/OAuth/OSM API/Titok"
 
 msgid "Native Password Manager Plugin"
 msgstr ""
 
 msgid "The username and password is protected by {0}."
-msgstr ""
+msgstr "Felhasználónév és jelszó a(z) {0} által védett."
 
 msgid "username"
-msgstr ""
+msgstr "felhasználónév"
 
 msgid "password"
-msgstr ""
+msgstr "jelszó"
 
 msgid "proxy username"
-msgstr ""
+msgstr "proxy felhasználónév"
 
 msgid "proxy password"
-msgstr ""
+msgstr "proxy jelszó"
 
 msgid "oauth key"
-msgstr ""
+msgstr "OAuth kulcs"
 
 msgid "oauth secret"
-msgstr ""
+msgstr "OAuth titok"
 
 msgid ""
 "<br><strong>Warning:</strong> There may be sensitive data left in your "
 "preference file. ({0})"
 msgstr ""
+"<br><strong>Figyelem:</strong> Esetleg érzékeny adatok maradhattak a "
+"konfigurációs fájlban. ({0})"
 
 msgid "Save user and password ({0})"
-msgstr ""
+msgstr "Felhasználó és jelszó mentése ({0})"
 
 msgid "Plain text, JOSM default"
-msgstr ""
+msgstr "Egyszerű szöveg, JOSM alapértelmezett"
 
 msgid "Use {0}"
-msgstr ""
+msgstr "Használ {0}"
 
 msgid "Encrypt data with Windows logon credentials"
 msgstr ""
+"Adatok titkosítása a Windows belépési meghatalmazással (felhasználó+jelszó)"
 
 msgid "The native password manager plugin detected {0} on your system."
-msgstr ""
+msgstr "The native password manager plugin detected {0} on your system."
 
 msgid "Days without mapping: {0}."
 msgstr ""
@@ -25732,39 +26676,42 @@ msgid "Split this data by neighbourhood (admin_level=11)."
 msgstr ""
 
 msgid "Download open data"
-msgstr ""
+msgstr "Nyílt adatok letöltése"
 
 msgid "License URL not available: {0}"
-msgstr ""
+msgstr "A licensz URL nem elérhető: {0}"
 
 msgid "OpenData preferences"
-msgstr ""
+msgstr "OpenData beállítások"
 
 msgid "License Agreement"
-msgstr ""
+msgstr "Licensz megállapodás"
 
 msgid "Accept"
-msgstr ""
+msgstr "Elfogad"
 
 msgid "Refuse"
-msgstr ""
+msgstr "Elutasít"
 
 msgid "I understand and accept these terms and conditions"
-msgstr ""
+msgstr "Értem és elfogadom ezeket a feltételeket és körülményeket"
 
 msgid "View the full text of this license"
-msgstr ""
+msgstr "A licensz teljes szövegének megjelenítése"
 
 msgid "I refuse these terms and conditions. Cancel download."
 msgstr ""
+"Elutasítom ezeket a feltételeket és körülményeket. Letöltés megszakítása."
 
 msgid "Module bundled with opendata plugin"
-msgstr ""
+msgstr "A modul az OpenData bővítménnyel van összecsomagolva"
 
 msgid ""
 "Please click on <strong>Download list</strong> to download and display a "
 "list of available modules."
 msgstr ""
+"Kérek, kattints a <strong>Lista letöltés</strong>re az elérhető modulok "
+"letöltéséhez és megjelenítéséhez."
 
 msgid ""
 "The following module has been downloaded <strong>successfully</strong>:"
@@ -25776,37 +26723,39 @@ msgstr[1] "Az alábbi {0} modul <strong>sikeresen</strong> letöltve:"
 msgid "Downloading the following module has <strong>failed</strong>:"
 msgid_plural ""
 "Downloading the following {0} modules has <strong>failed</strong>:"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "A következő modul letöltése <strong>meghiúsult</strong>:"
+msgstr[1] "A következő {0} modul letöltése <strong>meghiúsult</strong>:"
 
 msgid "Modules"
-msgstr ""
+msgstr "Modulok"
 
 msgid "Accept the new module sites and close the dialog"
-msgstr ""
+msgstr "Az új modul oldalak elfogadása és a dialógus bezárása"
 
 msgid "Configure Module Sites"
-msgstr ""
+msgstr "Modul Oldalak konfigurálása"
 
 msgid "Download the list of available modules"
-msgstr ""
+msgstr "Az elérhető modulok listájának letöltése"
 
 msgid "Update modules"
-msgstr ""
+msgstr "Modulok frissítése"
 
 msgid "Update the selected modules"
-msgstr ""
+msgstr "A kiválasztott modulok frissítése"
 
 msgid "Please restart JOSM to activate the downloaded modules."
-msgstr ""
+msgstr "Kérlek, indítsd újra a JOSM-ot a letöltött modulok aktiválásához."
 
 msgid ""
 "All installed modules are up to date. JOSM does not have to download newer "
 "versions."
 msgstr ""
+"Minden telepített modul naprakész. A JOSM-nak nem kell újabb verziókat "
+"letöltenie."
 
 msgid "Modules up to date"
-msgstr ""
+msgstr "A modulok naprakészek"
 
 msgid "Configure the list of sites where modules are downloaded from"
 msgstr ""
@@ -25824,7 +26773,7 @@ msgid "Download OSM data corresponding to the current data set."
 msgstr ""
 
 msgid "Diff"
-msgstr ""
+msgstr "Különbség"
 
 msgid "Perform diff between current data set and existing OSM data."
 msgstr ""
@@ -25836,10 +26785,10 @@ msgid "Open the OpenData window."
 msgstr ""
 
 msgid "Raw data"
-msgstr ""
+msgstr "Nyers adat"
 
 msgid "OpenData Preferences"
-msgstr ""
+msgstr "OpenData Beállítások"
 
 msgid ""
 "A special handler for various Open Data portals<br/><br/>Please read the "
@@ -25848,7 +26797,7 @@ msgid ""
 msgstr ""
 
 msgid "General settings"
-msgstr ""
+msgstr "Általános beállítások"
 
 msgid ""
 "Import only raw data (i.e. do not add/delete tags or replace them by "
@@ -25856,55 +26805,59 @@ msgid ""
 msgstr ""
 
 msgid "Overpass API server:"
-msgstr ""
+msgstr "Overpass API szerver:"
 
 msgid "Overpass API server used to download OSM data"
 msgstr ""
 
 msgid "XAPI server:"
-msgstr ""
+msgstr "XAPI szerver:"
 
 msgid ""
 "XAPI server used to download OSM data when Overpass API is not available"
 msgstr ""
+"A XAPI szerver OSM adatok letöltésére szolgál, amikor az OverPass API nem "
+"elérhető"
 
 msgid "Download modules"
-msgstr ""
+msgstr "Modulok letöltése"
 
 msgid "View summary"
-msgstr ""
+msgstr "Összegzés megtekintése"
 
 msgid "View full text"
-msgstr ""
+msgstr "Teljes szöveg megtekintése"
 
 msgid ""
 "''Lambert CC 9 zones'' coordinates found with different zone codes for X and "
 "Y: "
 msgstr ""
+"''Lambert CC 9 zones'' koordináták találhatóak eltérő zóna kódokkal X-hez és "
+"Y-hoz: "
 
 msgid "Downloading data..."
-msgstr ""
+msgstr "Adatok letöltése..."
 
 msgid "OpenData XML files"
-msgstr ""
+msgstr "OpenData XML fájlok"
 
 msgid "File to load"
-msgstr ""
+msgstr "Betöltendő fájl"
 
 msgid "7Zip Files"
-msgstr ""
+msgstr "7Zip fájlok"
 
 msgid "Reading 7Zip file..."
-msgstr ""
+msgstr "7Zip fájl olvasása..."
 
 msgid "Zip Files"
-msgstr ""
+msgstr "Zip fájlok"
 
 msgid "Reading Zip file..."
-msgstr ""
+msgstr "Zip fájl olvasása..."
 
 msgid "Cannot transform to WGS84"
-msgstr ""
+msgstr "Nem lehet WGS84-re alakítani"
 
 msgid ""
 "JOSM was unable to find a strict mathematical transformation between ''{0}'' "
@@ -25917,13 +26870,13 @@ msgid "Try lenient method"
 msgstr ""
 
 msgid "GML files"
-msgstr ""
+msgstr "GML fájlok"
 
 msgid "KML/KMZ files"
-msgstr ""
+msgstr "KML/KMZ fájlok"
 
 msgid "MapInfo files"
-msgstr ""
+msgstr "MapInfo fájlok"
 
 msgid "Shapefiles"
 msgstr ""
@@ -25946,10 +26899,10 @@ msgid "Loading shapefile ({0} features)"
 msgstr ""
 
 msgid "CSV files"
-msgstr ""
+msgstr "CSV fájlok"
 
 msgid "ODS files"
-msgstr ""
+msgstr "ODS fájlok"
 
 msgid "No valid coordinates have been found."
 msgstr ""
@@ -25958,7 +26911,7 @@ msgid "Invalid file. Bad length on line {0}. Expected {1} columns, got {2}."
 msgstr ""
 
 msgid "XLS files"
-msgstr ""
+msgstr "XLS fájlok"
 
 msgid "View OSM Wiki page"
 msgstr ""
@@ -26106,7 +27059,7 @@ msgid "Invalid URL ''{0}'' in module {1}"
 msgstr ""
 
 msgid "<b>Module provided by an external source:</b> {0}"
-msgstr ""
+msgstr "<b>Külső forrásból szolgáltatott modul:</b> {0}"
 
 msgid "Failed to create module information from manifest for module ''{0}''"
 msgstr ""
@@ -26131,7 +27084,7 @@ msgid "Processing module files..."
 msgstr ""
 
 msgid "Download module list..."
-msgstr ""
+msgstr "Modul lista letöltése..."
 
 msgid "Downloading module list from ''{0}''"
 msgstr ""
@@ -26179,13 +27132,13 @@ msgid ""
 msgstr ""
 
 msgid "Firefox executable"
-msgstr ""
+msgstr "FireFox futtatható állomány"
 
 msgid "OSM Server Files pbf compressed"
 msgstr ""
 
 msgid "Download PBF"
-msgstr ""
+msgstr "PBF letöltése"
 
 msgid "Invalid changeset id: {0}"
 msgstr ""
@@ -26215,227 +27168,227 @@ msgid "Transform error: Unsupported orientation"
 msgstr ""
 
 msgid "Finished"
-msgstr ""
+msgstr "Befejezett"
 
 msgid "Prefs"
-msgstr ""
+msgstr "Preferenciák"
 
 msgid "Load file..."
-msgstr ""
+msgstr "Fájl betöltése..."
 
 msgid "Place"
-msgstr ""
+msgstr "Hely"
 
 msgid "Show target"
-msgstr ""
+msgstr "Cél mutatása"
 
 msgid "Take X and Y from selected node"
-msgstr ""
+msgstr "X és Y bevétele a kijelölt pontból"
 
 msgid "Debug info"
-msgstr ""
+msgstr "Hibakeresési információ"
 
 msgid "Merge close nodes"
-msgstr ""
+msgstr "Közeli pontok egyesítése"
 
 msgid "Remove objects smaller than"
-msgstr ""
+msgstr "Kissebb objektumok eltávolítása, úgy mint"
 
 msgid "Remove objects larger than"
-msgstr ""
+msgstr "Nagyobb objektumok eltávolítása, úgy mint"
 
 msgid "Only this color"
-msgstr ""
+msgstr "Csak ez a szín"
 
 msgid "Remove parallel lines"
-msgstr ""
+msgstr "Párhuzamos vonalak eltávolítása"
 
 msgid "Take only first X paths"
-msgstr ""
+msgstr "Csak az első X útvonal bevétele"
 
 msgid "Color/width change"
-msgstr ""
+msgstr "Szín/szélesség változás"
 
 msgid "Shape closed"
-msgstr ""
+msgstr "Zárt alakzat"
 
 msgid "Single segments"
-msgstr ""
+msgstr "Önálló szakasz"
 
 msgid "Orthogonal shapes"
-msgstr ""
+msgstr "Derékszögű alakzatok"
 
 msgid "Import settings"
-msgstr ""
+msgstr "Betöltési beállítások"
 
 msgid "Introduce separate layers for:"
-msgstr ""
+msgstr "Önálló réteg bevezetése ehhez:"
 
 msgid "Bind to coordinates"
-msgstr ""
+msgstr "Koordinátákhoz rögzít"
 
 msgid "Projection:"
-msgstr ""
+msgstr "Vetítés:"
 
 msgid "Bottom left (min) corner:"
-msgstr ""
+msgstr "Bal alsó sarok (min):"
 
 msgid "PDF X and Y"
-msgstr ""
+msgstr "X és Y PDF"
 
 msgid "East and North"
-msgstr ""
+msgstr "Kelet és Észak"
 
 msgid "Top right (max) corner:"
-msgstr ""
+msgstr "Jobb felső sarok (max):"
 
 msgid "Projection Preferences"
-msgstr ""
+msgstr "Vetítési beállítások"
 
 msgid "Close the dialog and apply projection preferences"
-msgstr ""
+msgstr "A dialógus becsukása és a vetítési beállítások alkalmazása"
 
 msgid "Close the dialog, discard projection preference changes"
-msgstr ""
+msgstr "A dialógus becsukása és a vetítési beállítások elvetése"
 
 msgid "Loading..."
-msgstr ""
+msgstr "Töltés..."
 
 msgid "PDF file preview"
-msgstr ""
+msgstr "PDF fájl előnézet:"
 
 msgid "Loaded"
-msgstr ""
+msgstr "Betöltve"
 
 msgid "Imported PDF: "
-msgstr ""
+msgstr "Betöltött PDF: "
 
 msgid "Please select exactly one node."
-msgstr ""
+msgstr "Kérlek, csak egyetlen pontot válassz."
 
 msgid "PDF files"
-msgstr ""
+msgstr "PDF fájlok"
 
 msgid "OSM files"
-msgstr ""
+msgstr "OSM fájlok"
 
 msgid "Preparing"
-msgstr ""
+msgstr "Előkészítés"
 
 msgid "Tolerance is not a number"
-msgstr ""
+msgstr "A tűrés nem egy szám."
 
 msgid "Could not parse color"
-msgstr ""
+msgstr "Szín nem értelmezhető."
 
 msgid "Could not parse max path count"
-msgstr ""
+msgstr "A maximális utak száma nem értelmezhető"
 
 msgid "Parsing file"
-msgstr ""
+msgstr "Fájl ellenörzése"
 
 msgid "File not found."
-msgstr ""
+msgstr "Fájl nem található."
 
 msgid "Error while parsing: {0}"
-msgstr ""
+msgstr "Hiba az értelmezés során: {0}"
 
 msgid "Removing parallel segments"
-msgstr ""
+msgstr "Párhuzamos szakaszok eltávolítása"
 
 msgid "Max distance is not a number"
-msgstr ""
+msgstr "A maximális távolság nem egy szám"
 
 msgid "Joining nodes"
-msgstr ""
+msgstr "Pontok összekötése"
 
 msgid "Joining adjacent segments"
-msgstr ""
+msgstr "Szomszédos szakaszok összekötése"
 
 msgid "Removing small objects"
-msgstr ""
+msgstr "Kis objektumok eltávolítása"
 
 msgid "Removing large objects"
-msgstr ""
+msgstr "Nagy objektumok eltávolítása"
 
 msgid "Finalizing layers"
-msgstr ""
+msgstr "Rétegek véglegesítése."
 
 msgid "Please set a projection."
-msgstr ""
+msgstr "Kérlek, adj meg elrendezést."
 
 msgid "Could not parse numbers. Please check."
-msgstr ""
+msgstr "Számok értelmezése nem lehetséges. Kérlek, ellenőrizd."
 
 msgid "Building JOSM layer"
-msgstr ""
+msgstr "JOSM réteg építése"
 
 msgid "Postprocessing layer"
-msgstr ""
+msgstr "Réteg utófeldolgozása"
 
 msgid "Saving to file."
-msgstr ""
+msgstr "Mentés fájlba."
 
 msgid " Writing to file"
-msgstr ""
+msgstr " Fájlba írás"
 
 msgid "Building JOSM layer."
-msgstr ""
+msgstr "JOSM réteg építése."
 
 msgid " "
-msgstr ""
+msgstr " "
 
 msgid "Import PDF file"
-msgstr ""
+msgstr "PDF fájl betöltés"
 
 msgid "Import PDF file."
-msgstr ""
+msgstr "PDF fájl betöltés."
 
 msgid "Import PDF"
-msgstr ""
+msgstr "PDF betöltés"
 
 msgid " {0} objects so far"
-msgstr ""
+msgstr " eddig {0} objektum"
 
 msgid "Parsing PDF"
-msgstr ""
+msgstr "PDF feldolgozás"
 
 msgid "Encrypted documents not supported."
-msgstr ""
+msgstr "Titkosított dokumentumok nem támogatottak."
 
 msgid "The PDF file must have exactly one page."
-msgstr ""
+msgstr "A PDF fájlban csak egyetlen oldal lehet."
 
 msgid "Read error: "
-msgstr ""
+msgstr "Olvasási hiba: "
 
 msgid "Write error: "
-msgstr ""
+msgstr "Írási hiba: "
 
 msgid "Write coordinates to image header"
-msgstr ""
+msgstr "Koordináták írása a kép fejlécébe"
 
 msgid ""
 "Write position information into the exif header of the following files:"
-msgstr ""
+msgstr "Pozíció információk írása az alábbi fájlok exif fejlécébe:"
 
 msgid "settings"
-msgstr ""
+msgstr "beállítások"
 
 msgid "keep backup files"
-msgstr ""
+msgstr "biztonsági fájlok megtartása"
 
 msgid "change file modification time:"
-msgstr ""
+msgstr "fájlmódosítás idejének változtatása:"
 
 msgid "to gps time"
-msgstr ""
+msgstr "GPS időhöz"
 
 msgid "to previous value (unchanged mtime)"
-msgstr ""
+msgstr "a korábbi értékre (módosítatlan mtime)"
 
 msgid "Photo Geotagging Plugin"
-msgstr ""
+msgstr "Fotó Geotagging bővítmény"
 
 msgid "Writing position information to image files..."
 msgstr ""
@@ -26450,7 +27403,7 @@ msgid "File could not be deleted!"
 msgstr ""
 
 msgid "Could not rename file!"
-msgstr ""
+msgstr "Nem lehet átnevezni a fájlt!"
 
 msgid "Could not rename file {0} to {1}!"
 msgstr ""
@@ -26459,7 +27412,7 @@ msgid "<html><h3>There are old backup files in the image directory!</h3>"
 msgstr ""
 
 msgid "Override old backup files?"
-msgstr ""
+msgstr "Régi biztonsági másolat fájlok felülírása?"
 
 msgid "Keep old backups and continue"
 msgstr ""
@@ -26501,7 +27454,7 @@ msgid "Do you want to save current calibration of layer {0}?"
 msgstr ""
 
 msgid "Load Picture Calibration..."
-msgstr ""
+msgstr "Kép kalibráció betöltése..."
 
 msgid "Loads calibration data from a file"
 msgstr ""
@@ -26537,7 +27490,7 @@ msgid "New picture layer from clipboard"
 msgstr ""
 
 msgid "Supported image files, *.zip, *.kml"
-msgstr ""
+msgstr "Támogatott kép fájlok, *.zip, *.kml"
 
 msgid "New picture layer from file..."
 msgstr ""
@@ -26552,7 +27505,7 @@ msgid "PicLayer move"
 msgstr ""
 
 msgid "Moved"
-msgstr ""
+msgstr "Mozgatott"
 
 msgid "Drag to move the picture"
 msgstr ""
@@ -26633,7 +27586,7 @@ msgid "PicLayer: {0}"
 msgstr ""
 
 msgid "Calibration Files"
-msgstr ""
+msgstr "Kalibrációs Fájlok"
 
 msgid "Could not find the map object."
 msgstr ""
@@ -26657,12 +27610,14 @@ msgid ""
 "Set \"{0}\" to yes/no/ask in the preferences\n"
 "to control the autoloading of calibration files."
 msgstr ""
+"Állíts be a \"{0}\"-hez az igen/nem/kérdezz értékből a beállításoknál\n"
+", hogy vezérelhesd a kalibrációs fájlok automata betöltését."
 
 msgid "Do you want to apply it ?"
-msgstr ""
+msgstr "Alkalmazmi akarod ezt?"
 
 msgid "Load calibration file ?"
-msgstr ""
+msgstr "Kalibrációs fájl betöltése?"
 
 msgid "It will be applied automatically."
 msgstr ""
@@ -26696,7 +27651,7 @@ msgid "New address point added."
 msgstr ""
 
 msgid "Download Osmosis poly"
-msgstr ""
+msgstr "Osmosis poligon letöltése"
 
 msgid "Reading polygon filter file..."
 msgstr ""
@@ -26726,198 +27681,203 @@ msgid "Osmosis polygon filter files"
 msgstr ""
 
 msgid "Print..."
-msgstr ""
+msgstr "Nyomtatás..."
 
 msgid "Print the map"
-msgstr ""
+msgstr "Térkép nyomtatás"
 
 msgid "Print the Map"
-msgstr ""
+msgstr "Térkép nyomtatás"
 
 msgid "Printer"
-msgstr ""
+msgstr "Nyomtató"
 
 msgid "Media"
-msgstr ""
+msgstr "Média"
 
 msgid "Orientation"
-msgstr ""
+msgstr "Elrendezés"
 
 msgid "Printer settings"
-msgstr ""
+msgstr "Nyomtató beállítás"
 
 msgid "Scale"
-msgstr ""
+msgstr "Skála"
 
 msgid "Resolution"
-msgstr ""
+msgstr "Felbontás"
 
 msgid "Map information"
-msgstr ""
+msgstr "Térkép információ"
 
 msgid "Map Preview"
-msgstr ""
+msgstr "Térkép előnézet"
 
 msgid "Zoom To Page"
-msgstr ""
+msgstr "Lapra nagyítani"
 
 msgid "Zoom To Actual Size"
-msgstr ""
+msgstr "Aktuális méretre nagyítani"
 
 msgid "Print"
-msgstr ""
+msgstr "Nyomtat"
 
 msgid "Printing has been cancelled."
-msgstr ""
+msgstr "A nyomtatás megszakítva."
 
 msgid "Printing stopped"
-msgstr ""
+msgstr "A nyomtatás megállt"
 
 msgid "Printing has failed."
-msgstr ""
+msgstr "A nyomtatás meghiúsult."
 
 msgid "Proj4J: {0} selected"
-msgstr ""
+msgstr "Proj4J: {0} kijelölt"
 
 msgid "Selected: {0}"
-msgstr ""
+msgstr "Kijelölt: {0}"
 
 msgid "Proj4J Plugin"
-msgstr ""
+msgstr "Proj4J bővítmény"
 
 msgid "Code"
-msgstr ""
+msgstr "Kód"
 
 msgid "added"
-msgstr ""
+msgstr "hozzáadott"
 
 msgid "Public Transport: Enable GTFSStops"
-msgstr ""
+msgstr "Tömegközlekedés: GTFSStops engedélyezése"
 
 msgid "Public Transport: Catch GTFS stops"
-msgstr ""
+msgstr "Tömegközlekedés: GTFSStops elkapása"
 
 msgid "skipped"
-msgstr ""
+msgstr "kihagyott"
 
 msgid "Public Transport: Disable GTFS"
-msgstr ""
+msgstr "Tömegközlekedés: GTFSStops tiltása"
 
 msgid "Create Stops from GTFS ..."
-msgstr ""
+msgstr "Megálló készítés GTFS-ből..."
 
 msgid "Create Stops from a GTFS file"
-msgstr ""
+msgstr "Megálló készítés GTFS fájlból..."
 
 msgid "Select GTFS file (stops.txt)"
-msgstr ""
+msgstr "GTFS fájl kiválasztása (stops.txt)"
 
 msgid "File \"{0}\" does not exist"
-msgstr ""
+msgstr "A(z) \"{0}\" fájl nem létezik"
 
 msgid "IOException \"{0}\" occurred"
-msgstr ""
+msgstr "IOException \"{0}\" történt"
 
 msgid ""
 "There exists no dataset. Try to download data from the server or open an OSM "
 "file."
 msgstr ""
+"Nem létező adathalmaz. Próbálj meg adatot letölteni a szerverről vagy nyiss "
+"meg egy OSM fájlt."
 
 msgid "No data found"
-msgstr ""
+msgstr "Nem található adat"
 
 msgid "The GTFS file was empty."
-msgstr ""
+msgstr "A GTFS fájl üres volt."
 
 msgid "Create Stops from GTFS"
-msgstr ""
+msgstr "Megálló készítés GTFS-ből"
 
 msgid "GTFS-Stops"
-msgstr ""
+msgstr "GTFS megállók"
 
 msgid "Type of stops to add"
-msgstr ""
+msgstr "Hozzáadandó megálló típusok"
 
 msgid "Time on your GPS device"
-msgstr ""
+msgstr "Idő a GPS készülékeden"
 
 msgid "HH:MM:SS.sss"
-msgstr ""
+msgstr "HH:MM:SS.sss"
 
 msgid "Time on your stopwatch"
-msgstr ""
+msgstr "Idő a stopperórádon"
 
 msgid "Time window"
-msgstr ""
+msgstr "Időablak"
 
 msgid "seconds"
-msgstr ""
+msgstr "másodpercek"
 
 msgid "Move Threshold"
-msgstr ""
+msgstr "Küszöbérték mozdítás"
 
 msgid "Suggest Stops"
-msgstr ""
+msgstr "Javaslat megállókra"
 
 msgid "Find"
-msgstr ""
+msgstr "Keres"
+
+msgid "Show"
+msgstr "Mutat"
 
 msgid "Mark"
-msgstr ""
+msgstr "Jelöl"
 
 msgid "Catch"
-msgstr ""
+msgstr "Elkap"
 
 msgid "Join"
-msgstr ""
+msgstr "Összekapcsol"
 
 msgid "Enable"
-msgstr ""
+msgstr "Engedélyez"
 
 msgid "Can''t parse a time from this string."
-msgstr ""
+msgstr "Ebből a karakterláncból nem lehet időt bedolgozni."
 
 msgid "Invalid value"
-msgstr ""
+msgstr "Helytelen érték"
 
 msgid "moved"
-msgstr ""
+msgstr "mozgatott"
 
 msgid "Public Transport: Join GTFS stops"
-msgstr ""
+msgstr "Tömegközlekedés: GTFSStops összekapcsolása"
 
 msgid "Id"
-msgstr ""
+msgstr "ID"
 
 msgid "pending"
-msgstr ""
+msgstr "függőben"
 
 msgid "outside"
-msgstr ""
+msgstr "külső"
 
 msgid "[incomplete]"
-msgstr ""
+msgstr "[befejezetlen]"
 
 msgid "[empty way]"
-msgstr ""
+msgstr "[üres út]"
 
 msgid "[ID] {0}"
-msgstr ""
+msgstr "[ID] {0}"
 
 msgid "[gap]"
-msgstr ""
+msgstr "[eltérés]"
 
 msgid " [ID] {0}"
-msgstr ""
+msgstr " [ID] {0}"
 
 msgid "Route patterns ..."
-msgstr ""
+msgstr "Útvonal minták..."
 
 msgid "Edit Route patterns for public transport"
 msgstr ""
 
 msgid "Route Patterns"
-msgstr ""
+msgstr "Útvonal Minták"
 
 msgid "Overview"
 msgstr ""
@@ -26947,7 +27907,7 @@ msgid "Additional tags:"
 msgstr ""
 
 msgid "Add a new Tag"
-msgstr ""
+msgstr "Új címke hozzáadása"
 
 msgid "Name/Id"
 msgstr ""
@@ -26959,7 +27919,7 @@ msgid "Stops are possible on the"
 msgstr ""
 
 msgid "right hand side"
-msgstr ""
+msgstr "Jobb oldali"
 
 msgid "left hand side"
 msgstr ""
@@ -27078,7 +28038,7 @@ msgid "Relation Toolbox: {0}"
 msgstr ""
 
 msgid "another..."
-msgstr ""
+msgstr "másik..."
 
 msgid "Add/remove members from the chosen relation"
 msgstr ""
@@ -27108,7 +28068,7 @@ msgid "Choose a type for the relation:"
 msgstr ""
 
 msgid "Delete relation"
-msgstr ""
+msgstr "Kapcsolat törlése"
 
 msgid "Download incomplete members for the chosen relation"
 msgstr "A kiválasztott kapcsolat félkész tagjainak letöltése"
@@ -27120,7 +28080,7 @@ msgid "Download referrers for the chosen relation and its members."
 msgstr ""
 
 msgid "Duplicate relation"
-msgstr ""
+msgstr "Duplikált kapcsolat"
 
 msgid "Open relation editor for the chosen relation"
 msgstr ""
@@ -27227,13 +28187,13 @@ msgid ""
 msgstr ""
 
 msgid "Confirm"
-msgstr ""
+msgstr "Megerősít"
 
 msgid "Fetching missing primitives"
 msgstr "Hiányzó elemek lekérése"
 
 msgid "Downloading changeset"
-msgstr ""
+msgstr "Módosításcsomag letöltése"
 
 msgid "See {0}"
 msgstr ""
@@ -27255,7 +28215,7 @@ msgid "Road Sign Plugin"
 msgstr ""
 
 msgid "signs"
-msgstr ""
+msgstr "táblák"
 
 msgid "Change Properties"
 msgstr "Tulajdonságok megváltoztatása"
@@ -27291,16 +28251,16 @@ msgid "Roadsigns plugin: open dialog"
 msgstr ""
 
 msgid "custom"
-msgstr ""
+msgstr "egyéni"
 
 msgid "Could not read tagging preset source: ''{0}''"
-msgstr ""
+msgstr "Nem olvasható címkézési készlet forrás: ''{0}''"
 
 msgid "Error parsing tagging preset from ''{0}'':\n"
 msgstr ""
 
 msgid "Sign {0}"
-msgstr ""
+msgstr "Aláírás {0}"
 
 msgid "Additional sign {0}"
 msgstr ""
@@ -27348,22 +28308,22 @@ msgid "Add routing layer"
 msgstr ""
 
 msgid "Criteria"
-msgstr ""
+msgstr "Kritériumok"
 
 msgid "Shortest"
-msgstr ""
+msgstr "Legrövidebb"
 
 msgid "Fastest"
-msgstr ""
+msgstr "Leggyorsabb"
 
 msgid "Ignore oneways"
-msgstr ""
+msgstr "Egyirányúság figyelmen kívül hagyva"
 
 msgid "Reverse route"
-msgstr ""
+msgstr "Fordított útvonal"
 
 msgid "Clear route"
-msgstr ""
+msgstr "Egyértelmű útvonal"
 
 msgid "Reconstruct Graph"
 msgstr ""
@@ -27375,7 +28335,7 @@ msgid "Configure routing preferences."
 msgstr ""
 
 msgid "Speed (Km/h)"
-msgstr ""
+msgstr "Sebesség (Km/h)"
 
 msgid "Weight"
 msgstr ""
@@ -27412,76 +28372,82 @@ msgid "SDS data file"
 msgstr ""
 
 msgid "Load..."
-msgstr ""
+msgstr "Betöltés..."
 
 msgid "Load separate data store data from a file."
 msgstr ""
 
 msgid "Loading files"
-msgstr ""
+msgstr "Fájlok betöltése"
 
 msgid "SDS"
-msgstr ""
+msgstr "SDS"
 
 msgid "Information about SDS."
 msgstr ""
 
 msgid "About SDS..."
-msgstr ""
+msgstr "SDS névjegy..."
 
 msgid "Open a preferences dialog for SDS."
 msgstr ""
 
 msgid "Separate Data Store"
-msgstr ""
+msgstr "Különálló Adattároló (SDS)"
 
 msgid "Configures access to the Separate Data Store."
-msgstr ""
+msgstr "Hozzáférés konfigurálása a Különálló Adattárolóhoz (SDS)"
 
 msgid "Server"
-msgstr ""
+msgstr "Szerver"
 
 msgid "The URL under which the SDS server can be contacted."
-msgstr ""
+msgstr "Az URL, amelyen keresztül az SDS szerver elérhető."
 
 msgid ""
 "The user name at the SDS server. You need to create an account with the SDS "
 "admin first."
 msgstr ""
+"A felhasználónév az SDS szervernél. Előbb egy felhasználói fiókot szükséges "
+"készíteni az SDS adminisztrátorral."
 
 msgid ""
 "The password at the SDS server. You need to create an account with the SDS "
 "admin first."
 msgstr ""
+"A jelszó az SDS szervernél. Előbb egy felhasználói fiókot szükséges "
+"készíteni az SDS adminisztrátorral."
 
 msgid ""
 "Tags beginning with this prefix are never saved to OSM, but to the SDS "
 "server only."
 msgstr ""
+"Az ezzel az előtéttel kezdődő címkék soha nem lesznek az OSM szerverre "
+"mentve, csak az SDS szerverre."
 
 msgid "SDS server URL"
-msgstr ""
+msgstr "SDS szerver URL"
 
 msgid "SDS username"
-msgstr ""
+msgstr "SDS felhasználónév"
 
 msgid "SDS password"
-msgstr ""
+msgstr "SDS jelszó"
 
 msgid "Test credentials now"
 msgstr "Hitelesítés tesztelése most"
 
 msgid "SDS tag prefix"
-msgstr ""
+msgstr "SDS címke előtét (prefix)"
 
 msgid "Connection successful."
 msgstr "Kapcsolódás sikeres."
 
 msgid "Cannot connect to SDS server: "
-msgstr ""
+msgstr "Nem lehet az SDS szerverhez csatlakozni: "
 
 msgid "Save..."
-msgstr ""
+msgstr "Mentés..."
 
 msgid "Save the current separate data store information to a file."
 msgstr ""
@@ -27580,16 +28546,16 @@ msgid "Could not read surveyor definition: {0}"
 msgstr ""
 
 msgid "Error parsing {0}: {1}"
-msgstr ""
+msgstr "Értelmezési hiba {0}: {1}"
 
 msgid "Surveyor waypoint layer"
 msgstr ""
 
 msgid "{0} start"
-msgstr ""
+msgstr "{0} indul"
 
 msgid "{0} end"
-msgstr ""
+msgstr "{0} vége"
 
 msgid "Waypoint Description"
 msgstr ""
@@ -27606,7 +28572,7 @@ msgid ""
 msgstr ""
 
 msgid "Edit tags"
-msgstr ""
+msgstr "Címkék szerkesztése"
 
 msgid "Launches the tag editor dialog"
 msgstr ""
@@ -27621,13 +28587,13 @@ msgid "Apply edited tags and close dialog"
 msgstr ""
 
 msgid "Highlight"
-msgstr ""
+msgstr "Kiemelés"
 
 msgid "Group"
-msgstr ""
+msgstr "Csoport"
 
 msgid "Item"
-msgstr ""
+msgstr "Elem"
 
 msgid "unexpected column number {0}"
 msgstr ""
@@ -27673,7 +28639,7 @@ msgid "delete outline way"
 msgstr ""
 
 msgid "Street name: "
-msgstr ""
+msgstr "Utcanév: "
 
 msgid "Even/Odd"
 msgstr ""
@@ -27730,7 +28696,7 @@ msgid ""
 msgstr ""
 
 msgid "Terrace"
-msgstr ""
+msgstr "Terasz"
 
 msgid "Browse"
 msgstr ""
@@ -27792,10 +28758,10 @@ msgid "Tile size:"
 msgstr ""
 
 msgid "Resolution:"
-msgstr ""
+msgstr "Felbontás:"
 
 msgid "Mode:"
-msgstr ""
+msgstr "Mód:"
 
 msgid "Threshold:"
 msgstr ""
@@ -27804,7 +28770,7 @@ msgid "Points per circle:"
 msgstr ""
 
 msgid "Tag:"
-msgstr ""
+msgstr "Címke:"
 
 msgid "Preferred values:"
 msgstr ""
@@ -27840,7 +28806,7 @@ msgid "Tracer2Server has detected an error."
 msgstr ""
 
 msgid "GPG"
-msgstr ""
+msgstr "GPG"
 
 msgid "Export sigs..."
 msgstr ""
@@ -27870,10 +28836,10 @@ msgid ""
 msgstr ""
 
 msgid "Load objects from server"
-msgstr ""
+msgstr "Objektum betöltése a szerverről"
 
 msgid "Download signed data"
-msgstr ""
+msgstr "Aláírt adatok letöltése"
 
 msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
 msgstr ""
@@ -27884,36 +28850,38 @@ msgid ""
 "Generating new Keypair.\n"
 "Collecting randomness..."
 msgstr ""
+"Új kulcspár generálása.\n"
+"Véletlenszerű adat gyűjtése..."
 
 msgid "UID"
-msgstr ""
+msgstr "UID"
 
 msgid "KeyID"
 msgstr ""
 
 msgid "OSM-Info"
-msgstr ""
+msgstr "OSM-Infó"
 
 msgid "Signed"
-msgstr ""
+msgstr "Aláírt"
 
 msgid "Unknown"
-msgstr ""
+msgstr "Ismeretlen"
 
 msgid "Object signatures"
-msgstr ""
+msgstr "Objektum aláírások"
 
 msgid "Open object signing window."
-msgstr ""
+msgstr "Az aláíró ablak megnyitása."
 
 msgid "Check"
-msgstr ""
+msgstr "Vizsgálat"
 
 msgid "Check all available signatures for selected object."
-msgstr ""
+msgstr "Az összes elérhető aláírás vizsgálata a kijelölt objektumra."
 
 msgid "Sign"
-msgstr ""
+msgstr "Aláírás"
 
 msgid "Digital sign selected Tags, if you believe they are correct."
 msgstr ""
@@ -27942,7 +28910,7 @@ msgid "Use separate GnuPG configuration directory?"
 msgstr ""
 
 msgid "GnuPG"
-msgstr ""
+msgstr "GnuPG"
 
 msgid "Dialog"
 msgstr ""
@@ -27982,10 +28950,10 @@ msgid "Selected WaySegment was:"
 msgstr ""
 
 msgid "Signature Files"
-msgstr ""
+msgstr "Aláírás Fájlok"
 
 msgid "OSM Signature Files"
-msgstr ""
+msgstr "OSM Aláírás Fájlok"
 
 msgid "Only digits allowed in osmid: ''{0}''."
 msgstr ""
@@ -28009,16 +28977,16 @@ msgid "Select a signing key from your keyring-file:"
 msgstr ""
 
 msgid "Don''t ask again for the key"
-msgstr ""
+msgstr "Ne kérdezz újra a kulcsról"
 
 msgid "Use a random key from this list"
-msgstr ""
+msgstr "Véletlenszerű kulcs használata ebből a listából"
 
 msgid "Create new Key"
-msgstr ""
+msgstr "Új Kulcs készítése"
 
 msgid "Select a Key to sign"
-msgstr ""
+msgstr "Kulcs kiválasztása aláíráshoz"
 
 msgid ""
 "The object with the ID \"{0}\" ({1}) is newly created.\n"
@@ -28027,61 +28995,61 @@ msgid ""
 msgstr ""
 
 msgid "Signing canceled!"
-msgstr ""
+msgstr "Aláírás megszakítva!"
 
 msgid "Please give a tolerance in meters"
-msgstr ""
+msgstr "Kérlek adj meg tűrést, méterben"
 
 msgid "Select as much as you like:"
-msgstr ""
+msgstr "Válassz amennyit csak szeretnél:"
 
 msgid "Survey"
-msgstr ""
+msgstr "Felmérés"
 
 msgid "Aerial Photography"
-msgstr ""
+msgstr "Légifotózás"
 
 msgid "Web Recherche"
-msgstr ""
+msgstr "Webes kutatás"
 
 msgid "Trusted persons told me"
-msgstr ""
+msgstr "Megbízható személyek mondták nekem"
 
 msgid "Which source did you use?"
-msgstr ""
+msgstr "Milyen forrást használtál?"
 
 msgid "never"
-msgstr ""
+msgstr "soha"
 
 msgid "Primary user-ID: "
-msgstr ""
+msgstr "Elsődleges felhasználói-ID: "
 
 msgid "Key-ID: "
-msgstr ""
+msgstr "Kulcs-ID: "
 
 msgid "Fingerprint: "
-msgstr ""
+msgstr "Ujjlenyomat: "
 
 msgid "Algorithm: "
-msgstr ""
+msgstr "Algoritmus: "
 
 msgid "Strength in bit: "
-msgstr ""
+msgstr "Erősség bitekben: "
 
 msgid "Creation date: "
-msgstr ""
+msgstr "Létrehozás dátuma: "
 
 msgid "Expiration date: "
-msgstr ""
+msgstr "Lejárati dátum: "
 
 msgid "PGP-Key details"
-msgstr ""
+msgstr "PGP-Kulcs részletek"
 
 msgid "User-ID:"
-msgstr ""
+msgstr "Felhasználó-ID:"
 
 msgid "Select algorithm:"
-msgstr ""
+msgstr "Algoritmus kiválasztása:"
 
 msgid "Choose Bitlength (Strength):"
 msgstr ""
@@ -28096,65 +29064,70 @@ msgid "Create a new signing key"
 msgstr ""
 
 msgid "No such lane."
-msgstr ""
+msgstr "Nincs ilyen sáv."
 
 msgid ""
 "<html>The number of lanes is not specified for one or more roads; please add "
 "missing lanes tags.</html>"
 msgstr ""
+"<html>Egy vagy több úthoz nincs megadva a sávok száma; kérlek, pótold a "
+"hiányzó sávinformáció cimkéket.</html>"
 
 msgid ""
 "<html>An error occurred while constructing the model. Please run the "
 "validator to make sure the data is consistent.<br><br>Error: {0}</html>"
 msgstr ""
+"<html>A modell készítése közben hiba történt. Kérlek, futtasd az ellenörzőt, "
+"hogy biztosan konzisztensek-e az adatok.<br><br>Hiba: {0}</html>"
 
 msgid "Edit turn relations and lane lengths for selected node."
 msgstr ""
+"Szerkezd meg a kapcsolatokat és a sávok hosszát a kiválasztott ponthoz."
 
 msgid "Validate turn- and lane-length-relations for consistency."
-msgstr ""
+msgstr "Kanyar- és sávhossz-kapcsolatok ellenörzése a konzisztenciához."
 
 msgid "Turn Lanes"
-msgstr ""
+msgstr "Kanyarodósávok"
 
 msgid "Edit turn lanes"
-msgstr ""
+msgstr "Kanyarodósávok szerkesztése"
 
 msgid "Quick-Fix"
-msgstr ""
+msgstr "Gyorsjavítás"
 
 msgid "Revalidate all turnlanes-relations."
-msgstr ""
+msgstr "Minden kanyarodósáv-kapcsolat újraellenörzése."
 
 msgid "Automatically fixes the issue."
-msgstr ""
+msgstr "Probléma automatikus javítása."
 
 msgid "Selects the offending relation."
-msgstr ""
+msgstr "Problémás kapcsolat kiválasztása."
 
 msgid "Add turn"
-msgstr ""
+msgstr "Kanyar hozzáadása"
 
 msgid "Delete lane."
-msgstr ""
+msgstr "Sáv törlése"
 
 msgid "Delete turn."
-msgstr ""
+msgstr "Kanyar törlése."
 
 msgid "{0} lanes are not referenced in any turn-relation."
-msgstr ""
+msgstr "{0} sávra egyetlen hivatkozás sincs a kanyar-kapcsolatokban."
 
 msgid "Put the ways in order."
-msgstr ""
+msgstr "Vonalak sorrendbe rakása."
 
 msgid "Relation references non-existent (regular) lane {0}"
-msgstr ""
+msgstr "Kapcsolat hivatkozik a nem létező alap (tényleges) sávra {0}"
 
 msgid "Relation references non-existent extra lane {0}"
-msgstr ""
+msgstr "Kapcsolat hivatkozik a nem létező kiegészítő sávra {0}"
 
 msgid "Integer list \"{0}\" contains unexpected values."
-msgstr ""
+msgstr "A(z) \"{0}\" számsor nem várt értékeket is tartalmaz."
 
 msgid "Create/Edit turn restriction..."
 msgstr "Kanyarodási korlátozás készítése/szerkesztése…"
@@ -28410,7 +29383,7 @@ msgid "Bicycles"
 msgstr "Kerékpár"
 
 msgid "Mopeds"
-msgstr ""
+msgstr "Mopedek"
 
 msgid "Use standard exceptions"
 msgstr "Szabványos kivételek használata"
@@ -28743,25 +29716,31 @@ msgid "Change to the Basic Editor and select a way"
 msgstr "Váltás az Alap Szerkesztőre és vonal kijelölése"
 
 msgid "Undelete object..."
-msgstr ""
+msgstr "Objektum visszaállítás..."
 
 msgid "Undelete object by id"
-msgstr ""
+msgstr "Objektum visszaállítás azonosítóval"
 
 msgid "Unable to undelete node {0}. Object has likely been redacted"
 msgstr ""
+"A(z) {0} pont visszaállítása nem lehetséges. Az objektum valószínűleg "
+"szerkesztett"
 
 msgid "Unable to undelete way {0}. Object has likely been redacted"
 msgstr ""
+"A(z) {0} vonal visszaállítása nem lehetséges. Az objektum valószínűleg "
+"szerkesztett"
 
 msgid "Unable to undelete relation {0}. Object has likely been redacted"
 msgstr ""
+"A(z) {0} kapcsolat visszaállítása nem lehetséges. Az objektum valószínűleg "
+"szerkesztett"
 
 msgid "Undelete Object"
-msgstr ""
+msgstr "Objektum visszaállítása"
 
 msgid "Undelete object"
-msgstr ""
+msgstr "Objektum visszaállítása"
 
 msgid ""
 "Enter the type and ID of the objects that should be undeleted, e.g., ''n1 "
@@ -28769,13 +29748,13 @@ msgid ""
 msgstr ""
 
 msgid "Select if the data should be added into a new layer"
-msgstr ""
+msgstr "Jelölje be, ha az adatokat egy új réteghez kellene hozzáadni"
 
 msgid "Start undeleting"
-msgstr ""
+msgstr "Visszaállítás kezdődik"
 
 msgid "Close dialog and cancel"
-msgstr ""
+msgstr "Mégse és az ablak becsukása"
 
 msgid "Add nodes at intersections"
 msgstr "Pontok hozzáadása a metszéspontokon"
@@ -28787,7 +29766,7 @@ msgid "Please select one or more ways with intersections of segments."
 msgstr ""
 
 msgid "Align Way Nodes"
-msgstr ""
+msgstr "Vonalpontok igazítása"
 
 msgid "Align nodes in a way"
 msgstr ""
@@ -28813,7 +29792,7 @@ msgid "Extract node from line"
 msgstr ""
 
 msgid "Paste Relations"
-msgstr ""
+msgstr "Kapcsolatok beillesztése"
 
 msgid ""
 "Paste relation membership from objects in the buffer onto selected object(s)"
@@ -28829,7 +29808,7 @@ msgid "The current selection cannot be used for splitting."
 msgstr "A jelenlegi kijelölés nem használható a vágáshoz."
 
 msgid "The selected way is not closed."
-msgstr ""
+msgstr "A kiválasztott vonal nem zárt."
 
 msgid "The selected way does not contain the selected node."
 msgid_plural "The selected way does not contain all the selected nodes."
@@ -28856,7 +29835,7 @@ msgid ""
 msgstr ""
 
 msgid "Symmetry"
-msgstr ""
+msgstr "Szimetria"
 
 msgid ""
 "Please select at least two nodes for symmetry axis and something else to "
@@ -28927,7 +29906,7 @@ msgid "Save to file"
 msgstr ""
 
 msgid "Load from file"
-msgstr ""
+msgstr "Betöltés fájlból"
 
 msgid ""
 "Please edit custom URLs and select one row to use with the tool<br/> "
@@ -29156,142 +30135,145 @@ msgid "Select all nodes of a selected way."
 msgstr ""
 
 msgid "Undo selection"
-msgstr ""
+msgstr "Kiválasztás visszavonása"
 
 msgid "Reselect last added object or selection form history"
 msgstr ""
 
 msgid "Unselect nodes"
-msgstr ""
+msgstr "Pont kijelölések megszüntetése"
 
 msgid "Removes all nodes from selection"
-msgstr ""
+msgstr "Az összes pont eltávolítása a kijelölésből"
 
 msgid "Import Video"
-msgstr ""
+msgstr "Videó betöltése"
 
 msgid "Sync a video against this GPS track"
-msgstr ""
+msgstr "Videó szinkronizálása ezzel a GPS nyomvonallal"
 
 msgid "Remove Video"
-msgstr ""
+msgstr "Videó eltávolítása"
 
 msgid "removes current video from layer"
-msgstr ""
+msgstr "aktuális videó eltávolítása a rétegről"
 
 msgid "Play/Pause"
 msgstr "Lejátszás/Szünet"
 
 msgid "starts/pauses video playback"
-msgstr ""
+msgstr "Videó visszajátszást indít/megállít"
 
 msgid "Video: {0}"
-msgstr ""
+msgstr "Videó: {0}"
 
 msgid "Backward"
-msgstr ""
+msgstr "Visszafelé"
 
 msgid "jumps n sec back"
-msgstr ""
+msgstr "n másodperccel vissza"
 
 msgid "Forward"
 msgstr "Előre"
 
 msgid "jumps n sec forward"
-msgstr ""
+msgstr "n másodperccel előre"
 
 msgid "Faster"
 msgstr "Gyorsabban"
 
 msgid "faster playback"
-msgstr ""
+msgstr "gyorsabb lejátszás"
 
 msgid "Slower"
 msgstr "Lassabban"
 
 msgid "slower playback"
-msgstr ""
+msgstr "lassabb lejátszás"
 
 msgid "Jump To"
-msgstr ""
+msgstr "Ugrás"
 
 msgid "jumps to the entered gps time"
-msgstr ""
+msgstr "a megadott GPS időre ugrás"
 
 msgid "Loop"
-msgstr ""
+msgstr "Ismétlés"
 
 msgid "loops n sec around current position"
-msgstr ""
+msgstr "Ismétlődjön n sec a jelenlegi pozíció körül"
 
 msgid "Keep centered"
-msgstr ""
+msgstr "Tartsd központosítva"
 
 msgid "follows the video icon automatically"
-msgstr ""
+msgstr "a video ikon automatikus követése"
 
 msgid "Subtitles"
-msgstr ""
+msgstr "Feliratok"
 
 msgid "Show subtitles in video"
-msgstr ""
+msgstr "Feliratok mutatása a videón"
 
 msgid "Jump length"
-msgstr ""
+msgstr "Ugrás hossza"
 
 msgid "Set the length of a jump"
-msgstr ""
+msgstr "Az ugrás hosszának megadása"
 
 msgid "Jump in video for x ms"
-msgstr ""
+msgstr "Ugrás a videóban x ms-ot"
 
 msgid "Loop length"
-msgstr ""
+msgstr "Ismétlés hossza"
 
 msgid "Set the length around a looppoint"
-msgstr ""
+msgstr "Hossz beállítása egy ismétlési pont körül"
 
 msgid "no deinterlacing"
-msgstr ""
+msgstr "nincs deinterlace"
 
 msgid "deinterlacing using line doubling"
-msgstr ""
+msgstr "deinterlace vonalduplázással"
 
 msgid "deinterlacing using linear interpolation"
-msgstr ""
+msgstr "deinterlacing lineáris interpolációval"
 
 msgid ""
 "VLC library is not correctly initialized. Please check that VLC {0} is "
 "correctly installed on your system. Its architecture (32/64 bits) must also "
 "be the same as the JRE that runs JOSM."
 msgstr ""
+"A VLC könyvtár inicializálása nincs rendben. Kérlek, ellenőrizd, hogy a VLC "
+"{0} helyesen települt a gépeden. Az architektúrájának (32/64 bit) azonosnak "
+"kell lennie a JRE-vel, ami a JOSM-ot is futtatja."
 
 msgid "Jump to"
-msgstr ""
+msgstr "Ugrás oda"
 
 msgid "Jump to GPS time"
-msgstr ""
+msgstr "Ugrás GPS időhöz"
 
 msgid "Shows current position in the video"
-msgstr ""
+msgstr "Az aktuális pozíció mutatása a videón"
 
 msgid "Sync"
-msgstr ""
+msgstr "Szinkron"
 
 msgid "Unable to find JNA Java library!"
-msgstr ""
+msgstr "A JNA Java könyvtár nem található!"
 
 msgid "Unable to find native libvlc library!"
-msgstr ""
+msgstr "Az eredeti libvlc könyvtár nem található!"
 
 msgid "play"
-msgstr ""
+msgstr "lejátszás"
 
 msgid "loop"
-msgstr ""
+msgstr "ismétlés"
 
 msgid "mute"
-msgstr ""
+msgstr "némítás"
 
 msgid "Walking Papers Scanned Map"
 msgstr "Walking Papers szkennelt térkép"
@@ -29320,10 +30302,10 @@ msgid "Walking Papers layer ({0}) in zoom {1}"
 msgstr "Walking Papers réteg ({0}) nagyítás: {1}"
 
 msgid "Way Download"
-msgstr ""
+msgstr "Út letöltése"
 
 msgid "Download map data on the end of selected way"
-msgstr ""
+msgstr "Térképadat letöltése a kiválasztott vonal végéhez"
 
 msgid ""
 "<html>Neither a node nor a way with an endpoint outside of the<br>current "
@@ -29351,19 +30333,19 @@ msgid ""
 msgstr ""
 
 msgid "Merge duplicate node?"
-msgstr ""
+msgstr "Duplikált pont egyesítése?"
 
 msgid "<html>No more connected ways to download.</html>"
-msgstr ""
+msgstr "<html>Nincs több csatlakozó vonal a letöltéshez.</html>"
 
 msgid "Node ''{0}'' is a junction with more than 2 connected ways."
 msgstr ""
 
 msgid "Enter search expression here.."
-msgstr ""
+msgstr "Keresési kifejezés megadási tt..."
 
 msgid "Select waypoint to move map"
-msgstr ""
+msgstr "Válassz ki egy pontot a vonalon, a térkép mozgatásához"
 
 msgid "Waypoint search"
 msgstr "Útpontok keresése"
@@ -29372,10 +30354,10 @@ msgid "Search after waypoint. Click and move the map view to the waypoint."
 msgstr ""
 
 msgid "Way Select"
-msgstr ""
+msgstr "Út kiválasztás"
 
 msgid "Add names from Wikipedia"
-msgstr ""
+msgstr "Nevek hozzáadása a Wikipedia-ról"
 
 msgid ""
 "Fetches interwiki links from Wikipedia in order to add several name tags"
@@ -29387,74 +30369,78 @@ msgid ""
 msgstr ""
 
 msgid "Copy {0} template"
-msgstr ""
+msgstr "{0} sablon másolása"
 
 msgid "Fetch Wikipedia articles with coordinates"
-msgstr ""
+msgstr "Wikipédia cikkeket hoz el koordinátákkal"
 
 msgid ""
 "Double click on item to search for object with article name (and center "
 "coordinate)"
 msgstr ""
+"Dupla kattintás az elemen a szócikkekre (és központi koordinátákra) való "
+"kereséshez"
 
 msgid "Available via WIWOSM server"
-msgstr ""
+msgstr "Elérhető WIWOSM szerveren keresztül"
 
 msgid "Available in local dataset"
-msgstr ""
+msgstr "A helyi adathalmazban elérhető"
 
 msgid "Not linked yet"
-msgstr ""
+msgstr "Nincs még hivatkozás"
 
 msgid "{0}.Wikipedia.org"
-msgstr ""
+msgstr "{0}.Wikipedia.org"
 
 msgid "{0}.Wikipedia.org: {1}"
-msgstr ""
+msgstr "{0}.Wikipedia.org: {1}"
 
 msgid "Fetches all coordinates from Wikipedia in the current view"
-msgstr ""
+msgstr "Minden koordinátát elhoz a Wikipédiából, az aktuális nézet szerint"
 
 msgid "coordinates"
-msgstr ""
+msgstr "koordináták"
 
 msgid "Category"
-msgstr ""
+msgstr "Kategória"
 
 msgid "Fetches a list of all Wikipedia articles of a category"
-msgstr ""
+msgstr "Az egy kategóriába tartozó Wikipédia cikkeket listázza ki"
 
 msgid "Enter the Wikipedia category"
-msgstr ""
+msgstr "Wikipédia kategória megadása"
 
 msgid "Clipboard"
-msgstr ""
+msgstr "Vágólap"
 
 msgid "Pastes Wikipedia articles from the system clipboard"
-msgstr ""
+msgstr "Wikipédia cikkeket illeszt be a rendszer-vágólapról"
 
 msgid "clipboard"
-msgstr ""
+msgstr "Vágólap"
 
 msgid "Open Article"
-msgstr ""
+msgstr "Cikk megnyitása"
 
 msgid "Opens the Wikipedia article of the selected item in a browser"
 msgstr ""
+"Megnyitja böngészőben a kiválasztott elemhez tartozó Wikipédia cikket"
 
 msgid "Sets the default language for the Wikipedia articles"
-msgstr ""
+msgstr "Megadja az alapértelmezett nyelvet a Wikipédia cikkekhez"
 
 msgid "Enter the Wikipedia language"
-msgstr ""
+msgstr "Wikipedia nyelv megadása"
 
 msgid ""
 "Adds a ''wikipedia'' tag corresponding to this article to the selected "
 "objects"
 msgstr ""
+"Egy, az objektumok cimkéjével megegyező ''wikipedia'' szócikket ad hozzá"
 
 msgid "The Ultimate WMS Super-speed Turbo Challenge II"
-msgstr ""
+msgstr "Az - Ultimate WMS Super-speed Turbo Challenge II -"
 
 msgid "Go driving"
 msgstr "Vezetés"
diff --git a/i18n/po/hy.po b/i18n/po/hy.po
index dbfd96d..e2cabe9 100644
--- a/i18n/po/hy.po
+++ b/i18n/po/hy.po
@@ -1,8 +1,13 @@
+# Armenian translation for josm
+# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
+# This file is distributed under the same license as the josm package.
+# FIRST AUTHOR <EMAIL at ADDRESS>, 2009.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-21 03:38+0200\n"
+"POT-Creation-Date: 2014-12-10 03:42+0100\n"
 "PO-Revision-Date: 2011-04-13 21:51+0000\n"
 "Last-Translator: Gev777 <Unknown>\n"
 "Language-Team: Armenian <hy at li.org>\n"
@@ -10,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-10-21 04:35+0000\n"
-"X-Generator: Launchpad (build 17203)\n"
+"X-Launchpad-Export-Date: 2014-12-10 04:34+0000\n"
+"X-Generator: Launchpad (build 17283)\n"
 "Language: hy\n"
 
 msgid "Cancel"
@@ -171,16 +176,6 @@ msgid "About JOSM..."
 msgstr ""
 
 msgid ""
-"Unexpected format of API base URL. Redirection to info or history page for "
-"OSM object will probably fail. API base URL is: ''{0}''"
-msgstr ""
-
-msgid ""
-"Unexpected format of API base URL. Redirection to user page for OSM user "
-"will probably fail. API base URL is: ''{0}''"
-msgstr ""
-
-msgid ""
 "You are about to launch {0} browser window.<br>This may both clutter your "
 "screen with browser windows<br>and take some time to finish."
 msgid_plural ""
@@ -1519,6 +1514,15 @@ msgstr ""
 msgid "Nothing to upload. Get some data first."
 msgstr ""
 
+msgid "Upload note changes to server"
+msgstr ""
+
+msgid "Upload notes"
+msgstr ""
+
+msgid "Uploading notes to server"
+msgstr ""
+
 msgid "Upload selection"
 msgstr ""
 
@@ -1791,10 +1795,16 @@ msgstr ""
 msgid "Click the location where you wish to create a new note"
 msgstr ""
 
-msgid "Enter a comment for a new note"
+msgid "Create new note"
 msgstr ""
 
-msgid "Create new note"
+msgid "Create note"
+msgstr ""
+
+msgid "Enter a detailed comment to create a note"
+msgstr ""
+
+msgid "You must enter a comment to create a new note"
 msgstr ""
 
 msgid "Delete Mode"
@@ -2665,6 +2675,15 @@ msgstr ""
 msgid "Cycling dependencies"
 msgstr ""
 
+msgid "Uploading modified notes"
+msgstr ""
+
+msgid "Note {0} failed: {1}"
+msgstr ""
+
+msgid "Notes failed to upload"
+msgstr ""
+
 msgid ""
 "The following are results of automatic validation. Try fixing these, but be "
 "careful (don''t destroy valid data). When in doubt ignore them.<br>When you "
@@ -4894,6 +4913,12 @@ msgstr ""
 msgid "Conflict foreground: keep all tags"
 msgstr ""
 
+msgid "Conflict background: sum all numeric tags"
+msgstr ""
+
+msgid "Conflict foreground: sum all numeric tags"
+msgstr ""
+
 msgid "Conflict background: keep member"
 msgstr ""
 
@@ -5312,12 +5337,19 @@ msgstr ""
 msgid "all"
 msgstr ""
 
+msgid "sum"
+msgstr ""
+
 msgid "Please decide which values to keep"
 msgstr ""
 
 msgid "Value ''{0}'' is going to be applied for key ''{1}''"
 msgstr ""
 
+msgid ""
+"All numeric values sumed as ''{0}'' are going to be applied for key ''{1}''"
+msgstr ""
+
 msgid "The key ''{0}'' and all its values are going to be removed"
 msgstr ""
 
@@ -5680,24 +5712,6 @@ msgstr[1] ""
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
 
-msgid "Display the history of all selected items."
-msgstr ""
-
-msgid "Object with history"
-msgstr ""
-
-msgid "Reload"
-msgstr ""
-
-msgid "Reload all currently selected objects and refresh the list."
-msgstr ""
-
-msgid "Show"
-msgstr ""
-
-msgid "Display the history of the selected objects."
-msgstr ""
-
 msgid "Advanced object info"
 msgstr ""
 
@@ -6035,6 +6049,9 @@ msgstr ""
 msgid "Comment"
 msgstr ""
 
+msgid "Comment on note"
+msgstr ""
+
 msgid "Add comment to note:"
 msgstr ""
 
@@ -6044,9 +6061,6 @@ msgstr ""
 msgid "Close note with message:"
 msgstr ""
 
-msgid "Close Note"
-msgstr ""
-
 msgid "Create a new note"
 msgstr ""
 
@@ -6119,6 +6133,9 @@ msgstr ""
 msgid "Search for objects"
 msgstr ""
 
+msgid "Display the history of the selected objects."
+msgstr ""
+
 msgid "Zoom to selection"
 msgstr ""
 
@@ -6238,6 +6255,9 @@ msgstr ""
 msgid "Updating map ..."
 msgstr ""
 
+msgid "anonymous"
+msgstr ""
+
 msgid "Display the basic properties of the changeset"
 msgstr ""
 
@@ -6250,6 +6270,12 @@ msgstr ""
 msgid "Display the objects created, updated, and deleted by the changeset"
 msgstr ""
 
+msgid "Discussion"
+msgstr ""
+
+msgid "Display the public discussion around this changeset"
+msgstr ""
+
 msgid "Changeset Management Dialog"
 msgstr ""
 
@@ -6307,9 +6333,6 @@ msgctxt "changeset.state"
 msgid "Closed"
 msgstr ""
 
-msgid "anonymous"
-msgstr ""
-
 msgid "ID"
 msgstr ""
 
@@ -6325,6 +6348,9 @@ msgstr ""
 msgid "Closed at"
 msgstr ""
 
+msgid "Discussions"
+msgstr ""
+
 msgid "Downloading changeset content"
 msgstr ""
 
@@ -6436,6 +6462,15 @@ msgid ""
 "layer"
 msgstr ""
 
+msgid "Update changeset discussion"
+msgstr ""
+
+msgid "Update the changeset discussion from the OSM server"
+msgstr ""
+
+msgid "Date"
+msgstr ""
+
 msgid "Download changesets"
 msgstr ""
 
@@ -6853,7 +6888,7 @@ msgstr ""
 msgid "Set number of recently added tags"
 msgstr ""
 
-msgid "Remember last used tags"
+msgid "Remember last used tags after a restart"
 msgstr ""
 
 msgid "Please enter the number of recently added tags to display"
@@ -7199,6 +7234,9 @@ msgstr ""
 msgid "Load parent relations"
 msgstr ""
 
+msgid "Reload"
+msgstr ""
+
 msgid "Loading parent relations"
 msgstr ""
 
@@ -7321,6 +7359,12 @@ msgstr ""
 msgid "Select to download GPS traces in the selected download area."
 msgstr ""
 
+msgid "Notes"
+msgstr ""
+
+msgid "Select to download notes in the selected download area."
+msgstr ""
+
 msgid "Download as new layer"
 msgstr ""
 
@@ -7626,9 +7670,6 @@ msgstr ""
 msgid "B"
 msgstr ""
 
-msgid "Date"
-msgstr ""
-
 msgid ""
 "Failed to update primitive with id {0} because current edit layer is null"
 msgstr ""
@@ -8483,9 +8524,6 @@ msgstr ""
 msgid "Save Layer"
 msgstr ""
 
-msgid "Notes"
-msgstr ""
-
 msgid "Notes layer"
 msgstr ""
 
@@ -8501,9 +8539,6 @@ msgstr ""
 msgid "outside downloaded area"
 msgstr ""
 
-msgid "version {0}"
-msgstr ""
-
 msgid "Merging layers"
 msgstr ""
 
@@ -12129,6 +12164,15 @@ msgstr ""
 msgid "Open changeset expected. Got closed changeset with id {0}."
 msgstr ""
 
+msgid "Note upload failed"
+msgstr ""
+
+msgid "Error parsing note response from server"
+msgstr ""
+
+msgid "Error encoding string: {0}"
+msgstr ""
+
 msgid "(Code={0})"
 msgstr ""
 
@@ -12177,13 +12221,13 @@ msgstr ""
 msgid "Parsing changeset content ..."
 msgstr ""
 
-msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
-msgid "Illegal numeric value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
-msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal numeric value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
 msgid "Missing mandatory attribute ''{0}'' of XML element {1}."
@@ -12975,9 +13019,6 @@ msgstr ""
 msgid "Failed to scan file ''{0}'' for plugin information. Skipping."
 msgstr ""
 
-msgid "Processing plugin site cache icon files..."
-msgstr ""
-
 msgid "Processing plugin files..."
 msgstr ""
 
@@ -12996,12 +13037,6 @@ msgstr ""
 msgid "Details:"
 msgstr ""
 
-msgid "Plugin icons download error"
-msgstr ""
-
-msgid "JOSM failed to download plugin icons:"
-msgstr ""
-
 msgid ""
 "Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
 "plugin site ''{1}''."
@@ -13887,7 +13922,9 @@ msgid ""
 "Creating and handling address nodes and buildings within Czech Republic."
 msgstr ""
 
-msgid "Allows to import various file formats into JOSM directly."
+msgid ""
+"Allows to import various file formats into JOSM directly. Currently "
+"supported: TangoGPS, Garmin Trainings Center TCX."
 msgstr ""
 
 msgid "Download your GPX tracks from openstreetmap.org"
@@ -13984,6 +14021,11 @@ msgid "A helper for IRS satellite adjustment."
 msgstr ""
 
 msgid ""
+"Provides Java Native Access (JNA) library. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
+msgid ""
 "Provides Java Topology Suite (JTS) library and related utilities. Not meant "
 "to be installed directly by users, but rather as a dependency for other "
 "plugins."
@@ -14339,6 +14381,25 @@ msgstr ""
 msgid "Width (meters)"
 msgstr ""
 
+msgid "Sidewalk"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "both"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "left"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "right"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "no"
+msgstr ""
+
 msgid "Service type"
 msgstr ""
 
@@ -14703,15 +14764,19 @@ msgstr ""
 msgid "May-Sep 09:30-12:30,14:15-19:30"
 msgstr ""
 
+msgctxt "parking"
 msgid "multi-storey"
 msgstr ""
 
+msgctxt "parking"
 msgid "surface"
 msgstr ""
 
+msgctxt "parking"
 msgid "underground"
 msgstr ""
 
+msgctxt "parking"
 msgid "rooftop"
 msgstr ""
 
@@ -15169,15 +15234,26 @@ msgstr ""
 msgid "Overtaking"
 msgstr ""
 
+msgctxt "overtaking"
+msgid "yes"
+msgstr ""
+
+msgctxt "overtaking"
 msgid "both"
 msgstr ""
 
+msgctxt "overtaking"
 msgid "forward"
 msgstr ""
 
+msgctxt "overtaking"
 msgid "backward"
 msgstr ""
 
+msgctxt "overtaking"
+msgid "no"
+msgstr ""
+
 msgid "Roundabout"
 msgstr ""
 
@@ -15471,6 +15547,12 @@ msgstr ""
 msgid "tiger"
 msgstr ""
 
+msgid "Button operated"
+msgstr ""
+
+msgid "Sound signals"
+msgstr ""
+
 msgid "Crossing attendant"
 msgstr ""
 
@@ -15992,9 +16074,6 @@ msgstr ""
 msgid "Traffic lights"
 msgstr ""
 
-msgid "Sound signals"
-msgstr ""
-
 msgid "Barrier"
 msgstr ""
 
@@ -18054,6 +18133,9 @@ msgstr ""
 msgid "Gasometer"
 msgstr ""
 
+msgid "Bunker Silo"
+msgstr ""
+
 msgid "Pipeline"
 msgstr ""
 
@@ -18200,15 +18282,15 @@ msgstr ""
 msgid "Monitoring:"
 msgstr ""
 
-msgid "Weather"
-msgstr ""
-
 msgid "Water level"
 msgstr ""
 
 msgid "Tide Level"
 msgstr ""
 
+msgid "Groundwater"
+msgstr ""
+
 msgid "Traffic"
 msgstr ""
 
@@ -18227,6 +18309,9 @@ msgstr ""
 msgid "Galileo Signals"
 msgstr ""
 
+msgid "Weather"
+msgstr ""
+
 msgid "Radiation"
 msgstr ""
 
@@ -18407,6 +18492,9 @@ msgstr ""
 msgid "pivot_pier"
 msgstr ""
 
+msgid "Bridge outline"
+msgstr ""
+
 msgid "Power Plant"
 msgstr ""
 
@@ -19014,6 +19102,15 @@ msgstr ""
 msgid "Pole"
 msgstr ""
 
+msgid "Pole with Transformer"
+msgstr ""
+
+msgid "Pole Attributes:"
+msgstr ""
+
+msgid "Transformer Attributes:"
+msgstr ""
+
 msgid "Power Line"
 msgstr ""
 
@@ -19063,9 +19160,15 @@ msgstr ""
 msgid "Power Cable"
 msgstr ""
 
+msgctxt "power cable"
+msgid "underground"
+msgstr ""
+
+msgctxt "power cable"
 msgid "underwater"
 msgstr ""
 
+msgctxt "power cable"
 msgid "overground"
 msgstr ""
 
@@ -19093,6 +19196,33 @@ msgstr ""
 msgid "Memorial"
 msgstr ""
 
+msgctxt "memorial"
+msgid "statue"
+msgstr ""
+
+msgctxt "memorial"
+msgid "bust"
+msgstr ""
+
+msgctxt "memorial"
+msgid "plaque"
+msgstr ""
+
+msgctxt "memorial"
+msgid "stele"
+msgstr ""
+
+msgctxt "memorial"
+msgid "stone"
+msgstr ""
+
+msgctxt "memorial"
+msgid "war_memorial"
+msgstr ""
+
+msgid "Inscription"
+msgstr ""
+
 msgid "Wayside Cross"
 msgstr ""
 
@@ -19162,6 +19292,9 @@ msgstr ""
 msgid "Beverages"
 msgstr ""
 
+msgid "Wine"
+msgstr ""
+
 msgid "Boutique"
 msgstr ""
 
@@ -19207,6 +19340,9 @@ msgstr ""
 msgid "Video Games"
 msgstr ""
 
+msgid "Music"
+msgstr ""
+
 msgid "Cash"
 msgstr ""
 
@@ -19234,6 +19370,9 @@ msgstr ""
 msgid "Curtain"
 msgstr ""
 
+msgid "Art"
+msgstr ""
+
 msgid "Frame"
 msgstr ""
 
@@ -19279,6 +19418,9 @@ msgstr ""
 msgid "Beauty"
 msgstr ""
 
+msgid "Tattoo"
+msgstr ""
+
 msgid "Optician"
 msgstr ""
 
@@ -19330,6 +19472,9 @@ msgstr ""
 msgid "Pet"
 msgstr ""
 
+msgid "Funeral Directors"
+msgstr ""
+
 msgid "Vending Machine"
 msgstr ""
 
@@ -19429,6 +19574,15 @@ msgstr ""
 msgid "National Park"
 msgstr ""
 
+msgid "Protected Area"
+msgstr ""
+
+msgid "Protected Class"
+msgstr ""
+
+msgid "Title or type of protection"
+msgstr ""
+
 msgid "Places"
 msgstr ""
 
@@ -20505,7 +20659,13 @@ msgstr ""
 msgid "Estonia Ortho (Maaamet)"
 msgstr ""
 
-msgid "Estonia Multi (Maaamet)"
+msgid "Estonia Hillshade (Maaamet)"
+msgstr ""
+
+msgid "Estonia Cadastre (Maaamet)"
+msgstr ""
+
+msgid "Estonia Forestry (Maaamet)"
 msgstr ""
 
 msgid "Bordeaux - 2012"
@@ -20529,7 +20689,7 @@ msgstr ""
 msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
 msgstr ""
 
-msgid "CUGN Nancy - Orthophoto 2012"
+msgid "GrandNancy Orthophotographie 2012"
 msgstr ""
 
 msgid "Géobretagne - Brest 2010 - 10 cm"
@@ -20576,9 +20736,6 @@ msgid ""
 "- 1 m"
 msgstr ""
 
-msgid "Streets NRW Geofabrik.de"
-msgstr ""
-
 msgid "Hike & Bike"
 msgstr ""
 
@@ -20638,6 +20795,9 @@ msgstr ""
 msgid "NRW-Atlas: Topographische Karte 1:10000"
 msgstr ""
 
+msgid "Metropole Ruhr: Luftbilder (10 cm)"
+msgstr ""
+
 msgid "Drone Imagery (Haiti)"
 msgstr ""
 
@@ -20839,6 +20999,9 @@ msgstr ""
 msgid "Stadt Zürich Übersichtsplan (Strassen, Gebäude, Hausnummer)"
 msgstr ""
 
+msgid "Stadt Zürich Luftbild 2011"
+msgstr ""
+
 msgid "Orthofoto Kanton Solothurn RGB (SOGIS 2011/2012/2013)"
 msgstr ""
 
@@ -20857,7 +21020,7 @@ msgstr ""
 msgid "Canton de Fribourg 50cm (2005)"
 msgstr ""
 
-msgid "Stadt Bern 10cm/25cm (2008)"
+msgid "Stadt Bern 10cm/25cm (2012)"
 msgstr ""
 
 msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
@@ -20896,7 +21059,7 @@ msgstr ""
 msgid "OSM US TIGER 2012 Roads Overlay"
 msgstr ""
 
-msgid "New & Misaligned TIGER Roads (TIGER 2013)"
+msgid "New & Misaligned TIGER Roads (TIGER 2014)"
 msgstr ""
 
 msgid "MassGIS L3 Parcels"
@@ -20944,9 +21107,234 @@ msgstr ""
 msgid "NLS - Bartholomew Half Inch, 1897-1907"
 msgstr ""
 
+msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Annan 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgstr ""
+
 msgid "OS Town Plans, Cupar 1854 (NLS)"
 msgstr ""
 
+msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Elgin 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Forres 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Galashiels 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Girvan 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Greenock 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Haddington 1853 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Haddington 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Hamilton 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Irvine 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Jedburgh 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kelso 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Lanark 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Linlithgow 1856 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Musselburgh 1853 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Musselburgh 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Oban 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Peebles 1856 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Perth 1860 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Peterhead 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Selkirk 1865 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, St Andrews 1854 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, St Andrews 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stirling 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stonehaven 1864 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1847 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Strathaven 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wick 1872 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wigtown 1848 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wigtown 1894 (NLS)"
+msgstr ""
+
 msgid "Decreasing house numbers in addresses interpolation"
 msgstr ""
 
@@ -21000,17 +21388,37 @@ msgid "{0}={1} is deprecated. Please use instead a multipolygon."
 msgstr ""
 
 msgid ""
-"{0} is deprecated. Please specify ìnterval by using opening_hours syntax"
+"{0} is deprecated. Please specify interval by using opening_hours syntax"
 msgstr ""
 
 msgid ""
 "{0} is deprecated. Please delete this object and use a private layer instead"
 msgstr ""
 
-msgid "{0} on a node"
+msgid "{0}={1} is unspecific. Please replace ''{1}'' by a specific value."
 msgstr ""
 
-msgid "{0} on a node. Should be drawn as an area"
+msgid "{0} should be replaced with {1}"
+msgstr ""
+
+msgid ""
+"{0}={1} is unspecific. Please replace ''{1}'' by ''left'', ''right'' or "
+"''both''."
+msgstr ""
+
+msgid "{0} on a node. Should be used on a way."
+msgstr ""
+
+msgid "{0} on a node. Should be drawn as an area."
+msgstr ""
+
+msgid "{0}=* on a node. Should be used in a relation"
+msgstr ""
+
+msgid "{0} on a way. Should be used in a relation"
+msgstr ""
+
+msgid "{0} on a node"
 msgstr ""
 
 msgid "Building inside building"
@@ -25680,6 +26088,9 @@ msgstr ""
 msgid "Find"
 msgstr ""
 
+msgid "Show"
+msgstr ""
+
 msgid "Mark"
 msgstr ""
 
diff --git a/i18n/po/ia.po b/i18n/po/ia.po
index 94feb34..a4378e3 100644
--- a/i18n/po/ia.po
+++ b/i18n/po/ia.po
@@ -1,8 +1,13 @@
+# Interlingua translation for josm
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the josm package.
+# FIRST AUTHOR <EMAIL at ADDRESS>, 2011.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-21 03:38+0200\n"
+"POT-Creation-Date: 2014-12-10 03:42+0100\n"
 "PO-Revision-Date: 2011-08-29 01:02+0000\n"
 "Last-Translator: Emilio Sepulveda <Unknown>\n"
 "Language-Team: Interlingua <ia at li.org>\n"
@@ -10,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-10-21 04:59+0000\n"
-"X-Generator: Launchpad (build 17203)\n"
+"X-Launchpad-Export-Date: 2014-12-10 04:53+0000\n"
+"X-Generator: Launchpad (build 17283)\n"
 "Language: ia\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -168,16 +173,6 @@ msgid "About JOSM..."
 msgstr "Circa JOSM..."
 
 msgid ""
-"Unexpected format of API base URL. Redirection to info or history page for "
-"OSM object will probably fail. API base URL is: ''{0}''"
-msgstr ""
-
-msgid ""
-"Unexpected format of API base URL. Redirection to user page for OSM user "
-"will probably fail. API base URL is: ''{0}''"
-msgstr ""
-
-msgid ""
 "You are about to launch {0} browser window.<br>This may both clutter your "
 "screen with browser windows<br>and take some time to finish."
 msgid_plural ""
@@ -1519,6 +1514,15 @@ msgstr ""
 msgid "Nothing to upload. Get some data first."
 msgstr ""
 
+msgid "Upload note changes to server"
+msgstr ""
+
+msgid "Upload notes"
+msgstr ""
+
+msgid "Uploading notes to server"
+msgstr ""
+
 msgid "Upload selection"
 msgstr ""
 
@@ -1791,10 +1795,16 @@ msgstr ""
 msgid "Click the location where you wish to create a new note"
 msgstr ""
 
-msgid "Enter a comment for a new note"
+msgid "Create new note"
 msgstr ""
 
-msgid "Create new note"
+msgid "Create note"
+msgstr ""
+
+msgid "Enter a detailed comment to create a note"
+msgstr ""
+
+msgid "You must enter a comment to create a new note"
 msgstr ""
 
 msgid "Delete Mode"
@@ -2665,6 +2675,15 @@ msgstr ""
 msgid "Cycling dependencies"
 msgstr ""
 
+msgid "Uploading modified notes"
+msgstr ""
+
+msgid "Note {0} failed: {1}"
+msgstr ""
+
+msgid "Notes failed to upload"
+msgstr ""
+
 msgid ""
 "The following are results of automatic validation. Try fixing these, but be "
 "careful (don''t destroy valid data). When in doubt ignore them.<br>When you "
@@ -4894,6 +4913,12 @@ msgstr ""
 msgid "Conflict foreground: keep all tags"
 msgstr ""
 
+msgid "Conflict background: sum all numeric tags"
+msgstr ""
+
+msgid "Conflict foreground: sum all numeric tags"
+msgstr ""
+
 msgid "Conflict background: keep member"
 msgstr ""
 
@@ -5312,12 +5337,19 @@ msgstr ""
 msgid "all"
 msgstr ""
 
+msgid "sum"
+msgstr ""
+
 msgid "Please decide which values to keep"
 msgstr ""
 
 msgid "Value ''{0}'' is going to be applied for key ''{1}''"
 msgstr ""
 
+msgid ""
+"All numeric values sumed as ''{0}'' are going to be applied for key ''{1}''"
+msgstr ""
+
 msgid "The key ''{0}'' and all its values are going to be removed"
 msgstr ""
 
@@ -5680,24 +5712,6 @@ msgstr[1] ""
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
 
-msgid "Display the history of all selected items."
-msgstr ""
-
-msgid "Object with history"
-msgstr ""
-
-msgid "Reload"
-msgstr ""
-
-msgid "Reload all currently selected objects and refresh the list."
-msgstr ""
-
-msgid "Show"
-msgstr ""
-
-msgid "Display the history of the selected objects."
-msgstr ""
-
 msgid "Advanced object info"
 msgstr ""
 
@@ -6035,6 +6049,9 @@ msgstr ""
 msgid "Comment"
 msgstr ""
 
+msgid "Comment on note"
+msgstr ""
+
 msgid "Add comment to note:"
 msgstr ""
 
@@ -6044,9 +6061,6 @@ msgstr ""
 msgid "Close note with message:"
 msgstr ""
 
-msgid "Close Note"
-msgstr ""
-
 msgid "Create a new note"
 msgstr ""
 
@@ -6119,6 +6133,9 @@ msgstr ""
 msgid "Search for objects"
 msgstr ""
 
+msgid "Display the history of the selected objects."
+msgstr ""
+
 msgid "Zoom to selection"
 msgstr ""
 
@@ -6238,6 +6255,9 @@ msgstr ""
 msgid "Updating map ..."
 msgstr ""
 
+msgid "anonymous"
+msgstr ""
+
 msgid "Display the basic properties of the changeset"
 msgstr ""
 
@@ -6250,6 +6270,12 @@ msgstr ""
 msgid "Display the objects created, updated, and deleted by the changeset"
 msgstr ""
 
+msgid "Discussion"
+msgstr ""
+
+msgid "Display the public discussion around this changeset"
+msgstr ""
+
 msgid "Changeset Management Dialog"
 msgstr ""
 
@@ -6307,9 +6333,6 @@ msgctxt "changeset.state"
 msgid "Closed"
 msgstr ""
 
-msgid "anonymous"
-msgstr ""
-
 msgid "ID"
 msgstr ""
 
@@ -6325,6 +6348,9 @@ msgstr ""
 msgid "Closed at"
 msgstr ""
 
+msgid "Discussions"
+msgstr ""
+
 msgid "Downloading changeset content"
 msgstr ""
 
@@ -6436,6 +6462,15 @@ msgid ""
 "layer"
 msgstr ""
 
+msgid "Update changeset discussion"
+msgstr ""
+
+msgid "Update the changeset discussion from the OSM server"
+msgstr ""
+
+msgid "Date"
+msgstr ""
+
 msgid "Download changesets"
 msgstr ""
 
@@ -6853,7 +6888,7 @@ msgstr ""
 msgid "Set number of recently added tags"
 msgstr ""
 
-msgid "Remember last used tags"
+msgid "Remember last used tags after a restart"
 msgstr ""
 
 msgid "Please enter the number of recently added tags to display"
@@ -7199,6 +7234,9 @@ msgstr ""
 msgid "Load parent relations"
 msgstr ""
 
+msgid "Reload"
+msgstr ""
+
 msgid "Loading parent relations"
 msgstr ""
 
@@ -7321,6 +7359,12 @@ msgstr ""
 msgid "Select to download GPS traces in the selected download area."
 msgstr ""
 
+msgid "Notes"
+msgstr ""
+
+msgid "Select to download notes in the selected download area."
+msgstr ""
+
 msgid "Download as new layer"
 msgstr ""
 
@@ -7626,9 +7670,6 @@ msgstr ""
 msgid "B"
 msgstr ""
 
-msgid "Date"
-msgstr ""
-
 msgid ""
 "Failed to update primitive with id {0} because current edit layer is null"
 msgstr ""
@@ -8483,9 +8524,6 @@ msgstr ""
 msgid "Save Layer"
 msgstr ""
 
-msgid "Notes"
-msgstr ""
-
 msgid "Notes layer"
 msgstr ""
 
@@ -8501,9 +8539,6 @@ msgstr ""
 msgid "outside downloaded area"
 msgstr ""
 
-msgid "version {0}"
-msgstr ""
-
 msgid "Merging layers"
 msgstr ""
 
@@ -12129,6 +12164,15 @@ msgstr ""
 msgid "Open changeset expected. Got closed changeset with id {0}."
 msgstr ""
 
+msgid "Note upload failed"
+msgstr ""
+
+msgid "Error parsing note response from server"
+msgstr ""
+
+msgid "Error encoding string: {0}"
+msgstr ""
+
 msgid "(Code={0})"
 msgstr ""
 
@@ -12177,13 +12221,13 @@ msgstr ""
 msgid "Parsing changeset content ..."
 msgstr ""
 
-msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
-msgid "Illegal numeric value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
-msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal numeric value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
 msgid "Missing mandatory attribute ''{0}'' of XML element {1}."
@@ -12975,9 +13019,6 @@ msgstr ""
 msgid "Failed to scan file ''{0}'' for plugin information. Skipping."
 msgstr ""
 
-msgid "Processing plugin site cache icon files..."
-msgstr ""
-
 msgid "Processing plugin files..."
 msgstr ""
 
@@ -12996,12 +13037,6 @@ msgstr ""
 msgid "Details:"
 msgstr ""
 
-msgid "Plugin icons download error"
-msgstr ""
-
-msgid "JOSM failed to download plugin icons:"
-msgstr ""
-
 msgid ""
 "Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
 "plugin site ''{1}''."
@@ -13887,7 +13922,9 @@ msgid ""
 "Creating and handling address nodes and buildings within Czech Republic."
 msgstr ""
 
-msgid "Allows to import various file formats into JOSM directly."
+msgid ""
+"Allows to import various file formats into JOSM directly. Currently "
+"supported: TangoGPS, Garmin Trainings Center TCX."
 msgstr ""
 
 msgid "Download your GPX tracks from openstreetmap.org"
@@ -13984,6 +14021,11 @@ msgid "A helper for IRS satellite adjustment."
 msgstr ""
 
 msgid ""
+"Provides Java Native Access (JNA) library. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
+msgid ""
 "Provides Java Topology Suite (JTS) library and related utilities. Not meant "
 "to be installed directly by users, but rather as a dependency for other "
 "plugins."
@@ -14339,6 +14381,25 @@ msgstr ""
 msgid "Width (meters)"
 msgstr ""
 
+msgid "Sidewalk"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "both"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "left"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "right"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "no"
+msgstr ""
+
 msgid "Service type"
 msgstr ""
 
@@ -14703,15 +14764,19 @@ msgstr ""
 msgid "May-Sep 09:30-12:30,14:15-19:30"
 msgstr ""
 
+msgctxt "parking"
 msgid "multi-storey"
 msgstr ""
 
+msgctxt "parking"
 msgid "surface"
 msgstr ""
 
+msgctxt "parking"
 msgid "underground"
 msgstr ""
 
+msgctxt "parking"
 msgid "rooftop"
 msgstr ""
 
@@ -15169,15 +15234,26 @@ msgstr ""
 msgid "Overtaking"
 msgstr ""
 
+msgctxt "overtaking"
+msgid "yes"
+msgstr ""
+
+msgctxt "overtaking"
 msgid "both"
 msgstr ""
 
+msgctxt "overtaking"
 msgid "forward"
 msgstr ""
 
+msgctxt "overtaking"
 msgid "backward"
 msgstr ""
 
+msgctxt "overtaking"
+msgid "no"
+msgstr ""
+
 msgid "Roundabout"
 msgstr ""
 
@@ -15471,6 +15547,12 @@ msgstr ""
 msgid "tiger"
 msgstr ""
 
+msgid "Button operated"
+msgstr ""
+
+msgid "Sound signals"
+msgstr ""
+
 msgid "Crossing attendant"
 msgstr ""
 
@@ -15992,9 +16074,6 @@ msgstr ""
 msgid "Traffic lights"
 msgstr ""
 
-msgid "Sound signals"
-msgstr ""
-
 msgid "Barrier"
 msgstr ""
 
@@ -18054,6 +18133,9 @@ msgstr ""
 msgid "Gasometer"
 msgstr ""
 
+msgid "Bunker Silo"
+msgstr ""
+
 msgid "Pipeline"
 msgstr ""
 
@@ -18200,15 +18282,15 @@ msgstr ""
 msgid "Monitoring:"
 msgstr ""
 
-msgid "Weather"
-msgstr ""
-
 msgid "Water level"
 msgstr ""
 
 msgid "Tide Level"
 msgstr ""
 
+msgid "Groundwater"
+msgstr ""
+
 msgid "Traffic"
 msgstr ""
 
@@ -18227,6 +18309,9 @@ msgstr ""
 msgid "Galileo Signals"
 msgstr ""
 
+msgid "Weather"
+msgstr ""
+
 msgid "Radiation"
 msgstr ""
 
@@ -18407,6 +18492,9 @@ msgstr ""
 msgid "pivot_pier"
 msgstr ""
 
+msgid "Bridge outline"
+msgstr ""
+
 msgid "Power Plant"
 msgstr ""
 
@@ -19014,6 +19102,15 @@ msgstr ""
 msgid "Pole"
 msgstr ""
 
+msgid "Pole with Transformer"
+msgstr ""
+
+msgid "Pole Attributes:"
+msgstr ""
+
+msgid "Transformer Attributes:"
+msgstr ""
+
 msgid "Power Line"
 msgstr ""
 
@@ -19063,9 +19160,15 @@ msgstr ""
 msgid "Power Cable"
 msgstr ""
 
+msgctxt "power cable"
+msgid "underground"
+msgstr ""
+
+msgctxt "power cable"
 msgid "underwater"
 msgstr ""
 
+msgctxt "power cable"
 msgid "overground"
 msgstr ""
 
@@ -19093,6 +19196,33 @@ msgstr ""
 msgid "Memorial"
 msgstr ""
 
+msgctxt "memorial"
+msgid "statue"
+msgstr ""
+
+msgctxt "memorial"
+msgid "bust"
+msgstr ""
+
+msgctxt "memorial"
+msgid "plaque"
+msgstr ""
+
+msgctxt "memorial"
+msgid "stele"
+msgstr ""
+
+msgctxt "memorial"
+msgid "stone"
+msgstr ""
+
+msgctxt "memorial"
+msgid "war_memorial"
+msgstr ""
+
+msgid "Inscription"
+msgstr ""
+
 msgid "Wayside Cross"
 msgstr ""
 
@@ -19162,6 +19292,9 @@ msgstr ""
 msgid "Beverages"
 msgstr ""
 
+msgid "Wine"
+msgstr ""
+
 msgid "Boutique"
 msgstr ""
 
@@ -19207,6 +19340,9 @@ msgstr ""
 msgid "Video Games"
 msgstr ""
 
+msgid "Music"
+msgstr ""
+
 msgid "Cash"
 msgstr ""
 
@@ -19234,6 +19370,9 @@ msgstr ""
 msgid "Curtain"
 msgstr ""
 
+msgid "Art"
+msgstr ""
+
 msgid "Frame"
 msgstr ""
 
@@ -19279,6 +19418,9 @@ msgstr ""
 msgid "Beauty"
 msgstr ""
 
+msgid "Tattoo"
+msgstr ""
+
 msgid "Optician"
 msgstr ""
 
@@ -19330,6 +19472,9 @@ msgstr ""
 msgid "Pet"
 msgstr ""
 
+msgid "Funeral Directors"
+msgstr ""
+
 msgid "Vending Machine"
 msgstr ""
 
@@ -19429,6 +19574,15 @@ msgstr ""
 msgid "National Park"
 msgstr ""
 
+msgid "Protected Area"
+msgstr ""
+
+msgid "Protected Class"
+msgstr ""
+
+msgid "Title or type of protection"
+msgstr ""
+
 msgid "Places"
 msgstr ""
 
@@ -20505,7 +20659,13 @@ msgstr ""
 msgid "Estonia Ortho (Maaamet)"
 msgstr ""
 
-msgid "Estonia Multi (Maaamet)"
+msgid "Estonia Hillshade (Maaamet)"
+msgstr ""
+
+msgid "Estonia Cadastre (Maaamet)"
+msgstr ""
+
+msgid "Estonia Forestry (Maaamet)"
 msgstr ""
 
 msgid "Bordeaux - 2012"
@@ -20529,7 +20689,7 @@ msgstr ""
 msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
 msgstr ""
 
-msgid "CUGN Nancy - Orthophoto 2012"
+msgid "GrandNancy Orthophotographie 2012"
 msgstr ""
 
 msgid "Géobretagne - Brest 2010 - 10 cm"
@@ -20576,9 +20736,6 @@ msgid ""
 "- 1 m"
 msgstr ""
 
-msgid "Streets NRW Geofabrik.de"
-msgstr ""
-
 msgid "Hike & Bike"
 msgstr ""
 
@@ -20638,6 +20795,9 @@ msgstr ""
 msgid "NRW-Atlas: Topographische Karte 1:10000"
 msgstr ""
 
+msgid "Metropole Ruhr: Luftbilder (10 cm)"
+msgstr ""
+
 msgid "Drone Imagery (Haiti)"
 msgstr ""
 
@@ -20839,6 +20999,9 @@ msgstr ""
 msgid "Stadt Zürich Übersichtsplan (Strassen, Gebäude, Hausnummer)"
 msgstr ""
 
+msgid "Stadt Zürich Luftbild 2011"
+msgstr ""
+
 msgid "Orthofoto Kanton Solothurn RGB (SOGIS 2011/2012/2013)"
 msgstr ""
 
@@ -20857,7 +21020,7 @@ msgstr ""
 msgid "Canton de Fribourg 50cm (2005)"
 msgstr ""
 
-msgid "Stadt Bern 10cm/25cm (2008)"
+msgid "Stadt Bern 10cm/25cm (2012)"
 msgstr ""
 
 msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
@@ -20896,7 +21059,7 @@ msgstr ""
 msgid "OSM US TIGER 2012 Roads Overlay"
 msgstr ""
 
-msgid "New & Misaligned TIGER Roads (TIGER 2013)"
+msgid "New & Misaligned TIGER Roads (TIGER 2014)"
 msgstr ""
 
 msgid "MassGIS L3 Parcels"
@@ -20944,9 +21107,234 @@ msgstr ""
 msgid "NLS - Bartholomew Half Inch, 1897-1907"
 msgstr ""
 
+msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Annan 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgstr ""
+
 msgid "OS Town Plans, Cupar 1854 (NLS)"
 msgstr ""
 
+msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Elgin 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Forres 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Galashiels 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Girvan 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Greenock 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Haddington 1853 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Haddington 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Hamilton 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Irvine 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Jedburgh 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kelso 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Lanark 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Linlithgow 1856 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Musselburgh 1853 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Musselburgh 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Oban 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Peebles 1856 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Perth 1860 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Peterhead 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Selkirk 1865 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, St Andrews 1854 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, St Andrews 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stirling 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stonehaven 1864 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1847 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Strathaven 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wick 1872 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wigtown 1848 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wigtown 1894 (NLS)"
+msgstr ""
+
 msgid "Decreasing house numbers in addresses interpolation"
 msgstr ""
 
@@ -21000,17 +21388,37 @@ msgid "{0}={1} is deprecated. Please use instead a multipolygon."
 msgstr ""
 
 msgid ""
-"{0} is deprecated. Please specify ìnterval by using opening_hours syntax"
+"{0} is deprecated. Please specify interval by using opening_hours syntax"
 msgstr ""
 
 msgid ""
 "{0} is deprecated. Please delete this object and use a private layer instead"
 msgstr ""
 
-msgid "{0} on a node"
+msgid "{0}={1} is unspecific. Please replace ''{1}'' by a specific value."
 msgstr ""
 
-msgid "{0} on a node. Should be drawn as an area"
+msgid "{0} should be replaced with {1}"
+msgstr ""
+
+msgid ""
+"{0}={1} is unspecific. Please replace ''{1}'' by ''left'', ''right'' or "
+"''both''."
+msgstr ""
+
+msgid "{0} on a node. Should be used on a way."
+msgstr ""
+
+msgid "{0} on a node. Should be drawn as an area."
+msgstr ""
+
+msgid "{0}=* on a node. Should be used in a relation"
+msgstr ""
+
+msgid "{0} on a way. Should be used in a relation"
+msgstr ""
+
+msgid "{0} on a node"
 msgstr ""
 
 msgid "Building inside building"
@@ -25680,6 +26088,9 @@ msgstr ""
 msgid "Find"
 msgstr ""
 
+msgid "Show"
+msgstr ""
+
 msgid "Mark"
 msgstr ""
 
diff --git a/i18n/po/id.po b/i18n/po/id.po
index 1b972c1..bcff9e1 100644
--- a/i18n/po/id.po
+++ b/i18n/po/id.po
@@ -1,8 +1,13 @@
+# Indonesian translation for josm
+# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
+# This file is distributed under the same license as the josm package.
+# FIRST AUTHOR <EMAIL at ADDRESS>, 2009.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-21 03:38+0200\n"
+"POT-Creation-Date: 2014-12-10 03:42+0100\n"
 "PO-Revision-Date: 2014-10-16 10:41+0000\n"
 "Last-Translator: Trisno Pamuji <tri.snowman at gmail.com>\n"
 "Language-Team: Indonesian <id at li.org>\n"
@@ -10,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-10-21 04:59+0000\n"
-"X-Generator: Launchpad (build 17203)\n"
+"X-Launchpad-Export-Date: 2014-12-10 04:54+0000\n"
+"X-Generator: Launchpad (build 17283)\n"
 "Language: id\n"
 "X-Language: id_ID\n"
 
@@ -169,16 +174,6 @@ msgid "About JOSM..."
 msgstr "Tentang JOSM"
 
 msgid ""
-"Unexpected format of API base URL. Redirection to info or history page for "
-"OSM object will probably fail. API base URL is: ''{0}''"
-msgstr ""
-
-msgid ""
-"Unexpected format of API base URL. Redirection to user page for OSM user "
-"will probably fail. API base URL is: ''{0}''"
-msgstr ""
-
-msgid ""
 "You are about to launch {0} browser window.<br>This may both clutter your "
 "screen with browser windows<br>and take some time to finish."
 msgid_plural ""
@@ -1633,6 +1628,15 @@ msgstr "Tidak ada perubahan untuk diupload."
 msgid "Nothing to upload. Get some data first."
 msgstr "Tidak ada yang dapat diupload. Ambil beberapa data terlebih dahulu."
 
+msgid "Upload note changes to server"
+msgstr ""
+
+msgid "Upload notes"
+msgstr ""
+
+msgid "Uploading notes to server"
+msgstr ""
+
 msgid "Upload selection"
 msgstr "Upload pilihan"
 
@@ -1912,10 +1916,16 @@ msgstr ""
 msgid "Click the location where you wish to create a new note"
 msgstr ""
 
-msgid "Enter a comment for a new note"
+msgid "Create new note"
 msgstr ""
 
-msgid "Create new note"
+msgid "Create note"
+msgstr ""
+
+msgid "Enter a detailed comment to create a note"
+msgstr ""
+
+msgid "You must enter a comment to create a new note"
 msgstr ""
 
 msgid "Delete Mode"
@@ -2877,6 +2887,15 @@ msgstr "... mengacu pada hubungan"
 msgid "Cycling dependencies"
 msgstr "Mensikluskan ketergantungan"
 
+msgid "Uploading modified notes"
+msgstr ""
+
+msgid "Note {0} failed: {1}"
+msgstr ""
+
+msgid "Notes failed to upload"
+msgstr ""
+
 msgid ""
 "The following are results of automatic validation. Try fixing these, but be "
 "careful (don''t destroy valid data). When in doubt ignore them.<br>When you "
@@ -5202,6 +5221,12 @@ msgstr ""
 msgid "Conflict foreground: keep all tags"
 msgstr ""
 
+msgid "Conflict background: sum all numeric tags"
+msgstr ""
+
+msgid "Conflict foreground: sum all numeric tags"
+msgstr ""
+
 msgid "Conflict background: keep member"
 msgstr ""
 
@@ -5646,12 +5671,19 @@ msgstr "tidak ada"
 msgid "all"
 msgstr "Seluruhnya"
 
+msgid "sum"
+msgstr ""
+
 msgid "Please decide which values to keep"
 msgstr "Mohon tentukan mana nilai yang akan disimpan"
 
 msgid "Value ''{0}'' is going to be applied for key ''{1}''"
 msgstr "Nilai ''{0}'' yang akan digantikan dengan key ''{1}''"
 
+msgid ""
+"All numeric values sumed as ''{0}'' are going to be applied for key ''{1}''"
+msgstr ""
+
 msgid "The key ''{0}'' and all its values are going to be removed"
 msgstr "key ''{0}'' dan semua nilai akan dihapus"
 
@@ -6028,24 +6060,6 @@ msgstr[1] ""
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr "</p><p>Tutup saringan dialog untuk melihat semua objek.<p></html>"
 
-msgid "Display the history of all selected items."
-msgstr "Tampilkan sejarah dari seluruh item yang terpilih"
-
-msgid "Object with history"
-msgstr "Objek dengan sejarah"
-
-msgid "Reload"
-msgstr "Muat ulang"
-
-msgid "Reload all currently selected objects and refresh the list."
-msgstr "Muat ulang semua objek yang dipilih saat ini dan refresh daftar"
-
-msgid "Show"
-msgstr "Tunjukkan"
-
-msgid "Display the history of the selected objects."
-msgstr "Tampilan riwayat objek yang dipilih"
-
 msgid "Advanced object info"
 msgstr "Lanjutan info objek"
 
@@ -6396,6 +6410,9 @@ msgstr ""
 msgid "Comment"
 msgstr "Komentar"
 
+msgid "Comment on note"
+msgstr ""
+
 msgid "Add comment to note:"
 msgstr ""
 
@@ -6405,9 +6422,6 @@ msgstr ""
 msgid "Close note with message:"
 msgstr ""
 
-msgid "Close Note"
-msgstr ""
-
 msgid "Create a new note"
 msgstr ""
 
@@ -6480,6 +6494,9 @@ msgstr "Pilihan saat ini"
 msgid "Search for objects"
 msgstr "Pencarian untuk objek"
 
+msgid "Display the history of the selected objects."
+msgstr "Tampilan riwayat objek yang dipilih"
+
 msgid "Zoom to selection"
 msgstr "Perbesar ke pilihan"
 
@@ -6602,6 +6619,9 @@ msgstr "Memperbaiki ({0}/{1}):\"{2}\""
 msgid "Updating map ..."
 msgstr "memperbarui peta"
 
+msgid "anonymous"
+msgstr "anonim"
+
 msgid "Display the basic properties of the changeset"
 msgstr "Memperlihatkan properti set perubahan dasar"
 
@@ -6614,6 +6634,12 @@ msgstr "Isi/Konten"
 msgid "Display the objects created, updated, and deleted by the changeset"
 msgstr "Memperlihatkan objek yang dibuat, diperbarui, dan dihapus oleh set"
 
+msgid "Discussion"
+msgstr ""
+
+msgid "Display the public discussion around this changeset"
+msgstr ""
+
 msgid "Changeset Management Dialog"
 msgstr "Pengaturan dialog perubahan set"
 
@@ -6675,9 +6701,6 @@ msgctxt "changeset.state"
 msgid "Closed"
 msgstr "Tutup"
 
-msgid "anonymous"
-msgstr "anonim"
-
 msgid "ID"
 msgstr "ID"
 
@@ -6693,6 +6716,9 @@ msgstr "Dibuat di"
 msgid "Closed at"
 msgstr "Tutup di"
 
+msgid "Discussions"
+msgstr ""
+
 msgid "Downloading changeset content"
 msgstr "download isi set perubahan"
 
@@ -6807,6 +6833,15 @@ msgid ""
 msgstr ""
 "Perbesar konten/isi objek  dari set perubahan pada data layer saat ini"
 
+msgid "Update changeset discussion"
+msgstr ""
+
+msgid "Update the changeset discussion from the OSM server"
+msgstr ""
+
+msgid "Date"
+msgstr "Tanggal"
+
 msgid "Download changesets"
 msgstr "download set perubahan"
 
@@ -7265,8 +7300,8 @@ msgstr "Silahkan pilih sebuah value"
 msgid "Set number of recently added tags"
 msgstr "Mengatur jumlah tag/label yang baru ditambahkan"
 
-msgid "Remember last used tags"
-msgstr "Ingat tag/label yang terakhir digunakan"
+msgid "Remember last used tags after a restart"
+msgstr ""
 
 msgid "Please enter the number of recently added tags to display"
 msgstr "Masukkan jumlah tag baru yang ditambahkan untuk ditampilkan"
@@ -7640,6 +7675,9 @@ msgstr "termasuk children dari relasi parent"
 msgid "Load parent relations"
 msgstr "Memuat relasi keluarga"
 
+msgid "Reload"
+msgstr "Muat ulang"
+
 msgid "Loading parent relations"
 msgstr "Memuat relasi keluarga"
 
@@ -7769,6 +7807,12 @@ msgid "Select to download GPS traces in the selected download area."
 msgstr ""
 "Pilih untuk mendownload jejak GPS pada area download yang telah dipilih."
 
+msgid "Notes"
+msgstr "Catatan"
+
+msgid "Select to download notes in the selected download area."
+msgstr ""
+
 msgid "Download as new layer"
 msgstr "Download sebagai layer baru"
 
@@ -8114,9 +8158,6 @@ msgstr "A"
 msgid "B"
 msgstr "B"
 
-msgid "Date"
-msgstr "Tanggal"
-
 msgid ""
 "Failed to update primitive with id {0} because current edit layer is null"
 msgstr ""
@@ -9060,9 +9101,6 @@ msgstr ""
 msgid "Save Layer"
 msgstr "Simpan Layer"
 
-msgid "Notes"
-msgstr "Catatan"
-
 msgid "Notes layer"
 msgstr ""
 
@@ -9078,9 +9116,6 @@ msgstr "Data Layer {0}"
 msgid "outside downloaded area"
 msgstr "diluar area yang didownload"
 
-msgid "version {0}"
-msgstr "versi {0}"
-
 msgid "Merging layers"
 msgstr "Gabungan layer"
 
@@ -13034,6 +13069,15 @@ msgid "Open changeset expected. Got closed changeset with id {0}."
 msgstr ""
 "Buka changeset pengecualian. Dapatkan changeset tertutup dengan id {0}."
 
+msgid "Note upload failed"
+msgstr ""
+
+msgid "Error parsing note response from server"
+msgstr ""
+
+msgid "Error encoding string: {0}"
+msgstr ""
+
 msgid "(Code={0})"
 msgstr "(Kode={0})"
 
@@ -13084,15 +13128,15 @@ msgstr ""
 msgid "Parsing changeset content ..."
 msgstr "Mengurai konten changeset ..."
 
+msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
+msgstr "Ilegal nilai boolean untuk atribut \"{0}\". Dapat \"{1}\"."
+
 msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
 msgstr "Illegal nilai untuk atribut ''{0}''. Mendapatkan ''{1}''."
 
 msgid "Illegal numeric value for attribute ''{0}''. Got ''{1}''."
 msgstr "Illegal nilai numerik untuk atribut ''{0}''. Mendapatkan ''{1}''."
 
-msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
-msgstr "Ilegal nilai boolean untuk atribut \"{0}\". Dapat \"{1}\"."
-
 msgid "Missing mandatory attribute ''{0}'' of XML element {1}."
 msgstr "Menghilang atribut wajibnya \"{0}\" elemen XML {1}."
 
@@ -13940,9 +13984,6 @@ msgstr "Memproses file ''{0}''"
 msgid "Failed to scan file ''{0}'' for plugin information. Skipping."
 msgstr ""
 
-msgid "Processing plugin site cache icon files..."
-msgstr "Pengolahan ikon file plugin cache situs..."
-
 msgid "Processing plugin files..."
 msgstr "memproses berkas plugin"
 
@@ -13961,12 +14002,6 @@ msgstr ""
 msgid "Details:"
 msgstr ""
 
-msgid "Plugin icons download error"
-msgstr ""
-
-msgid "JOSM failed to download plugin icons:"
-msgstr ""
-
 msgid ""
 "Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
 "plugin site ''{1}''."
@@ -14982,9 +15017,10 @@ msgid ""
 "Creating and handling address nodes and buildings within Czech Republic."
 msgstr "Membuat dan penanganantitik alamat dan bangunan di Republik Ceko."
 
-msgid "Allows to import various file formats into JOSM directly."
+msgid ""
+"Allows to import various file formats into JOSM directly. Currently "
+"supported: TangoGPS, Garmin Trainings Center TCX."
 msgstr ""
-"Memungkinkan untuk mengimpor berbagai format file ke JOSM secara langsung."
 
 msgid "Download your GPX tracks from openstreetmap.org"
 msgstr "Download track/jalur GPX anda dari openstreetmap.org"
@@ -15100,6 +15136,11 @@ msgid "A helper for IRS satellite adjustment."
 msgstr "Penolong untuk penyesuaian satelit IRS."
 
 msgid ""
+"Provides Java Native Access (JNA) library. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
+msgid ""
 "Provides Java Topology Suite (JTS) library and related utilities. Not meant "
 "to be installed directly by users, but rather as a dependency for other "
 "plugins."
@@ -15512,6 +15553,25 @@ msgstr "Sulut"
 msgid "Width (meters)"
 msgstr "Lebar (meter)"
 
+msgid "Sidewalk"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "both"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "left"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "right"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "no"
+msgstr ""
+
 msgid "Service type"
 msgstr ""
 
@@ -15876,17 +15936,21 @@ msgstr ""
 msgid "May-Sep 09:30-12:30,14:15-19:30"
 msgstr ""
 
+msgctxt "parking"
 msgid "multi-storey"
-msgstr "multi-storey"
+msgstr ""
 
+msgctxt "parking"
 msgid "surface"
-msgstr "Permukaan"
+msgstr ""
 
+msgctxt "parking"
 msgid "underground"
-msgstr "Bawah Tanah"
+msgstr ""
 
+msgctxt "parking"
 msgid "rooftop"
-msgstr "atap"
+msgstr ""
 
 msgid "Reference number"
 msgstr "Nomor referensi"
@@ -16342,14 +16406,25 @@ msgstr "Panjang Maksimum (meter)"
 msgid "Overtaking"
 msgstr "menyalip"
 
+msgctxt "overtaking"
+msgid "yes"
+msgstr ""
+
+msgctxt "overtaking"
 msgid "both"
-msgstr "keduanya"
+msgstr ""
 
+msgctxt "overtaking"
 msgid "forward"
-msgstr "Meneruskan"
+msgstr ""
 
+msgctxt "overtaking"
 msgid "backward"
-msgstr "berbalik"
+msgstr ""
+
+msgctxt "overtaking"
+msgid "no"
+msgstr ""
 
 msgid "Roundabout"
 msgstr "Bundaran"
@@ -16653,6 +16728,12 @@ msgstr "pegasus"
 msgid "tiger"
 msgstr "harimau"
 
+msgid "Button operated"
+msgstr ""
+
+msgid "Sound signals"
+msgstr "Sinyal suara"
+
 msgid "Crossing attendant"
 msgstr "Petugas penyeberangan"
 
@@ -17174,9 +17255,6 @@ msgstr "Lintasan"
 msgid "Traffic lights"
 msgstr "Lampu lalu lintas"
 
-msgid "Sound signals"
-msgstr "Sinyal suara"
-
 msgid "Barrier"
 msgstr "Halangan"
 
@@ -19236,6 +19314,9 @@ msgstr "Kincir Angin"
 msgid "Gasometer"
 msgstr "Gasometer"
 
+msgid "Bunker Silo"
+msgstr ""
+
 msgid "Pipeline"
 msgstr "Jalur Pipa"
 
@@ -19382,15 +19463,15 @@ msgstr ""
 msgid "Monitoring:"
 msgstr ""
 
-msgid "Weather"
-msgstr ""
-
 msgid "Water level"
 msgstr ""
 
 msgid "Tide Level"
 msgstr ""
 
+msgid "Groundwater"
+msgstr ""
+
 msgid "Traffic"
 msgstr ""
 
@@ -19409,6 +19490,9 @@ msgstr ""
 msgid "Galileo Signals"
 msgstr ""
 
+msgid "Weather"
+msgstr ""
+
 msgid "Radiation"
 msgstr ""
 
@@ -19589,6 +19673,9 @@ msgstr ""
 msgid "pivot_pier"
 msgstr ""
 
+msgid "Bridge outline"
+msgstr ""
+
 msgid "Power Plant"
 msgstr ""
 
@@ -20196,6 +20283,15 @@ msgstr ""
 msgid "Pole"
 msgstr "Tiang"
 
+msgid "Pole with Transformer"
+msgstr ""
+
+msgid "Pole Attributes:"
+msgstr ""
+
+msgid "Transformer Attributes:"
+msgstr ""
+
 msgid "Power Line"
 msgstr "Kabel Listrik"
 
@@ -20245,9 +20341,15 @@ msgstr ""
 msgid "Power Cable"
 msgstr ""
 
+msgctxt "power cable"
+msgid "underground"
+msgstr ""
+
+msgctxt "power cable"
 msgid "underwater"
 msgstr ""
 
+msgctxt "power cable"
 msgid "overground"
 msgstr ""
 
@@ -20275,6 +20377,33 @@ msgstr "Monumen"
 msgid "Memorial"
 msgstr "tugu"
 
+msgctxt "memorial"
+msgid "statue"
+msgstr ""
+
+msgctxt "memorial"
+msgid "bust"
+msgstr ""
+
+msgctxt "memorial"
+msgid "plaque"
+msgstr ""
+
+msgctxt "memorial"
+msgid "stele"
+msgstr ""
+
+msgctxt "memorial"
+msgid "stone"
+msgstr ""
+
+msgctxt "memorial"
+msgid "war_memorial"
+msgstr ""
+
+msgid "Inscription"
+msgstr ""
+
 msgid "Wayside Cross"
 msgstr "Salib bersejarah"
 
@@ -20344,6 +20473,9 @@ msgstr "Alkohol"
 msgid "Beverages"
 msgstr "Minuman"
 
+msgid "Wine"
+msgstr ""
+
 msgid "Boutique"
 msgstr "Butik"
 
@@ -20389,6 +20521,9 @@ msgstr "Video"
 msgid "Video Games"
 msgstr ""
 
+msgid "Music"
+msgstr ""
+
 msgid "Cash"
 msgstr "Kas"
 
@@ -20416,6 +20551,9 @@ msgstr "Dapur"
 msgid "Curtain"
 msgstr "Gorden"
 
+msgid "Art"
+msgstr ""
+
 msgid "Frame"
 msgstr "Frame"
 
@@ -20461,6 +20599,9 @@ msgstr ""
 msgid "Beauty"
 msgstr ""
 
+msgid "Tattoo"
+msgstr ""
+
 msgid "Optician"
 msgstr "Optician"
 
@@ -20512,6 +20653,9 @@ msgstr ""
 msgid "Pet"
 msgstr ""
 
+msgid "Funeral Directors"
+msgstr ""
+
 msgid "Vending Machine"
 msgstr ""
 
@@ -20611,6 +20755,15 @@ msgstr ""
 msgid "National Park"
 msgstr ""
 
+msgid "Protected Area"
+msgstr ""
+
+msgid "Protected Class"
+msgstr ""
+
+msgid "Title or type of protection"
+msgstr ""
+
 msgid "Places"
 msgstr "Tempat"
 
@@ -21689,7 +21842,13 @@ msgstr ""
 msgid "Estonia Ortho (Maaamet)"
 msgstr ""
 
-msgid "Estonia Multi (Maaamet)"
+msgid "Estonia Hillshade (Maaamet)"
+msgstr ""
+
+msgid "Estonia Cadastre (Maaamet)"
+msgstr ""
+
+msgid "Estonia Forestry (Maaamet)"
 msgstr ""
 
 msgid "Bordeaux - 2012"
@@ -21713,7 +21872,7 @@ msgstr ""
 msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
 msgstr ""
 
-msgid "CUGN Nancy - Orthophoto 2012"
+msgid "GrandNancy Orthophotographie 2012"
 msgstr ""
 
 msgid "Géobretagne - Brest 2010 - 10 cm"
@@ -21760,9 +21919,6 @@ msgid ""
 "- 1 m"
 msgstr ""
 
-msgid "Streets NRW Geofabrik.de"
-msgstr ""
-
 msgid "Hike & Bike"
 msgstr ""
 
@@ -21822,6 +21978,9 @@ msgstr ""
 msgid "NRW-Atlas: Topographische Karte 1:10000"
 msgstr ""
 
+msgid "Metropole Ruhr: Luftbilder (10 cm)"
+msgstr ""
+
 msgid "Drone Imagery (Haiti)"
 msgstr ""
 
@@ -22023,6 +22182,9 @@ msgstr ""
 msgid "Stadt Zürich Übersichtsplan (Strassen, Gebäude, Hausnummer)"
 msgstr ""
 
+msgid "Stadt Zürich Luftbild 2011"
+msgstr ""
+
 msgid "Orthofoto Kanton Solothurn RGB (SOGIS 2011/2012/2013)"
 msgstr ""
 
@@ -22041,7 +22203,7 @@ msgstr ""
 msgid "Canton de Fribourg 50cm (2005)"
 msgstr ""
 
-msgid "Stadt Bern 10cm/25cm (2008)"
+msgid "Stadt Bern 10cm/25cm (2012)"
 msgstr ""
 
 msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
@@ -22080,7 +22242,7 @@ msgstr ""
 msgid "OSM US TIGER 2012 Roads Overlay"
 msgstr ""
 
-msgid "New & Misaligned TIGER Roads (TIGER 2013)"
+msgid "New & Misaligned TIGER Roads (TIGER 2014)"
 msgstr ""
 
 msgid "MassGIS L3 Parcels"
@@ -22128,9 +22290,234 @@ msgstr ""
 msgid "NLS - Bartholomew Half Inch, 1897-1907"
 msgstr ""
 
+msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Annan 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgstr ""
+
 msgid "OS Town Plans, Cupar 1854 (NLS)"
 msgstr ""
 
+msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Elgin 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Forres 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Galashiels 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Girvan 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Greenock 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Haddington 1853 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Haddington 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Hamilton 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Irvine 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Jedburgh 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kelso 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Lanark 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Linlithgow 1856 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Musselburgh 1853 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Musselburgh 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Oban 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Peebles 1856 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Perth 1860 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Peterhead 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Selkirk 1865 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, St Andrews 1854 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, St Andrews 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stirling 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stonehaven 1864 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1847 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Strathaven 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wick 1872 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wigtown 1848 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wigtown 1894 (NLS)"
+msgstr ""
+
 msgid "Decreasing house numbers in addresses interpolation"
 msgstr ""
 
@@ -22184,17 +22571,37 @@ msgid "{0}={1} is deprecated. Please use instead a multipolygon."
 msgstr ""
 
 msgid ""
-"{0} is deprecated. Please specify ìnterval by using opening_hours syntax"
+"{0} is deprecated. Please specify interval by using opening_hours syntax"
 msgstr ""
 
 msgid ""
 "{0} is deprecated. Please delete this object and use a private layer instead"
 msgstr ""
 
-msgid "{0} on a node"
+msgid "{0}={1} is unspecific. Please replace ''{1}'' by a specific value."
 msgstr ""
 
-msgid "{0} on a node. Should be drawn as an area"
+msgid "{0} should be replaced with {1}"
+msgstr ""
+
+msgid ""
+"{0}={1} is unspecific. Please replace ''{1}'' by ''left'', ''right'' or "
+"''both''."
+msgstr ""
+
+msgid "{0} on a node. Should be used on a way."
+msgstr ""
+
+msgid "{0} on a node. Should be drawn as an area."
+msgstr ""
+
+msgid "{0}=* on a node. Should be used in a relation"
+msgstr ""
+
+msgid "{0} on a way. Should be used in a relation"
+msgstr ""
+
+msgid "{0} on a node"
 msgstr ""
 
 msgid "Building inside building"
@@ -27187,6 +27594,9 @@ msgstr "Saran Pemberhentian"
 msgid "Find"
 msgstr "Cari"
 
+msgid "Show"
+msgstr "Tunjukkan"
+
 msgid "Mark"
 msgstr "Tandai"
 
diff --git a/i18n/po/is.po b/i18n/po/is.po
index 419c601..f81ea94 100644
--- a/i18n/po/is.po
+++ b/i18n/po/is.po
@@ -1,8 +1,13 @@
+# Icelandic translation for josm
+# Copyright (c) 2008 Rosetta Contributors and Canonical Ltd 2008
+# This file is distributed under the same license as the josm package.
+# FIRST AUTHOR <EMAIL at ADDRESS>, 2008.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-21 03:38+0200\n"
+"POT-Creation-Date: 2014-12-10 03:42+0100\n"
 "PO-Revision-Date: 2013-03-30 13:49+0000\n"
 "Last-Translator: Pjetur G. Hjaltason <pjetur at pjetur.net>\n"
 "Language-Team: Icelandic <is at li.org>\n"
@@ -10,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-10-21 04:58+0000\n"
-"X-Generator: Launchpad (build 17203)\n"
+"X-Launchpad-Export-Date: 2014-12-10 04:53+0000\n"
+"X-Generator: Launchpad (build 17283)\n"
 "Language: is\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -168,16 +173,6 @@ msgid "About JOSM..."
 msgstr "Um JOSM..."
 
 msgid ""
-"Unexpected format of API base URL. Redirection to info or history page for "
-"OSM object will probably fail. API base URL is: ''{0}''"
-msgstr ""
-
-msgid ""
-"Unexpected format of API base URL. Redirection to user page for OSM user "
-"will probably fail. API base URL is: ''{0}''"
-msgstr ""
-
-msgid ""
 "You are about to launch {0} browser window.<br>This may both clutter your "
 "screen with browser windows<br>and take some time to finish."
 msgid_plural ""
@@ -1533,6 +1528,15 @@ msgstr "Engar breytingar til að hlaða upp"
 msgid "Nothing to upload. Get some data first."
 msgstr "Ekkert til að upphala. Náðu í og breyttu einhverjum gögnum fyrst."
 
+msgid "Upload note changes to server"
+msgstr ""
+
+msgid "Upload notes"
+msgstr ""
+
+msgid "Uploading notes to server"
+msgstr ""
+
 msgid "Upload selection"
 msgstr ""
 
@@ -1805,10 +1809,16 @@ msgstr ""
 msgid "Click the location where you wish to create a new note"
 msgstr ""
 
-msgid "Enter a comment for a new note"
+msgid "Create new note"
 msgstr ""
 
-msgid "Create new note"
+msgid "Create note"
+msgstr ""
+
+msgid "Enter a detailed comment to create a note"
+msgstr ""
+
+msgid "You must enter a comment to create a new note"
 msgstr ""
 
 msgid "Delete Mode"
@@ -2681,6 +2691,15 @@ msgstr ""
 msgid "Cycling dependencies"
 msgstr ""
 
+msgid "Uploading modified notes"
+msgstr ""
+
+msgid "Note {0} failed: {1}"
+msgstr ""
+
+msgid "Notes failed to upload"
+msgstr ""
+
 msgid ""
 "The following are results of automatic validation. Try fixing these, but be "
 "careful (don''t destroy valid data). When in doubt ignore them.<br>When you "
@@ -4915,6 +4934,12 @@ msgstr ""
 msgid "Conflict foreground: keep all tags"
 msgstr ""
 
+msgid "Conflict background: sum all numeric tags"
+msgstr ""
+
+msgid "Conflict foreground: sum all numeric tags"
+msgstr ""
+
 msgid "Conflict background: keep member"
 msgstr ""
 
@@ -5333,12 +5358,19 @@ msgstr ""
 msgid "all"
 msgstr ""
 
+msgid "sum"
+msgstr ""
+
 msgid "Please decide which values to keep"
 msgstr ""
 
 msgid "Value ''{0}'' is going to be applied for key ''{1}''"
 msgstr ""
 
+msgid ""
+"All numeric values sumed as ''{0}'' are going to be applied for key ''{1}''"
+msgstr ""
+
 msgid "The key ''{0}'' and all its values are going to be removed"
 msgstr ""
 
@@ -5701,24 +5733,6 @@ msgstr[1] ""
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
 
-msgid "Display the history of all selected items."
-msgstr "Sýna breytingarsögu valdra hluta."
-
-msgid "Object with history"
-msgstr ""
-
-msgid "Reload"
-msgstr "Endurhlaða"
-
-msgid "Reload all currently selected objects and refresh the list."
-msgstr "Endurhlaða breytingaskrálistann með núverandi vali."
-
-msgid "Show"
-msgstr "Sýna"
-
-msgid "Display the history of the selected objects."
-msgstr ""
-
 msgid "Advanced object info"
 msgstr ""
 
@@ -6056,6 +6070,9 @@ msgstr ""
 msgid "Comment"
 msgstr ""
 
+msgid "Comment on note"
+msgstr ""
+
 msgid "Add comment to note:"
 msgstr ""
 
@@ -6065,9 +6082,6 @@ msgstr ""
 msgid "Close note with message:"
 msgstr ""
 
-msgid "Close Note"
-msgstr ""
-
 msgid "Create a new note"
 msgstr ""
 
@@ -6140,6 +6154,9 @@ msgstr "Núverandi val"
 msgid "Search for objects"
 msgstr ""
 
+msgid "Display the history of the selected objects."
+msgstr ""
+
 msgid "Zoom to selection"
 msgstr "Þysja að vali"
 
@@ -6261,6 +6278,9 @@ msgstr ""
 msgid "Updating map ..."
 msgstr ""
 
+msgid "anonymous"
+msgstr ""
+
 msgid "Display the basic properties of the changeset"
 msgstr ""
 
@@ -6273,6 +6293,12 @@ msgstr ""
 msgid "Display the objects created, updated, and deleted by the changeset"
 msgstr ""
 
+msgid "Discussion"
+msgstr ""
+
+msgid "Display the public discussion around this changeset"
+msgstr ""
+
 msgid "Changeset Management Dialog"
 msgstr ""
 
@@ -6330,9 +6356,6 @@ msgctxt "changeset.state"
 msgid "Closed"
 msgstr ""
 
-msgid "anonymous"
-msgstr ""
-
 msgid "ID"
 msgstr ""
 
@@ -6348,6 +6371,9 @@ msgstr ""
 msgid "Closed at"
 msgstr ""
 
+msgid "Discussions"
+msgstr ""
+
 msgid "Downloading changeset content"
 msgstr "Sæki innihald breytingar-setts"
 
@@ -6459,6 +6485,15 @@ msgid ""
 "layer"
 msgstr ""
 
+msgid "Update changeset discussion"
+msgstr ""
+
+msgid "Update the changeset discussion from the OSM server"
+msgstr ""
+
+msgid "Date"
+msgstr ""
+
 msgid "Download changesets"
 msgstr "Sækja breytingar-sett"
 
@@ -6878,7 +6913,7 @@ msgstr "Veldu gildi"
 msgid "Set number of recently added tags"
 msgstr ""
 
-msgid "Remember last used tags"
+msgid "Remember last used tags after a restart"
 msgstr ""
 
 msgid "Please enter the number of recently added tags to display"
@@ -7224,6 +7259,9 @@ msgstr "ná einnig í fyrsta-stigs undirvensl yfirvenslanna"
 msgid "Load parent relations"
 msgstr ""
 
+msgid "Reload"
+msgstr "Endurhlaða"
+
 msgid "Loading parent relations"
 msgstr "Næ í yfirvensl"
 
@@ -7349,6 +7387,12 @@ msgstr "GPS gögn"
 msgid "Select to download GPS traces in the selected download area."
 msgstr "Veljið til að sækja GPS slóðir í völdu svæði."
 
+msgid "Notes"
+msgstr "Athugasemd"
+
+msgid "Select to download notes in the selected download area."
+msgstr ""
+
 msgid "Download as new layer"
 msgstr "Sækja sem nýtt lag"
 
@@ -7657,9 +7701,6 @@ msgstr ""
 msgid "B"
 msgstr ""
 
-msgid "Date"
-msgstr ""
-
 msgid ""
 "Failed to update primitive with id {0} because current edit layer is null"
 msgstr ""
@@ -8521,9 +8562,6 @@ msgstr ""
 msgid "Save Layer"
 msgstr ""
 
-msgid "Notes"
-msgstr "Athugasemd"
-
 msgid "Notes layer"
 msgstr ""
 
@@ -8539,9 +8577,6 @@ msgstr "Gagnalag {0}"
 msgid "outside downloaded area"
 msgstr "utan sótts svæðis"
 
-msgid "version {0}"
-msgstr "útgáfa {0}"
-
 msgid "Merging layers"
 msgstr ""
 
@@ -12179,6 +12214,15 @@ msgstr ""
 msgid "Open changeset expected. Got closed changeset with id {0}."
 msgstr ""
 
+msgid "Note upload failed"
+msgstr ""
+
+msgid "Error parsing note response from server"
+msgstr ""
+
+msgid "Error encoding string: {0}"
+msgstr ""
+
 msgid "(Code={0})"
 msgstr ""
 
@@ -12227,13 +12271,13 @@ msgstr ""
 msgid "Parsing changeset content ..."
 msgstr ""
 
-msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
-msgid "Illegal numeric value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
-msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal numeric value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
 msgid "Missing mandatory attribute ''{0}'' of XML element {1}."
@@ -13027,9 +13071,6 @@ msgstr ""
 msgid "Failed to scan file ''{0}'' for plugin information. Skipping."
 msgstr ""
 
-msgid "Processing plugin site cache icon files..."
-msgstr ""
-
 msgid "Processing plugin files..."
 msgstr ""
 
@@ -13048,12 +13089,6 @@ msgstr ""
 msgid "Details:"
 msgstr ""
 
-msgid "Plugin icons download error"
-msgstr ""
-
-msgid "JOSM failed to download plugin icons:"
-msgstr ""
-
 msgid ""
 "Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
 "plugin site ''{1}''."
@@ -13941,7 +13976,9 @@ msgid ""
 "Creating and handling address nodes and buildings within Czech Republic."
 msgstr ""
 
-msgid "Allows to import various file formats into JOSM directly."
+msgid ""
+"Allows to import various file formats into JOSM directly. Currently "
+"supported: TangoGPS, Garmin Trainings Center TCX."
 msgstr ""
 
 msgid "Download your GPX tracks from openstreetmap.org"
@@ -14039,6 +14076,11 @@ msgid "A helper for IRS satellite adjustment."
 msgstr ""
 
 msgid ""
+"Provides Java Native Access (JNA) library. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
+msgid ""
 "Provides Java Topology Suite (JTS) library and related utilities. Not meant "
 "to be installed directly by users, but rather as a dependency for other "
 "plugins."
@@ -14394,6 +14436,25 @@ msgstr ""
 msgid "Width (meters)"
 msgstr "Breidd (í metrum)"
 
+msgid "Sidewalk"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "both"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "left"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "right"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "no"
+msgstr ""
+
 msgid "Service type"
 msgstr ""
 
@@ -14758,15 +14819,19 @@ msgstr ""
 msgid "May-Sep 09:30-12:30,14:15-19:30"
 msgstr ""
 
+msgctxt "parking"
 msgid "multi-storey"
 msgstr ""
 
+msgctxt "parking"
 msgid "surface"
-msgstr "slitlag"
+msgstr ""
 
+msgctxt "parking"
 msgid "underground"
 msgstr ""
 
+msgctxt "parking"
 msgid "rooftop"
 msgstr ""
 
@@ -15224,15 +15289,26 @@ msgstr ""
 msgid "Overtaking"
 msgstr ""
 
+msgctxt "overtaking"
+msgid "yes"
+msgstr ""
+
+msgctxt "overtaking"
 msgid "both"
 msgstr ""
 
+msgctxt "overtaking"
 msgid "forward"
 msgstr ""
 
+msgctxt "overtaking"
 msgid "backward"
 msgstr ""
 
+msgctxt "overtaking"
+msgid "no"
+msgstr ""
+
 msgid "Roundabout"
 msgstr "Hringtorg"
 
@@ -15526,6 +15602,12 @@ msgstr ""
 msgid "tiger"
 msgstr ""
 
+msgid "Button operated"
+msgstr ""
+
+msgid "Sound signals"
+msgstr ""
+
 msgid "Crossing attendant"
 msgstr ""
 
@@ -16047,9 +16129,6 @@ msgstr ""
 msgid "Traffic lights"
 msgstr ""
 
-msgid "Sound signals"
-msgstr ""
-
 msgid "Barrier"
 msgstr ""
 
@@ -18109,6 +18188,9 @@ msgstr "Vindmylla"
 msgid "Gasometer"
 msgstr ""
 
+msgid "Bunker Silo"
+msgstr ""
+
 msgid "Pipeline"
 msgstr "Leiðsla"
 
@@ -18255,15 +18337,15 @@ msgstr ""
 msgid "Monitoring:"
 msgstr ""
 
-msgid "Weather"
-msgstr ""
-
 msgid "Water level"
 msgstr ""
 
 msgid "Tide Level"
 msgstr ""
 
+msgid "Groundwater"
+msgstr ""
+
 msgid "Traffic"
 msgstr ""
 
@@ -18282,6 +18364,9 @@ msgstr ""
 msgid "Galileo Signals"
 msgstr ""
 
+msgid "Weather"
+msgstr ""
+
 msgid "Radiation"
 msgstr ""
 
@@ -18462,6 +18547,9 @@ msgstr ""
 msgid "pivot_pier"
 msgstr ""
 
+msgid "Bridge outline"
+msgstr ""
+
 msgid "Power Plant"
 msgstr ""
 
@@ -19069,6 +19157,15 @@ msgstr ""
 msgid "Pole"
 msgstr ""
 
+msgid "Pole with Transformer"
+msgstr ""
+
+msgid "Pole Attributes:"
+msgstr ""
+
+msgid "Transformer Attributes:"
+msgstr ""
+
 msgid "Power Line"
 msgstr "Raflína"
 
@@ -19118,9 +19215,15 @@ msgstr ""
 msgid "Power Cable"
 msgstr ""
 
+msgctxt "power cable"
+msgid "underground"
+msgstr ""
+
+msgctxt "power cable"
 msgid "underwater"
 msgstr ""
 
+msgctxt "power cable"
 msgid "overground"
 msgstr ""
 
@@ -19148,6 +19251,33 @@ msgstr "Minnismerki"
 msgid "Memorial"
 msgstr "Minnisvarði"
 
+msgctxt "memorial"
+msgid "statue"
+msgstr ""
+
+msgctxt "memorial"
+msgid "bust"
+msgstr ""
+
+msgctxt "memorial"
+msgid "plaque"
+msgstr ""
+
+msgctxt "memorial"
+msgid "stele"
+msgstr ""
+
+msgctxt "memorial"
+msgid "stone"
+msgstr ""
+
+msgctxt "memorial"
+msgid "war_memorial"
+msgstr ""
+
+msgid "Inscription"
+msgstr ""
+
 msgid "Wayside Cross"
 msgstr ""
 
@@ -19217,6 +19347,9 @@ msgstr ""
 msgid "Beverages"
 msgstr "Vínbúð"
 
+msgid "Wine"
+msgstr ""
+
 msgid "Boutique"
 msgstr ""
 
@@ -19262,6 +19395,9 @@ msgstr ""
 msgid "Video Games"
 msgstr ""
 
+msgid "Music"
+msgstr ""
+
 msgid "Cash"
 msgstr "Fjármál"
 
@@ -19289,6 +19425,9 @@ msgstr ""
 msgid "Curtain"
 msgstr ""
 
+msgid "Art"
+msgstr ""
+
 msgid "Frame"
 msgstr ""
 
@@ -19334,6 +19473,9 @@ msgstr ""
 msgid "Beauty"
 msgstr ""
 
+msgid "Tattoo"
+msgstr ""
+
 msgid "Optician"
 msgstr ""
 
@@ -19385,6 +19527,9 @@ msgstr ""
 msgid "Pet"
 msgstr ""
 
+msgid "Funeral Directors"
+msgstr ""
+
 msgid "Vending Machine"
 msgstr ""
 
@@ -19484,6 +19629,15 @@ msgstr ""
 msgid "National Park"
 msgstr ""
 
+msgid "Protected Area"
+msgstr ""
+
+msgid "Protected Class"
+msgstr ""
+
+msgid "Title or type of protection"
+msgstr ""
+
 msgid "Places"
 msgstr "Staðir"
 
@@ -20560,7 +20714,13 @@ msgstr ""
 msgid "Estonia Ortho (Maaamet)"
 msgstr ""
 
-msgid "Estonia Multi (Maaamet)"
+msgid "Estonia Hillshade (Maaamet)"
+msgstr ""
+
+msgid "Estonia Cadastre (Maaamet)"
+msgstr ""
+
+msgid "Estonia Forestry (Maaamet)"
 msgstr ""
 
 msgid "Bordeaux - 2012"
@@ -20584,7 +20744,7 @@ msgstr ""
 msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
 msgstr ""
 
-msgid "CUGN Nancy - Orthophoto 2012"
+msgid "GrandNancy Orthophotographie 2012"
 msgstr ""
 
 msgid "Géobretagne - Brest 2010 - 10 cm"
@@ -20631,9 +20791,6 @@ msgid ""
 "- 1 m"
 msgstr ""
 
-msgid "Streets NRW Geofabrik.de"
-msgstr ""
-
 msgid "Hike & Bike"
 msgstr ""
 
@@ -20693,6 +20850,9 @@ msgstr ""
 msgid "NRW-Atlas: Topographische Karte 1:10000"
 msgstr ""
 
+msgid "Metropole Ruhr: Luftbilder (10 cm)"
+msgstr ""
+
 msgid "Drone Imagery (Haiti)"
 msgstr ""
 
@@ -20894,6 +21054,9 @@ msgstr ""
 msgid "Stadt Zürich Übersichtsplan (Strassen, Gebäude, Hausnummer)"
 msgstr ""
 
+msgid "Stadt Zürich Luftbild 2011"
+msgstr ""
+
 msgid "Orthofoto Kanton Solothurn RGB (SOGIS 2011/2012/2013)"
 msgstr ""
 
@@ -20912,7 +21075,7 @@ msgstr ""
 msgid "Canton de Fribourg 50cm (2005)"
 msgstr ""
 
-msgid "Stadt Bern 10cm/25cm (2008)"
+msgid "Stadt Bern 10cm/25cm (2012)"
 msgstr ""
 
 msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
@@ -20951,7 +21114,7 @@ msgstr ""
 msgid "OSM US TIGER 2012 Roads Overlay"
 msgstr ""
 
-msgid "New & Misaligned TIGER Roads (TIGER 2013)"
+msgid "New & Misaligned TIGER Roads (TIGER 2014)"
 msgstr ""
 
 msgid "MassGIS L3 Parcels"
@@ -20999,9 +21162,234 @@ msgstr ""
 msgid "NLS - Bartholomew Half Inch, 1897-1907"
 msgstr ""
 
+msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Annan 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgstr ""
+
 msgid "OS Town Plans, Cupar 1854 (NLS)"
 msgstr ""
 
+msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Elgin 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Forres 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Galashiels 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Girvan 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Greenock 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Haddington 1853 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Haddington 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Hamilton 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Irvine 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Jedburgh 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kelso 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Lanark 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Linlithgow 1856 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Musselburgh 1853 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Musselburgh 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Oban 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Peebles 1856 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Perth 1860 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Peterhead 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Selkirk 1865 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, St Andrews 1854 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, St Andrews 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stirling 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stonehaven 1864 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1847 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Strathaven 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wick 1872 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wigtown 1848 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wigtown 1894 (NLS)"
+msgstr ""
+
 msgid "Decreasing house numbers in addresses interpolation"
 msgstr ""
 
@@ -21055,17 +21443,37 @@ msgid "{0}={1} is deprecated. Please use instead a multipolygon."
 msgstr ""
 
 msgid ""
-"{0} is deprecated. Please specify ìnterval by using opening_hours syntax"
+"{0} is deprecated. Please specify interval by using opening_hours syntax"
 msgstr ""
 
 msgid ""
 "{0} is deprecated. Please delete this object and use a private layer instead"
 msgstr ""
 
-msgid "{0} on a node"
+msgid "{0}={1} is unspecific. Please replace ''{1}'' by a specific value."
 msgstr ""
 
-msgid "{0} on a node. Should be drawn as an area"
+msgid "{0} should be replaced with {1}"
+msgstr ""
+
+msgid ""
+"{0}={1} is unspecific. Please replace ''{1}'' by ''left'', ''right'' or "
+"''both''."
+msgstr ""
+
+msgid "{0} on a node. Should be used on a way."
+msgstr ""
+
+msgid "{0} on a node. Should be drawn as an area."
+msgstr ""
+
+msgid "{0}=* on a node. Should be used in a relation"
+msgstr ""
+
+msgid "{0} on a way. Should be used in a relation"
+msgstr ""
+
+msgid "{0} on a node"
 msgstr ""
 
 msgid "Building inside building"
@@ -25735,6 +26143,9 @@ msgstr ""
 msgid "Find"
 msgstr ""
 
+msgid "Show"
+msgstr "Sýna"
+
 msgid "Mark"
 msgstr ""
 
diff --git a/i18n/po/it.po b/i18n/po/it.po
index 9111627..7567350 100644
--- a/i18n/po/it.po
+++ b/i18n/po/it.po
@@ -1,23 +1,25 @@
+# Josm italian translation
+# License: GPL
 msgid ""
 msgstr ""
 "Project-Id-Version: josm 20081003\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-21 03:38+0200\n"
-"PO-Revision-Date: 2014-10-19 23:09+0000\n"
+"POT-Creation-Date: 2014-12-10 03:42+0100\n"
+"PO-Revision-Date: 2014-11-24 21:33+0000\n"
 "Last-Translator: Don-vip <Unknown>\n"
 "Language-Team: Italian <talk-it at lists.openstreetmap.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2014-10-21 05:01+0000\n"
-"X-Generator: Launchpad (build 17203)\n"
+"X-Launchpad-Export-Date: 2014-12-10 04:55+0000\n"
+"X-Generator: Launchpad (build 17283)\n"
 "Language: it\n"
 "X-Language: it_IT\n"
 "X-Source-Language: en\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
-msgstr "{0}: l''opzione ''{1}'' è ambigua"
+msgstr "{0}: opzione ''{1}'' è ambigua"
 
 msgid "{0}: option ''--{1}'' does not allow an argument"
 msgstr "{0}: l''opzione ''--{1}'' non consente un argomento"
@@ -176,21 +178,6 @@ msgid "About JOSM..."
 msgstr "Informazioni su JOSM..."
 
 msgid ""
-"Unexpected format of API base URL. Redirection to info or history page for "
-"OSM object will probably fail. API base URL is: ''{0}''"
-msgstr ""
-"Formato inatteso per l''URL delle API. La redirezione verso la pagina delle "
-"informazioni o dello storico per un oggetto OSM probabilmente fallirà. "
-"L''URL delle API è: ''{0}''"
-
-msgid ""
-"Unexpected format of API base URL. Redirection to user page for OSM user "
-"will probably fail. API base URL is: ''{0}''"
-msgstr ""
-"Formato inatteso per l''URL delle API. La redirezione alla pagina utente OSM "
-"probabilmente fallirà. L''URL delle API è: ''{0}''"
-
-msgid ""
 "You are about to launch {0} browser window.<br>This may both clutter your "
 "screen with browser windows<br>and take some time to finish."
 msgid_plural ""
@@ -1691,6 +1678,15 @@ msgstr "Nessun cambiamento da caricare."
 msgid "Nothing to upload. Get some data first."
 msgstr "Niente da caricare. Prima è necessario ottenere dei dati."
 
+msgid "Upload note changes to server"
+msgstr "Invia al server le note sulle modifiche"
+
+msgid "Upload notes"
+msgstr "Carica note"
+
+msgid "Uploading notes to server"
+msgstr "Carica sul server le note"
+
 msgid "Upload selection"
 msgstr "Carica selezione"
 
@@ -1992,12 +1988,18 @@ msgstr "Agginugi modalità nota"
 msgid "Click the location where you wish to create a new note"
 msgstr "Selezionare la posizione dove creare la nuova nota"
 
-msgid "Enter a comment for a new note"
-msgstr "Inserire un commento per la nota"
-
 msgid "Create new note"
 msgstr "Creare una nuova nota"
 
+msgid "Create note"
+msgstr "Crea nota"
+
+msgid "Enter a detailed comment to create a note"
+msgstr "Inserire un commento dettagliato per creare una nota"
+
+msgid "You must enter a comment to create a new note"
+msgstr "Occorre inserire un commento per creare una nuova nota"
+
 msgid "Delete Mode"
 msgstr "Modalità Cancella"
 
@@ -2992,6 +2994,15 @@ msgstr "... fa riferimento alla relazione"
 msgid "Cycling dependencies"
 msgstr "Dipendenze cicliche"
 
+msgid "Uploading modified notes"
+msgstr "Carica note modificate"
+
+msgid "Note {0} failed: {1}"
+msgstr "Note {0} fallite: {1}"
+
+msgid "Notes failed to upload"
+msgstr "Fallito il caricamento delle note"
+
 msgid ""
 "The following are results of automatic validation. Try fixing these, but be "
 "careful (don''t destroy valid data). When in doubt ignore them.<br>When you "
@@ -5431,6 +5442,12 @@ msgstr "Sfondo conflitto: mantieni tutte le etichette"
 msgid "Conflict foreground: keep all tags"
 msgstr "Primo piano conflitto: mantieni tutte le etichette"
 
+msgid "Conflict background: sum all numeric tags"
+msgstr ""
+
+msgid "Conflict foreground: sum all numeric tags"
+msgstr ""
+
 msgid "Conflict background: keep member"
 msgstr "Sfondo conflitto: mantieni membro"
 
@@ -5915,6 +5932,9 @@ msgstr "nessuno"
 msgid "all"
 msgstr "tutti"
 
+msgid "sum"
+msgstr ""
+
 msgid "Please decide which values to keep"
 msgstr "Decidere quali valori mantenere"
 
@@ -5922,6 +5942,10 @@ msgid "Value ''{0}'' is going to be applied for key ''{1}''"
 msgstr ""
 "Si è in procinto di applicare il valore ''''{0}'''' alla chiave ''''{1}''''"
 
+msgid ""
+"All numeric values sumed as ''{0}'' are going to be applied for key ''{1}''"
+msgstr ""
+
 msgid "The key ''{0}'' and all its values are going to be removed"
 msgstr ""
 "Si è in procinto di rimuovere la chiave ''''{0}'''' e tutti i suoi valori"
@@ -6335,26 +6359,6 @@ msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
 "</p><p>Chiudi la finestra di filtro per vedere tutti gli oggetti.<p></html>"
 
-msgid "Display the history of all selected items."
-msgstr "Visualizza la cronologia di tutti gli oggetti selezionati."
-
-msgid "Object with history"
-msgstr "Oggetto con cronologia"
-
-msgid "Reload"
-msgstr "Ricarica"
-
-msgid "Reload all currently selected objects and refresh the list."
-msgstr ""
-"Carica nuovamente tutti gli oggetti attualmente selezionati ed aggiorna la "
-"lista."
-
-msgid "Show"
-msgstr "Visualizza"
-
-msgid "Display the history of the selected objects."
-msgstr "Visualizza la cronologia degli oggetti selezionati."
-
 msgid "Advanced object info"
 msgstr "Informazioni avanzate sull''oggetto"
 
@@ -6721,6 +6725,9 @@ msgstr "Aggiungi un commento"
 msgid "Comment"
 msgstr "Commento"
 
+msgid "Comment on note"
+msgstr "Commento sulla nota"
+
 msgid "Add comment to note:"
 msgstr "Aggiungi un commento alla nota:"
 
@@ -6730,9 +6737,6 @@ msgstr "Chiudi nota"
 msgid "Close note with message:"
 msgstr "Chiudi nota con messaggio:"
 
-msgid "Close Note"
-msgstr "Chiudi nota"
-
 msgid "Create a new note"
 msgstr "Crea una nuova nota"
 
@@ -6811,6 +6815,9 @@ msgstr "Selezione corrente"
 msgid "Search for objects"
 msgstr "Cerca oggetti"
 
+msgid "Display the history of the selected objects."
+msgstr "Visualizza la cronologia degli oggetti selezionati."
+
 msgid "Zoom to selection"
 msgstr "Ingrandisci visuale sulla selezione"
 
@@ -6938,6 +6945,9 @@ msgstr "Correzione ({0}/{1}): ''{2}''"
 msgid "Updating map ..."
 msgstr "Aggiornamento mappa ..."
 
+msgid "anonymous"
+msgstr "anonimo"
+
 msgid "Display the basic properties of the changeset"
 msgstr "Mostra le proprietà di base del gruppo di modifiche"
 
@@ -6951,6 +6961,12 @@ msgid "Display the objects created, updated, and deleted by the changeset"
 msgstr ""
 "Mostra gli oggetti creati, aggiornati, ed eliminati dal gruppo di modifiche"
 
+msgid "Discussion"
+msgstr "Discussione"
+
+msgid "Display the public discussion around this changeset"
+msgstr "Mostra la discussione pubblica sulle modifiche"
+
 msgid "Changeset Management Dialog"
 msgstr "Finestra di gestione del gruppo di modifiche"
 
@@ -7014,9 +7030,6 @@ msgctxt "changeset.state"
 msgid "Closed"
 msgstr "Chiuso"
 
-msgid "anonymous"
-msgstr "anonimo"
-
 msgid "ID"
 msgstr "ID"
 
@@ -7032,6 +7045,9 @@ msgstr "Creato il"
 msgid "Closed at"
 msgstr "Chiuso il"
 
+msgid "Discussions"
+msgstr "Discussioni"
+
 msgid "Downloading changeset content"
 msgstr "Scaricamento del contenuto del gruppo di modifiche"
 
@@ -7157,6 +7173,15 @@ msgstr ""
 "Ingrandisci la visuale sugli oggetti contenuti in questo gruppo di modifiche "
 "nel livello dati corrente"
 
+msgid "Update changeset discussion"
+msgstr "Aggiorna le discussini sulle modifiche"
+
+msgid "Update the changeset discussion from the OSM server"
+msgstr "Aggiorna le discussioni sulle modifiche dal server OSM"
+
+msgid "Date"
+msgstr "Data"
+
 msgid "Download changesets"
 msgstr "Scarica gruppi di modifiche"
 
@@ -7640,8 +7665,8 @@ msgstr "Seleziona un valore"
 msgid "Set number of recently added tags"
 msgstr "Imposta il numero delle etichette aggiunte di recente"
 
-msgid "Remember last used tags"
-msgstr "Ricorda le etichette usate recentemente"
+msgid "Remember last used tags after a restart"
+msgstr "Ricorda le ultime etichette usati, dopo il riavvio"
 
 msgid "Please enter the number of recently added tags to display"
 msgstr ""
@@ -8038,6 +8063,9 @@ msgstr "inclusi i figli diretti delle relazioni da cui dipendono"
 msgid "Load parent relations"
 msgstr "Carica le relazioni da cui dipende"
 
+msgid "Reload"
+msgstr "Ricarica"
+
 msgid "Loading parent relations"
 msgstr "Caricamento delle relazioni da cui dipende"
 
@@ -8175,6 +8203,12 @@ msgstr ""
 "Selezionare per scaricare i tracciati GPS presenti nell''area di scarico "
 "selezionata."
 
+msgid "Notes"
+msgstr "Banconote"
+
+msgid "Select to download notes in the selected download area."
+msgstr "Selezionare per scaricare le note dell''area evidenziata."
+
 msgid "Download as new layer"
 msgstr "Scarica come nuovo livello"
 
@@ -8294,10 +8328,10 @@ msgid "Error occured with query ''{0}'': ''{1}''"
 msgstr "Errore con la query ''{0}'': ''{1}''"
 
 msgid "Name server returned invalid data. Please try again."
-msgstr ""
+msgstr "Nome server ha restituito dati non validi. Prego riprovare."
 
 msgid "Bad response"
-msgstr ""
+msgstr "Risposta non corretta"
 
 msgid "Type"
 msgstr "Tipo"
@@ -8530,9 +8564,6 @@ msgstr "A"
 msgid "B"
 msgstr "B"
 
-msgid "Date"
-msgstr "Data"
-
 msgid ""
 "Failed to update primitive with id {0} because current edit layer is null"
 msgstr ""
@@ -9561,9 +9592,6 @@ msgstr ""
 msgid "Save Layer"
 msgstr "Salva livello"
 
-msgid "Notes"
-msgstr "Banconote"
-
 msgid "Notes layer"
 msgstr "Livello note"
 
@@ -9579,9 +9607,6 @@ msgstr "Livello dati {0}"
 msgid "outside downloaded area"
 msgstr "al di fuori dell''area scaricata"
 
-msgid "version {0}"
-msgstr "versione {0}"
-
 msgid "Merging layers"
 msgstr "Unione dei livelli"
 
@@ -13734,6 +13759,15 @@ msgstr ""
 "Era atteso un gruppo di modifiche aperto. Ottenuto il gruppo di modifiche "
 "chiuso con id {0}."
 
+msgid "Note upload failed"
+msgstr "Caricamente delle note fallito"
+
+msgid "Error parsing note response from server"
+msgstr "Errore dal server durante l''analisi delle note"
+
+msgid "Error encoding string: {0}"
+msgstr "Stringa di codifica errore: {0}"
+
 msgid "(Code={0})"
 msgstr "(Code={0})"
 
@@ -13792,6 +13826,11 @@ msgstr ""
 msgid "Parsing changeset content ..."
 msgstr "Analisi del contenuto del gruppo di modifiche ..."
 
+msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
+msgstr ""
+"Valore booleano non valido per l''attributo ''''{0}''''. Ottenuto "
+"''''{1}''''."
+
 msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 "Valore non valido per l''attributo ''''{0}''''. Ottenuto ''''{1}''''."
@@ -13800,11 +13839,6 @@ msgid "Illegal numeric value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 "Valore numerico non valido per l''attributo ''{0}''. Ottenuto ''{1}''."
 
-msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
-msgstr ""
-"Valore booleano non valido per l''attributo ''''{0}''''. Ottenuto "
-"''''{1}''''."
-
 msgid "Missing mandatory attribute ''{0}'' of XML element {1}."
 msgstr "Attributo obbligatorio ''''{0}'''' mancante dell''elemento XML {1}."
 
@@ -14218,10 +14252,10 @@ msgid "The minima must be less than the maxima"
 msgstr "Il minimo deve essere minore del massimo"
 
 msgid "Remote Control has been asked to load the following data:"
-msgstr ""
+msgstr "Richiesta a Remote Control di caricare i seguenti dati:"
 
 msgid "Loading data"
-msgstr ""
+msgstr "Caricamento dei dati"
 
 msgid ""
 "Remote Control has been asked to load objects (specified by their id) from "
@@ -14728,11 +14762,6 @@ msgstr ""
 "Fallita la scansione del file ''{0}'' per le informazioni dell''estensione. "
 "Tralascio."
 
-msgid "Processing plugin site cache icon files..."
-msgstr ""
-"Elaborazione dei file delle icone sul sito di cache dell''estensione in "
-"corso..."
-
 msgid "Processing plugin files..."
 msgstr "Elaborazione dei file dell''estensione..."
 
@@ -14751,12 +14780,6 @@ msgstr "JOSM non è riuscito a scaricare la lista delle estensioni:"
 msgid "Details:"
 msgstr "Dettagli:"
 
-msgid "Plugin icons download error"
-msgstr "Errore nello scaricamento delle icone delle estensioni"
-
-msgid "JOSM failed to download plugin icons:"
-msgstr "JOSM non è riuscito a scaricare le icone delle estensioni:"
-
 msgid ""
 "Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
 "plugin site ''{1}''."
@@ -15875,9 +15898,10 @@ msgstr ""
 "Creazione e gestione degli indirizzi di nodi ed edifici all''interno della "
 "Repubblica Ceca."
 
-msgid "Allows to import various file formats into JOSM directly."
+msgid ""
+"Allows to import various file formats into JOSM directly. Currently "
+"supported: TangoGPS, Garmin Trainings Center TCX."
 msgstr ""
-"Permette l''importazione di file di vario formato direttamente in JOSM."
 
 msgid "Download your GPX tracks from openstreetmap.org"
 msgstr "Scarica i tracciati GPX personali da openstreetmap.org"
@@ -16000,6 +16024,11 @@ msgid "A helper for IRS satellite adjustment."
 msgstr "Un supporto per la regolazione satellitare IRS."
 
 msgid ""
+"Provides Java Native Access (JNA) library. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
+msgid ""
 "Provides Java Topology Suite (JTS) library and related utilities. Not meant "
 "to be installed directly by users, but rather as a dependency for other "
 "plugins."
@@ -16253,7 +16282,7 @@ msgid "Plugin to digital sign OSM-Data"
 msgstr "Estensione per firmare digitalmente i dati OSM"
 
 msgid "${plugin.description}"
-msgstr ""
+msgstr "${plugin.description}"
 
 msgid ""
 "Provides a straightforward GUI for adding, editing and deleting turn lanes."
@@ -16433,6 +16462,25 @@ msgstr "Illuminazione stradale"
 msgid "Width (meters)"
 msgstr "Larghezza (metri)"
 
+msgid "Sidewalk"
+msgstr "Corsia a lato strada"
+
+msgctxt "sidewalk"
+msgid "both"
+msgstr "in entrambi i lati del percorso"
+
+msgctxt "sidewalk"
+msgid "left"
+msgstr "a sinistra"
+
+msgctxt "sidewalk"
+msgid "right"
+msgstr "a destra"
+
+msgctxt "sidewalk"
+msgid "no"
+msgstr "nessuna"
+
 msgid "Service type"
 msgstr "Tipo servizio"
 
@@ -16801,17 +16849,21 @@ msgstr "Lu-Ve 09:00-18:00,Sa 08:00-14:00"
 msgid "May-Sep 09:30-12:30,14:15-19:30"
 msgstr "Mag-Set 09:30-12:30,14:15-19:30"
 
+msgctxt "parking"
 msgid "multi-storey"
-msgstr "multi-piano"
+msgstr ""
 
+msgctxt "parking"
 msgid "surface"
-msgstr "superficie"
+msgstr ""
 
+msgctxt "parking"
 msgid "underground"
-msgstr "sotterraneo"
+msgstr ""
 
+msgctxt "parking"
 msgid "rooftop"
-msgstr "sul tetto"
+msgstr ""
 
 msgid "Reference number"
 msgstr "Numero di riferimento"
@@ -17226,7 +17278,7 @@ msgid "All vehicles"
 msgstr "Tutti i veicoli"
 
 msgid "use_sidepath"
-msgstr ""
+msgstr "use_sidepath"
 
 msgid "Motor vehicles"
 msgstr "Veicoli a motore"
@@ -17267,14 +17319,25 @@ msgstr "Lunghezza massima (metri)"
 msgid "Overtaking"
 msgstr "Sorpasso"
 
+msgctxt "overtaking"
+msgid "yes"
+msgstr "sì"
+
+msgctxt "overtaking"
 msgid "both"
-msgstr "in entrambi i sensi del percorso"
+msgstr "in entrambi i lati del percorso"
 
+msgctxt "overtaking"
 msgid "forward"
-msgstr "nel senso di marcia"
+msgstr "nella direzione del percorso"
 
+msgctxt "overtaking"
 msgid "backward"
-msgstr "nel senso contrario di marcia"
+msgstr "nella direzione contraria"
+
+msgctxt "overtaking"
+msgid "no"
+msgstr "non permesso"
 
 msgid "Roundabout"
 msgstr "Rotatoria"
@@ -17585,6 +17648,12 @@ msgstr "pegasus"
 msgid "tiger"
 msgstr "tiger"
 
+msgid "Button operated"
+msgstr ""
+
+msgid "Sound signals"
+msgstr "Segnali sonori"
+
 msgid "Crossing attendant"
 msgstr "Attraversamento controllato"
 
@@ -18115,9 +18184,6 @@ msgstr "Passaggio a livello"
 msgid "Traffic lights"
 msgstr "Semafori"
 
-msgid "Sound signals"
-msgstr "Segnali sonori"
-
 msgid "Barrier"
 msgstr "Barriera"
 
@@ -19040,6 +19106,7 @@ msgstr "Indicatore stradale"
 msgid ""
 "A Signpost/Guidepost to indicate the directions to different destinations."
 msgstr ""
+"Un cartello indicatore che mostra la direzione per le varie destinazioni."
 
 msgid "Information Terminal"
 msgstr "Terminale informazioni"
@@ -19820,7 +19887,7 @@ msgid "water_park"
 msgstr "parco acquatico"
 
 msgid "Scuba Diving"
-msgstr ""
+msgstr "Immersione subacquea"
 
 msgid "Piste type"
 msgstr "Tipo di pista"
@@ -20177,6 +20244,9 @@ msgstr "Mulino a vento"
 msgid "Gasometer"
 msgstr "Gasometro"
 
+msgid "Bunker Silo"
+msgstr "Silos a bunker"
+
 msgid "Pipeline"
 msgstr "Conduttura"
 
@@ -20323,15 +20393,15 @@ msgstr "Stazione di monitoraggio"
 msgid "Monitoring:"
 msgstr "Monitoraggio:"
 
-msgid "Weather"
-msgstr "Meteo"
-
 msgid "Water level"
 msgstr "Livello dell''acqua"
 
 msgid "Tide Level"
 msgstr "Livello di marea"
 
+msgid "Groundwater"
+msgstr ""
+
 msgid "Traffic"
 msgstr "Traffico"
 
@@ -20350,6 +20420,9 @@ msgstr "Segnali GLONASS"
 msgid "Galileo Signals"
 msgstr "Segnali Galileo"
 
+msgid "Weather"
+msgstr "Meteo"
+
 msgid "Radiation"
 msgstr "Radiazioni"
 
@@ -20513,7 +20586,7 @@ msgid "swing"
 msgstr "girevole"
 
 msgid "transporter"
-msgstr ""
+msgstr "Ponte trasportatore"
 
 msgid "Bridge Support"
 msgstr "Supporto del ponte"
@@ -20530,6 +20603,9 @@ msgstr "banchina sollevabile"
 msgid "pivot_pier"
 msgstr "banchina ruotabile"
 
+msgid "Bridge outline"
+msgstr "Sagoma del ponte"
+
 msgid "Power Plant"
 msgstr "Centrale elettrica"
 
@@ -20591,7 +20667,7 @@ msgid "steam_turbine"
 msgstr "turbina a vapore"
 
 msgid "Coal Power Generator"
-msgstr ""
+msgstr "Generatore a carbone"
 
 msgid "Gas Power Generator"
 msgstr "Generatore a gas"
@@ -20766,7 +20842,7 @@ msgid "vertical_axis"
 msgstr "vertical_axis"
 
 msgid "Wave Energy Converter"
-msgstr ""
+msgstr "Ganeratore da moto ondoso"
 
 msgid "Osmotic Power Generator"
 msgstr "Generatore ad osmosi"
@@ -21140,6 +21216,15 @@ msgstr "Torre incompleta"
 msgid "Pole"
 msgstr "Palo"
 
+msgid "Pole with Transformer"
+msgstr "Palo con trasformatore"
+
+msgid "Pole Attributes:"
+msgstr "Attributi del palo:"
+
+msgid "Transformer Attributes:"
+msgstr "Attributi del trasformatore:"
+
 msgid "Power Line"
 msgstr "Elettrodotto"
 
@@ -21189,11 +21274,17 @@ msgstr "Utilizzato per comunicazione dati"
 msgid "Power Cable"
 msgstr "Cavo elettrico"
 
+msgctxt "power cable"
+msgid "underground"
+msgstr ""
+
+msgctxt "power cable"
 msgid "underwater"
-msgstr "subacqueo"
+msgstr ""
 
+msgctxt "power cable"
 msgid "overground"
-msgstr "sopra il suolo"
+msgstr ""
 
 msgid "Historic Places"
 msgstr "Luoghi storici"
@@ -21219,6 +21310,33 @@ msgstr "Monumento"
 msgid "Memorial"
 msgstr "Memoriale"
 
+msgctxt "memorial"
+msgid "statue"
+msgstr "statua"
+
+msgctxt "memorial"
+msgid "bust"
+msgstr "busto"
+
+msgctxt "memorial"
+msgid "plaque"
+msgstr "targa"
+
+msgctxt "memorial"
+msgid "stele"
+msgstr "stele"
+
+msgctxt "memorial"
+msgid "stone"
+msgstr "pietra"
+
+msgctxt "memorial"
+msgid "war_memorial"
+msgstr "monumento ai caduti"
+
+msgid "Inscription"
+msgstr "Iscrizione"
+
 msgid "Wayside Cross"
 msgstr "Crocefisso"
 
@@ -21256,7 +21374,7 @@ msgid "Deli (Fine Food)"
 msgstr "Cibi e bevande pregiate"
 
 msgid "Candy Store"
-msgstr ""
+msgstr "Negozio di dolci"
 
 msgid "Tea"
 msgstr "Tè"
@@ -21288,6 +21406,9 @@ msgstr "Alcolici (non in Italia)"
 msgid "Beverages"
 msgstr "Bevande"
 
+msgid "Wine"
+msgstr "Vino"
+
 msgid "Boutique"
 msgstr "Boutique"
 
@@ -21333,6 +21454,9 @@ msgstr "Video"
 msgid "Video Games"
 msgstr "Videogiochi"
 
+msgid "Music"
+msgstr "Musica"
+
 msgid "Cash"
 msgstr "Contanti"
 
@@ -21360,6 +21484,9 @@ msgstr "Cucine"
 msgid "Curtain"
 msgstr "Tende"
 
+msgid "Art"
+msgstr "Arte"
+
 msgid "Frame"
 msgstr "Cornici"
 
@@ -21373,19 +21500,19 @@ msgid "Antiques"
 msgstr "Antichità"
 
 msgid "Printed Material"
-msgstr ""
+msgstr "Materiale stampato"
 
 msgid "Stationery"
 msgstr "Cartoleria"
 
 msgid "Copy Shop"
-msgstr ""
+msgstr "Copisteria"
 
 msgid "Book Store"
 msgstr "Libreria"
 
 msgid "Newspaper Stand"
-msgstr ""
+msgstr "Distributore giornali"
 
 msgid "Ticket"
 msgstr "Biglietto"
@@ -21400,11 +21527,14 @@ msgid "Chemist"
 msgstr "Articoli di pulizia e bellezza"
 
 msgid "Hairdresser/Barber"
-msgstr ""
+msgstr "Parrucchiere/Barbiere"
 
 msgid "Beauty"
 msgstr "Bellezza"
 
+msgid "Tattoo"
+msgstr "Tatuaggi"
+
 msgid "Optician"
 msgstr "Ottico"
 
@@ -21456,6 +21586,9 @@ msgstr "Borsa"
 msgid "Pet"
 msgstr "Animale"
 
+msgid "Funeral Directors"
+msgstr "Pompe funebri"
+
 msgid "Vending Machine"
 msgstr "Distributore automatico"
 
@@ -21555,6 +21688,15 @@ msgstr "Codice postale"
 msgid "National Park"
 msgstr "Perco nazionale"
 
+msgid "Protected Area"
+msgstr "Area protetta"
+
+msgid "Protected Class"
+msgstr "Classe protetta"
+
+msgid "Title or type of protection"
+msgstr "Titolo o tipo di protezione"
+
 msgid "Places"
 msgstr "Luoghi"
 
@@ -22525,7 +22667,7 @@ msgid "OpenStreetMap (Mapnik, no labels)"
 msgstr "OpenStreetMap (Mapnik, senza etichette)"
 
 msgid "skobbler"
-msgstr ""
+msgstr "skobbler"
 
 msgid "skobbler heatmap"
 msgstr "Heatmap di Skobbler(c)"
@@ -22603,7 +22745,7 @@ msgid "IBGE Mapa de Setores Rurais"
 msgstr "IBGE Mappa dei Settori Rurali"
 
 msgid "Geobase Hydrography"
-msgstr ""
+msgstr "Idrografia Geobase"
 
 msgid "Geobase Roads"
 msgstr "Geobase strade"
@@ -22644,8 +22786,14 @@ msgstr "Estonia Basemap (Maaamet)"
 msgid "Estonia Ortho (Maaamet)"
 msgstr "Estonia Ortho (Maaamet)"
 
-msgid "Estonia Multi (Maaamet)"
-msgstr "Estonia Multi (Maaamet)"
+msgid "Estonia Hillshade (Maaamet)"
+msgstr ""
+
+msgid "Estonia Cadastre (Maaamet)"
+msgstr ""
+
+msgid "Estonia Forestry (Maaamet)"
+msgstr ""
 
 msgid "Bordeaux - 2012"
 msgstr "Bordeaux - 2012"
@@ -22668,8 +22816,8 @@ msgstr "CRAIG - Le Puy 2010 - 15 cm"
 msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
 msgstr "CRIGE PACA Alpei-Marittime 2009 - 40 cm"
 
-msgid "CUGN Nancy - Orthophoto 2012"
-msgstr "CUGN Nancy - Ortofoto 2012"
+msgid "GrandNancy Orthophotographie 2012"
+msgstr "OrtoFoto GrandNancy 2012"
 
 msgid "Géobretagne - Brest 2010 - 10 cm"
 msgstr "Géobretagne - Brest 2010 - 10 cm"
@@ -22716,9 +22864,6 @@ msgid ""
 msgstr ""
 "Vercors - Riserva naturale degli Altipiani di Vercors - Ortofoto 1999 - 1 m"
 
-msgid "Streets NRW Geofabrik.de"
-msgstr "Strade NRW Geofabrik.de"
-
 msgid "Hike & Bike"
 msgstr "Hike & Bike"
 
@@ -22780,6 +22925,9 @@ msgstr "NRW-Atlas: Luftbilder"
 msgid "NRW-Atlas: Topographische Karte 1:10000"
 msgstr "NRW-Atlas: Topographische Karte 1:10000"
 
+msgid "Metropole Ruhr: Luftbilder (10 cm)"
+msgstr ""
+
 msgid "Drone Imagery (Haiti)"
 msgstr "Drone Imagery (Haiti)"
 
@@ -22981,6 +23129,9 @@ msgstr "Stadtplan Zürich"
 msgid "Stadt Zürich Übersichtsplan (Strassen, Gebäude, Hausnummer)"
 msgstr "Stadt Zürich Übersichtsplan (Strassen, Gebäude, Hausnummer)"
 
+msgid "Stadt Zürich Luftbild 2011"
+msgstr "Stadt Zürich Luftbild 2011"
+
 msgid "Orthofoto Kanton Solothurn RGB (SOGIS 2011/2012/2013)"
 msgstr "Orthofoto Kanton Solothurn RGB (SOGIS 2011/2012/2013)"
 
@@ -22999,8 +23150,8 @@ msgstr "Canton du Jura 50cm (RCJU 1998)"
 msgid "Canton de Fribourg 50cm (2005)"
 msgstr "Canton de Fribourg 50cm (2005)"
 
-msgid "Stadt Bern 10cm/25cm (2008)"
-msgstr "Stadt Bern 10cm/25cm (2008)"
+msgid "Stadt Bern 10cm/25cm (2012)"
+msgstr "Stadt Bern 10cm/25cm (2012)"
 
 msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
 msgstr "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
@@ -23038,8 +23189,8 @@ msgstr "USGS Large Scale Imagery"
 msgid "OSM US TIGER 2012 Roads Overlay"
 msgstr "OSM US TIGER 2012 Roads Overlay"
 
-msgid "New & Misaligned TIGER Roads (TIGER 2013)"
-msgstr "New & Misaligned TIGER Roads (TIGER 2013)"
+msgid "New & Misaligned TIGER Roads (TIGER 2014)"
+msgstr ""
 
 msgid "MassGIS L3 Parcels"
 msgstr "MassGIS L3 Parcels"
@@ -23086,9 +23237,234 @@ msgstr "OS Scottish Popular historic"
 msgid "NLS - Bartholomew Half Inch, 1897-1907"
 msgstr "NLS - Bartholomew Half Inch, 1897-1907"
 
+msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Annan 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgstr ""
+
 msgid "OS Town Plans, Cupar 1854 (NLS)"
 msgstr "OS Town Plans, Cupar 1854 (NLS)"
 
+msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Elgin 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Forres 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Galashiels 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Girvan 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Greenock 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Haddington 1853 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Haddington 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Hamilton 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Irvine 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Jedburgh 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kelso 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Lanark 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Linlithgow 1856 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Musselburgh 1853 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Musselburgh 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Oban 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Peebles 1856 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Perth 1860 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Peterhead 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Selkirk 1865 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, St Andrews 1854 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, St Andrews 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stirling 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stonehaven 1864 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1847 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Strathaven 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wick 1872 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wigtown 1848 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wigtown 1894 (NLS)"
+msgstr ""
+
 msgid "Decreasing house numbers in addresses interpolation"
 msgstr "Decremento numeri civici in interpolazione indirizzi"
 
@@ -23147,21 +23523,45 @@ msgid "{0}={1} is deprecated. Please use instead a multipolygon."
 msgstr "{0}={1} è deprecato. Utilizzare invece un multipoligono."
 
 msgid ""
-"{0} is deprecated. Please specify ìnterval by using opening_hours syntax"
+"{0} is deprecated. Please specify interval by using opening_hours syntax"
 msgstr ""
-"{0} è deprecato. Specificare intervallo usando la sintassi di opening_hours"
+"{0} è deprecato. Specificare un intervallo usando la sintassi di "
+"opening_hours"
 
 msgid ""
 "{0} is deprecated. Please delete this object and use a private layer instead"
 msgstr ""
 "{0} è deprecato. Cancellare l''oggetto e utilizzare un livello privato"
 
+msgid "{0}={1} is unspecific. Please replace ''{1}'' by a specific value."
+msgstr ""
+"{0}={1} non è specificato. Sostituire ''{1}'' con un valore specifico."
+
+msgid "{0} should be replaced with {1}"
+msgstr "{0} dovrebbe essere sostituito da {1}"
+
+msgid ""
+"{0}={1} is unspecific. Please replace ''{1}'' by ''left'', ''right'' or "
+"''both''."
+msgstr ""
+"{0}={1} non è specifico. Sostituire ''{1}'' con ''sinistra'', ''destra'' o "
+"''entrambi''."
+
+msgid "{0} on a node. Should be used on a way."
+msgstr ""
+
+msgid "{0} on a node. Should be drawn as an area."
+msgstr ""
+
+msgid "{0}=* on a node. Should be used in a relation"
+msgstr "{0}=* in un nodo. Dovrebbe essere utilizzato in una relazione"
+
+msgid "{0} on a way. Should be used in a relation"
+msgstr "{0} su un percorso. Dovrebbe essere usato in una relazione"
+
 msgid "{0} on a node"
 msgstr "{0} su un nodo"
 
-msgid "{0} on a node. Should be drawn as an area"
-msgstr "{0} in un nodo. Dovrebbe essere disegnata CON UN''area"
-
 msgid "Building inside building"
 msgstr "Edificio interno ad altro edificio"
 
@@ -25381,31 +25781,32 @@ msgid "Cannot replace geometry."
 msgstr "Impossibile rimpiazzare la geometria."
 
 msgid "Zoom to selected primitive(s)"
-msgstr ""
+msgstr "Ingrandisci alle primitive selezionate"
 
 msgid "Select selected primitive(s)"
-msgstr ""
+msgstr "Seleziona primitive evidenziate"
 
 msgid "Select the primitives currently selected in the list"
-msgstr ""
+msgstr "Seleziona le primitive correntemente evidenziate nell''elenco"
 
 msgid "Match finder settings"
-msgstr ""
+msgstr "Impostazioni per la ricerca delle corrispondenze"
 
 msgid "Match finder method"
-msgstr ""
+msgstr "metodo per la ricerca delle corrispondenze"
 
 msgid "Threshold distance"
-msgstr ""
+msgstr "Soglia distanza"
 
 msgid "Distances greater than this will result in a score of zero."
 msgstr ""
+"Distanze superiori a questo si tradurranno in un punteggio pari a zero."
 
 msgid "Centroid distance"
-msgstr ""
+msgstr "Distanza baricentro"
 
 msgid "Hausdorff distance"
-msgstr ""
+msgstr "Distanza di Hausdorff"
 
 msgid "Configure conflation settings"
 msgstr "Configura impostazioni di fusione"
@@ -25414,28 +25815,29 @@ msgid "Generate matches"
 msgstr "Genera corrispondenze"
 
 msgid "Subject"
-msgstr ""
+msgstr "Oggetto"
 
 msgid "Selections must be made for both reference and subject."
 msgstr ""
+"Le selezioni dovrebbero essere fatte sia per la referenze che l''oggetto"
 
 msgid "Incomplete selections"
 msgstr "Selezioni incomplete"
 
 msgid "Restore subject selection"
-msgstr ""
+msgstr "Ripristina la selezione dell''oggetto"
 
 msgid "Restore reference selection"
-msgstr ""
+msgstr "Ripristina il riferimento alla selezione"
 
 msgid "Freeze subject selection"
-msgstr ""
+msgstr "Blocca oggetto selezionato"
 
 msgid "No valid OSM data layer present."
 msgstr "Nessun livello dati OSM valido presente."
 
 msgid "Error freezing selection"
-msgstr ""
+msgstr "Errore nel bloccare la selezione"
 
 msgid "Nothing is selected, please try again."
 msgstr "Non è stato selezionato niente, si prega di riprovare."
@@ -25444,7 +25846,7 @@ msgid "Empty selection"
 msgstr "Nessuna selezione"
 
 msgid "Invalid reference or subject"
-msgstr ""
+msgstr "Riferimento all''oggetto non valido"
 
 msgid "Address"
 msgstr "Indirizzo"
@@ -28302,6 +28704,9 @@ msgstr "Suggerisci fermate"
 msgid "Find"
 msgstr "Cerca"
 
+msgid "Show"
+msgstr "Visualizza"
+
 msgid "Mark"
 msgstr "Contrassegna"
 
@@ -29960,7 +30365,7 @@ msgid "Bicycles"
 msgstr "Biciclette"
 
 msgid "Mopeds"
-msgstr ""
+msgstr "Ciclomotori"
 
 msgid "Use standard exceptions"
 msgstr "Utilizza le eccezioni standard"
diff --git a/i18n/po/ja.po b/i18n/po/ja.po
index ac50558..e312b29 100644
--- a/i18n/po/ja.po
+++ b/i18n/po/ja.po
@@ -1,17 +1,22 @@
+# Japanese translation for josm
+# Copyright (c) 2008 Rosetta Contributors and Canonical Ltd 2008
+# This file is distributed under the same license as the josm package.
+# FIRST AUTHOR <EMAIL at ADDRESS>, 2008.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-21 03:38+0200\n"
-"PO-Revision-Date: 2014-10-16 15:19+0000\n"
+"POT-Creation-Date: 2014-12-10 03:42+0100\n"
+"PO-Revision-Date: 2014-12-04 18:08+0000\n"
 "Last-Translator: fujimoto <fujimoto at internet.ne.jp>\n"
 "Language-Team: Japanese <tr at openstreetmap.jp>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2014-10-21 05:02+0000\n"
-"X-Generator: Launchpad (build 17203)\n"
+"X-Launchpad-Export-Date: 2014-12-10 04:56+0000\n"
+"X-Generator: Launchpad (build 17283)\n"
 "X-Poedit-Country: JAPAN\n"
 "Language: ja\n"
 "X-Poedit-Language: Japanese\n"
@@ -173,18 +178,6 @@ msgid "About JOSM..."
 msgstr "JOSMについて..."
 
 msgid ""
-"Unexpected format of API base URL. Redirection to info or history page for "
-"OSM object will probably fail. API base URL is: ''{0}''"
-msgstr ""
-"APIのベースURLの形式が不正です。OSMオブジェクト情報・履歴ページへのリダイレクトはおそらく失敗します。APIのベースURLは''{0}''です。"
-
-msgid ""
-"Unexpected format of API base URL. Redirection to user page for OSM user "
-"will probably fail. API base URL is: ''{0}''"
-msgstr ""
-"APIベースURLの書式が不正です。OSMユーザーのユーザーページへのリダイレクトはおそらく失敗します。APIベースURLは''{0}''です。"
-
-msgid ""
 "You are about to launch {0} browser window.<br>This may both clutter your "
 "screen with browser windows<br>and take some time to finish."
 msgid_plural ""
@@ -1133,7 +1126,7 @@ msgid "Report bug"
 msgstr "バグを報告"
 
 msgid "Report a ticket to JOSM bugtracker"
-msgstr ""
+msgstr "JOSMバグトラッカーにチケットを報告"
 
 msgid "Restart"
 msgstr "再起動"
@@ -1538,6 +1531,15 @@ msgstr "アップロードする変更はありません。"
 msgid "Nothing to upload. Get some data first."
 msgstr "アップロードするものがありません。最初にデータを取得してください。"
 
+msgid "Upload note changes to server"
+msgstr "メモの変更をサーバーにアップロード"
+
+msgid "Upload notes"
+msgstr "メモをアップロード"
+
+msgid "Uploading notes to server"
+msgstr "メモをサーバーにアップロード"
+
 msgid "Upload selection"
 msgstr "選択をアップロード"
 
@@ -1590,7 +1592,7 @@ msgid "Zoom In"
 msgstr "拡大"
 
 msgid "Zoom In (Keypad)"
-msgstr "ズームイン (テンキー)"
+msgstr "ズームイン(テンキー)"
 
 msgid "Zoom Out"
 msgstr "ズームアウト"
@@ -1747,7 +1749,7 @@ msgid "Download session"
 msgstr "ダウンロードセッション"
 
 msgid "Download {0} of {1} ({2} left)"
-msgstr "ダウンロード {1}のうち{0} (残り {2})"
+msgstr "ダウンロード{1}件中{0}件目(残り{2}件)"
 
 msgid "Updating data"
 msgstr "データ更新中"
@@ -1808,12 +1810,18 @@ msgstr "メモ追加モード"
 msgid "Click the location where you wish to create a new note"
 msgstr "新しいメモを作成したい場所をクリックしてください"
 
-msgid "Enter a comment for a new note"
-msgstr "新しいメモを入力してください"
-
 msgid "Create new note"
 msgstr "新しいメモを作成"
 
+msgid "Create note"
+msgstr "メモを作成"
+
+msgid "Enter a detailed comment to create a note"
+msgstr "ノートを作成するために詳細コメントを入力してください"
+
+msgid "You must enter a comment to create a new note"
+msgstr "新しいメモを作成するには、コメントを入力する必要があります"
+
 msgid "Delete Mode"
 msgstr "削除モード"
 
@@ -2022,7 +2030,7 @@ msgstr "平行補助線を作成"
 msgid ""
 "Select ways as in Select mode. Drag selected ways or a single way to create "
 "a parallel copy (Alt toggles tag preservation)"
-msgstr "選択モードと同様にウェイを選択。選択したウェイをドラッグして平行コピーを作成 (Altでタグのコピーを切り替え)。"
+msgstr "選択モードと同様にウェイを選択。選択したウェイをドラッグして平行コピーを作成(Altでタグのコピーを切り替え)。"
 
 msgid "Hold Ctrl to toggle snapping"
 msgstr "Ctrlを押しながらで位置合わせの有無を切替"
@@ -2374,7 +2382,7 @@ msgid ""
 "<b>areasize:</b>... - closed ways with given area in m² (<b>areasize:</b>min-"
 "max or <b>areasize:</b>max)"
 msgstr ""
-"<b>areasize:</b>... - 閉じたウェイの面積をm²で指定 (<b>areasize:</b>最小値-最大値 or "
+"<b>areasize:</b>... - 閉じたウェイの面積をm²で指定(<b>areasize:</b>最小値-最大値 or "
 "<b>areasize:</b>最大値)"
 
 msgid "<b>modified</b> - all changed objects"
@@ -2714,6 +2722,15 @@ msgstr "... リレーションを参照"
 msgid "Cycling dependencies"
 msgstr "循環依存"
 
+msgid "Uploading modified notes"
+msgstr "変更されたメモをアップロード"
+
+msgid "Note {0} failed: {1}"
+msgstr "メモ {0} 失敗: {1}"
+
+msgid "Notes failed to upload"
+msgstr "メモのアップロードに失敗しました"
+
 msgid ""
 "The following are results of automatic validation. Try fixing these, but be "
 "careful (don''t destroy valid data). When in doubt ignore them.<br>When you "
@@ -3949,7 +3966,7 @@ msgstr "リレーションのエラーを検査します。"
 
 msgid ""
 "Route scheme is unspecified. Add {0} ({1}=public_transport; {2}=legacy)"
-msgstr "ルートのスキームが指定されていません。{0}を追加してください ({1}=public_transport; {2}=legacy)"
+msgstr "ルートのスキームが指定されていません。{0}を追加してください({1}=public_transport; {2}=legacy)"
 
 msgid "Relation type is unknown"
 msgstr "リレーション種別が不明です"
@@ -4723,7 +4740,7 @@ msgid "Status bar foreground: active"
 msgstr "ステータスバーの前景: アクティブ"
 
 msgid "{0} ({1})"
-msgstr "{0} ({1})"
+msgstr "{0}({1})"
 
 msgid "The geographic latitude at the mouse pointer."
 msgstr "マウスポインターの位置の緯度です。"
@@ -4846,7 +4863,7 @@ msgid "from tile"
 msgstr "min(最小値)"
 
 msgid "up to tile"
-msgstr "max (最大値)"
+msgstr "max(最大値)"
 
 msgid ""
 "<html>Alternatively you may enter a <strong>tile address</strong> for a "
@@ -4951,6 +4968,12 @@ msgstr "競合: すべてのタグを保持の背景色"
 msgid "Conflict foreground: keep all tags"
 msgstr "競合: すべてのタグを保持の前景色"
 
+msgid "Conflict background: sum all numeric tags"
+msgstr "競合: すべての数値タグの背景色"
+
+msgid "Conflict foreground: sum all numeric tags"
+msgstr "競合: 全数値タグの合計の背景"
+
 msgid "Conflict background: keep member"
 msgstr "競合: メンバーを保持の背景色"
 
@@ -5006,7 +5029,7 @@ msgid ""
 msgstr "結合されたノードリストを固定しました。このウェイのノードリストには保留中の競合はありません。"
 
 msgid "Nodes(with conflicts)"
-msgstr "ノード (競合あり)"
+msgstr "ノード(競合あり)"
 
 msgid "Pending conflicts in the node list of this way"
 msgstr "このウェイのノードリストにある保留中の競合"
@@ -5020,7 +5043,7 @@ msgid ""
 msgstr "結合されたメンバーリストを固定しました。このリレーションのメンバーリストには保留中の競合はありません。"
 
 msgid "Members(with conflicts)"
-msgstr "メンバー (競合あり)"
+msgstr "メンバー(競合あり)"
 
 msgid "Pending conflicts in the member list of this relation"
 msgstr "このリレーションのメンバーリストにある保留中の競合"
@@ -5029,7 +5052,7 @@ msgid "No pending property conflicts"
 msgstr "保留中のプロパティの競合はありません"
 
 msgid "Properties(with conflicts)"
-msgstr "プロパティ (競合あり)"
+msgstr "プロパティ(競合あり)"
 
 msgid "Pending property conflicts to be resolved"
 msgstr "解決が必要なプロパティの保留中の競合"
@@ -5277,10 +5300,10 @@ msgid "Cannot apply undecided tag merge item."
 msgstr "未決のタグ結合アイテムを適用できません"
 
 msgid "My version (local dataset)"
-msgstr "自分のバージョン (ローカルデータセット)"
+msgstr "自分のバージョン(ローカルデータセット)"
 
 msgid "Their version (server dataset)"
-msgstr "相手のバージョン (サーバーデータセット)"
+msgstr "相手のバージョン(サーバーデータセット)"
 
 msgid "Keep the selected key/value pairs from the local dataset"
 msgstr "ローカルデータセットから選択されたキー/値のペアを残す"
@@ -5368,12 +5391,19 @@ msgstr "なし"
 msgid "all"
 msgstr "全て"
 
+msgid "sum"
+msgstr "合計"
+
 msgid "Please decide which values to keep"
 msgstr "どちらの値を残すか決めてください"
 
 msgid "Value ''{0}'' is going to be applied for key ''{1}''"
 msgstr "値 ''{0}'' はキー  ''{1}'' に割り当てられます"
 
+msgid ""
+"All numeric values sumed as ''{0}'' are going to be applied for key ''{1}''"
+msgstr "{1}キーにすべての数値を合計した''{0}''が適用されます"
+
 msgid "The key ''{0}'' and all its values are going to be removed"
 msgstr "キー ''{0}'' とその全ての値は削除されます"
 
@@ -5741,24 +5771,6 @@ msgstr[0] "<b>{0}</b>件のオブジェクトが無効化"
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr "</p><p>全オブジェクトを見るにはフィルターのダイアログを閉じてください。<p></html>"
 
-msgid "Display the history of all selected items."
-msgstr "選択したアイテムすべての履歴"
-
-msgid "Object with history"
-msgstr "履歴があるオブジェクト"
-
-msgid "Reload"
-msgstr "再読込"
-
-msgid "Reload all currently selected objects and refresh the list."
-msgstr "選択しているオブジェクトを再読み込みし、リストを更新します。"
-
-msgid "Show"
-msgstr "表示"
-
-msgid "Display the history of the selected objects."
-msgstr "選択したオブジェクトの履歴を表示。"
-
 msgid "Advanced object info"
 msgstr "詳細なオブジェクト情報"
 
@@ -6057,10 +6069,10 @@ msgid "Save a copy of this Style to file and add it to the list"
 msgstr "このスタイルのコピーをファイルに保存し、一覧に追加します"
 
 msgid "Map paint style file (*.mapcss, *.zip)"
-msgstr "地図描画スタイルファイル (*.mapcss, *.zip)"
+msgstr "地図描画スタイルファイル(*.mapcss, *.zip)"
 
 msgid "Map paint style file (*.xml, *.zip)"
-msgstr "地図描画スタイルファイル (*.xml, *.zip)"
+msgstr "地図描画スタイルファイル(*.xml, *.zip)"
 
 msgid "Reloading style sources"
 msgstr "スタイルのソースを再読み込み中"
@@ -6113,6 +6125,9 @@ msgstr "コメントの追加"
 msgid "Comment"
 msgstr "コメント"
 
+msgid "Comment on note"
+msgstr "メモにコメント"
+
 msgid "Add comment to note:"
 msgstr "メモにコメントを追加:"
 
@@ -6122,9 +6137,6 @@ msgstr "メモを閉じる"
 msgid "Close note with message:"
 msgstr "メッセージを付けてメモを閉じる:"
 
-msgid "Close Note"
-msgstr "メモを閉じる"
-
 msgid "Create a new note"
 msgstr "新しいメモを作成"
 
@@ -6202,6 +6214,9 @@ msgstr "現在の選択範囲"
 msgid "Search for objects"
 msgstr "オブジェクトを検索"
 
+msgid "Display the history of the selected objects."
+msgstr "選択したオブジェクトの履歴を表示。"
+
 msgid "Zoom to selection"
 msgstr "選択へズーム"
 
@@ -6320,6 +6335,9 @@ msgstr "''{2}''を修正中({0}/{1})"
 msgid "Updating map ..."
 msgstr "地図を更新中 ..."
 
+msgid "anonymous"
+msgstr "匿名"
+
 msgid "Display the basic properties of the changeset"
 msgstr "変更セットの基本情報を表示する"
 
@@ -6332,6 +6350,12 @@ msgstr "内容"
 msgid "Display the objects created, updated, and deleted by the changeset"
 msgstr "変更セットでのアクション(作成/更新/削除)を表示する"
 
+msgid "Discussion"
+msgstr "議論"
+
+msgid "Display the public discussion around this changeset"
+msgstr "この変更セットをめぐる公開議論を表示"
+
 msgid "Changeset Management Dialog"
 msgstr "変更セット管理ダイアログ"
 
@@ -6391,9 +6415,6 @@ msgctxt "changeset.state"
 msgid "Closed"
 msgstr "閉じる"
 
-msgid "anonymous"
-msgstr "匿名"
-
 msgid "ID"
 msgstr "ID"
 
@@ -6409,6 +6430,9 @@ msgstr "作成日時"
 msgid "Closed at"
 msgstr "保存日時"
 
+msgid "Discussions"
+msgstr "議論"
+
 msgid "Downloading changeset content"
 msgstr "変更セットをダウンロード中"
 
@@ -6416,7 +6440,7 @@ msgid "({0}/{1}) Downloading changeset {2}..."
 msgstr "変更セット {2} をダウンロード中。({0}/{1})"
 
 msgid "({0}/{1}) Downloading content for changeset {2}..."
-msgstr "変更セット {2} の内容をダウンロード中。 ({0}/{1})"
+msgstr "変更セット {2} の内容をダウンロード中。({0}/{1})"
 
 msgid ""
 "<html>The selected object is not available in the current<br>edit layer "
@@ -6519,6 +6543,15 @@ msgid ""
 "layer"
 msgstr "現在のデータレイヤー中のこの変更セットに含まれるオブジェクトにズームする"
 
+msgid "Update changeset discussion"
+msgstr "変更セットの議論を更新"
+
+msgid "Update the changeset discussion from the OSM server"
+msgstr "OSMサーバーから変更セットの議論を更新"
+
+msgid "Date"
+msgstr "日付"
+
 msgid "Download changesets"
 msgstr "変更セットをダウンロード"
 
@@ -6940,8 +6973,8 @@ msgstr "値を選択してください"
 msgid "Set number of recently added tags"
 msgstr "最近追加されたタグの数を設定"
 
-msgid "Remember last used tags"
-msgstr "最後に使用したタグを記憶"
+msgid "Remember last used tags after a restart"
+msgstr "再起動時に最後に使用したタグを記憶"
 
 msgid "Please enter the number of recently added tags to display"
 msgstr "最近追加されたタグの表示数を入力してください"
@@ -7019,7 +7052,7 @@ msgid "Download relations"
 msgstr "リレーションをダウンロード"
 
 msgid "({0}/{1}): Downloading relation ''{2}''..."
-msgstr "リレーション ''{2}'' をダウンロード中 ({0}/{1})"
+msgstr "リレーション ''{2}'' をダウンロード中({0}/{1})"
 
 msgid "Tags and Members"
 msgstr "タグとメンバ-"
@@ -7293,6 +7326,9 @@ msgstr "直接の親子リレーションを含む"
 msgid "Load parent relations"
 msgstr "親リレーションをロード"
 
+msgid "Reload"
+msgstr "再読込"
+
 msgid "Loading parent relations"
 msgstr "親リレーションをロード中"
 
@@ -7415,6 +7451,12 @@ msgstr "生のGPSデータ"
 msgid "Select to download GPS traces in the selected download area."
 msgstr "選択すると指定されたダウンロード領域内のGPSトレースをダウンロードします。"
 
+msgid "Notes"
+msgstr "紙幣"
+
+msgid "Select to download notes in the selected download area."
+msgstr "選択したダウンロード領域内でダウンロードするメモを選択してください。"
+
 msgid "Download as new layer"
 msgstr "新しいレイヤーとしてダウンロード"
 
@@ -7520,13 +7562,13 @@ msgid "Querying name server ..."
 msgstr "ネームサーバーに問合せ中 ..."
 
 msgid "Error occured with query ''{0}'': ''{1}''"
-msgstr ""
+msgstr "クエリー''{0}''でエラーが発生しました: ''{1}''"
 
 msgid "Name server returned invalid data. Please try again."
-msgstr ""
+msgstr "ネームサーバーが無効なデータを返しました。やり直してください。"
 
 msgid "Bad response"
-msgstr ""
+msgstr "応答が不正です"
 
 msgid "Type"
 msgstr "種別"
@@ -7738,9 +7780,6 @@ msgstr "A"
 msgid "B"
 msgstr "B"
 
-msgid "Date"
-msgstr "日付"
-
 msgid ""
 "Failed to update primitive with id {0} because current edit layer is null"
 msgstr "編集レイヤーに何も含まれていないため、ID {0} のプリミティブ更新に失敗しました。"
@@ -7835,7 +7874,7 @@ msgid ""
 "left.</html>"
 msgstr ""
 "<html>左端のボタンをクリックしたときに、このレイヤーに対して行われる動作を選択してください。<br/>「アップロード」をチェックすると、OSMサーバ"
-"ーーに変更をアップロードします。<br/>「保存」をチェックすると、左側で指定されたファイルにこのレイヤーを保存します。</html>"
+"ーに変更をアップロードします。<br/>「保存」をチェックすると、左側で指定されたファイルにこのレイヤーを保存します。</html>"
 
 msgid "Provide a brief comment for the changes you are uploading:"
 msgstr "アップロードする変更の概略コメントを入力してください。"
@@ -8631,9 +8670,6 @@ msgstr ""
 msgid "Save Layer"
 msgstr "レイヤーを保存"
 
-msgid "Notes"
-msgstr "紙幣"
-
 msgid "Notes layer"
 msgstr "メモレイヤー"
 
@@ -8649,9 +8685,6 @@ msgstr "データレイヤー {0}"
 msgid "outside downloaded area"
 msgstr "ダウンロード範囲外"
 
-msgid "version {0}"
-msgstr "バージョン {0}"
-
 msgid "Merging layers"
 msgstr "レイヤーを併合"
 
@@ -8801,10 +8834,10 @@ msgid "Downloaded {0}/{1} tiles"
 msgstr "{0}/{1}タイルをダウンロード"
 
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
-msgstr "WMS レイヤー ({0}), 自動的に倍率 {1} でダウンロード"
+msgstr "WMS レイヤー({0}), 自動的に倍率 {1} でダウンロード"
 
 msgid "WMS layer ({0}), downloading in zoom {1}"
-msgstr "WMS レイヤー ({0}), 倍率 {1} でダウンロード"
+msgstr "WMS レイヤー({0}), 倍率 {1} でダウンロード"
 
 msgid "Download visible tiles"
 msgstr "見えるタイルのダウンロード"
@@ -8920,10 +8953,10 @@ msgid "Override position for: "
 msgstr "次の位置を上書きする "
 
 msgid "Images with geo location in exif data ({0}/{1})"
-msgstr "EXIFデータ中に位置情報を含む画像 ({0}/{1})"
+msgstr "EXIFデータ中に位置情報を含む画像({0}/{1})"
 
 msgid "Images that are already tagged ({0}/{1})"
-msgstr "タグ付け済みの画像 ({0}/{1})"
+msgstr "タグ付け済みの画像({0}/{1})"
 
 msgid "Show Thumbnail images on the map"
 msgstr "地図にサムネイル画像を表示"
@@ -9638,7 +9671,7 @@ msgid ""
 "With OAuth you grant JOSM the right to upload map data and GPS tracks on "
 "your behalf (<a href=\"{0}\">more info...</a>)."
 msgstr ""
-"OAuth を使い、あなたはJOSMにマップデータとGPSトラックのアップロードをあなたの責任において許可します。 (<a "
+"OAuth を使い、あなたはJOSMにマップデータとGPSトラックのアップロードをあなたの責任において許可します。(<a "
 "href=\"{0}\">詳細...</a>)."
 
 msgid "Please select an authorization procedure: "
@@ -9922,13 +9955,13 @@ msgid "active"
 msgstr "有効"
 
 msgid "Map paint style file (*.xml, *.mapcss, *.zip)"
-msgstr "地図描画スタイルファイル (*.xml, *.mapcss, *.zip)"
+msgstr "地図描画スタイルファイル(*.xml, *.mapcss, *.zip)"
 
 msgid "Preset definition file (*.xml, *.zip)"
-msgstr "プリセット定義ファイル (*.xml, *.zip)"
+msgstr "プリセット定義ファイル(*.xml, *.zip)"
 
 msgid "Tag checker rule (*.validator.mapcss, *.zip)"
-msgstr "タグチェッカールール (*.validator.mapcss, *.zip)"
+msgstr "タグチェッカールール(*.validator.mapcss, *.zip)"
 
 msgid "Edit source entry:"
 msgstr "ソースエントリを編集:"
@@ -10039,7 +10072,7 @@ msgid "Export selected items"
 msgstr "選択された項目をエクスポート"
 
 msgid "JOSM custom settings files (*.xml)"
-msgstr "JOSMカスタム設定ファイル (*.xml)"
+msgstr "JOSMカスタム設定ファイル(*.xml)"
 
 msgid "Please select some preference keys not marked as default"
 msgstr "デフォルトの値になっていないキーを選択してください"
@@ -10426,10 +10459,10 @@ msgid "Draw a circle from HDOP value"
 msgstr "HDOPの値をもとに円を描く"
 
 msgid "Velocity (red = slow, green = fast)"
-msgstr "速度(赤=遅い、緑=速い)"
+msgstr "速度(赤=遅い、緑=速い)"
 
 msgid "Direction (red = west, yellow = north, green = east, blue = south)"
-msgstr "方向 (赤=西、黄色=北、緑=東、青=南)"
+msgstr "方向 (赤=西、黄=北、緑=東、青=南)"
 
 msgid "Dilution of Position (red = high, green = low, if available)"
 msgstr "位置精度低下率(赤=高い、緑=低い、可能な場合)"
@@ -10472,17 +10505,17 @@ msgstr "GPS測位点間に線を描画"
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to ''-1'' to "
 "draw all lines."
-msgstr "ローカルファイルで線を描画する最大長 (m) です。''-1''にすると全ての線を描きます。"
+msgstr "ローカルファイルで線を描画する最大長(m)です。''-1''にすると全ての線を描きます。"
 
 msgid "Maximum length for local files (meters)"
-msgstr "ローカルファイルでの最大長 (m)"
+msgstr "ローカルファイルでの最大長(m)"
 
 msgid ""
 "Maximum length (in meters) to draw lines. Set to ''-1'' to draw all lines."
-msgstr "線を描画する最大長 (m) です。''-1''にすると全ての線を描きます。"
+msgstr "線を描画する最大長(m)です。''-1''にすると全ての線を描きます。"
 
 msgid "Maximum length (meters)"
-msgstr "最大長 (m)"
+msgstr "最大長(m)"
 
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
@@ -10581,7 +10614,7 @@ msgid "Display ISO dates"
 msgstr "ISO日付で表示"
 
 msgid "Use native file choosers (nicer, but do not support file filters)"
-msgstr "ネイティブのファイル選択を使用 (より良いが、ファイルフィルターがサポートされない)"
+msgstr "ネイティブのファイル選択を使用(より良いが、ファイルフィルターがサポートされない)"
 
 msgid "Show localized name in selection lists, if available"
 msgstr "選択リストにできるだけローカライズした名前を表示"
@@ -10757,7 +10790,7 @@ msgid "Imagery URL"
 msgstr "画像のURL"
 
 msgid "Menu Name (Default)"
-msgstr "メニュー名(既定)"
+msgstr "メニュー名(既定値)"
 
 msgid "Imagery URL (Default)"
 msgstr "画像URL(既定値)"
@@ -10898,17 +10931,16 @@ msgstr "''{0}'' からスタイルソースをロード中"
 msgid ""
 "<html>Failed to load the list of style sources "
 "from<br>''{0}''.<br><br>Details (untranslated):<br>{1}</html>"
-msgstr ""
-"<html>''{0}'' からのスタイルソースのダウンロードに<br>失敗。<br><br>詳細 (未翻訳):<br>{1}</html>"
+msgstr "<html>''{0}''からのスタイルソースのダウンロードに<br>失敗。<br><br>詳細(未翻訳):<br>{1}</html>"
 
 msgid "Warning: illegal format of entry in style list ''{0}''. Got ''{1}''"
 msgstr "警告: スタイルリスト ''{0}'' 中に不正な形式のエントリ。入力値 ''{1}''"
 
 msgid "JOSM default (XML; old version)"
-msgstr "JOSM標準 (XML; 旧バージョン)"
+msgstr "JOSM標準(XML; 旧バージョン)"
 
 msgid "JOSM default (MapCSS)"
-msgstr "JOSM標準 (MapCSS)"
+msgstr "JOSM標準(MapCSS)"
 
 msgid ""
 "Internal style to be used as base for runtime switchable overlay styles"
@@ -11918,7 +11950,7 @@ msgid "Some of the key modifier listeners forgot to remove themselves: {0}"
 msgstr "一部のキー変更リスナの登録が解除されていません: {0}"
 
 msgid "All files (*.*)"
-msgstr "すべてのファイル (*.*)"
+msgstr "すべてのファイル(*.*)"
 
 msgid "Received error page:"
 msgstr "エラーページを受信しました:"
@@ -12011,7 +12043,7 @@ msgstr "削除されたノード {0} はウェイ {1} の一部です"
 msgid ""
 "Way {0} with {1} nodes has incomplete nodes because at least one node was "
 "missing in the loaded data."
-msgstr "ロードしたデータ内に1つ以上のノードが見つからないため、ウェイ {0} ({1} 個のノード)に不完全なノードが含まれています。"
+msgstr "ロードしたデータ内に1つ以上のノードが見つからないため、ウェイ {0}({1}個のノード)に不完全なノードが含まれています。"
 
 msgid ""
 "Relation with external id ''{0}'' refers to a missing primitive with "
@@ -12388,6 +12420,15 @@ msgstr "現在の変更セットのIDは正の数でなければなりません
 msgid "Open changeset expected. Got closed changeset with id {0}."
 msgstr "開いた変更セットでなければなりません。ID {0} の変更セットは閉じています。"
 
+msgid "Note upload failed"
+msgstr "メモのアップロードに失敗しました"
+
+msgid "Error parsing note response from server"
+msgstr "サーバーからのメモ応答の解析エラー"
+
+msgid "Error encoding string: {0}"
+msgstr "文字列のエンコードエラー; {0}"
+
 msgid "(Code={0})"
 msgstr "(コード={0})"
 
@@ -12438,15 +12479,15 @@ msgstr "変更セット内の位置({1},{2})で要素''{0}''の終了はサポ
 msgid "Parsing changeset content ..."
 msgstr "変更セットコンテンツをパース中 ..."
 
+msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
+msgstr "属性''{0}''に不正なブール値です。入力値: ''{1}''。"
+
 msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
 msgstr "属性 ''{0}'' に不正な値。入力値: ''{1}''。"
 
 msgid "Illegal numeric value for attribute ''{0}''. Got ''{1}''."
 msgstr "属性 ''{0}'' に対する不正な数値。入力値 ''{1}''。"
 
-msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
-msgstr "属性 ''{0}'' に不正なブール値。入力値: ''{1}''。"
-
 msgid "Missing mandatory attribute ''{0}'' of XML element {1}."
 msgstr "XML 要素 {1} の必須属性 ''{0}'' が見つかりません。"
 
@@ -12676,7 +12717,7 @@ msgid "OSM Server Files zip compressed"
 msgstr "OSMサーバーファイル(ZIP圧縮)"
 
 msgid "WMS Files (*.wms)"
-msgstr "WMS ファイル (*.wms)"
+msgstr "WMSファイル(*.wms)"
 
 msgid ""
 "<html><body><p class=\"warning-body\"><strong>Warning:</strong> The password "
@@ -12819,10 +12860,10 @@ msgid "The minima must be less than the maxima"
 msgstr "最小値は最大値より小さくなければなりません。"
 
 msgid "Remote Control has been asked to load the following data:"
-msgstr ""
+msgstr "リモート制御から次のデータをロードするように指示されました:"
 
 msgid "Loading data"
-msgstr ""
+msgstr "データをロード中"
 
 msgid ""
 "Remote Control has been asked to load objects (specified by their id) from "
@@ -12907,7 +12948,7 @@ msgid ""
 msgstr "OSMデータレイヤーのメタデータのバージョン ''{0}'' はサポートされていません。0.1である必要があります。"
 
 msgid "Session file (*.jos, *.joz)"
-msgstr "セッションファイル (*.jos,*.joz)"
+msgstr "セッションファイル(*.jos,*.joz)"
 
 msgid "Unable to locate file  ''{0}''."
 msgstr "''{0}'' ファイルが見つかりません。"
@@ -13082,7 +13123,7 @@ msgid "Could not load plugin {0}. Delete from preferences?"
 msgstr "プラグイン {0} を読み込めません。設定から削除しますか?"
 
 msgid "loading plugin ''{0}'' (version {1})"
-msgstr "プラグイン ''{0}'' をロード中 (バージョン {1})"
+msgstr "プラグイン''{0}''をロード中(バージョン{1})"
 
 msgid ""
 "<html>Could not load plugin {0} because the plugin<br>main class ''{1}'' was "
@@ -13202,7 +13243,7 @@ msgstr "説明がありません"
 msgid ""
 "Do not ask again and remember my decision (go to Preferences->Plugins to "
 "change it later)"
-msgstr "この決定を記憶し、次回からは確認しない (プリファレンス>プラグイン で後から変更できます)"
+msgstr "この決定を記憶し、次回からは確認しない(プリファレンス>プラグイン で後から変更できます)"
 
 msgid "Invalid jar file ''{0}''"
 msgstr "jarファイル ''{0}'' が無効です"
@@ -13246,14 +13287,11 @@ msgstr "ファイル ''{0}''の処理中"
 msgid "Failed to scan file ''{0}'' for plugin information. Skipping."
 msgstr "プラグイン情報のファイル''{0}''が見つかりませんでした。スキップします。"
 
-msgid "Processing plugin site cache icon files..."
-msgstr "プラグインのサイトキャッシュアイコンファイルを処理中..."
-
 msgid "Processing plugin files..."
 msgstr "プラグインファイルの処理中..."
 
 msgid "Download plugin list..."
-msgstr "プラグインリストをダウンロード..."
+msgstr "プラグインリストをダウンロードします..."
 
 msgid "Downloading plugin list from ''{0}''"
 msgstr "''{0}'' からプラグインリストをダウンロード中"
@@ -13267,12 +13305,6 @@ msgstr "JOSMがプラグイン一覧のダウンロードに失敗しました
 msgid "Details:"
 msgstr "詳細:"
 
-msgid "Plugin icons download error"
-msgstr "プラグインアイコンダウンロードエラー"
-
-msgid "JOSM failed to download plugin icons:"
-msgstr "JOSMがプラグインアイコンのダウンロードに失敗しました。"
-
 msgid ""
 "Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
 "plugin site ''{1}''."
@@ -13557,7 +13589,7 @@ msgstr "<html>すでに {1} に閉じられているため、変更セット <st
 msgid ""
 "<html>The server reported that it has detected a conflict.<br>Error message "
 "(untranslated):<br>{0}</html>"
-msgstr "<html>サーバーから競合検知の報告がありました。<br>エラーメッセージ (未翻訳):<br>{0}</html>"
+msgstr "<html>サーバーから競合検知の報告がありました。<br>エラーメッセージ(未翻訳):<br>{0}</html>"
 
 msgid "<html>The server reported that it has detected a conflict."
 msgstr "<html>このサーバーは競合が検出されたと報告されました。"
@@ -13584,14 +13616,14 @@ 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>転送データの問題により<br>''{0}'' への<br>アップロード、またはダウンロードが失敗しました。<br><br>詳細 (未翻訳): "
+"<html>転送データの問題により<br>''{0}'' への<br>アップロード、またはダウンロードが失敗しました。<br><br>詳細(未翻訳): "
 "{1}</html>"
 
 msgid ""
 "<html>Failed to download data. Its format is either unsupported, ill-formed, "
 "and/or inconsistent.<br><br>Details (untranslated): {0}</html>"
 msgstr ""
-"<html>データのダウンロードに失敗。フォーマットがサポートされていない、形式が不正、矛盾している、のいずれかです。<br><br>詳細 (未翻訳): "
+"<html>データのダウンロードに失敗。フォーマットがサポートされていない、形式が不正、矛盾している、のいずれかです。<br><br>詳細(未翻訳): "
 "{0}</html>"
 
 msgid "<html>Failed to download data.<br><br>Details: {0}</html>"
@@ -14220,8 +14252,12 @@ msgid ""
 "Creating and handling address nodes and buildings within Czech Republic."
 msgstr "チェコ共和国内のアドレスノードと建物を作成、編集するためのプラグインです。"
 
-msgid "Allows to import various file formats into JOSM directly."
-msgstr "様々なフォーマットのファイルをJOSMに直接インポートできるようにします。"
+msgid ""
+"Allows to import various file formats into JOSM directly. Currently "
+"supported: TangoGPS, Garmin Trainings Center TCX."
+msgstr ""
+"さまざまなファイル形式からJOSMに直接インポートできるようにします。現在サポートしているものは、TangoGPSとGarmin Trainings "
+"Center TCXです。"
 
 msgid "Download your GPX tracks from openstreetmap.org"
 msgstr "openstreetmap.orgから自分のGPXトレースをダウンロード"
@@ -14320,6 +14356,13 @@ msgid "A helper for IRS satellite adjustment."
 msgstr "IRS 衛星の位置合わせの補助ツールです。"
 
 msgid ""
+"Provides Java Native Access (JNA) library. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+"Java Native Access (JNA) "
+"ライブラリを提供します。ユーザーが直接インストールするものではなく、他のプラグインの依存関係でインストールされるものです。"
+
+msgid ""
 "Provides Java Topology Suite (JTS) library and related utilities. Not meant "
 "to be installed directly by users, but rather as a dependency for other "
 "plugins."
@@ -14523,7 +14566,7 @@ msgid "Plugin to digital sign OSM-Data"
 msgstr "OSMデータに電子署名をするプラグイン"
 
 msgid "${plugin.description}"
-msgstr ""
+msgstr "${plugin.description}"
 
 msgid ""
 "Provides a straightforward GUI for adding, editing and deleting turn lanes."
@@ -14657,7 +14700,7 @@ msgid "Lanes"
 msgstr "車線数"
 
 msgid "Max. speed (km/h)"
-msgstr "最高速度 (km/h)"
+msgstr "最高速度(km/h)"
 
 msgid "Bridge"
 msgstr "橋"
@@ -14693,7 +14736,26 @@ msgid "Lit"
 msgstr "照明"
 
 msgid "Width (meters)"
-msgstr "幅 (m)"
+msgstr "幅(m)"
+
+msgid "Sidewalk"
+msgstr "歩道"
+
+msgctxt "sidewalk"
+msgid "both"
+msgstr "両側"
+
+msgctxt "sidewalk"
+msgid "left"
+msgstr "左側"
+
+msgctxt "sidewalk"
+msgid "right"
+msgstr "右側"
+
+msgctxt "sidewalk"
+msgid "no"
+msgstr "なし"
 
 msgid "Service type"
 msgstr "線路の種別"
@@ -14863,13 +14925,13 @@ msgid "Wheelchairs"
 msgstr "車いす"
 
 msgid "Height (meters)"
-msgstr "高さ (m)"
+msgstr "高さ(m)"
 
 msgid "Max. width (meters)"
-msgstr "最大幅 (m)"
+msgstr "最大幅(m)"
 
 msgid "Max. height (meters)"
-msgstr "最大高 (m)"
+msgstr "最大高(m)"
 
 msgid "pitch"
 msgstr "競技場"
@@ -14960,7 +15022,7 @@ msgstr "馬術"
 
 msgctxt "sport"
 msgid "gaelic_games"
-msgstr "ゲーリック・ゲーム"
+msgstr "ゲーリックゲーム"
 
 msgctxt "sport"
 msgid "golf"
@@ -15061,15 +15123,19 @@ msgstr "Mo-Fr 09:00-18:00,Sa 08:00-14:00"
 msgid "May-Sep 09:30-12:30,14:15-19:30"
 msgstr "May-Sep 09:30-12:30,14:15-19:30"
 
+msgctxt "parking"
 msgid "multi-storey"
-msgstr "多階の建物"
+msgstr "多層階"
 
+msgctxt "parking"
 msgid "surface"
 msgstr "平面"
 
+msgctxt "parking"
 msgid "underground"
 msgstr "地下"
 
+msgctxt "parking"
 msgid "rooftop"
 msgstr "屋上"
 
@@ -15116,13 +15182,13 @@ msgid "Post code"
 msgstr "郵便番号"
 
 msgid "Distance (km)"
-msgstr "距離 (km)"
+msgstr "距離(km)"
 
 msgid "Ascent (m)"
-msgstr "上り坂 (m)"
+msgstr "上り坂(m)"
 
 msgid "Descent (m)"
-msgstr "下り坂 (m)"
+msgstr "下り坂(m)"
 
 msgid "Roundtrip"
 msgstr "周回ルート"
@@ -15260,7 +15326,7 @@ msgid "110000;20000"
 msgstr "110000;20000"
 
 msgid "Branch operator"
-msgstr "支店の運営者"
+msgstr "支店"
 
 msgid "Amount of Cables"
 msgstr "ケーブル数"
@@ -15337,7 +15403,7 @@ msgid "vacuum"
 msgstr "真空"
 
 msgid "Max. weight (tonnes)"
-msgstr "最大重量 (t)"
+msgstr "最大重量(t)"
 
 msgid "Toll"
 msgstr "料金"
@@ -15423,7 +15489,7 @@ msgid "Living Street"
 msgstr "生活道路"
 
 msgid "Pedestrian"
-msgstr "歩行者専用道路"
+msgstr "歩行者天国"
 
 msgid "Area"
 msgstr "エリア"
@@ -15492,10 +15558,10 @@ msgid "Motor vehicles"
 msgstr "動力付き車両"
 
 msgid "Light Commercial Vehicles (goods)"
-msgstr "軽トラック (goods)"
+msgstr "軽トラック(goods)"
 
 msgid "Heavy Goods Vehicles (hgv)"
-msgstr "中大型貨物車 (hgv)"
+msgstr "中大型貨物車(hgv)"
 
 msgid "Vehicles per use"
 msgstr "車両の利用目的別"
@@ -15507,34 +15573,45 @@ msgid "Emergency vehicles"
 msgstr "緊急車両"
 
 msgid "High-occupancy vehicles (hov)"
-msgstr "相乗り車 (hov)"
+msgstr "相乗り車(hov)"
 
 msgid "Public Service Vehicles (psv)"
-msgstr "公共交通機関 (psv)"
+msgstr "公共交通機関(psv)"
 
 msgid "Tourist buses"
 msgstr "観光バス"
 
 msgid "Min. speed (km/h)"
-msgstr "最低速度 (km/h)"
+msgstr "最低速度(km/h)"
 
 msgid "Max. axleload (tonnes)"
-msgstr "最大軸重 (t)"
+msgstr "最大軸重(t)"
 
 msgid "Max. length (meters)"
-msgstr "最大長 (m)"
+msgstr "最大長(m)"
 
 msgid "Overtaking"
 msgstr "追い越し"
 
+msgctxt "overtaking"
+msgid "yes"
+msgstr "可"
+
+msgctxt "overtaking"
 msgid "both"
 msgstr "両方向"
 
+msgctxt "overtaking"
 msgid "forward"
-msgstr "下り方向"
+msgstr "前方向"
 
+msgctxt "overtaking"
 msgid "backward"
-msgstr "上り方向"
+msgstr "後方向"
+
+msgctxt "overtaking"
+msgid "no"
+msgstr "禁止"
 
 msgid "Roundabout"
 msgstr "ロータリー交差点"
@@ -15829,6 +15906,12 @@ msgstr "馬・歩行者・自転車用"
 msgid "tiger"
 msgstr "歩行者・自転車用(混合)"
 
+msgid "Button operated"
+msgstr "押しボタン式"
+
+msgid "Sound signals"
+msgstr "警報音"
+
 msgid "Crossing attendant"
 msgstr "有人"
 
@@ -15881,10 +15964,10 @@ msgid "Passing Place"
 msgstr "対向車待機所"
 
 msgid "Turning Circle"
-msgstr "転回場 (島なし)"
+msgstr "転回場(島なし)"
 
 msgid "Turning Loop"
-msgstr "転回ループ (島あり)"
+msgstr "転回ループ(島あり)"
 
 msgid "City Limit"
 msgstr "市町村境界標識"
@@ -15937,9 +16020,11 @@ msgstr "プラスチック"
 msgid "Cycle Barrier"
 msgstr "自転車止め"
 
+# http://en.wikipedia.org/wiki/Cattle_grid
 msgid "Cattle Grid"
 msgstr "家畜脱出防止溝"
 
+# http://en.wikipedia.org/wiki/Bus_trap
 msgid "Bus Trap"
 msgstr "バストラップ"
 
@@ -16172,7 +16257,7 @@ msgstr "海岸線"
 
 msgid ""
 "Line between the sea and land (with the water on the right side of the way)."
-msgstr "海と陸の境界線です(水面がウェイの右側)。"
+msgstr "海と陸の境界線です(水面がウェイの右側)。"
 
 msgid "Riverbank"
 msgstr "川岸"
@@ -16350,9 +16435,6 @@ msgstr "踏切"
 msgid "Traffic lights"
 msgstr "警報灯"
 
-msgid "Sound signals"
-msgstr "警報音"
-
 msgid "Barrier"
 msgstr "柵"
 
@@ -18055,7 +18137,7 @@ msgid "water_park"
 msgstr "ウォーターパーク"
 
 msgid "Scuba Diving"
-msgstr ""
+msgstr "スキューバダイビング"
 
 msgid "Piste type"
 msgstr "雪道の種類"
@@ -18412,6 +18494,9 @@ msgstr "風車"
 msgid "Gasometer"
 msgstr "ガスタンク"
 
+msgid "Bunker Silo"
+msgstr "バンカーサイロ"
+
 msgid "Pipeline"
 msgstr "パイプライン"
 
@@ -18558,15 +18643,15 @@ msgstr "観測所"
 msgid "Monitoring:"
 msgstr "観測対象:"
 
-msgid "Weather"
-msgstr "気象"
-
 msgid "Water level"
 msgstr "水位"
 
 msgid "Tide Level"
 msgstr "潮位"
 
+msgid "Groundwater"
+msgstr ""
+
 msgid "Traffic"
 msgstr "交通"
 
@@ -18585,6 +18670,9 @@ msgstr "GLONASS信号"
 msgid "Galileo Signals"
 msgstr "Galileo信号"
 
+msgid "Weather"
+msgstr "気象"
+
 msgid "Radiation"
 msgstr "放射線"
 
@@ -18676,7 +18764,7 @@ msgid "Inclination in degrees"
 msgstr "傾き(角度)"
 
 msgid "Height in meter (m)"
-msgstr "高さ (m)"
+msgstr "高さ(m)"
 
 msgid "Bridges"
 msgstr "橋の種類"
@@ -18765,6 +18853,9 @@ msgstr "昇開橋用の橋脚"
 msgid "pivot_pier"
 msgstr "支点の橋脚"
 
+msgid "Bridge outline"
+msgstr "橋の輪郭"
+
 msgid "Power Plant"
 msgstr "発電所"
 
@@ -19054,7 +19145,7 @@ msgid "industrial"
 msgstr "工場内"
 
 msgid "Power rating (kVA/MVA)"
-msgstr "変換能力 (kVA/MVA)"
+msgstr "変換能力(kVA/MVA)"
 
 msgid "2700 kVA"
 msgstr "2700kVA"
@@ -19372,6 +19463,15 @@ msgstr "未使用あり"
 msgid "Pole"
 msgstr "電柱"
 
+msgid "Pole with Transformer"
+msgstr "変電器つきの電柱"
+
+msgid "Pole Attributes:"
+msgstr "電柱の属性:"
+
+msgid "Transformer Attributes:"
+msgstr "変電器の属性:"
+
 msgid "Power Line"
 msgstr "送電線"
 
@@ -19421,9 +19521,15 @@ msgstr "通信に利用"
 msgid "Power Cable"
 msgstr "電力ケーブル"
 
+msgctxt "power cable"
+msgid "underground"
+msgstr "地下"
+
+msgctxt "power cable"
 msgid "underwater"
-msgstr "水底"
+msgstr "水面下"
 
+msgctxt "power cable"
 msgid "overground"
 msgstr "地上"
 
@@ -19451,6 +19557,33 @@ msgstr "記念堂"
 msgid "Memorial"
 msgstr "記念碑"
 
+msgctxt "memorial"
+msgid "statue"
+msgstr "像"
+
+msgctxt "memorial"
+msgid "bust"
+msgstr "胸像"
+
+msgctxt "memorial"
+msgid "plaque"
+msgstr "飾り額"
+
+msgctxt "memorial"
+msgid "stele"
+msgstr "石碑"
+
+msgctxt "memorial"
+msgid "stone"
+msgstr "石碑"
+
+msgctxt "memorial"
+msgid "war_memorial"
+msgstr "戦争記念碑"
+
+msgid "Inscription"
+msgstr "碑文"
+
 msgid "Wayside Cross"
 msgstr "道路際の十字架"
 
@@ -19520,6 +19653,9 @@ msgstr "酒店"
 msgid "Beverages"
 msgstr "飲料店"
 
+msgid "Wine"
+msgstr "ワイン店"
+
 msgid "Boutique"
 msgstr "ブティック"
 
@@ -19565,6 +19701,9 @@ msgstr "ビデオ"
 msgid "Video Games"
 msgstr "ビデオゲーム"
 
+msgid "Music"
+msgstr "CD店"
+
 msgid "Cash"
 msgstr "お金"
 
@@ -19592,6 +19731,9 @@ msgstr "キッチン販売店"
 msgid "Curtain"
 msgstr "カーテン店"
 
+msgid "Art"
+msgstr "アート"
+
 msgid "Frame"
 msgstr "額縁店"
 
@@ -19637,6 +19779,9 @@ msgstr "理美容店"
 msgid "Beauty"
 msgstr "美容"
 
+msgid "Tattoo"
+msgstr "刺青"
+
 msgid "Optician"
 msgstr "眼鏡店"
 
@@ -19688,6 +19833,9 @@ msgstr "かばん店"
 msgid "Pet"
 msgstr "ペット店"
 
+msgid "Funeral Directors"
+msgstr "葬儀社"
+
 msgid "Vending Machine"
 msgstr "自動販売機"
 
@@ -19787,6 +19935,15 @@ msgstr "郵便番号"
 msgid "National Park"
 msgstr "国立公園"
 
+msgid "Protected Area"
+msgstr "保護区域"
+
+msgid "Protected Class"
+msgstr "保護クラス"
+
+msgid "Title or type of protection"
+msgstr "保護の種類"
+
 msgid "Places"
 msgstr "地名"
 
@@ -19933,7 +20090,7 @@ msgstr "草原"
 msgid ""
 "Where vegetation is dominated by grasses (Poaceae) and other herbaceous (non-"
 "woody) plants. Excludes cultivated areas and wetlands."
-msgstr "(イネ科の)草または類似の(木ではない)植物に覆われた植生地です。耕作地や湿地は除きます。"
+msgstr "(イネ科の)草または類似の(木ではない)植物に覆われた植生地です。耕作地や湿地は除きます。"
 
 msgid "pampas"
 msgstr "パンパス"
@@ -20346,13 +20503,13 @@ msgid "potential"
 msgstr "恐らく"
 
 msgid "Contact (Common Schema)"
-msgstr "連絡先 (共通スキーマ)"
+msgstr "連絡先(共通スキーマ)"
 
 msgid "Image"
 msgstr "画像"
 
 msgid "Contact (Schema with ''contact:*'' Prefix)"
-msgstr "連絡先 (''contact:*''接頭辞のついたスキーマ)"
+msgstr "連絡先(''contact:*''接頭辞のついたスキーマ)"
 
 msgid "outer segment"
 msgstr "外側の区間"
@@ -20864,8 +21021,14 @@ msgstr "Estonia Basemap (Maaamet)"
 msgid "Estonia Ortho (Maaamet)"
 msgstr "Estonia Ortho (Maaamet)"
 
-msgid "Estonia Multi (Maaamet)"
-msgstr "Estonia Multi (Maaamet)"
+msgid "Estonia Hillshade (Maaamet)"
+msgstr ""
+
+msgid "Estonia Cadastre (Maaamet)"
+msgstr ""
+
+msgid "Estonia Forestry (Maaamet)"
+msgstr ""
 
 msgid "Bordeaux - 2012"
 msgstr "Bordeaux - 2012"
@@ -20888,8 +21051,8 @@ msgstr "CRAIG - Le Puy 2010 - 15 cm"
 msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
 msgstr "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
 
-msgid "CUGN Nancy - Orthophoto 2012"
-msgstr "CUGN Nancy - Orthophoto 2012"
+msgid "GrandNancy Orthophotographie 2012"
+msgstr "GrandNancy Orthophotographie 2012"
 
 msgid "Géobretagne - Brest 2010 - 10 cm"
 msgstr "Géobretagne - Brest 2010 - 10 cm"
@@ -20937,9 +21100,6 @@ msgstr ""
 "Vercors - Réserve naturelle des Hauts-Plateaux du Vercors - Orthophotos 1999 "
 "- 1 m"
 
-msgid "Streets NRW Geofabrik.de"
-msgstr "Streets NRW Geofabrik.de"
-
 msgid "Hike & Bike"
 msgstr "Hike & Bike"
 
@@ -21001,6 +21161,9 @@ msgstr "NRW-Atlas: Luftbilder"
 msgid "NRW-Atlas: Topographische Karte 1:10000"
 msgstr "NRW-Atlas: Topographische Karte 1:10000"
 
+msgid "Metropole Ruhr: Luftbilder (10 cm)"
+msgstr "Metropole Ruhr: Luftbilder (10 cm)"
+
 msgid "Drone Imagery (Haiti)"
 msgstr "Drone Imagery (Haiti)"
 
@@ -21053,16 +21216,16 @@ msgid "ORT10LT (Lithuania)"
 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 "Niger Delta Oct 2012 Landsat"
@@ -21202,6 +21365,9 @@ msgstr "Stadtplan Zürich"
 msgid "Stadt Zürich Übersichtsplan (Strassen, Gebäude, Hausnummer)"
 msgstr "Stadt Zürich Übersichtsplan (Strassen, Gebäude, Hausnummer)"
 
+msgid "Stadt Zürich Luftbild 2011"
+msgstr "Stadt Zürich Luftbild 2011"
+
 msgid "Orthofoto Kanton Solothurn RGB (SOGIS 2011/2012/2013)"
 msgstr "Orthofoto Kanton Solothurn RGB (SOGIS 2011/2012/2013)"
 
@@ -21220,8 +21386,8 @@ msgstr "Canton du Jura 50cm (RCJU 1998)"
 msgid "Canton de Fribourg 50cm (2005)"
 msgstr "Canton de Fribourg 50cm (2005)"
 
-msgid "Stadt Bern 10cm/25cm (2008)"
-msgstr "Stadt Bern 10cm/25cm (2008)"
+msgid "Stadt Bern 10cm/25cm (2012)"
+msgstr "Stadt Bern 10cm/25cm (2012)"
 
 msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
 msgstr "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
@@ -21259,8 +21425,8 @@ msgstr "USGS Large Scale Imagery"
 msgid "OSM US TIGER 2012 Roads Overlay"
 msgstr "OSM US TIGER 2012 Roads Overlay"
 
-msgid "New & Misaligned TIGER Roads (TIGER 2013)"
-msgstr "New & Misaligned TIGER Roads (TIGER 2013)"
+msgid "New & Misaligned TIGER Roads (TIGER 2014)"
+msgstr ""
 
 msgid "MassGIS L3 Parcels"
 msgstr "MassGIS L3 Parcels"
@@ -21307,9 +21473,234 @@ msgstr "OS Scottish Popular historic"
 msgid "NLS - Bartholomew Half Inch, 1897-1907"
 msgstr "NLS - Bartholomew Half Inch, 1897-1907"
 
+msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgstr "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+
+msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgstr "OS Town Plans, Airdrie 1858 (NLS)"
+
+msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgstr "OS Town Plans, Alexandria 1859 (NLS)"
+
+msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgstr "OS Town Plans, Alloa 1861-1862 (NLS)"
+
+msgid "OS Town Plans, Annan 1859 (NLS)"
+msgstr "OS Town Plans, Annan 1859 (NLS)"
+
+msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgstr "OS Town Plans, Arbroath 1858 (NLS)"
+
+msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgstr "OS Town Plans, Ayr 1855 (NLS)"
+
+msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgstr "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+
+msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgstr "OS Town Plans, Brechin 1862 (NLS)"
+
+msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgstr "OS Town Plans, Burntisland 1894 (NLS)"
+
+msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgstr "OS Town Plans, Campbelton 1865 (NLS)"
+
+msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgstr "OS Town Plans, Coatbridge 1858 (NLS)"
+
 msgid "OS Town Plans, Cupar 1854 (NLS)"
 msgstr "OS Town Plans, Cupar 1854 (NLS)"
 
+msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgstr "OS Town Plans, Cupar 1893-1894 (NLS)"
+
+msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgstr "OS Town Plans, Dalkeith 1852 (NLS)"
+
+msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgstr "OS Town Plans, Dalkeith 1893 (NLS)"
+
+msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgstr "OS Town Plans, Dumbarton 1859 (NLS)"
+
+msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgstr "OS Town Plans, Dumfries 1850 (NLS)"
+
+msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgstr "OS Town Plans, Dumfries 1893 (NLS)"
+
+msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgstr "OS Town Plans, Dundee 1857-1858 (NLS)"
+
+msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgstr "OS Town Plans, Dundee 1870-1872 (NLS)"
+
+msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgstr "OS Town Plans, Dunfermline 1854 (NLS)"
+
+msgid "OS Town Plans, Dunfermline 1894 (NLS)"
+msgstr "OS Town Plans, Dunfermline 1894 (NLS)"
+
+msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
+msgstr "OS Town Plans, Edinburgh 1849-1851 (NLS)"
+
+msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
+msgstr "OS Town Plans, Edinburgh 1876-1877 (NLS)"
+
+msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
+msgstr "OS Town Plans, Edinburgh 1893-1894 (NLS)"
+
+msgid "OS Town Plans, Elgin 1868 (NLS)"
+msgstr "OS Town Plans, Elgin 1868 (NLS)"
+
+msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
+msgstr "OS Town Plans, Falkirk 1858-1859 (NLS)"
+
+msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
+msgstr "OS Town Plans, Forfar 1860-1861 (NLS)"
+
+msgid "OS Town Plans, Forres 1868 (NLS)"
+msgstr "OS Town Plans, Forres 1868 (NLS)"
+
+msgid "OS Town Plans, Galashiels 1858 (NLS)"
+msgstr "OS Town Plans, Galashiels 1858 (NLS)"
+
+msgid "OS Town Plans, Girvan 1857 (NLS)"
+msgstr "OS Town Plans, Girvan 1857 (NLS)"
+
+msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
+msgstr "OS Town Plans, Glasgow 1857-1858 (NLS)"
+
+msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
+msgstr "OS Town Plans, Glasgow 1892-1894 (NLS)"
+
+msgid "OS Town Plans, Greenock 1857 (NLS)"
+msgstr "OS Town Plans, Greenock 1857 (NLS)"
+
+msgid "OS Town Plans, Haddington 1853 (NLS)"
+msgstr "OS Town Plans, Haddington 1853 (NLS)"
+
+msgid "OS Town Plans, Haddington 1893 (NLS)"
+msgstr "OS Town Plans, Haddington 1893 (NLS)"
+
+msgid "OS Town Plans, Hamilton 1858 (NLS)"
+msgstr "OS Town Plans, Hamilton 1858 (NLS)"
+
+msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
+msgstr "OS Town Plans, Hawick 1857-1858 (NLS)"
+
+msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
+msgstr "OS Town Plans, Inverness 1867-1868 (NLS)"
+
+msgid "OS Town Plans, Irvine 1859 (NLS)"
+msgstr "OS Town Plans, Irvine 1859 (NLS)"
+
+msgid "OS Town Plans, Jedburgh 1858 (NLS)"
+msgstr "OS Town Plans, Jedburgh 1858 (NLS)"
+
+msgid "OS Town Plans, Kelso 1857 (NLS)"
+msgstr "OS Town Plans, Kelso 1857 (NLS)"
+
+msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
+msgstr "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
+
+msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
+msgstr "OS Town Plans, Kirkcaldy 1855 (NLS)"
+
+msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
+msgstr "OS Town Plans, Kirkcaldy 1894 (NLS)"
+
+msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
+msgstr "OS Town Plans, Kirkcudbright 1850 (NLS)"
+
+msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
+msgstr "OS Town Plans, Kirkcudbright 1893 (NLS)"
+
+msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
+msgstr "OS Town Plans, Kirkintilloch 1859 (NLS)"
+
+msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
+msgstr "OS Town Plans, Kirriemuir 1861 (NLS)"
+
+msgid "OS Town Plans, Lanark 1858 (NLS)"
+msgstr "OS Town Plans, Lanark 1858 (NLS)"
+
+msgid "OS Town Plans, Linlithgow 1856 (NLS)"
+msgstr "OS Town Plans, Linlithgow 1856 (NLS)"
+
+msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
+msgstr "OS Town Plans, Mayole 1856-1857 (NLS)"
+
+msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
+msgstr "OS Town Plans, Montrose 1861-1862 (NLS)"
+
+msgid "OS Town Plans, Musselburgh 1853 (NLS)"
+msgstr "OS Town Plans, Musselburgh 1853 (NLS)"
+
+msgid "OS Town Plans, Musselburgh 1893 (NLS)"
+msgstr "OS Town Plans, Musselburgh 1893 (NLS)"
+
+msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
+msgstr "OS Town Plans, Nairn 1867-1868 (NLS)"
+
+msgid "OS Town Plans, Oban 1867-1868 (NLS)"
+msgstr "OS Town Plans, Oban 1867-1868 (NLS)"
+
+msgid "OS Town Plans, Peebles 1856 (NLS)"
+msgstr "OS Town Plans, Peebles 1856 (NLS)"
+
+msgid "OS Town Plans, Perth 1860 (NLS)"
+msgstr "OS Town Plans, Perth 1860 (NLS)"
+
+msgid "OS Town Plans, Peterhead 1868 (NLS)"
+msgstr "OS Town Plans, Peterhead 1868 (NLS)"
+
+msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
+msgstr "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
+
+msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
+msgstr "OS Town Plans, Portobello 1893-1894 (NLS)"
+
+msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
+msgstr "OS Town Plans, Rothesay 1862-1863 (NLS)"
+
+msgid "OS Town Plans, Selkirk 1865 (NLS)"
+msgstr "OS Town Plans, Selkirk 1865 (NLS)"
+
+msgid "OS Town Plans, St Andrews 1854 (NLS)"
+msgstr "OS Town Plans, St Andrews 1854 (NLS)"
+
+msgid "OS Town Plans, St Andrews 1893 (NLS)"
+msgstr "OS Town Plans, St Andrews 1893 (NLS)"
+
+msgid "OS Town Plans, Stirling 1858 (NLS)"
+msgstr "OS Town Plans, Stirling 1858 (NLS)"
+
+msgid "OS Town Plans, Stonehaven 1864 (NLS)"
+msgstr "OS Town Plans, Stonehaven 1864 (NLS)"
+
+msgid "OS Town Plans, Stranraer 1847 (NLS)"
+msgstr "OS Town Plans, Stranraer 1847 (NLS)"
+
+msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
+msgstr "OS Town Plans, Stranraer 1863-1877 (NLS)"
+
+msgid "OS Town Plans, Stranraer 1893 (NLS)"
+msgstr "OS Town Plans, Stranraer 1893 (NLS)"
+
+msgid "OS Town Plans, Strathaven 1858 (NLS)"
+msgstr "OS Town Plans, Strathaven 1858 (NLS)"
+
+msgid "OS Town Plans, Wick 1872 (NLS)"
+msgstr "OS Town Plans, Wick 1872 (NLS)"
+
+msgid "OS Town Plans, Wigtown 1848 (NLS)"
+msgstr "OS Town Plans, Wigtown 1848 (NLS)"
+
+msgid "OS Town Plans, Wigtown 1894 (NLS)"
+msgstr "OS Town Plans, Wigtown 1894 (NLS)"
+
 msgid "Decreasing house numbers in addresses interpolation"
 msgstr "住所の補完で住居番号が減少している"
 
@@ -21363,19 +21754,39 @@ msgid "{0}={1} is deprecated. Please use instead a multipolygon."
 msgstr "{0}={1}は推奨されません。代わりにマルチポリゴンを使用してください。"
 
 msgid ""
-"{0} is deprecated. Please specify ìnterval by using opening_hours syntax"
-msgstr "{0}は推奨されません。opening_hoursの文法で間隔を指定してください"
+"{0} is deprecated. Please specify interval by using opening_hours syntax"
+msgstr "{0}は推奨されません。opening_hoursの文法を使用して間隔を指定してください"
 
 msgid ""
 "{0} is deprecated. Please delete this object and use a private layer instead"
 msgstr "{0}は推奨されません。このオブジェクトを削除して、代わりにプライベートレイヤーを使用してください"
 
+msgid "{0}={1} is unspecific. Please replace ''{1}'' by a specific value."
+msgstr "{0}={1}は未定義です。「{1}」を具体的な値に置き換えてください。"
+
+msgid "{0} should be replaced with {1}"
+msgstr "{0}は{1}に置き換えるべきです"
+
+msgid ""
+"{0}={1} is unspecific. Please replace ''{1}'' by ''left'', ''right'' or "
+"''both''."
+msgstr "{0}={1}は未定義です。''{1}''を''left''、''right''、''both''のいずれかに置き換えてください。"
+
+msgid "{0} on a node. Should be used on a way."
+msgstr "{0}がノードに設定されています。ウェイに設定するべきです。"
+
+msgid "{0} on a node. Should be drawn as an area."
+msgstr "{0}がノードに設定されています。エリアとして描画するべきです。"
+
+msgid "{0}=* on a node. Should be used in a relation"
+msgstr "{0}=*がノードに設定されています。リレーションに設定するべきです"
+
+msgid "{0} on a way. Should be used in a relation"
+msgstr "{0}はウェイ上にあります。リレーションの中で使用してください"
+
 msgid "{0} on a node"
 msgstr "{0}がノード上にある"
 
-msgid "{0} on a node. Should be drawn as an area"
-msgstr "{0}がノードに設定されています。エリアとして描くべきです。"
-
 msgid "Building inside building"
 msgstr "建物の内側にある建物"
 
@@ -21502,7 +21913,7 @@ msgid "Less obtrusive node symbols at low zoom"
 msgstr "低いズームで目立たないノードシンボル"
 
 msgid "Display street labels (at high zoom)"
-msgstr "通りのラベルを表示(大きいズームの時)"
+msgstr "通りのラベルを表示(大きいズームの時)"
 
 msgid "OSM Export"
 msgstr "OSMエクスポート"
@@ -21682,7 +22093,7 @@ msgid "Public (shown in trace list and as anonymous, unordered points)"
 msgstr "公開(トレース一覧に匿名で表示、点は順不同)"
 
 msgid "Trackable (only shared as anonymous, ordered points with timestamps)"
-msgstr "追跡可能 (匿名で共有、点はタイムスタンプ付き)"
+msgstr "追跡可能(匿名で共有、点はタイムスタンプ付き)"
 
 msgid ""
 "Identifiable (shown in trace list and as identifiable, ordered points with "
@@ -21708,7 +22119,7 @@ msgid "Please enter Description about your trace."
 msgstr "あなたのトレースについて説明を記入して下さい"
 
 msgid "Tags (comma delimited)"
-msgstr "タグ (カンマ区切り)"
+msgstr "タグ(カンマ区切り)"
 
 msgid "Please enter tags about your trace."
 msgstr "あなたのトレースについて属性タグを記入して下さい"
@@ -22712,21 +23123,23 @@ msgid ""
 "Maximum distance away each point in the sequence can be from a line, in "
 "pixels (Default: {0})."
 msgstr ""
+"Maximum distance away each point in the sequence can be from a line, in "
+"pixels (Default: {0})."
 
 msgid "Tolerance Distance"
-msgstr ""
+msgstr "距離の許容度"
 
 msgid "Tolerance for fitting angles, in radians (Default {0})."
-msgstr ""
+msgstr "角度合わせの許容度、ラジアン単位です(既定値は{0})。"
 
 msgid "Tolerance Angle"
-msgstr ""
+msgstr "角度の許容度"
 
 msgid "Plugin Settings"
 msgstr "プラグイン設定"
 
 msgid "Show Address Dialog after mapping an area"
-msgstr ""
+msgstr "エリアを描いた後で住所ダイアログを表示"
 
 msgid "show address dialog"
 msgstr "住所ダイアログを表示"
@@ -22828,22 +23241,22 @@ msgstr ""
 "おそらくキャッシュファイルが古いと思われます。"
 
 msgid "Lambert Zone {0} cache file (.{0})"
-msgstr "ランベルトゾーン {0}のキャッシュファイル (.{0})"
+msgstr "ランベルトゾーン {0}のキャッシュファイル(.{0})"
 
 msgid "Lambert CC9 Zone {0} cache file (.CC{0})"
-msgstr "ランベルト CC9  ゾーン {0}のキャッシュファイル (.CC{0})"
+msgstr "ランベルト CC9  ゾーン {0}のキャッシュファイル(.CC{0})"
 
 msgid "Guadeloupe Fort-Marigot cache file (.UTM1)"
-msgstr "Guadeloupe Fort-Marigot キャッシュファイル (.UTM1)"
+msgstr "Guadeloupe Fort-Marigot キャッシュファイル(.UTM1)"
 
 msgid "Guadeloupe Ste-Anne cache file (.UTM2)"
-msgstr "Guadeloupe Ste-Anne キャッシュファイル (.UTM2)"
+msgstr "Guadeloupe Ste-Anne キャッシュファイル(.UTM2)"
 
 msgid "Martinique Fort Desaix cache file (.UTM3)"
-msgstr "Martinique Fort Desaix キャッシュファイル (.UTM3)"
+msgstr "Martinique Fort Desaix キャッシュファイル(.UTM3)"
 
 msgid "Reunion RGR92 cache file (.UTM4)"
-msgstr "Reunion RGR92 キャッシュファイル (.UTM4)"
+msgstr "Reunion RGR92 キャッシュファイル(.UTM4)"
 
 msgid "CadastreGrabber: Illegal url."
 msgstr "CadastreGrabber: 不正な url."
@@ -22913,7 +23326,7 @@ msgid "Replace original background by JOSM background color."
 msgstr "JOSM背景色で、オリジナルの背景を置き換える。"
 
 msgid "Reverse grey colors (for black backgrounds)."
-msgstr "グレーカラーの反転 (黒い背景用)."
+msgstr "グレーカラーの反転(黒い背景用)."
 
 msgid "Set background transparent."
 msgstr "背景を透明に設定。"
@@ -22934,7 +23347,7 @@ msgid "Select first WMS layer in list."
 msgstr "リスト中の最初のWMSレイヤーを選択。"
 
 msgid "Don''t use relation for addresses (but \"addr:street\" on elements)."
-msgstr "アドレスにはリレーションを使わないでください (エレメントには \"addr:street\" を使用)。"
+msgstr "住所にはリレーションを使わないでください(要素に\"addr:street\"を使用してください)。"
 
 msgid "off"
 msgstr "オフ"
@@ -22973,7 +23386,7 @@ msgid "Enable automatic caching."
 msgstr "自動キャッシュを有効にする"
 
 msgid "Max. cache size (in MB)"
-msgstr "最大キャッシュサイズをMB単位で指定します。"
+msgstr "最大キャッシュサイズ(MB)"
 
 msgid "French cadastre WMS"
 msgstr "フランスのCadastre WMS"
@@ -22988,10 +23401,9 @@ msgid ""
 "<BR>before any upload of data created by this plugin."
 msgstr ""
 "フランス cadastre wms (www.cadastre.gouv.fr) "
-"の特別なハンドラ<BR><BR>このプラグインで作成されたデータをアップロードする前に、こちらの利用許諾条件を読んでください (フランス語): "
-"<br><a "
-"href=\"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.htm"
-"l\"> "
+"の特別なハンドラ<BR><BR>このプラグインで作成されたデータをアップロードする前に、こちらの利用許諾条件を読んでください(フランス語): "
+"<br><a href=\"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales"
+"_fr.html\"> "
 "http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html</a>"
 
 msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
@@ -23276,7 +23688,7 @@ msgid "PNG files (*.png)"
 msgstr "PNG ファイル (*.png)"
 
 msgid "GeoTiff files (*.tif)"
-msgstr "GeoTiff ファイル (*.tif)"
+msgstr "GeoTiff ファイル(*.tif)"
 
 msgid "Export image (only raster images)"
 msgstr "画像をエクスポート(ラスタ画像のみ)"
@@ -23356,7 +23768,7 @@ msgid "Reset offset (only vector images)"
 msgstr "オフセットを初期化(ベクトルイメージのみ)"
 
 msgid "WMS layer ({0}), {1} tile(s) loaded"
-msgstr "WMSレイヤー ({0}), {1}枚のタイルを読み込みました"
+msgstr "WMSレイヤー({0}), {1}枚のタイルを読み込みました"
 
 msgid "Is not vectorized."
 msgstr "ベクターではありません。"
@@ -23415,7 +23827,7 @@ msgid "Color Schemes"
 msgstr "配色"
 
 msgid "Conflate object pair"
-msgstr ""
+msgstr "一対のオブジェクトを統合"
 
 msgid "Added {0} object to subject layer"
 msgid_plural "Added {0} objects to subject layer"
@@ -23491,10 +23903,10 @@ msgid "Distances greater than this will result in a score of zero."
 msgstr ""
 
 msgid "Centroid distance"
-msgstr ""
+msgstr "中点距離"
 
 msgid "Hausdorff distance"
-msgstr ""
+msgstr "ハウスドルフ距離"
 
 msgid "Configure conflation settings"
 msgstr ""
@@ -23527,7 +23939,7 @@ msgid "Error freezing selection"
 msgstr ""
 
 msgid "Nothing is selected, please try again."
-msgstr ""
+msgstr "何も選択していません。やり直してください。"
 
 msgid "Empty selection"
 msgstr "選択されていません"
@@ -23695,7 +24107,7 @@ msgid "not logged in"
 msgstr "ログインしていません"
 
 msgid "Failed to log in to GeoChat:"
-msgstr ""
+msgstr "GeoChatへのログインに失敗しました:"
 
 msgid "Failed to send message:"
 msgstr "メッセージの送信に失敗しました:"
@@ -23941,22 +24353,22 @@ msgid "Couldn''t find built-in ruleset {0}"
 msgstr "内蔵ルールセット {0} が見つかりません"
 
 msgid "height (m)"
-msgstr "高さ (m)"
+msgstr "高さ(m)"
 
 msgid "width (m)"
-msgstr "幅 (m)"
+msgstr "幅(m)"
 
 msgid "length (m)"
-msgstr "長さ (m)"
+msgstr "長さ(m)"
 
 msgid "speed (km/h)"
-msgstr "速度 (km/h)"
+msgstr "速度(km/h)"
 
 msgid "weight (t)"
-msgstr "重量 (t)"
+msgstr "重量(t)"
 
 msgid "axleload (t)"
-msgstr "軸重 (t)"
+msgstr "軸重(t)"
 
 msgid "Bookmark name"
 msgstr "ブックマーク名"
@@ -23983,13 +24395,13 @@ msgid "Road requirements"
 msgstr "道路の要件"
 
 msgid "Max. incline up (%, pos.)"
-msgstr "最大上り勾配 (%)"
+msgstr "最大上り勾配(%)"
 
 msgid "Maximum incline the vehicle can go up"
 msgstr "自動車が上ることができる最大上り勾配"
 
 msgid "Max. incline down (%, pos.)"
-msgstr "最大下り勾配 (%)"
+msgstr "最大下り勾配(%)"
 
 msgid "Maximum incline the vehicle can go down"
 msgstr "自動車が下ることができる最大下り勾配"
@@ -24431,7 +24843,7 @@ msgid "Imported Images"
 msgstr "インポートした画像"
 
 msgid "Image files (*.jpg, *.jpeg, *.png, *.gif)"
-msgstr "画像ファイル (*.jpg, *.jpeg, *.png, *.gif)"
+msgstr "画像ファイル(*.jpg, *.jpeg, *.png, *.gif)"
 
 msgid "Import vector graphics"
 msgstr "ベクターグラフィックスをインポート"
@@ -24446,7 +24858,7 @@ msgid "Importing..."
 msgstr "インポート中..."
 
 msgid "SVG files [ImportVec plugin] (*.svg)"
-msgstr "SVGファイル[ImportVecプラグイン] (*.svg)"
+msgstr "SVGファイル[ImportVecプラグイン](*.svg)"
 
 msgid "Please open or create data layer before importing"
 msgstr "インポート前にデータレイヤーを開くか新規作成するかしてください"
@@ -24666,10 +25078,10 @@ msgid "Maximum gray value to count as water (0-255)"
 msgstr "水域として判断する灰色の最大明度(0~255)"
 
 msgid "Line simplification accuracy (degrees)"
-msgstr "線を簡略化するぶれ幅 (度)"
+msgstr "線を簡略化するぶれ幅(度)"
 
 msgid "Resolution of Landsat tiles (pixels per degree)"
-msgstr "ランドサットタイルの解像度 (度あたりのピクセル)"
+msgstr "ランドサットタイルの解像度(度あたりのピクセル)"
 
 msgid "Size of Landsat tiles (pixels)"
 msgstr "ランドサットタイルのサイズ(ピクセル)"
@@ -26228,6 +26640,9 @@ msgstr "提案する停留所"
 msgid "Find"
 msgstr "検索"
 
+msgid "Show"
+msgstr "表示"
+
 msgid "Mark"
 msgstr "マーク"
 
@@ -26612,12 +27027,12 @@ msgstr "変更セット #{0} を取り消します"
 msgid ""
 "Warning: unsupported start element ''{0}'' in changeset content at position "
 "({1},{2}). Skipping."
-msgstr "警告: 変更セットコンテンツ中 ({1},{2}) の位置にサポートされない開始エレメント ''{0}'' があります。スキップします。"
+msgstr "警告: 変更セットコンテンツ中({1},{2})の位置にサポートされない開始エレメント ''{0}'' があります。スキップします。"
 
 msgid ""
 "Warning: unsupported end element ''{0}'' in changeset content at position "
 "({1},{2}). Skipping."
-msgstr "警告: 変更セットコンテンツ中 ({1},{2}) の位置にサポートされない終了エレメント ''{0}'' があります。スキップします。"
+msgstr "警告: 変更セットコンテンツ中({1},{2})の位置にサポートされない終了エレメント ''{0}'' があります。スキップします。"
 
 msgid "Road Sign Plugin"
 msgstr "Road Sign プラグイン"
@@ -26743,7 +27158,7 @@ msgid "Configure routing preferences."
 msgstr "ルーティング設定情報の構成"
 
 msgid "Speed (Km/h)"
-msgstr "速度 (Km/h)"
+msgstr "速度(Km/h)"
 
 msgid "Weight"
 msgstr "重み付け"
@@ -28662,7 +29077,7 @@ msgstr "以前スキャンしてwalking-papers.org にアップロードされ
 
 msgid ""
 "Enter a walking-papers.org URL or ID (the bit after the ?id= in the URL)"
-msgstr "walking-papers.org のURL またはID (URL中の ?id= の後のビット)を入力"
+msgstr "walking-papers.orgのURLまたはID(URL中の ?id= の後のビット)を入力"
 
 msgid "Could not read information from walking-papers.org the id \"{0}\""
 msgstr "walking-papers.org からの情報を読み取れませんでした。idは \"{0}\""
diff --git a/i18n/po/ka.po b/i18n/po/ka.po
index cf967b8..7cab125 100644
--- a/i18n/po/ka.po
+++ b/i18n/po/ka.po
@@ -1,8 +1,13 @@
+# Georgian translation for josm
+# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
+# This file is distributed under the same license as the josm package.
+# FIRST AUTHOR <EMAIL at ADDRESS>, 2009.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-21 03:38+0200\n"
+"POT-Creation-Date: 2014-12-10 03:42+0100\n"
 "PO-Revision-Date: 2011-12-16 00:14+0000\n"
 "Last-Translator: datogogishvili <Unknown>\n"
 "Language-Team: Georgian <ka at li.org>\n"
@@ -10,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-10-21 04:51+0000\n"
-"X-Generator: Launchpad (build 17203)\n"
+"X-Launchpad-Export-Date: 2014-12-10 04:47+0000\n"
+"X-Generator: Launchpad (build 17283)\n"
 "Language: ka\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -168,16 +173,6 @@ msgid "About JOSM..."
 msgstr "JOSM-ის შესახებ"
 
 msgid ""
-"Unexpected format of API base URL. Redirection to info or history page for "
-"OSM object will probably fail. API base URL is: ''{0}''"
-msgstr ""
-
-msgid ""
-"Unexpected format of API base URL. Redirection to user page for OSM user "
-"will probably fail. API base URL is: ''{0}''"
-msgstr ""
-
-msgid ""
 "You are about to launch {0} browser window.<br>This may both clutter your "
 "screen with browser windows<br>and take some time to finish."
 msgid_plural ""
@@ -1524,6 +1519,15 @@ msgstr ""
 msgid "Nothing to upload. Get some data first."
 msgstr ""
 
+msgid "Upload note changes to server"
+msgstr ""
+
+msgid "Upload notes"
+msgstr ""
+
+msgid "Uploading notes to server"
+msgstr ""
+
 msgid "Upload selection"
 msgstr ""
 
@@ -1796,10 +1800,16 @@ msgstr ""
 msgid "Click the location where you wish to create a new note"
 msgstr ""
 
-msgid "Enter a comment for a new note"
+msgid "Create new note"
 msgstr ""
 
-msgid "Create new note"
+msgid "Create note"
+msgstr ""
+
+msgid "Enter a detailed comment to create a note"
+msgstr ""
+
+msgid "You must enter a comment to create a new note"
 msgstr ""
 
 msgid "Delete Mode"
@@ -2670,6 +2680,15 @@ msgstr ""
 msgid "Cycling dependencies"
 msgstr ""
 
+msgid "Uploading modified notes"
+msgstr ""
+
+msgid "Note {0} failed: {1}"
+msgstr ""
+
+msgid "Notes failed to upload"
+msgstr ""
+
 msgid ""
 "The following are results of automatic validation. Try fixing these, but be "
 "careful (don''t destroy valid data). When in doubt ignore them.<br>When you "
@@ -4899,6 +4918,12 @@ msgstr ""
 msgid "Conflict foreground: keep all tags"
 msgstr ""
 
+msgid "Conflict background: sum all numeric tags"
+msgstr ""
+
+msgid "Conflict foreground: sum all numeric tags"
+msgstr ""
+
 msgid "Conflict background: keep member"
 msgstr ""
 
@@ -5317,12 +5342,19 @@ msgstr ""
 msgid "all"
 msgstr ""
 
+msgid "sum"
+msgstr ""
+
 msgid "Please decide which values to keep"
 msgstr ""
 
 msgid "Value ''{0}'' is going to be applied for key ''{1}''"
 msgstr ""
 
+msgid ""
+"All numeric values sumed as ''{0}'' are going to be applied for key ''{1}''"
+msgstr ""
+
 msgid "The key ''{0}'' and all its values are going to be removed"
 msgstr ""
 
@@ -5685,24 +5717,6 @@ msgstr[1] ""
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
 
-msgid "Display the history of all selected items."
-msgstr ""
-
-msgid "Object with history"
-msgstr ""
-
-msgid "Reload"
-msgstr ""
-
-msgid "Reload all currently selected objects and refresh the list."
-msgstr ""
-
-msgid "Show"
-msgstr ""
-
-msgid "Display the history of the selected objects."
-msgstr ""
-
 msgid "Advanced object info"
 msgstr ""
 
@@ -6040,6 +6054,9 @@ msgstr ""
 msgid "Comment"
 msgstr ""
 
+msgid "Comment on note"
+msgstr ""
+
 msgid "Add comment to note:"
 msgstr ""
 
@@ -6049,9 +6066,6 @@ msgstr ""
 msgid "Close note with message:"
 msgstr ""
 
-msgid "Close Note"
-msgstr ""
-
 msgid "Create a new note"
 msgstr ""
 
@@ -6124,6 +6138,9 @@ msgstr ""
 msgid "Search for objects"
 msgstr ""
 
+msgid "Display the history of the selected objects."
+msgstr ""
+
 msgid "Zoom to selection"
 msgstr ""
 
@@ -6243,6 +6260,9 @@ msgstr ""
 msgid "Updating map ..."
 msgstr ""
 
+msgid "anonymous"
+msgstr ""
+
 msgid "Display the basic properties of the changeset"
 msgstr ""
 
@@ -6255,6 +6275,12 @@ msgstr ""
 msgid "Display the objects created, updated, and deleted by the changeset"
 msgstr ""
 
+msgid "Discussion"
+msgstr ""
+
+msgid "Display the public discussion around this changeset"
+msgstr ""
+
 msgid "Changeset Management Dialog"
 msgstr ""
 
@@ -6312,9 +6338,6 @@ msgctxt "changeset.state"
 msgid "Closed"
 msgstr ""
 
-msgid "anonymous"
-msgstr ""
-
 msgid "ID"
 msgstr ""
 
@@ -6330,6 +6353,9 @@ msgstr ""
 msgid "Closed at"
 msgstr ""
 
+msgid "Discussions"
+msgstr ""
+
 msgid "Downloading changeset content"
 msgstr ""
 
@@ -6441,6 +6467,15 @@ msgid ""
 "layer"
 msgstr ""
 
+msgid "Update changeset discussion"
+msgstr ""
+
+msgid "Update the changeset discussion from the OSM server"
+msgstr ""
+
+msgid "Date"
+msgstr ""
+
 msgid "Download changesets"
 msgstr ""
 
@@ -6858,7 +6893,7 @@ msgstr ""
 msgid "Set number of recently added tags"
 msgstr ""
 
-msgid "Remember last used tags"
+msgid "Remember last used tags after a restart"
 msgstr ""
 
 msgid "Please enter the number of recently added tags to display"
@@ -7204,6 +7239,9 @@ msgstr ""
 msgid "Load parent relations"
 msgstr ""
 
+msgid "Reload"
+msgstr ""
+
 msgid "Loading parent relations"
 msgstr ""
 
@@ -7326,6 +7364,12 @@ msgstr ""
 msgid "Select to download GPS traces in the selected download area."
 msgstr ""
 
+msgid "Notes"
+msgstr ""
+
+msgid "Select to download notes in the selected download area."
+msgstr ""
+
 msgid "Download as new layer"
 msgstr ""
 
@@ -7631,9 +7675,6 @@ msgstr ""
 msgid "B"
 msgstr ""
 
-msgid "Date"
-msgstr ""
-
 msgid ""
 "Failed to update primitive with id {0} because current edit layer is null"
 msgstr ""
@@ -8488,9 +8529,6 @@ msgstr ""
 msgid "Save Layer"
 msgstr ""
 
-msgid "Notes"
-msgstr ""
-
 msgid "Notes layer"
 msgstr ""
 
@@ -8506,9 +8544,6 @@ msgstr ""
 msgid "outside downloaded area"
 msgstr ""
 
-msgid "version {0}"
-msgstr ""
-
 msgid "Merging layers"
 msgstr ""
 
@@ -12134,6 +12169,15 @@ msgstr ""
 msgid "Open changeset expected. Got closed changeset with id {0}."
 msgstr ""
 
+msgid "Note upload failed"
+msgstr ""
+
+msgid "Error parsing note response from server"
+msgstr ""
+
+msgid "Error encoding string: {0}"
+msgstr ""
+
 msgid "(Code={0})"
 msgstr ""
 
@@ -12182,13 +12226,13 @@ msgstr ""
 msgid "Parsing changeset content ..."
 msgstr ""
 
-msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
-msgid "Illegal numeric value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
-msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal numeric value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
 msgid "Missing mandatory attribute ''{0}'' of XML element {1}."
@@ -12980,9 +13024,6 @@ msgstr ""
 msgid "Failed to scan file ''{0}'' for plugin information. Skipping."
 msgstr ""
 
-msgid "Processing plugin site cache icon files..."
-msgstr ""
-
 msgid "Processing plugin files..."
 msgstr ""
 
@@ -13001,12 +13042,6 @@ msgstr ""
 msgid "Details:"
 msgstr ""
 
-msgid "Plugin icons download error"
-msgstr ""
-
-msgid "JOSM failed to download plugin icons:"
-msgstr ""
-
 msgid ""
 "Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
 "plugin site ''{1}''."
@@ -13892,7 +13927,9 @@ msgid ""
 "Creating and handling address nodes and buildings within Czech Republic."
 msgstr ""
 
-msgid "Allows to import various file formats into JOSM directly."
+msgid ""
+"Allows to import various file formats into JOSM directly. Currently "
+"supported: TangoGPS, Garmin Trainings Center TCX."
 msgstr ""
 
 msgid "Download your GPX tracks from openstreetmap.org"
@@ -13989,6 +14026,11 @@ msgid "A helper for IRS satellite adjustment."
 msgstr ""
 
 msgid ""
+"Provides Java Native Access (JNA) library. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
+msgid ""
 "Provides Java Topology Suite (JTS) library and related utilities. Not meant "
 "to be installed directly by users, but rather as a dependency for other "
 "plugins."
@@ -14344,6 +14386,25 @@ msgstr ""
 msgid "Width (meters)"
 msgstr ""
 
+msgid "Sidewalk"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "both"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "left"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "right"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "no"
+msgstr ""
+
 msgid "Service type"
 msgstr ""
 
@@ -14708,15 +14769,19 @@ msgstr ""
 msgid "May-Sep 09:30-12:30,14:15-19:30"
 msgstr ""
 
+msgctxt "parking"
 msgid "multi-storey"
 msgstr ""
 
+msgctxt "parking"
 msgid "surface"
 msgstr ""
 
+msgctxt "parking"
 msgid "underground"
 msgstr ""
 
+msgctxt "parking"
 msgid "rooftop"
 msgstr ""
 
@@ -15174,15 +15239,26 @@ msgstr ""
 msgid "Overtaking"
 msgstr ""
 
+msgctxt "overtaking"
+msgid "yes"
+msgstr ""
+
+msgctxt "overtaking"
 msgid "both"
 msgstr ""
 
+msgctxt "overtaking"
 msgid "forward"
 msgstr ""
 
+msgctxt "overtaking"
 msgid "backward"
 msgstr ""
 
+msgctxt "overtaking"
+msgid "no"
+msgstr ""
+
 msgid "Roundabout"
 msgstr ""
 
@@ -15476,6 +15552,12 @@ msgstr ""
 msgid "tiger"
 msgstr ""
 
+msgid "Button operated"
+msgstr ""
+
+msgid "Sound signals"
+msgstr ""
+
 msgid "Crossing attendant"
 msgstr ""
 
@@ -15997,9 +16079,6 @@ msgstr ""
 msgid "Traffic lights"
 msgstr ""
 
-msgid "Sound signals"
-msgstr ""
-
 msgid "Barrier"
 msgstr ""
 
@@ -18059,6 +18138,9 @@ msgstr ""
 msgid "Gasometer"
 msgstr ""
 
+msgid "Bunker Silo"
+msgstr ""
+
 msgid "Pipeline"
 msgstr ""
 
@@ -18205,15 +18287,15 @@ msgstr ""
 msgid "Monitoring:"
 msgstr ""
 
-msgid "Weather"
-msgstr ""
-
 msgid "Water level"
 msgstr ""
 
 msgid "Tide Level"
 msgstr ""
 
+msgid "Groundwater"
+msgstr ""
+
 msgid "Traffic"
 msgstr ""
 
@@ -18232,6 +18314,9 @@ msgstr ""
 msgid "Galileo Signals"
 msgstr ""
 
+msgid "Weather"
+msgstr ""
+
 msgid "Radiation"
 msgstr ""
 
@@ -18412,6 +18497,9 @@ msgstr ""
 msgid "pivot_pier"
 msgstr ""
 
+msgid "Bridge outline"
+msgstr ""
+
 msgid "Power Plant"
 msgstr ""
 
@@ -19019,6 +19107,15 @@ msgstr ""
 msgid "Pole"
 msgstr ""
 
+msgid "Pole with Transformer"
+msgstr ""
+
+msgid "Pole Attributes:"
+msgstr ""
+
+msgid "Transformer Attributes:"
+msgstr ""
+
 msgid "Power Line"
 msgstr ""
 
@@ -19068,9 +19165,15 @@ msgstr ""
 msgid "Power Cable"
 msgstr ""
 
+msgctxt "power cable"
+msgid "underground"
+msgstr ""
+
+msgctxt "power cable"
 msgid "underwater"
 msgstr ""
 
+msgctxt "power cable"
 msgid "overground"
 msgstr ""
 
@@ -19098,6 +19201,33 @@ msgstr ""
 msgid "Memorial"
 msgstr ""
 
+msgctxt "memorial"
+msgid "statue"
+msgstr ""
+
+msgctxt "memorial"
+msgid "bust"
+msgstr ""
+
+msgctxt "memorial"
+msgid "plaque"
+msgstr ""
+
+msgctxt "memorial"
+msgid "stele"
+msgstr ""
+
+msgctxt "memorial"
+msgid "stone"
+msgstr ""
+
+msgctxt "memorial"
+msgid "war_memorial"
+msgstr ""
+
+msgid "Inscription"
+msgstr ""
+
 msgid "Wayside Cross"
 msgstr ""
 
@@ -19167,6 +19297,9 @@ msgstr ""
 msgid "Beverages"
 msgstr ""
 
+msgid "Wine"
+msgstr ""
+
 msgid "Boutique"
 msgstr ""
 
@@ -19212,6 +19345,9 @@ msgstr ""
 msgid "Video Games"
 msgstr ""
 
+msgid "Music"
+msgstr ""
+
 msgid "Cash"
 msgstr ""
 
@@ -19239,6 +19375,9 @@ msgstr ""
 msgid "Curtain"
 msgstr ""
 
+msgid "Art"
+msgstr ""
+
 msgid "Frame"
 msgstr ""
 
@@ -19284,6 +19423,9 @@ msgstr ""
 msgid "Beauty"
 msgstr ""
 
+msgid "Tattoo"
+msgstr ""
+
 msgid "Optician"
 msgstr ""
 
@@ -19335,6 +19477,9 @@ msgstr ""
 msgid "Pet"
 msgstr ""
 
+msgid "Funeral Directors"
+msgstr ""
+
 msgid "Vending Machine"
 msgstr ""
 
@@ -19434,6 +19579,15 @@ msgstr ""
 msgid "National Park"
 msgstr ""
 
+msgid "Protected Area"
+msgstr ""
+
+msgid "Protected Class"
+msgstr ""
+
+msgid "Title or type of protection"
+msgstr ""
+
 msgid "Places"
 msgstr ""
 
@@ -20510,7 +20664,13 @@ msgstr ""
 msgid "Estonia Ortho (Maaamet)"
 msgstr ""
 
-msgid "Estonia Multi (Maaamet)"
+msgid "Estonia Hillshade (Maaamet)"
+msgstr ""
+
+msgid "Estonia Cadastre (Maaamet)"
+msgstr ""
+
+msgid "Estonia Forestry (Maaamet)"
 msgstr ""
 
 msgid "Bordeaux - 2012"
@@ -20534,7 +20694,7 @@ msgstr ""
 msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
 msgstr ""
 
-msgid "CUGN Nancy - Orthophoto 2012"
+msgid "GrandNancy Orthophotographie 2012"
 msgstr ""
 
 msgid "Géobretagne - Brest 2010 - 10 cm"
@@ -20581,9 +20741,6 @@ msgid ""
 "- 1 m"
 msgstr ""
 
-msgid "Streets NRW Geofabrik.de"
-msgstr ""
-
 msgid "Hike & Bike"
 msgstr ""
 
@@ -20643,6 +20800,9 @@ msgstr ""
 msgid "NRW-Atlas: Topographische Karte 1:10000"
 msgstr ""
 
+msgid "Metropole Ruhr: Luftbilder (10 cm)"
+msgstr ""
+
 msgid "Drone Imagery (Haiti)"
 msgstr ""
 
@@ -20844,6 +21004,9 @@ msgstr ""
 msgid "Stadt Zürich Übersichtsplan (Strassen, Gebäude, Hausnummer)"
 msgstr ""
 
+msgid "Stadt Zürich Luftbild 2011"
+msgstr ""
+
 msgid "Orthofoto Kanton Solothurn RGB (SOGIS 2011/2012/2013)"
 msgstr ""
 
@@ -20862,7 +21025,7 @@ msgstr ""
 msgid "Canton de Fribourg 50cm (2005)"
 msgstr ""
 
-msgid "Stadt Bern 10cm/25cm (2008)"
+msgid "Stadt Bern 10cm/25cm (2012)"
 msgstr ""
 
 msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
@@ -20901,7 +21064,7 @@ msgstr ""
 msgid "OSM US TIGER 2012 Roads Overlay"
 msgstr ""
 
-msgid "New & Misaligned TIGER Roads (TIGER 2013)"
+msgid "New & Misaligned TIGER Roads (TIGER 2014)"
 msgstr ""
 
 msgid "MassGIS L3 Parcels"
@@ -20949,9 +21112,234 @@ msgstr ""
 msgid "NLS - Bartholomew Half Inch, 1897-1907"
 msgstr ""
 
+msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Annan 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgstr ""
+
 msgid "OS Town Plans, Cupar 1854 (NLS)"
 msgstr ""
 
+msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Elgin 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Forres 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Galashiels 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Girvan 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Greenock 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Haddington 1853 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Haddington 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Hamilton 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Irvine 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Jedburgh 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kelso 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Lanark 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Linlithgow 1856 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Musselburgh 1853 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Musselburgh 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Oban 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Peebles 1856 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Perth 1860 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Peterhead 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Selkirk 1865 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, St Andrews 1854 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, St Andrews 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stirling 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stonehaven 1864 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1847 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Strathaven 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wick 1872 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wigtown 1848 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wigtown 1894 (NLS)"
+msgstr ""
+
 msgid "Decreasing house numbers in addresses interpolation"
 msgstr ""
 
@@ -21005,17 +21393,37 @@ msgid "{0}={1} is deprecated. Please use instead a multipolygon."
 msgstr ""
 
 msgid ""
-"{0} is deprecated. Please specify ìnterval by using opening_hours syntax"
+"{0} is deprecated. Please specify interval by using opening_hours syntax"
 msgstr ""
 
 msgid ""
 "{0} is deprecated. Please delete this object and use a private layer instead"
 msgstr ""
 
-msgid "{0} on a node"
+msgid "{0}={1} is unspecific. Please replace ''{1}'' by a specific value."
 msgstr ""
 
-msgid "{0} on a node. Should be drawn as an area"
+msgid "{0} should be replaced with {1}"
+msgstr ""
+
+msgid ""
+"{0}={1} is unspecific. Please replace ''{1}'' by ''left'', ''right'' or "
+"''both''."
+msgstr ""
+
+msgid "{0} on a node. Should be used on a way."
+msgstr ""
+
+msgid "{0} on a node. Should be drawn as an area."
+msgstr ""
+
+msgid "{0}=* on a node. Should be used in a relation"
+msgstr ""
+
+msgid "{0} on a way. Should be used in a relation"
+msgstr ""
+
+msgid "{0} on a node"
 msgstr ""
 
 msgid "Building inside building"
@@ -25685,6 +26093,9 @@ msgstr ""
 msgid "Find"
 msgstr ""
 
+msgid "Show"
+msgstr ""
+
 msgid "Mark"
 msgstr ""
 
diff --git a/i18n/po/km.po b/i18n/po/km.po
index f7f099f..1043cb1 100644
--- a/i18n/po/km.po
+++ b/i18n/po/km.po
@@ -1,17 +1,22 @@
+# Khmer translation for josm
+# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
+# This file is distributed under the same license as the josm package.
+# FIRST AUTHOR <EMAIL at ADDRESS>, 2009.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-21 03:38+0200\n"
-"PO-Revision-Date: 2014-10-20 09:38+0000\n"
+"POT-Creation-Date: 2014-12-10 03:42+0100\n"
+"PO-Revision-Date: 2014-12-10 04:29+0000\n"
 "Last-Translator: Sophea Sok <sksophea at gmail.com>\n"
 "Language-Team: Khmer <km at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2014-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 17203)\n"
+"X-Launchpad-Export-Date: 2014-12-10 04:56+0000\n"
+"X-Generator: Launchpad (build 17283)\n"
 "Language: \n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -171,21 +176,6 @@ msgid "About JOSM..."
 msgstr "អំពី JOSM..."
 
 msgid ""
-"Unexpected format of API base URL. Redirection to info or history page for "
-"OSM object will probably fail. API base URL is: ''{0}''"
-msgstr ""
-"ទ្រង់ទ្រាយ​មិន​រំពឹង​ទុក​របស់ API base URL ។ ការ​ប្ដូរ​ទិស​ទៅ​ព័ត៌មាន "
-"ឬ​ទំព័រ​ប្រវត្តិ​សម្រាប់​វត្ថុ OSM នឹង​បរាជ័យ។ API base URL គឺ៖ ''{0}''"
-
-msgid ""
-"Unexpected format of API base URL. Redirection to user page for OSM user "
-"will probably fail. API base URL is: ''{0}''"
-msgstr ""
-"ទ្រង់ទ្រាយ API base URL មិន​រំពឹង​ទុក។ "
-"ការ​ប្ដូរ​ទិស​ទៅ​ទំព័រ​អ្នកប្រើ​សម្រាប់​អ្នកប្រើ OSM នឹង​បរាជ័យ។ API base "
-"URL គឺ៖ ''{0}''"
-
-msgid ""
 "You are about to launch {0} browser window.<br>This may both clutter your "
 "screen with browser windows<br>and take some time to finish."
 msgid_plural ""
@@ -1637,6 +1627,15 @@ msgstr "គ្មាន​ការ​ផ្លាស់ប្ដូរ​ដើ
 msgid "Nothing to upload. Get some data first."
 msgstr "មិន​មាន​អ្វី​ត្រូវ​ផ្ទុក​ឡើង។ យក​ទិន្នន័យ​ខ្លះ​ជាមុន​សិន។"
 
+msgid "Upload note changes to server"
+msgstr "ផ្ទុក​ការ​ផ្លាស់ប្ដូរ​ចំណាំ​ឡើង​ទៅ​ម៉ាស៊ីន​មេ"
+
+msgid "Upload notes"
+msgstr "ផ្ទុក​ចំណាំ​ឡើង"
+
+msgid "Uploading notes to server"
+msgstr "កំពុង​ផ្ទុក​ចំណាំ​ឡើង​ទៅ​ម៉ាស៊ីន​មេ"
+
 msgid "Upload selection"
 msgstr "ជម្រើស​ផ្ទុក​ឡើង"
 
@@ -1915,12 +1914,18 @@ msgstr "បន្ថែម​របៀប​តំណ"
 msgid "Click the location where you wish to create a new note"
 msgstr "បន្ថែម​ទីតាំង​ដែល​អ្នក​ចង់​បង្កើត​តំណ​ថ្មី"
 
-msgid "Enter a comment for a new note"
-msgstr "បញ្ចូល​មតិយោបល់​សម្រាប់​តំណ​ថ្មី"
-
 msgid "Create new note"
 msgstr "បង្កើត​តំណ​ថ្មី"
 
+msgid "Create note"
+msgstr "បង្កើត​តំណ"
+
+msgid "Enter a detailed comment to create a note"
+msgstr "បញ្ចូល​មតិយោបល់​លម្អិត​ដើម្បី​បង្កើត​តំណ"
+
+msgid "You must enter a comment to create a new note"
+msgstr "អ្នក​ត្រូវតែ​បញ្ចូល​មតិយោបល់​ដើម្បី​បង្កើត​តំណ"
+
 msgid "Delete Mode"
 msgstr "លុប​របៀប"
 
@@ -2416,10 +2421,10 @@ msgid "Invalid search expression"
 msgstr "កន្សោម​ស្វែងរក​មិន​ត្រឹមត្រូវ"
 
 msgid "<b>Baker Street</b> - ''Baker'' and ''Street'' in any key"
-msgstr ""
+msgstr "<b>Baker Street</b> - ''Baker'' and ''Street'' in any key"
 
 msgid "<b>\"Baker Street\"</b> - ''Baker Street'' in any key"
-msgstr ""
+msgstr "<b>\"Baker Street\"</b> - ''Baker Street'' in any key"
 
 msgid "<b>key:Bak</b> - ''Bak'' anywhere in the key ''key''"
 msgstr "<b>key:Bak</b> - ''Bak'' anywhere in the key ''key''"
@@ -2749,111 +2754,138 @@ msgstr "បាន​រក​ឃើញ​ការ​ផ្គូផ្គង {0
 
 msgctxt "search"
 msgid "CS"
-msgstr ""
+msgstr "CS"
 
 msgctxt "search"
 msgid "CI"
-msgstr ""
+msgstr "CI"
 
 msgctxt "search"
 msgid "RX"
-msgstr ""
+msgstr "RX"
 
 msgctxt "search"
 msgid "A"
-msgstr ""
+msgstr "A"
 
 msgid ""
 "The regex \"{0}\" had a parse error at offset {1}, full error:\n"
 "\n"
 "{2}"
 msgstr ""
+"កន្សោម​ធម្មតា \"{0}\" មាន​កំហុស​ក្នុង​ការ​ញែក​នៅ​អុហ្វសិត {1}, "
+"កំហុស​ទាំងស្រុង៖\n"
+"\n"
+"{2}"
 
 msgid ""
 "The regex \"{0}\" had a parse error, full error:\n"
 "\n"
 "{1}"
 msgstr ""
+"កន្សោម​ធម្មតា \"{0}\" មាន​កំហុស​ក្នុង​ការ​ញែក, កំហុស​ទាំងស្រុង៖\n"
+"\n"
+"{1}"
 
 msgid "Expecting <i>min</i>/<i>max</i> after ''timestamp''"
-msgstr ""
+msgstr "ការ​រំពឹង​ទុក <i>អប្ប.</i>/<i>អតិ.</i> បន្ទាប់ពី ''timestamp''"
 
 msgid "Range of primitive ids expected"
-msgstr ""
+msgstr "ជួរ​ព្រីមីទីវ ids ដែល​បាន​រំពឹង​ទុក"
 
 msgid "Range of changeset ids expected"
-msgstr ""
+msgstr "ជួរ changeset ids ដែល​បាន​រំពឹង​ទុក"
 
 msgid "Range of versions expected"
-msgstr ""
+msgstr "ជួរ​កំណែ​ដែល​បាន​រំពឹង​ទុក"
 
 msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
 msgstr ""
+"ពាក្យ​គន្លឹះ​មិន​អាច​ទទេ​បាន​ឡើយ ពេល​ប្រមាណវិធី​ស្លាក​ត្រូវ​បាន​ប្រើ។ "
+"ការ​ប្រើ​គំរូ៖ ពាក្យ​គន្លឹះ=តម្លៃ"
 
 msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
 msgstr ""
+"មិន​ស្គាល់​ប្រភេទ​ព្រីមីទីវ៖ {0} ។ តម្លៃ​ដែល​អនុញ្ញាត​គឺ​តំណ ផ្លូវ "
+"ឬ​ទំនាក់ទំនង"
 
 msgid "Positive integer expected"
-msgstr ""
+msgstr "បាន​រំពឹង​ទុក​ចំនួនគត់​វិជ្ជមាន"
 
 msgid "Range of numbers expected"
-msgstr ""
+msgstr "ជួរ​លេខ​ដែល​បាន​រំពឹង​ទុក"
 
 msgid "Unexpected token. Expected {0}, found {1}"
-msgstr ""
+msgstr "ថូខឹន​ដែល​មិន​បាន​រំពឹង​ទុក។ បាន​រំពឹង​ទុក {0}, រក​ឃើញ {1}"
 
 msgid "Unexpected token: {0}"
-msgstr ""
+msgstr "ថូខឹន​ដែល​មិន​បាន​រំពឹង​ទុក៖ {0}"
 
 msgid "Missing parameter for OR"
-msgstr ""
+msgstr "បាត់​ប៉ារ៉ាម៉ែត្រ​សម្រាប់ OR"
 
 msgid "Missing parameter for XOR"
-msgstr ""
+msgstr "បាត់​ប៉ារ៉ាម៉ែត្រ​សម្រាប់ XOR"
 
 msgid "Missing operator for NOT"
-msgstr ""
+msgstr "បាត់​ប៉ារ៉ាម៉ែត្រ​សម្រាប់ NOT"
 
 msgid "Automatically truncating value of tag ''{0}'' on deleted object {1}"
-msgstr ""
+msgstr "កាត់​តម្លៃ​ស្លាក ''{0}'' ដោយ​ស្វ័យប្រវត្តិ ពេល​បាន​លុប​វត្ថុ {1}"
 
 msgid ""
 "Length of value for tag ''{0}'' on object {1} exceeds the max. allowed "
 "length {2}. Values length is {3}."
 msgstr ""
+"ប្រវែង​តម្លៃ​សម្រាប់​ស្លាក ''{0}'' នៅ​លើ​វត្ថុ {1} បាន​លើស​ចំនួន​អតិបរមា។ "
+"ប្រវែង​ដែល​អនុញ្ញាត​គឺ {2} ។ ប្រវែង​តម្លៃ​គឺ {3} ។"
 
 msgid "Precondition Violation"
-msgstr ""
+msgstr "ការ​បំពាន​លក្ខខណ្ឌ​ជាមុន"
 
 msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}"
 msgstr ""
+"{0} តំណ​នៅ​ក្នុង​ផ្លូវ {1} បាន​លើស​ចំនួន​អតិបរមា។ ចំនួន​តំណ​ដែល​អនុញ្ញាត​គឺ "
+"{2}"
 
 msgid "API Capabilities Violation"
-msgstr ""
+msgstr "ការ​បំពាន​សមត្ថភាព API"
 
 msgid "Cyclic dependency between relations:"
-msgstr ""
+msgstr "ភាព​អាស្រ័យ​ទៀងទាត់​រវាង​ទំនាក់ទំនង"
 
 msgid "Removed obsolete tags"
-msgstr ""
+msgstr "បាន​លុប​ស្លាក​ដាច់ខាត"
 
 msgid "Fix deprecated tags"
-msgstr ""
+msgstr "កែ​ស្លាក​ដែល​បដិសេធ"
 
 msgid ""
 "<html>{0} relations build a cycle because they refer to each other.<br>JOSM "
 "cannot upload them. Please edit the relations and remove the cyclic "
 "dependency.</html>"
 msgstr ""
+"<html>{0} ទំនាក់ទំនង​បង្កើត​រង្វង់​ព្រោះ​វា​បាន​យោង​គ្នា​ទៅវិញ​ទៅមក។<br>JOSM "
+"មិន​អាច​ផ្ទុក​ពួកវា​ឡើង​បាន​ទេ។ សូម​កែសម្រួល​ទំនាក់ទំនង "
+"រួច​លុប​ភាព​អាស្រ័យ​ទៀងទាត់​ចេញ។</html>"
 
 msgid "Relation ..."
-msgstr ""
+msgstr "ទំនាក់ទំនង..."
 
 msgid "... refers to relation"
-msgstr ""
+msgstr "... យោង​ទៅ​ទំនាក់ទំនង"
 
 msgid "Cycling dependencies"
-msgstr ""
+msgstr "ភាព​អាស្រ័យ​ទៀងទាត់"
+
+msgid "Uploading modified notes"
+msgstr "កំពុង​ផ្ទុក​ឡើង​នូវ​ចំណាំ​ដែល​បាន​កែប្រែ"
+
+msgid "Note {0} failed: {1}"
+msgstr "ចំណាំ {0} បាន​បរាជ័យ៖ {1}"
+
+msgid "Notes failed to upload"
+msgstr "ការ​ផ្ទុក​ចំណាំ​ឡើង​បាន​បរាជ័យ"
 
 msgid ""
 "The following are results of automatic validation. Try fixing these, but be "
@@ -2861,156 +2893,157 @@ msgid ""
 "cancel this dialog, you can find the entries in the validator side panel to "
 "inspect them."
 msgstr ""
+"ខាងក្រោម​នេះ​ជា​លទ្ធផល​នៃ​ការ​ធ្វើ​សុពលកម្ម​ស្វ័យប្រវត្តិ។ សាកល្បង​កែ​ពួកវា "
+"ប៉ុន្តែ​ត្រូវ​ប្រុង​ប្រយ័ត្ន (កុំ​បំផ្លាញ​ទិន្នន័យ​ត្រឹមត្រូវ)។ បើ​សង្ស័យ "
+"សូម​កុំ​ប៉ះពាល់​វា។<br>ពេល​អ្នក​បោះបង់​ប្រអប់​បញ្ចូល​នេះ "
+"អ្នក​នឹង​អាច​រក​ឃើញ​ធាតុ​នៅ​ក្នុង​ផ្ទាំង​ចំហៀង​នៃ​កម្មវិធី​ធ្វើ​សុពលកម្ម​ដើម្"
+"បី​ពិនិត្យ​វា។"
 
 msgid "Errors"
-msgstr ""
+msgstr "កំហុស"
 
 msgid "Usually this should be fixed."
-msgstr ""
+msgstr "ជាទូទៅ​វា​គួរ​ត្រូវ​បាន​កែ។"
 
 msgid "Warnings"
-msgstr ""
+msgstr "ការ​ព្រមាន"
 
 msgid "Fix these when possible."
-msgstr ""
+msgstr "កែ​វា​ពេល​អាច​ធ្វើ​បាន"
 
 msgid "Other"
-msgstr ""
+msgstr "ផ្សេងទៀត"
 
 msgid "Informational warnings, expect many false entries."
-msgstr ""
+msgstr "ការ​ព្រមាន​មិន​ផ្លូវការ រំពឹង​ថា​មាន​ធាតុ​បន្លំ​ច្រើន។"
 
 msgid "Suspicious data found. Upload anyway?"
-msgstr ""
+msgstr "បាន​រក​ឃើញ​ទិន្នន័យ​សង្ស័យ។ ផ្ទុក​ឡើង?"
 
 msgid "Continue upload"
-msgstr ""
+msgstr "បន្ត​ផ្ទុក​ឡើង"
 
 msgid "Add node {0}"
-msgstr ""
+msgstr "បន្ថែម​តំណ {0}"
 
 msgid "Add way {0}"
-msgstr ""
+msgstr "បន្ថែម​ផ្លូវ {0}"
 
 msgid "Add relation {0}"
-msgstr ""
+msgstr "បន្ថែម​ទំនាក់ទំនង {0}"
 
 msgid "Added {0} object"
 msgid_plural "Added {0} objects"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "បាន​បន្ថែម​វត្ថុ {0}"
 
 msgid "New way {0} has 0 nodes"
-msgstr ""
+msgstr "ផ្លូវ​ថ្មី {0} មាន 0 តំណ"
 
 msgid "Change node {0}"
-msgstr ""
+msgstr "ប្ដូរ​តំណ {0}"
 
 msgid "Change way {0}"
-msgstr ""
+msgstr "ប្ដូរ​ផ្លូវ {0}"
 
 msgid "Change relation {0}"
-msgstr ""
+msgstr "ប្ដូរ​ទំនាក់ទំនង {0}"
 
 msgid "Changed nodes of {0}"
-msgstr ""
+msgstr "តំណ​ដែល​បាន​ប្ដូរ​ក្នុង​ចំណោម {0}"
 
 msgid "Remove \"{0}\" for node ''{1}''"
-msgstr ""
+msgstr "លុប \"{0}\" សម្រាប់​តំណ ''{1}''"
 
 msgid "Remove \"{0}\" for way ''{1}''"
-msgstr ""
+msgstr "លុប \"{0}\" សម្រាប់​ផ្លូវ ''{1}''"
 
 msgid "Remove \"{0}\" for relation ''{1}''"
-msgstr ""
+msgstr "លុប \"{0}\" សម្រាប់ ''{1}''"
 
 msgid "Set {0}={1} for node ''{2}''"
-msgstr ""
+msgstr "កំណត់ {0}={1} សម្រាប់​តំណ ''{2}''"
 
 msgid "Set {0}={1} for way ''{2}''"
-msgstr ""
+msgstr "កំណត់ {0}={1} សម្រាប់​ផ្លូវ ''{2}''"
 
 msgid "Set {0}={1} for relation ''{2}''"
-msgstr ""
+msgstr "កំណត់ {0}={1} សម្រាប់​ទំនាក់ទំនង ''{2}''"
 
 msgid "Remove \"{0}\" for {1} object"
 msgid_plural "Remove \"{0}\" for {1} objects"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "លុប \"{0}\" សម្រាប់​វត្ថុ {1}"
 
 msgid "Set {0}={1} for {2} object"
 msgid_plural "Set {0}={1} for {2} objects"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "កំណត់ {0}={1} សម្រាប់​វត្ថុ {2}"
 
 msgid "Deleted {0} tags for {1} object"
 msgid_plural "Deleted {0} tags for {1} objects"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "បាន​លុប​ស្លាក {0} សម្រាប់​វត្ថុ {1}"
 
 msgid "Set {0} tags for {1} object"
 msgid_plural "Set {0} tags for {1} objects"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "បាន​កំណត់​ស្លាក {0} សម្រាប់​វត្ថុ {1}"
 
 msgid "Replace \"{0}\" by \"{1}\" for"
-msgstr ""
+msgstr "ជំនួស \"{0}\" ដោយ \"{1}\" សម្រាប់"
 
 msgid "object"
 msgid_plural "objects"
 msgstr[0] "វត្ថុ"
 
 msgid "Change relation member role for {0} {1}"
-msgstr ""
+msgstr "ប្ដូរ​តួនាទី​ធាតុ​ទំនាក់ទំនង​សម្រាប់ {0} {1}"
 
 msgid "At least one object to delete required, got empty collection"
-msgstr ""
+msgstr "បាន​ទាមទារ​វត្ថុ​យ៉ាង​ហោច​មួយ​ដើម្បី​លុប ទទួល​បាន​សម្រាំង​ទទេ"
 
 msgid "Delete node {0}"
-msgstr ""
+msgstr "លុប​ថ្នាំង {0}"
 
 msgid "Delete way {0}"
-msgstr ""
+msgstr "លុប​ផ្លូវ {0}"
 
 msgid "Delete relation {0}"
-msgstr ""
+msgstr "លុប​ទំនាក់ទំនង {0}"
 
 msgid "Delete {0} object"
 msgid_plural "Delete {0} objects"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "លុប​វត្ថុ {0}"
 
 msgid "Delete {0} node"
 msgid_plural "Delete {0} nodes"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "លុប​តំណ {0}"
 
 msgid "Delete {0} way"
 msgid_plural "Delete {0} ways"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "លុប​ផ្លូវ {0}"
 
 msgid "Delete {0} relation"
 msgid_plural "Delete {0} relations"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "លុប​ទំនាក់ទំនង {0}"
 
 msgid "Deleted ''{0}''"
-msgstr ""
+msgstr "បាន​លុប ''{0}''"
 
 msgid "Delete confirmation"
-msgstr ""
+msgstr "បញ្ជាក់​ការ​លុប"
 
 msgid ""
 "You are about to delete nodes outside of the area you have "
 "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 ""
+"អ្នក​ហៀប​នឹង​លុប​តំណ​ដែល​នៅ​ក្រៅ​តំបន់​អ្នក​បាន​ទាញ​យក។<br>វា​អាច​ធ្វើឲ្យ​មាន"
+"​បញ្ហា ព្រោះ​វត្ថុ​ផ្សេង (ដែល​អ្នក​មើល​មិន​ឃើញ) "
+"អាច​ប្រើ​វា។<br>តើ​អ្នក​ពិតជា​ចង់​លុប​មែន​ឬ?"
 
 msgid ""
 "You are about to delete incomplete objects.<br>This will cause problems "
 "because you don''t see the real object.<br>Do you really want to delete?"
 msgstr ""
+"អ្នក​ហៀប​នឹង​លុប​វត្ថុ​ដែល​មិន​បញ្ចប់។<br>វា​អាច​ធ្វើឲ្យ​មាន​បញ្ហា "
+"ព្រោះ​អ្នក​មិន​ឃើញ​វត្ថុ​ពិត។<br>តើ​អ្នក​ពិតជា​ចង់​លុប​មែន​ឬ?"
 
 msgid ""
 "You are about to delete {0} relation: {1}<br/>This step is rarely necessary "
@@ -3021,120 +3054,119 @@ msgid_plural ""
 "and cannot be undone easily after being uploaded to the server.<br/>Do you "
 "really want to delete?"
 msgstr[0] ""
-msgstr[1] ""
+"អ្នក​ហៀបនឹង​លុប​ទំនាក់ទំនង {0} ៖ {1}<br/>ជំហាន​នេះ​គឺ​សំខាន់​ណាស់ "
+"ហើយ​មិន​អាច​មិនធ្វើវិញ​ដោយ​ងាយៗ​បាន​ឡើយ "
+"បន្ទាប់ពី​ផ្ទុក​ឡើង​ទៅកាន់​ម៉ាស៊ីន​មេ​រួច។<br/>តើ​អ្នក​ពិតជា​ចង់​លុប​មែន​ឬ?"
 
 msgid "Delete relation?"
-msgstr ""
+msgstr "លុប​ទំនាក់ទំនង?"
 
 msgid "Move {0} node"
 msgid_plural "Move {0} nodes"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "ផ្លាស់ទី​តំណ {0}"
 
 msgid "Purged {0} object"
 msgid_plural "Purged {0} objects"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "បាន​លុប​វត្ថុ {0}"
 
 msgid "Removed nodes from {0}"
-msgstr ""
+msgstr "បាន​លុប​តំណ​ចេញពី {0}"
 
 msgid "Rotate {0} node"
 msgid_plural "Rotate {0} nodes"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "បង្វិល​តំណ {0}"
 
 msgid "Scale {0} node"
 msgid_plural "Scale {0} nodes"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "ធ្វើ​មាត្រដ្ឋាន​តំណ {0}"
 
 msgid "Selected {0} object"
 msgid_plural "Selected {0} objects"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "បាន​ជ្រើស​វត្ថុ {0}"
 
 msgid "Sequence: {0}"
-msgstr ""
+msgstr "លំដាប់៖ {0}"
 
 msgid "Transform {0} node"
 msgid_plural "Transform {0} nodes"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "ប្លែង​តំណ {0}"
 
 msgid ""
 "<html>Layer ''{0}'' already has a conflict for object<br>''{1}''.<br>This "
 "conflict cannot be added.</html>"
 msgstr ""
+"<html>ស្រទាប់ ''{0}'' មាន​ការ​ប៉ះទង្គិច​រួចហើយ​សម្រាប់​វត្ថុ<br>''{1}'' "
+"។<br>ការ​ប៉ះទង្គិច​នេះ​មិន​អាច​បន្ថែម​បាន​ទេ។</html>"
 
 msgid "Double conflict"
-msgstr ""
+msgstr "ប៉ះទង្គិច​ស្ទួន"
 
 msgid ""
 "Layer ''{0}'' does not exist any more. Cannot remove conflict for object "
 "''{1}''."
 msgstr ""
+"ស្រទាប់ ''{0}'' មិន​មាន​ទៀត​ទេ។ មិន​អាច​លុប​ការ​ប៉ះទង្គិច​សម្រាប់​វត្ថុ "
+"''{1}'' បាន​ទេ។"
 
 msgid "Add conflict for ''{0}''"
-msgstr ""
+msgstr "បន្ថែម​ការ​ប៉ះ​ទង្គិច​សម្រាប់ ''{0}''"
 
 msgid ""
 "Cannot undo command ''{0}'' because layer ''{1}'' is not present any more"
 msgstr ""
+"មិន​អាច​មិនធ្វើវិញ​នូវ​ពាក្យ​បញ្ជា ''{0}'' បាន​ទេ ព្រោះ​ស្រទាប់ ''{1}'' "
+"មិន​មាន​ទៀត​ទេ"
 
 msgid "Resolve conflicts in coordinates in {0}"
-msgstr ""
+msgstr "ដោះស្រាយ​ការ​ប៉ះទង្គិច​នៅ​ក្នុង​កូអរដោណេ {0}"
 
 msgid "Cannot resolve undecided conflict."
-msgstr ""
+msgstr "មិន​អាច​ដោះស្រាយ​ការ​ប៉ះទង្គិច​មិន​បា​ន​សម្រេចចិត្ត។"
 
 msgid "Resolve conflicts in deleted state in {0}"
-msgstr ""
+msgstr "ដោះស្រាយ​ការ​ប៉ះទង្គិច​សម្រាប់​ស្ថានភាព​ដែល​បាន​លុប​ក្នុង {0}"
 
 msgid "Set the ''modified'' flag for node {0}"
-msgstr ""
+msgstr "កំណត់​ទង់ ''ដែល​បា​ន​កែ'' សម្រាប់​តំណ {0}"
 
 msgid "Set the ''modified'' flag for way {0}"
-msgstr ""
+msgstr "កំណត់​ទង់ ''ដែល​បាន​កែ'' សម្រាប់​ផ្លូវ {0}"
 
 msgid "Set the ''modified'' flag for relation {0}"
-msgstr ""
+msgstr "កំណត់​ទង់ ''ដែល​បាន​កែ'' សម្រាប់​ទំនាក់ទំនង {0}"
 
 msgid "Resolve conflicts in member list of relation {0}"
-msgstr ""
+msgstr "ដោះស្រាយ​ការ​ប៉ះទង្គិច​នៅ​ក្នុង​បញ្ជី​ធាតុ​ទំនាក់ទំនង {0}"
 
 msgid "Resolve {0} tag conflict in node {1}"
 msgid_plural "Resolve {0} tag conflicts in node {1}"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "ដោះស្រាយ​ស្លាក​ប៉ះទង្គិច {0} នៅ​ក្នុង​តំណ {1}"
 
 msgid "Resolve {0} tag conflict in way {1}"
 msgid_plural "Resolve {0} tag conflicts in way {1}"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "ដោះស្រាយ​ស្លាក​ប៉ះទង្គិច {0} នៅ​ក្នុង​ផ្លូវ {1}"
 
 msgid "Resolve {0} tag conflict in relation {1}"
 msgid_plural "Resolve {0} tag conflicts in relation {1}"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "ដោះស្រាយ​ស្លាក​ប៉ះទង្គិច {0} នៅ​ក្នុង​ទំនាក់ទំនង {1}"
 
 msgid "Resolve version conflict for node {0}"
-msgstr ""
+msgstr "ដោះស្រាយ​ការ​ប៉ះទង្គិច​កំណែ​សម្រាប់​តំណ {0}"
 
 msgid "Resolve version conflict for way {0}"
-msgstr ""
+msgstr "ដោះស្រាយ​ការ​ប៉ះទង្គិច​កំណែ​សម្រាប់​ផ្លូវ {0}"
 
 msgid "Resolve version conflict for relation {0}"
-msgstr ""
+msgstr "ដោះស្រាយ​ការ​ប៉ះទង្គិច​កំណែ​សម្រាប់​ទំនាក់ទំនង {0}"
 
 msgid "Resolve conflicts in node list of way {0}"
-msgstr ""
+msgstr "ដោះស្រាយ​ការ​ប៉ះទង្គិច​នៅ​ក្នុង​បញ្ជី​តំណ​របស់​ផ្លូវ {0}"
 
 msgid "Main dataset does not include node {0}"
-msgstr ""
+msgstr "សំណុំ​ទិន្នន័យ​មេ​មិន​រួម​បញ្ចូល​តំណ {0}"
 
 msgid "Apply?"
-msgstr ""
+msgstr "អនុវត្ត?"
 
 msgid ""
 "<html>You are going to reverse the way ''{0}'',<br/> whose semantic meaning "
@@ -3145,15 +3177,21 @@ msgid_plural ""
 "of these tags are defined by its direction:<br/>{1}Do you really want to "
 "change the way direction, thus its semantic meaning?</html>"
 msgstr[0] ""
-msgstr[1] ""
+"<html>អ្នក​នឹង​បញ្ច្រាស​ផ្លូវ ''{0}'',<br/> ដែល​អត្ថន័យ​នៃ​ស្លាក​របស់​វា "
+"''{1}'' "
+"ត្រូវ​បាន​កំណត់​ដោយ​ទិសដៅ​របស់​វា។<br/>តើ​អ្នក​ពិតជា​ចង់​ប្ដូរ​ទិស​ផ្លូវ "
+"រួម​ទាំង​អត្ថន័យ​របស់​វា​មែន​ឬ?</html>"
 
 msgid "Reverse directional way."
-msgstr ""
+msgstr "បញ្ច្រាស​ទិសដៅ​ផ្លូវ"
 
 msgid ""
 "When reversing this way, the following changes are suggested in order to "
 "maintain data consistency."
 msgstr ""
+"ពេល​បញ្ច្រាស​ផ្លូវ​នេះ "
+"វា​នឹង​មាន​ការ​ស្នើ​សុំ​ការ​ផ្លាស់ប្ដូរ​ដូច​ខាងក្រោម​ដើម្បី​ថែរក្សា​ភាព​ប្រក្"
+"រតី​នៃ​ទិន្នន័យ។"
 
 msgid "Relation"
 msgstr "ទំនាក់ទំនង"
@@ -3177,261 +3215,297 @@ msgid "New value"
 msgstr "តម្លៃថ្មី"
 
 msgid "Apply selected changes"
-msgstr ""
+msgstr "អនុវត្ត​ការ​ផ្លាស់ប្ដូរ​ដែល​បាន​ជ្រើស"
 
 msgid "Do not apply changes"
-msgstr ""
+msgstr "កុំ​អនុវត្ត​ការ​ផ្លាស់ប្ដូរ"
 
 msgid "Please select which changes you want to apply."
-msgstr ""
+msgstr "សូម​ជ្រើស​ការ​ផ្លាស់ប្ដូរ​ដែល​អ្នក​ចង់​អនុវត្ត។"
 
 msgid "Tags of "
-msgstr ""
+msgstr "ស្លាក​របស់ "
 
 msgid "Roles in relations referring to"
-msgstr ""
+msgstr "តួនាទី​ក្នុង​ទំនាក់ទំនង​​គឺ​យោង​ទៅ"
 
 msgid "Automatic tag correction"
-msgstr ""
+msgstr "ការ​កែ​ស្លាក​ស្វ័យប្រវត្តិ"
 
 msgid "Unable to create directory {0}, autosave will be disabled"
-msgstr ""
+msgstr "មិន​អាច​បង្កើត​ថត {0}, ការ​រក្សាទុក​ស្វ័យប្រវត្តិ​នឹង​ត្រូវ​បាន​បិទ"
 
 msgid "Unable to create file {0}, other filename will be used"
-msgstr ""
+msgstr "មិន​អាច​បង្កើត​ឯកសារ {0}, ឈ្មោះ​ឯកសារ​ផ្សារ​នឹង​ត្រូវ​បាន​ប្រើ"
 
 msgid "IOError while creating file, autosave will be skipped: {0}"
 msgstr ""
+"IOError ពេល​បង្កើត​ឯកសារ ការ​រក្សាទុក​ស្វ័យប្រវត្តិ​នឹង​ត្រូវ​បាន​រំលង៖ {0}"
 
 msgid "Unable to delete old backup file {0}"
-msgstr ""
+msgstr "មិន​អាច​លុប​ឯកសារ​បម្រុងទុក​ចាស់ {0}"
 
 msgid "Your work has been saved automatically."
-msgstr ""
+msgstr "ការងារ​របស់​អ្នក​ត្រូវ​បាន​រក្សាទុក​ដោយ​ស្វ័យប្រវត្តិ។"
 
 msgid "Restoring files"
-msgstr ""
+msgstr "ការ​ស្ដារ​ឯកសារ"
 
 msgid "Illegal latitude value ''{0}''"
-msgstr ""
+msgstr "តម្លៃ​រយៈទទឹង​មិន​ត្រឹមត្រូវ ''{0}''"
 
 msgid "Illegal longitude value ''{0}''"
-msgstr ""
+msgstr "តម្លៃ​រយៈបណ្ដោយ​មិន​ត្រឹមត្រូវ ''{0}''"
 
 msgid "Question"
-msgstr ""
+msgstr "សំណួរ"
 
 msgid "Message"
-msgstr ""
+msgstr "សារ"
 
 msgid "Enter text"
-msgstr ""
+msgstr "បញ្ចូល​អត្ថបទ"
 
 msgid "Installing plugins"
-msgstr ""
+msgstr "ដំឡើង​កម្មវិធី​ជំនួយ"
 
 msgid ""
 "<html>Settings file asks to append preferences to <b>{0}</b>,<br/> but its "
 "default value is unknown at this moment.<br/> Please activate corresponding "
 "function manually and retry importing."
 msgstr ""
+"<html>ការ​កំណត់​ឯកសារ បាន​សួរ​ឲ្យ​បន្ថែម​ចូលចិត្ត​ទៅ <b>{0}</b>,<br/> "
+"ប៉ុន្តែ​ឥឡូវនេះ​មិន​ស្គាល់​តម្លៃ​លំនាំដើម​របស់​វា។<br/> "
+"សូម​ធ្វើឲ្យ​មុខងារ​ដែល​ត្រូវ​គ្នា​សកម្ម​ដោយ​ដៃ រួច​ព្យាយាម​នាំចូល​ម្ដងទៀត។"
 
 msgid "Failed to create missing cache directory: {0}"
-msgstr ""
+msgstr "បាន​បរាជ័យ​ក្នុង​ការ​បង្កើត​ថត​ឃ្លាំង​សម្ងាត់​ដែល​បាត់៖ {0}"
 
 msgid "<html>Failed to create missing cache directory: {0}</html>"
-msgstr ""
+msgstr "<html>បាន​បរាជ័យ​ក្នុង​ការ​បង្កើត​ថត​ឃ្លាំង​សម្ងាត់៖ {0}</html>"
 
 msgid ""
 "Failed to initialize preferences. Preference directory ''{0}'' is not a "
 "directory."
 msgstr ""
+"បាន​បរាជ័យ​ក្នុង​ការ​ចាប់ផ្ដើម​ចំណូលចិត្ត។ ចំណូលចិត្ត​ថត ''{0}'' "
+"គឺ​មិន​នៅ​ក្នុង​ថត។"
 
 msgid ""
 "<html>Failed to initialize preferences.<br>Preference directory ''{0}'' is "
 "not a directory.</html>"
 msgstr ""
+"<html>បាន​បរាជ័យ​ក្នុង​ការ​ចាប់ផ្ដើម​ចំណូលចិត្ត។<br>ថត​ចំណូលចិត្ត ''{0}'' "
+"គឺ​មិន​នៅ​ក្នុង​ថត។</html>"
 
 msgid ""
 "Failed to initialize preferences. Failed to create missing preference "
 "directory: {0}"
 msgstr ""
+"បាន​បរាជ័យ​ក្នុង​ការ​ចាប់ផ្ដើម​ចំណូលចិត្ត។ "
+"បរាជ័យ​ក្នុង​ការ​បង្កើត​ថត​ចំណូលចិត្ត​ដែល​បាត់៖ {0}"
 
 msgid ""
 "<html>Failed to initialize preferences.<br>Failed to create missing "
 "preference directory: {0}</html>"
 msgstr ""
+"<html>បាន​បរាជ័យ​ក្នុង​ការ​ចាប់ផ្ដើម​ចំណូលចិត្ត។<br>បរាជ័យ​ក្នុង​ការ​បង្កើត​ថ"
+"ត​ចំណូលចិត្ត​ដែល​បាត់៖ {0}</html>"
 
 msgid "Missing preference file ''{0}''. Creating a default preference file."
-msgstr ""
+msgstr "បាត់​ឯកសារ​ចំណូលចិត្ត ''{0}'' ។ បង្កើត​ឯកសារ​ចំណូលចិត្ត​លំនាំដើម។"
 
 msgid ""
 "Replacing existing preference file ''{0}'' with default preference file."
 msgstr ""
+"ជំនួស​ឯកសារ​ចំណូលចិត្ត​ដែល​មាន​ស្រាប់ ''{0}'' "
+"ជាមួយ​ឯកសារ​ចំណូលចិត្ត​លំនាំដើម។"
 
 msgid ""
 "<html>Failed to initialize preferences.<br>Failed to reset preference file "
 "to default: {0}</html>"
 msgstr ""
+"<html>បាន​បរាជ័យ​ក្នុង​ការ​ចាប់ផ្ដើម​ចំណូលចិត្ត។<br>បាន​បរាជ័យ​ក្នុង​ការ​កំណត"
+"់​ឯកសារ​ចំណូលចិត្ត​ឡើងវិញ​ទៅ​លំនាំដើម៖ {0}</html>"
 
 msgid ""
 "<html>Preferences file had errors.<br> Making backup of old one to "
 "<br>{0}<br> and creating a new default preference file.</html>"
 msgstr ""
+"<html>ឯកសារ​ចំណូលចិត្ត​មាន​បញ្ហា។<br> បម្រុងទុក​ឯកសារ​ចាស់​ទៅ <br>{0}<br> "
+"រួច​បង្កើត​ឯកសារ​ចំណូលចិត្ត​លំនាំដើម​ថ្មី។</html>"
 
 msgid ""
 "Failed to initialize preferences. Failed to reset preference file to "
 "default: {0}"
 msgstr ""
+"បាន​បរាជ័យ​ក្នុង​ការ​ចាប់ផ្ដើម​ចំណូលចិត្ត។ "
+"បរាជ័យ​ក្នុង​ការ​កំណត់​ឯកសារ​ចំណូលចិត្ត​ឡើងវិញ​ទៅ​លំនាំដើម៖ {0}"
 
 msgid "Paint style {0}: {1}"
-msgstr ""
+msgstr "រចនាប័ទ្ម​លាប​ពណ៌ {0}: {1}"
 
 msgid "Layer: {0}"
-msgstr ""
+msgstr "ស្រទាប់៖ {0}"
 
 msgid "Failed to persist preferences to ''{0}''"
-msgstr ""
+msgstr "បាន​បរាជ័យ​ក្នុង​ការ​បន្ត​ចំណូលចិត្ត ''{0}''"
 
 msgid " (at line {0}, column {1})"
-msgstr ""
+msgstr " (នៅ​បន្ទាត់​ទី {0}, ជួរឈរ {1})"
 
 msgid "Preference setting {0} has been removed since it is no longer used."
-msgstr ""
+msgstr "ការ​កំណត់​ចំណូលចិត្ត {0} ត្រូវ​បាន​លុបចេញ​ដោយសារ​វា​លែង​ប្រើ។"
 
 msgid "Metric"
-msgstr ""
+msgstr "ម៉ែត្រ"
 
 msgid "Chinese"
-msgstr ""
+msgstr "ចិន"
 
 msgid "Imperial"
-msgstr ""
+msgstr "Imperial"
 
 msgid "Nautical Mile"
-msgstr ""
+msgstr "Nautical Mile"
 
 msgid "Failed to load resource ''{0}'', error is {1}."
-msgstr ""
+msgstr "បាន​បរាជ័យ​ក្នុង​ការ​ផ្ទុក​ធនធាន ''{0}'', កំហុស​គឺ {1} ។"
 
 msgid "UNKNOWN"
 msgstr "មិន​ស្គាល់"
 
 msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
 msgstr ""
+"លេខ​កំណែ JOSM ដែល​មិន​រំពឹង​ទុក​នៅ​ក្នុង​ឯកសារ​ពិនិត្យ​ឡើងវិញ តម្លៃ​គឺ "
+"''{0}''"
 
 msgid "The revision file ''/REVISION'' is missing."
-msgstr ""
+msgstr "ឯកសារ​ពិនិត្យ​ឡើងវិញ ''/REVISION'' គឺ​បាត់។"
 
 msgid "Already registered a conflict for primitive ''{0}''."
-msgstr ""
+msgstr "បាន​ចុះឈ្មោះ​ការ​ប៉ះ​ទង្គិច​រួចហើយ​សម្រាប់​ព្រីមីទីវ ''{0}'' ។"
 
 msgid "Decimal Degrees"
-msgstr ""
+msgstr "កម្រិត​ទសភាគ"
 
 msgid "deg° min'' sec\""
-msgstr ""
+msgstr "deg° min'' sec\""
 
 msgid "deg° min'' (Nautical)"
-msgstr ""
+msgstr "deg° min'' (Nautical)"
 
 msgid "Projected Coordinates"
-msgstr ""
+msgstr "កូអរដោណេ​ដែល​បាន​ធ្វើ​ចំណោល"
 
 msgctxt "compass"
 msgid "S"
-msgstr ""
+msgstr "ត្បូង"
 
 msgctxt "compass"
 msgid "N"
-msgstr ""
+msgstr "ជើង"
 
 msgctxt "compass"
 msgid "W"
-msgstr ""
+msgstr "លិច"
 
 msgctxt "compass"
 msgid "E"
-msgstr ""
+msgstr "កើត"
 
 msgid "Not in cache"
-msgstr ""
+msgstr "មិន​នៅ​ក្នុង​ឃ្លាំង"
 
 msgid "Projection ''{0}'' is not found, bookmark ''{1}'' is not usable"
-msgstr ""
+msgstr "រក​មិន​ឃើញ​ចំណោល ''{0}'' ចំណាំ ''{1}'' មិន​អាច​ប្រើ​បាន"
 
 msgid "ID > 0 expected. Got {0}."
-msgstr ""
+msgstr "ID > 0 expected. Got {0}."
 
 msgid "Version > 0 expected. Got {0}."
-msgstr ""
+msgstr "Version > 0 expected. Got {0}."
 
 msgid ""
 "Cannot assign a changesetId > 0 to a new primitive. Value of changesetId is "
 "{0}"
 msgstr ""
+"មិន​អាច​ផ្ដល់​តម្លៃ changesetId > 0 ទៅកាន់​ព្រីមីទីវ​ថ្មី។ តម្លៃ changesetId "
+"គឺ {0}"
 
 msgid "A primitive with ID = 0 cannot be invisible."
-msgstr ""
+msgstr "ព្រីមីទីវ​ដែល​មាន​លេខ​សម្គាល់ = 0 មិន​អាច​មើល​ឃើញ។"
 
 msgid ""
 "Unable to add primitive {0} to the dataset because it is already included"
 msgstr ""
+"មិន​អាច​បន្ថែម​ព្រីមីទីវ {0} ទៅ​សំណុំ​ទិន្នន័យ​បាន​ទេ "
+"ព្រោះ​វា​បាន​រួមបញ្ចូល​រួចហើយ"
 
 msgid ""
 "JOSM expected to find primitive [{0} {1}] in dataset but it is not there. "
 "Please report this at {2}. This is not a critical error, it should be safe "
 "to continue in your work."
 msgstr ""
+"JOSM រំពឹង​ថា​រក​ឃើញ​ព្រីមីទីវ [{0} {1}] នៅ​ក្នុង​សំណុំ​ទិន្នន័យ "
+"ប៉ុន្តែ​វា​មិន​នៅ​ទីនោះ។ សូម​រាយការណ៍​វា​នៅ {2} ។ "
+"នេះ​មិនមែន​ជា​កំហុស​ធ្ងន់ធ្ងរ​ទេ "
+"វា​គួរតែ​មាន​សុវត្ថិភាព​ក្នុង​ការ​បន្ត​ការងារ​របស់​អ្នក។"
 
 msgid "Missing merge target for way with id {0}"
-msgstr ""
+msgstr "បញ្ចូល​គោលដៅ​ចូលគ្នា​សម្រាប់​ផ្លូវ​ដែល​មាន​លេខ​សម្គាល់ {0}"
 
 msgid ""
 "Object of type {0} with id {1} was marked to be deleted, but it''s missing "
 "in the source dataset"
 msgstr ""
+"វត្ថុ​ប្រភេទ {0} ដែល​មាន​លេខ​សម្គាល់ {1} សម្គាល់​ថា​ត្រូវ​បាន​លុប "
+"ប៉ុន្តែ​បាន​បាន​បាត់​នៅ​ក្នុង​សំណុំ​ទិន្នន័យ"
 
 msgid "Missing merge target for node with id {0}"
-msgstr ""
+msgstr "បាត់​គោលដៅ​បញ្ចូល​គ្នា​សម្រាប់​តំណ​ដែល​មាន​លេខ​សម្គាល់ {0}"
 
 msgid "Missing merge target for relation with id {0}"
-msgstr ""
+msgstr "បាត់​គោលដៅ​បញ្ចូល​គ្នា​សម្រាប់​ទំនាក់ទំនង​ដែល​មាន​លេខ​សម្គាល់ {0}"
 
 msgid "Missing merge target of type {0} with id {1}"
-msgstr ""
+msgstr "បាត់​គោលដៅ​បញ្ចូល​គ្នា​នៃ​ប្រភេទ {0} ដែល​មាន​លេខ​សម្គាល់ {1}"
 
 msgid "Conflict in ''visible'' attribute for object of type {0} with id {1}"
 msgstr ""
+"ប៉ះទង្គិច​នៅ​ក្នុង​គុណ​លក្ខណៈ ''visible'' សម្រាប់​វត្ថុ​ប្រភេទ {0} "
+"ដែល​មាន​លេខ​សម្គាល់ {1}"
 
 msgid "Merging data..."
-msgstr ""
+msgstr "កំពុង​បញ្ចូល​ទិន្នន័យ​ចូលគ្នា..."
 
 msgid "Test ''{0}'' completed in {1}"
-msgstr ""
+msgstr "ការ​សាកល្បង ''{0}'' បាន​បញ្ចប់​ក្នុង {1}"
 
 msgid "Cannot add a way with only {0} nodes."
-msgstr ""
+msgstr "មិន​អាច​បន្ថែម​ផ្លូវ​ដែល​មាន​តែ​តំណ {0} ឡើយ។"
 
 msgid "Each node must connect exactly 2 ways"
-msgstr ""
+msgstr "តំណ​នីមួយៗ​ត្រូវតែ​តភ្ជាប់​ទៅ​ផ្លូវ ២"
 
 msgid "There is an intersection between ways."
-msgstr ""
+msgstr "មាន​ចំណុច​ប្រសព្វ​រវាង​ផ្លូវ។"
 
 msgid ""
 "Cannot merge because either of the participating primitives is new and the "
 "other is not"
 msgstr ""
+"មិន​អាច​បញ្ចូល​គ្នា​ព្រោះ​ព្រីមីទីវ​ចូលរួម​គឺ​ថ្មី ហើយ​ផ្សេងទៀត​គឺ​ចាស់"
 
 msgid ""
 "Cannot merge primitives with different ids. This id is {0}, the other is {1}"
 msgstr ""
+"មិន​អាច​បញ្ចូល​ព្រីមីទីវ​ចូលគ្នា​ជាមួយ​លេខ​សម្គាល់​ខុសគ្នា​បាន​ទេ។ "
+"លេខ​សម្គាល់​គឺ {0}, ផ្សេងទៀត​គឺ {1}"
 
 msgid "node"
 msgid_plural "nodes"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "តំណ"
 
 msgid "way"
 msgid_plural "ways"
@@ -3442,606 +3516,641 @@ msgid_plural "relations"
 msgstr[0] "ទំនាក់ទំនង"
 
 msgid "closedway"
-msgstr ""
+msgstr "ផ្លូវ​បិទ​ជិត"
 
 msgid "multipolygon"
-msgstr ""
+msgstr "ពហុកោណ​ច្រើន"
 
 msgid ""
 "Tag collection cannot be applied to a primitive because there are keys with "
 "multiple values."
 msgstr ""
+"សម្រាំង​ស្លាក​មិន​បង្ហាញ​ទៅកាន់​ព្រីមីទីវ "
+"ព្រោះ​មាន​ពាក្យ​គន្លឹះ​ជាមួយ​តម្លៃ​ច្រើន។"
 
 msgid "<anonymous>"
-msgstr ""
+msgstr "<អនាមិក>"
 
 msgid "Cannot add node {0} to incomplete way {1}."
-msgstr ""
+msgstr "មិន​អាច​បន្ថែម​តំណ {0} ទៅកាន់​ផ្លូវ​មិន​បញ្ចប់ {1} ។"
 
 msgid "Nodes in way must be in the same dataset"
-msgstr ""
+msgstr "តំណ​នៅ​ក្នុង​ផ្លូវ​ត្រូវតែ​នៅ​ក្នុង​សំណុំ​ទិន្នន័យ​ដូចគ្នា"
 
 msgid "Deleted node referenced by {0}"
-msgstr ""
+msgstr "បាន​លុប​សេចក្ដី​យោង​តំណ​ដោយ {0}"
 
 msgid "Complete node {0} with null coordinates in way {1}"
-msgstr ""
+msgstr "បំពេញ​តំណ {0} ជាមួយ​កូអរដោណេ​ទទេ​នៅ​ក្នុង​ផ្លូវ {1}"
 
 msgid ""
 "Cannot compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
 msgstr ""
+"មិន​អាច​ប្រៀបធៀប​ព្រីមីទីវ​ដែល​មាន​លេខ​សម្គាល់ ''{0}'' "
+"ជាមួយ​ព្រីមីទីវ​ដែល​មាន​លេខ​សម្គាល់ ''{1}'' បាន​ទេ។"
 
 msgid "Parameter {0} not in range 0..{1}. Got ''{2}''."
-msgstr ""
+msgstr "ប៉ារ៉ាម៉ែត្រ {0} មិន​នៅ​ក្នុង​ជួរ 0..{1} ។ ទទួល​បាន ''{2}'' ។"
 
 msgid "Failed to load map renderer class ''{0}''. The class wasn''t found."
 msgstr ""
+"បាន​បរាជ័យ​ក្នុង​ការ​ផ្ទុក​ថ្នាក់​កម្មវិធី​បង្ហាញ​ផែនទី ''{0}'' ។ "
+"រក​មិន​ឃើញ​ថ្នាក់។"
 
 msgid ""
 "Can''t activate map renderer class ''{0}'', because the class wasn''t found."
 msgstr ""
+"មិន​អាច​ធ្វើឲ្យ​ថ្នាក់​កម្មវិធី​បង្ហាញ​ផែនទី ''{0}'' សកម្ម​បាន "
+"ព្រោះ​រក​មិន​ឃើញ​ថ្នាក់។"
 
 msgid "Activating the standard map renderer instead."
-msgstr ""
+msgstr "ធ្វើឲ្យ​កម្មវិធី​បង្ហាញ​ផែនទី​ស្តង់ដារ​សកម្ម​ជំនួស"
 
 msgid ""
 "Can''t activate map renderer class ''{0}'', because it isn''t a subclass of "
 "''{1}''."
 msgstr ""
+"មិន​អាច​ធ្វើឲ្យ​ថ្នាក់​កម្មវិធី​បង្ហាញ​ផែនទី ''{0}'' សកម្ម​បាន "
+"ព្រោះ​វា​មិនមែន​ជា​ថ្នាក់​រង​របស់ ''{1}'' ។"
 
 msgid ""
 "Can''t activate map renderer class ''{0}'', because it isn''t registered as "
 "map renderer."
 msgstr ""
+"មិន​អាច​ធ្វើឲ្យ​ថ្នាក់​កម្មវិធី​បង្ហាញ​ផែនទី ''{0}'' សកម្ម​បាន "
+"ព្រោះ​វា​មិន​បាន​ចុះឈ្មោះ​ជា​កម្មវិធី​បង្ហាញ​ផែនទី។"
 
 msgid "Wireframe Map Renderer"
-msgstr ""
+msgstr "កម្មវិធី​បង្ហាញ​ផែនទី​ស៊ុម​ខ្សែ"
 
 msgid "Renders the map as simple wire frame."
-msgstr ""
+msgstr "បង្ហាញ​ផែនទី​ជា​ស៊ុមខ្សែ​ធម្មតា។"
 
 msgid "Styled Map Renderer"
-msgstr ""
+msgstr "កម្មវិធី​បង្ហាញ​ផែនទី​រចនាប័ទ្ម"
 
 msgid "Renders the map using style rules in a set of style sheets."
 msgstr ""
+"បង្ហាញ​ផែនទី​ដោយ​ប្រើ​ក្បួន​រចនាប័ទ្ម​នៅ​ក្នុង​សំណុំ​នៃ​សន្លឹក​រចនាប័ទ្ម។"
 
 msgid "inactive"
 msgstr "អសកម្ម"
 
 msgid "selected"
-msgstr ""
+msgstr "បាន​ជ្រើស"
 
 msgid "Relation: selected"
-msgstr ""
+msgstr "ទំនាក់ទំនង៖ បាន​ជ្រើស"
 
 msgid "Node: standard"
-msgstr ""
+msgstr "តំណ៖ ស្តង់ដារ"
 
 msgid "Node: connection"
-msgstr ""
+msgstr "តំណ៖ ការ​តភ្ជាប់"
 
 msgid "Node: tagged"
-msgstr ""
+msgstr "តំណ៖ បាន​ដាក់​ស្លាក"
 
 msgid "untagged way"
-msgstr ""
+msgstr "ដោះ​ស្លាក​ផ្លូវ"
 
 msgid "background"
 msgstr "ផ្ទៃ​ខាងក្រោយ"
 
 msgid "highlight"
-msgstr ""
+msgstr "រំលេច"
 
 msgid "highlight wireframe"
-msgstr ""
+msgstr "រំលេច​ស៊ុម​ខ្សែ"
 
 msgid "untagged"
-msgstr ""
+msgstr "ដោះ​ស្លាក"
 
 msgid "text"
 msgstr "អត្ថបទ"
 
 msgid "areatext"
-msgstr ""
+msgstr "ផ្ទៃ​អត្ថបទ"
 
 msgid "Parameter must begin with a ''+'' character (found ''{0}'')"
-msgstr ""
+msgstr "ប៉ារ៉ាម៉ែត្រ​ត្រូវតែ​ចាប់ផ្ដើម​ដោយ​តួអក្សរ ''+'' (រក​ឃើញ ''{0}'')"
 
 msgid "Unknown parameter: ''{0}''."
-msgstr ""
+msgstr "មិន​ស្គាល់​ប៉ារ៉ាម៉ែត្រ៖ ''{0}'' ។"
 
 msgid "Value expected for parameter ''{0}''."
-msgstr ""
+msgstr "តម្លៃ​រំពឹង​ទុក​សម្រាប់​ប៉ារ៉ាម៉ែត្រ ''{0}'' ។"
 
 msgid "No value expected for parameter ''{0}''."
-msgstr ""
+msgstr "គ្មាន​តម្លៃ​រំពឹង​ទុក​សម្រាប់​ប៉ារ៉ាម៉ែត្រ ''{0}'' ។"
 
 msgid "Unexpected parameter format (''{0}'')"
-msgstr ""
+msgstr "ទ្រង់ទ្រាយ​ប៉ារ៉ាម៉ែត្រ​មិន​រំពឹង​ទុក (''{0}'')"
 
 msgid "Value ''{0}'' for option +init not supported."
-msgstr ""
+msgstr "តម្លៃ ''{0}'' សម្រាប់​ជម្រើស +init មិន​ត្រូវ​បាន​គាំទ្រ។"
 
 msgid ": "
-msgstr ""
+msgstr ": "
 
 msgid "Ellipsoid ''{0}'' not supported."
-msgstr ""
+msgstr "អេលីប ''{0}'' មិន​ត្រូវ​បាន​គាំទ្រ។"
 
 msgid "Combination of ellipsoid parameters is not supported."
-msgstr ""
+msgstr "បន្សំ​ប៉ារ៉ាម៉ែត្រ​អេលីប​មិន​ត្រូវ​បាន​គាំទ្រ។"
 
 msgid "Ellipsoid required (+ellps=* or +a=*, +b=*)"
-msgstr ""
+msgstr "រាង​អេលីប​បាន​ទាមទារ (+ellps=* or +a=*, +b=*)"
 
 msgid "Grid shift file ''{0}'' for option +nadgrids not supported."
 msgstr ""
+"ឯកសារ Grid shift ''{0}'' សម្រាប់​ជម្រើស +nadgrids មិន​ត្រូវ​បាន​គាំទ្រ។"
 
 msgid "Unknown datum identifier: ''{0}''"
-msgstr ""
+msgstr "មិន​ស្គាល់​គ្រឿង​សម្គាល់ datum ៖ ''{0}''"
 
 msgid "Datum required (+datum=*, +towgs84=* or +nadgrids=*)"
-msgstr ""
+msgstr "Datum បាន​ទាមទារ (+datum=*, +towgs84=* ឬ +nadgrids=*)"
 
 msgid ""
 "Unexpected number of arguments for parameter ''towgs84'' (must be 3 or 7)"
 msgstr ""
+"លេខ​មិន​រំពឹង​ទុក​របស់​អាគុយម៉ង់​សម្រាប់​ប៉ារ៉ាម៉ែត្រ ''towgs84'' (ត្រូវតែ 3 "
+"ឬ 7)"
 
 msgid "Unable to parse value of parameter ''towgs84'' (''{0}'')"
-msgstr ""
+msgstr "មិន​អាច​ញែក​តម្លៃ​ប៉ារ៉ាម៉ែត្រ ''towgs84'' (''{0}'')"
 
 msgid "Projection required (+proj=*)"
-msgstr ""
+msgstr "ចំណោល​បាន​ទាមទារ (+proj=*)"
 
 msgid "Unknown projection identifier: ''{0}''"
-msgstr ""
+msgstr "មិន​ស្គាល់​គ្រឿង​សម្គាល់​ចំណោល៖ ''{0}''"
 
 msgid "Unexpected number of arguments for parameter ''+bounds'' (must be 4)"
 msgstr ""
+"លេខ​មិន​រំពឹង​ទុក​របស់​អាគុយម៉ង់​សម្រាប់​ប៉ារ៉ាម៉ែត្រ ''+bounds'' (ត្រូវតែ 4)"
 
 msgid "Unknown parameter ''{0}''"
-msgstr ""
+msgstr "មិន​ស្គាល់​ប៉ារ៉ាមែត្រ ''{0}''"
 
 msgid "Expected number argument for parameter ''{0}''"
-msgstr ""
+msgstr "លេខ​អាគុយម៉ង់​ដែល​បាន​រំពឹង​ទុក​សម្រាប់​ប៉ារ៉ាម៉ែត្រ ''{0}''"
 
 msgid "Unable to parse value ''{1}'' of parameter ''{0}'' as number."
-msgstr ""
+msgstr "មិន​អាច​ញែក​តម្លៃ ''{1}'' របស់​ប៉ារ៉ាម៉ែត្រ ''{0}'' ជា​លេខ​បាន​ទេ។"
 
 msgid ""
 "Unable to parse value ''{1}'' of parameter ''{0}'' as coordinate value."
 msgstr ""
+"មិន​អាច​ញែក​តម្លៃ ''{1}'' របស់​ប៉ារ៉ាម៉ែត្រ ''{0}'' ជា​តម្លៃ​កូអរដោណេ​បាន​ទេ។"
 
 msgid "Custom Projection"
-msgstr ""
+msgstr "ចំណោល​ផ្ទាល់ខ្លួន"
 
 msgid "GRS80"
-msgstr ""
+msgstr "GRS80"
 
 msgid "WGS84"
-msgstr ""
+msgstr "WGS84"
 
 msgid "Parameter ''{0}'' required."
-msgstr ""
+msgstr "ប៉ារ៉ាម៉ែត្រ ''{0}'' បាន​ទាមទារ។"
 
 msgid "Lambert Conformal Conic"
-msgstr ""
+msgstr "Lambert Conformal Conic"
 
 msgid "Lat/lon (Geodetic)"
-msgstr ""
+msgstr "Lat/lon (Geodetic)"
 
 msgid "Mercator"
-msgstr ""
+msgstr "Mercator"
 
 msgid "Swiss Oblique Mercator"
-msgstr ""
+msgstr "Swiss Oblique Mercator"
 
 msgid "Transverse Mercator"
-msgstr ""
+msgstr "Transverse Mercator"
 
 msgid ""
 "Error initializing test {0}:\n"
 " {1}"
 msgstr ""
+"កំហុស​ក្នុង​ការ​ចាប់ផ្ដើម​ការ​សាកល្បង {0} ៖\n"
+" {1}"
 
 msgid "validation error"
-msgstr ""
+msgstr "កំហុស​សុពលកម្ម"
 
 msgid "validation warning"
-msgstr ""
+msgstr "ជូនដំណឹង​សុពល​កម្ម"
 
 msgid "validation other"
-msgstr ""
+msgstr "សុពលកម្ម​ផ្សេងទៀត"
 
 msgid "Running test {0}"
-msgstr ""
+msgstr "ដំណើរការ​ការ​សាកល្បង {0}"
 
 msgid "E-mail address contains non-ascii characters"
-msgstr ""
+msgstr "អាសយដ្ឋាន​អ៊ីមែល​មាន​តួអក្សរ​មិនមែន​អាស្គី"
 
 msgid "E-mail address is invalid"
-msgstr ""
+msgstr "អាសយដ្ឋាន​អ៊ីមែល​មិន​ត្រឹមត្រូវ"
 
 msgid "E-mail address contains an invalid username: {0}"
-msgstr ""
+msgstr "អាសយដ្ឋាន​អ៊ីមែល​មាន​ឈ្មោះ​អ្នកប្រើ​មិន​ត្រឹមត្រូវ៖ {0}"
 
 msgid "E-mail address contains an invalid domain: {0}"
-msgstr ""
+msgstr "អាសយដ្ឋាន​អ៊ីមែល​មាន​ដែន​មិន​ត្រឹមត្រូវ៖ {0}"
 
 msgid "URL contains non-ascii characters"
-msgstr ""
+msgstr "URL មាន​តួអក្សរ​ដែល​មិនមែន​អាស្គី"
 
 msgid "URL is invalid"
-msgstr ""
+msgstr "URL មិន​ត្រឹមត្រូវ"
 
 msgid "URL contains an invalid protocol: {0}"
-msgstr ""
+msgstr "URL មាន​ពិធីការ​មិន​ត្រឹមត្រូវ៖ {0}"
 
 msgid "URL contains an invalid authority: {0}"
-msgstr ""
+msgstr "URL មាន​ប្រភព​មិន​ត្រឹមត្រូវ៖ {0}"
 
 msgid "URL contains an invalid path: {0}"
-msgstr ""
+msgstr "URL មាន​ផ្លូវ​មិន​ត្រឹមត្រូវ៖ {0}"
 
 msgid "URL contains an invalid query: {0}"
-msgstr ""
+msgstr "URL មាន​សំណួរ​មិន​ត្រឹមត្រូវ៖ {0}"
 
 msgid "URL contains an invalid fragment: {0}"
-msgstr ""
+msgstr "URL មាន​បំណែក​មិន​ត្រឹមត្រូវ៖ {0}"
 
 msgid "Addresses"
-msgstr ""
+msgstr "អាសយដ្ឋាន"
 
 msgid "Checks for errors in addresses and associatedStreet relations."
-msgstr ""
+msgstr "ពិនិត្យមើល​កំហុស​នៅ​ក្នុង​អាសយដ្ឋាន និង​ទំនាក់ទំនង​ផ្លូវ​ពាក់ព័ន្ធ។"
 
 msgid "Multiple associatedStreet relations"
-msgstr ""
+msgstr "ទំនាក់ទំនង​ផ្លូវ​ពាក់ព័ន្ធ​ច្រើន"
 
 msgid "House number without street"
-msgstr ""
+msgstr "លេខ​ផ្ទះ​ដោយ​គ្មាន​ផ្លូវ"
 
 msgid "House number ''{0}'' duplicated"
-msgstr ""
+msgstr "លេខ​ផ្ទះ ''{0}'' ស្ទួន​គ្នា"
 
 msgid "Duplicate house numbers"
-msgstr ""
+msgstr "លេខ​ផ្ទះ​ស្ទួន​គ្នា"
 
 msgid "Multiple street names in relation"
-msgstr ""
+msgstr "ឈ្មោះ​ផ្លូវ​ច្រើន​ក្នុង​ទំនាក់ទំនង"
 
 msgid "House number too far from street"
-msgstr ""
+msgstr "លេខ​ផ្ទះ​ឆ្ងាយ​ពី​ផ្លូវ​ពេក"
 
 msgid "API Capabilities"
-msgstr ""
+msgstr "សមត្ថភាព API"
 
 msgid "Checks for errors against API capabilities"
-msgstr ""
+msgstr "ពិនិត្យមើល​កំហុស​ទល់នឹង​សមត្ថភាព API"
 
 msgid ""
 "Way contains more than {0} nodes. It should be replaced by a multipolygon"
 msgstr ""
+"ផ្លូវ​មាន​តំណ​ច្រើន​ជាង {0} ។ វា​គួរ​ត្រូវ​បាន​ជំនួស​ដោយ​ពហុកោណ​ច្រើន"
 
 msgid "Way contains more than {0} nodes. It should be split or simplified"
 msgstr ""
+"ផ្លូវ​មាន​តំណ​ច្រើន​ជា {0} ។ វា​គួរ​ត្រូវ​បាន​បំបែក ឬ​ធ្វើឲ្យ​ងាយស្រួល"
 
 msgid "Barriers and entrances"
-msgstr ""
+msgstr "របង និង​ច្រក​ចូល"
 
 msgid "Checks for errors in barriers and entrances."
-msgstr ""
+msgstr "ពិនិត្យមើល​កំហុស​នៅ​ក្នុង​របង និង​ច្រក​ចូល។"
 
 msgid "Barrier entrance not set on a barrier"
-msgstr ""
+msgstr "ច្រក​ចូល​របង​មិន​បាន​កំណត់​នៅ​លើ​របង"
 
 msgid "Coastlines"
-msgstr ""
+msgstr "ច្រាំង​សមុទ្រ"
 
 msgid "This test checks that coastlines are correct."
-msgstr ""
+msgstr "ការ​សាកល្បង​នេះ​ពិនិត្យមើល​ជួរ​មាត់​ច្រាំង​សមុទ្រ​ឲ្យ​ត្រឹមត្រូវ។"
 
 msgid "Unconnected coastline"
-msgstr ""
+msgstr "ជួរ​មាត់ច្រាំង​សមុទ្រ​ដែល​មិនបាន​តភ្ជាប់"
 
 msgid "Unordered coastline"
-msgstr ""
+msgstr "ជួរ​មាត់ច្រាំង​សមុទ្រ​ដែល​មិនបាន​តម្រៀប"
 
 msgid "Reversed coastline"
-msgstr ""
+msgstr "ជួរ​មាត់ច្រាំង​សមុទ្រ​ដែល​បាន​បញ្ច្រាស"
 
 msgid "Conditional Keys"
-msgstr ""
+msgstr "កូនសោ​លក្ខខណ្ឌ"
 
 msgid "Tests for the correct usage of ''*:conditional'' tags."
-msgstr ""
+msgstr "សាកល្បង​ឲ្យ​ដឹង​ថា​ការ​ប្រើ​ស្លាក ''*:conditional'' ត្រឹមត្រូវ។"
 
 msgid "Does not match pattern ''restriction value @ condition''"
-msgstr ""
+msgstr "មិន​ផ្គូផ្គង​លំនាំ ''restriction value @ condition''"
 
 msgid "{0} is not a valid restriction value"
-msgstr ""
+msgstr "{0} មិនមែន​ជា​តម្លៃ​ដាក់​កម្រិត​ត្រឹមត្រូវ"
 
 msgid "Wrong syntax in {0} key"
-msgstr ""
+msgstr "វាក្យសម្ពន្ធ​មិន​ត្រឹមត្រូវ​នៅ​ក្នុង​ពាក្យ​គន្លឹះ {0}"
 
 msgid "Error in {0} value: {1}"
-msgstr ""
+msgstr "កំហុស​នៅ​ក្នុង​តម្លៃ {0} ៖ {1}"
 
 msgid "Crossing ways"
-msgstr ""
+msgstr "ផ្លូវ​សម្រាប់​ឆ្លងកាត់"
 
 msgid "Crossing buildings"
-msgstr ""
+msgstr "ផ្លូវ​ឆ្លង​អគារ"
 
 msgid "Crossing waterways"
-msgstr ""
+msgstr "ផ្លូវ​ឆ្លង​ទឹក"
 
 msgid "Crossing waterway/highway"
-msgstr ""
+msgstr "ផ្លូវ​ឆ្លង​ទឹក/ផ្លូវ​ធំ"
 
 msgid "Crossing boundaries"
-msgstr ""
+msgstr "ផ្លូវ​កាត់​ព្រំដែន"
 
 msgid "Crossing barriers"
-msgstr ""
+msgstr "ផ្លូវ​ឆ្លងកាត់​របាំង"
 
 msgid ""
 "This test checks if two roads, railways, waterways or buildings crosses in "
 "the same layer, but are not connected by a node."
 msgstr ""
+"ការ​សាកល្បង​នេះ​ដើម្បី​ពិនិត្យ​ថា​តើ​ផ្លូវ ផ្លូវ​ដែក ផ្លូវ​ទឹក "
+"ឬ​អគារ​ពីរ​កាត់​គ្នា​ក្នុង​ស្រទាប់​តែ​មួយ "
+"ប៉ុន្តែ​មិន​ត្រូវ​បាន​តភ្ជាប់​ដោយ​តំណ។"
 
 msgid "Duplicated nodes"
-msgstr ""
+msgstr "តំណ​ស្ទួន"
 
 msgid "This test checks that there are no nodes at the very same location."
-msgstr ""
+msgstr "ការ​សាកល្បង​ពិនិត្យមើល​ថា​មិន​មាន​តំណ​នៅ​ទីតាំង​ដូចគ្នា។"
 
 msgid "Mixed type duplicated nodes"
-msgstr ""
+msgstr "ប្រភេទ​ចម្រុះ​តំណ​ស្ទួន"
 
 msgid "Highway duplicated nodes"
-msgstr ""
+msgstr "តំណ​ស្ទួន​ផ្លូវ​ធំ"
 
 msgid "Railway duplicated nodes"
-msgstr ""
+msgstr "តំណ​ស្ទួន​ផ្លូវ​ដែក"
 
 msgid "Waterway duplicated nodes"
-msgstr ""
+msgstr "តំណ​ស្ទួន​ផ្លូវ​ទឹក"
 
 msgid "Boundary duplicated nodes"
-msgstr ""
+msgstr "តំណ​ស្ទួន​ព្រំដែន"
 
 msgid "Power duplicated nodes"
-msgstr ""
+msgstr "តំណ​ស្ទួន​ថាមពល"
 
 msgid "Natural duplicated nodes"
-msgstr ""
+msgstr "តំណ​ស្ទួន​ធម្មជាតិ"
 
 msgid "Building duplicated nodes"
-msgstr ""
+msgstr "តំណ​ស្ទួន​អគារ"
 
 msgid "Landuse duplicated nodes"
-msgstr ""
+msgstr "តំណ​ស្ទួន​ការ​ប្រើ​ដី"
 
 msgid "Other duplicated nodes"
-msgstr ""
+msgstr "តំណ​ស្ទួន​ផ្សេងទៀត"
 
 msgid "Nodes at same position"
-msgstr ""
+msgstr "តំណ​នៅ​ទីតាំង​ដូចគ្នា"
 
 msgid "Duplicated relations"
-msgstr ""
+msgstr "ទំនាក់ទំនង​ស្ទួន"
 
 msgid ""
 "This test checks that there are no relations with same tags and same members "
 "with same roles."
 msgstr ""
+"ការ​សាកល្បង​នេះ​ពិនិត្យមើល​ឲ្យ​ដឹង​ថា​គ្មាន​ទំនាក់ទំនង​ដែល​មាន​ស្លាក "
+"និង​សមាជិក​ដូចគ្នា​ជាមួយ​តួនាទី​ដូចគ្នា។"
 
 msgid "Relations with same members"
-msgstr ""
+msgstr "ទំនាក់ទំនង​ដែល​មាន​សមាជិក​ដូចគ្នា"
 
 msgid "Delete duplicate relations"
-msgstr ""
+msgstr "លុប​ទំនាក់ទំនង​ស្ទួន​គ្នា"
 
 msgid "Duplicated ways"
-msgstr ""
+msgstr "ផ្លូវ​ស្ទួន​គ្នា"
 
 msgid ""
 "This test checks that there are no ways with same node coordinates and "
 "optionally also same tags."
 msgstr ""
+"ការ​សាកល្បង​នេះ​ពិនិត្យមើល​ឲ្យ​ដឹង​ថា​គ្មាន​ផ្លូវ​ដែល​មាន​កូអរដោណេ​តំណ "
+"និង​ស្លាក​ជម្រើស​ដូចគ្នា។"
 
 msgid "Ways with same position"
-msgstr ""
+msgstr "ផ្លូវ​ដែល​មាន​ទីតាំង​ដូចគ្នា"
 
 msgid "Delete duplicate ways"
-msgstr ""
+msgstr "លុប​ផ្លូវ​ស្ទួន​គ្នា"
 
 msgid "Duplicated way nodes"
-msgstr ""
+msgstr "តំណ​ផ្លូវ​ស្ទួន​គ្នា"
 
 msgid "Checks for ways with identical consecutive nodes."
-msgstr ""
+msgstr "ពិនិត្យមើល​ផ្លូវ​ដែល​មាន​តំណ​រៀង​ដូចគ្នា។"
 
 msgid "Highways"
-msgstr ""
+msgstr "ផ្លូវ​ធំ"
 
 msgid "Performs semantic checks on highways."
-msgstr ""
+msgstr "ដំណើរការ​ការ​ពិនិត្យ​ស៊ីម៉ានទិច​នៅ​លើ​ផ្លូវ​ធំ"
 
 msgid "Incorrect roundabout (highway: {0} instead of {1})"
-msgstr ""
+msgstr "នៅ​ជិត​មិន​ត្រឹមត្រូវ (ផ្លូវ​ធំ៖ {0} ជំនួស​ឲ្យ {1})"
 
 msgid "Highway link is not linked to adequate highway/link"
-msgstr ""
+msgstr "តំណ​ផ្លូវ​ធំ​មិន​ត្រូវ​បាន​តភ្ជាប់​ទៅ​ផ្លូវ​ធំ/តំណ​ត្រឹមត្រូវ"
 
 msgid "Missing pedestrian crossing information"
-msgstr ""
+msgstr "បាត់​ព័ត៌មាន​អ្នក​ថ្មើរជើង​ឆ្លងកាត់"
 
 msgid "Unknown country code: {0}"
-msgstr ""
+msgstr "មិន​ស្គាល់​លេខ​កូដ​ប្រទេស៖ {0}"
 
 msgid "Unknown source:maxspeed context: {0}"
-msgstr ""
+msgstr "មិន​ស្គាល់​ប្រភព៖បរិបទ​ល្បឿន​អតិបរមា៖ {0}"
 
 msgid "Internet tags"
-msgstr ""
+msgstr "ស្លាក​អ៊ីនធឺណិត"
 
 msgid "Checks for errors in internet-related tags."
-msgstr ""
+msgstr "ពិនិត្យមើល​កំហុស​ក្នុង​ស្លាក​អ៊ីនធឺណិត​ពាក់ព័ន្ធ"
 
 msgid "''{0}'': {1}"
-msgstr ""
+msgstr "''{0}'': {1}"
 
 msgid "Lane tags"
-msgstr ""
+msgstr "ស្លាក​ចំណែក​ផ្លូវ"
 
 msgid "Test that validates ''lane:'' tags."
-msgstr ""
+msgstr "សាកល្បង​ថា​​វា​ជា​ស្លាក ''ចំណែក​ផ្លូវ៖'' ត្រឹមត្រូវ។"
 
 msgid "Number of {0} greater than {1}"
-msgstr ""
+msgstr "ចំនួន {0} ធំ​ជាង {1}"
 
 msgid "{0}+{1}"
-msgstr ""
+msgstr "{0}+{1}"
 
 msgid "Number of lane dependent values inconsistent"
-msgstr ""
+msgstr "ចំនួន​តម្លៃ​អាស្រ័យ​ចំណែក​ផ្លូវ​ប្រែប្រួល"
 
 msgid "Number of lane dependent values inconsistent in forward direction"
-msgstr ""
+msgstr "ចំនួន​តម្លៃ​អាស្រ័យ​ចំណែក​ផ្លូវ​នៅ​ក្នុង​ទិសដៅ​ទៅ​មុខ"
 
 msgid "Number of lane dependent values inconsistent in backward direction"
-msgstr ""
+msgstr "ចំនួន​តម្លៃ​អាស្រ័យ​ចំណែក​ផ្លូវ​នៅ​ក្នុង​ទិសដៅ​ថយក្រោយ"
 
 msgid "Tag checker (MapCSS based)"
-msgstr ""
+msgstr "កម្មវិធី​ពិនិត្យ​ស្លាក (មូលដ្ឋាន​លើ MapCSS)"
 
 msgid "This test checks for errors in tag keys and values."
 msgstr ""
+"ការ​សាកល្បង​នេះ​ពិនិត្យមើល​កំហុស​នៅ​ក្នុង​តម្លៃ និង​ពាក្យ​គន្លឹះ​ស្លាក។"
 
 msgid "Unable to replace argument {0} in {1}: {2}"
-msgstr ""
+msgstr "មិន​អាច​ជំនួស​អាគុយម៉ង់ {0} នៅ​ក្នុង {1}: {2}"
 
 msgid "Fix of {0}"
-msgstr ""
+msgstr "តម្លៃ​ថេ​របស់ {0}"
 
 msgid " or "
-msgstr ""
+msgstr " ឬ "
 
 msgid "{0}, use {1} instead"
-msgstr ""
+msgstr "{0}, ប្រើ {1} ជំនួស"
 
 msgid "Adding {0} to tag checker"
-msgstr ""
+msgstr "ការ​បន្ថែម {0} ទៅ​កម្មវិធី​ពិនិត្យ​ស្លាក"
 
 msgid "Failed to add {0} to tag checker"
-msgstr ""
+msgstr "ការ​បន្ថែម {0} ទៅ​កម្មវិធី​ពិនិត្យ​ស្លាក​បាន​បរាជ័យ"
 
 msgid "Multipolygon"
-msgstr ""
+msgstr "ពហុកោណ​ចម្រុះ"
 
 msgid "This test checks if multipolygons are valid."
-msgstr ""
+msgstr "ការ​សាកល្បង​នេះ​ពិិនិត្យមើល​ពហុកោណ​ចម្រុះ​ថា​ត្រឹមត្រូវ។"
 
 msgid "Area style way is not closed"
-msgstr ""
+msgstr "ផ្លូវ​រចនាប័ទ្ម​ផ្ទៃ​មិន​បាន​បិទ"
 
 msgid "No outer way for multipolygon"
-msgstr ""
+msgstr "មិន​មាន​ផ្លូវ​ក្រៅ​សម្រាប់​ពហុកោណ​ចម្រុះ"
 
 msgid "Role for ''{0}'' should be ''{1}''"
-msgstr ""
+msgstr "តួនាទី​របស់ ''{0}'' គួរតែ ''{1}''"
 
 msgid "No area style for multipolygon"
-msgstr ""
+msgstr "មិន​មាន​រចនាប័ទ្ម​ផ្ទៃ​សម្រាប់​ពហុកោណ​ចម្រុះ"
 
 msgid ""
 "Multipolygon relation should be tagged with area tags and not the outer way"
 msgid_plural ""
 "Multipolygon relation should be tagged with area tags and not the outer ways"
 msgstr[0] ""
-msgstr[1] ""
+"ទំនាក់ទំនង​ពហុកោណ​គួរតែ​បាន​ដាក់​ស្លាក​ដោយ​ស្លាក​ផ្ទៃ មិនមែន​ផ្លូវ​ខាងក្រៅ​ទេ"
 
 msgid "Style for inner way equals multipolygon"
-msgstr ""
+msgstr "រចនាប័ទ្ម​សម្រាប់​ផ្លូវ​ខាងក្នុង​គឺ​ស្មើ​នឹង​ពហុកោណ​ចម្រុះ"
 
 msgid "Style for outer way mismatches"
-msgstr ""
+msgstr "រចនាប័ទ្ម​សម្រាប់​ផ្លូវ​ខាងក្រៅ​គឺ​មិន​ផ្គូផ្គង"
 
 msgid "Style for outer way mismatches polygon"
-msgstr ""
+msgstr "រចនាប័ទ្ម​សម្រាប់​ផ្លូវ​ខាងក្រៅ​គឺ​មិន​ផ្គូផ្គង​នឹង​ពហុកោណ"
 
 msgid "Area style on outer way"
-msgstr ""
+msgstr "រចនាប័ទ្ម​ផ្ទៃ​នៅ​លើ​ផ្លូវ​ខាងក្រៅ"
 
 msgid "Multipolygon is not closed"
-msgstr ""
+msgstr "ពហុកោណ​ចម្រុះ​គឺ​មិន​បាន​បិទ"
 
 msgid "Multipolygon inner way is outside"
-msgstr ""
+msgstr "ពហុកោណ​ចម្រុះ​ខាងក្នុង​គឺ​នៅ​ក្រៅ"
 
 msgid "Intersection between multipolygon ways"
-msgstr ""
+msgstr "ចំណុច​ប្រសព្វ​រវាង​ផ្លូវ​ពហុកោណ​ចម្រុះ"
 
 msgid "No useful role for multipolygon member"
-msgstr ""
+msgstr "មិន​មាន​តួនាទី​ចាំបាច់​សម្រាប់​សមាជិក​ពហុកោណ​ចម្រុះ"
 
 msgid "Non-Way in multipolygon"
-msgstr ""
+msgstr "មិន​មាន​ផ្លូវ​នៅ​ក្នុង​ពហុកោណ​ចម្រុះ"
 
 msgid "Missing name:* translation"
-msgstr ""
+msgstr "បាត់​ការ​បកប្រែ name:*"
 
 msgid ""
 "This test finds multilingual objects whose ''name'' attribute is not equal "
 "to some ''name:*'' attribute and not a composition of ''name:*'' attributes, "
 "e.g., Italia - Italien - Italy."
 msgstr ""
+"ការ​សាកល្បង​នេះ​គឺ​ដើម្បី​រក​មើល​ធាតុ​ភាសា​ច្រើន​ដែល​គុណ​លក្ខណៈ​របស់ "
+"''name'' មិន​ស្មើនឹង​គុណ​លក្ខណៈ​ខ្លះ​របស់ ''name:*'' "
+"ហើយ​មិនមែន​ជា​បន្សំ​នៃ​គុណ​លក្ខណ ''name:*'' ឧ. Italia - Italien - Italy ។"
 
 msgid "A name:* translation is missing."
-msgstr ""
+msgstr "ការ​បកប្រែ name:* គឺ​បាត់។"
 
 msgid "A name is missing, even though name:* exists."
-msgstr ""
+msgstr "ឈ្មោះ​បាន​បាត់ ទោះបីជា​មាន name:* ក៏ដោយ។"
 
 msgid "Opening hours syntax"
-msgstr ""
+msgstr "ការ​បើក​វាក្យសម្ពន្ធ​ម៉ោង"
 
 msgid "This test checks the correct usage of the opening hours syntax."
 msgstr ""
+"ការ​សាកល្បង​នេះ​នឹង​ពិនិត្យមើល​ការ​ប្រើប្រាស់​ត្រឹមត្រូវ "
+"នៃ​ការ​បើក​វាក្យសម្ពន្ធ​ម៉ោង។"
 
 msgid "opening_hours value can be prettified"
-msgstr ""
+msgstr "ការ​បើក​តម្លៃ​ម៉ោង​អាច​ល្អ"
 
 msgid "Unexpected token:"
-msgstr ""
+msgstr "ថូខឹន​មិន​រំពឹង​ទុក៖"
 
 msgid "Unexpected token (school holiday parser):"
-msgstr ""
+msgstr "ថូខឹន​មិន​រំពឹង​ទុក (កម្មវិធី​ញែក​ថ្ងៃ​ឈប់​សម្រាក)"
 
 msgid "Unexpected token in number range:"
-msgstr ""
+msgstr "ថូខឹន​មិន​រំពឹង​ទុក​នៅ​ក្នុង​ជួរ​លេខ៖"
 
 msgid "Unexpected token in week range:"
-msgstr ""
+msgstr "ថូខឹន​មិន​រំពឹង​ទុក​ក្នុង​ជួរ​សប្ដាហ៍៖"
 
 msgid "Unexpected token in weekday range:"
-msgstr ""
+msgstr "ថូខឹន​មិន​រំពឹង​ទុក​ក្នុង​ជួរ​នៃ​ថ្ងៃ​ធ្វើការ៖"
 
 msgid "Unexpected token in month range:"
-msgstr ""
+msgstr "ថូខឹន​មិន​រំពឹង​ទុកក្នុង​ជួរ​ខែ៖"
 
 msgid "Unexpected token in year range:"
-msgstr ""
+msgstr "ថូខឹន​មិន​រំពឹង​ទុក​ក្នុង​ជួរ​ឆ្នាំ៖"
 
 msgid "Invalid/unsupported syntax."
-msgstr ""
+msgstr "វាក្យសម្ពន្ធ​មិន​ត្រឹមត្រូវ/មិន​គាំទ្រ។"
 
 msgid "Overlapping ways"
-msgstr ""
+msgstr "ផ្លូវ​ត្រួត​គ្នា"
 
 msgid ""
 "This test checks that a connection between two nodes is not used by more "
@@ -5080,6 +5189,12 @@ msgstr ""
 msgid "Conflict foreground: keep all tags"
 msgstr ""
 
+msgid "Conflict background: sum all numeric tags"
+msgstr ""
+
+msgid "Conflict foreground: sum all numeric tags"
+msgstr ""
+
 msgid "Conflict background: keep member"
 msgstr ""
 
@@ -5498,12 +5613,19 @@ msgstr ""
 msgid "all"
 msgstr ""
 
+msgid "sum"
+msgstr ""
+
 msgid "Please decide which values to keep"
 msgstr ""
 
 msgid "Value ''{0}'' is going to be applied for key ''{1}''"
 msgstr ""
 
+msgid ""
+"All numeric values sumed as ''{0}'' are going to be applied for key ''{1}''"
+msgstr ""
+
 msgid "The key ''{0}'' and all its values are going to be removed"
 msgstr ""
 
@@ -5866,24 +5988,6 @@ msgstr[1] ""
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
 
-msgid "Display the history of all selected items."
-msgstr ""
-
-msgid "Object with history"
-msgstr ""
-
-msgid "Reload"
-msgstr "ផ្ទុក​ឡើងវិញ"
-
-msgid "Reload all currently selected objects and refresh the list."
-msgstr ""
-
-msgid "Show"
-msgstr "បង្ហាញ"
-
-msgid "Display the history of the selected objects."
-msgstr ""
-
 msgid "Advanced object info"
 msgstr ""
 
@@ -6221,6 +6325,9 @@ msgstr ""
 msgid "Comment"
 msgstr ""
 
+msgid "Comment on note"
+msgstr ""
+
 msgid "Add comment to note:"
 msgstr ""
 
@@ -6230,9 +6337,6 @@ msgstr ""
 msgid "Close note with message:"
 msgstr ""
 
-msgid "Close Note"
-msgstr ""
-
 msgid "Create a new note"
 msgstr ""
 
@@ -6305,6 +6409,9 @@ msgstr "ជម្រើស​បច្ចុប្បន្ន"
 msgid "Search for objects"
 msgstr ""
 
+msgid "Display the history of the selected objects."
+msgstr ""
+
 msgid "Zoom to selection"
 msgstr ""
 
@@ -6424,6 +6531,9 @@ msgstr ""
 msgid "Updating map ..."
 msgstr ""
 
+msgid "anonymous"
+msgstr ""
+
 msgid "Display the basic properties of the changeset"
 msgstr ""
 
@@ -6436,6 +6546,12 @@ msgstr ""
 msgid "Display the objects created, updated, and deleted by the changeset"
 msgstr ""
 
+msgid "Discussion"
+msgstr ""
+
+msgid "Display the public discussion around this changeset"
+msgstr ""
+
 msgid "Changeset Management Dialog"
 msgstr ""
 
@@ -6493,9 +6609,6 @@ msgctxt "changeset.state"
 msgid "Closed"
 msgstr ""
 
-msgid "anonymous"
-msgstr ""
-
 msgid "ID"
 msgstr ""
 
@@ -6511,6 +6624,9 @@ msgstr ""
 msgid "Closed at"
 msgstr ""
 
+msgid "Discussions"
+msgstr ""
+
 msgid "Downloading changeset content"
 msgstr ""
 
@@ -6622,6 +6738,15 @@ msgid ""
 "layer"
 msgstr ""
 
+msgid "Update changeset discussion"
+msgstr ""
+
+msgid "Update the changeset discussion from the OSM server"
+msgstr ""
+
+msgid "Date"
+msgstr ""
+
 msgid "Download changesets"
 msgstr ""
 
@@ -7039,7 +7164,7 @@ msgstr ""
 msgid "Set number of recently added tags"
 msgstr ""
 
-msgid "Remember last used tags"
+msgid "Remember last used tags after a restart"
 msgstr ""
 
 msgid "Please enter the number of recently added tags to display"
@@ -7385,6 +7510,9 @@ msgstr ""
 msgid "Load parent relations"
 msgstr ""
 
+msgid "Reload"
+msgstr "ផ្ទុក​ឡើងវិញ"
+
 msgid "Loading parent relations"
 msgstr ""
 
@@ -7507,6 +7635,12 @@ msgstr ""
 msgid "Select to download GPS traces in the selected download area."
 msgstr ""
 
+msgid "Notes"
+msgstr ""
+
+msgid "Select to download notes in the selected download area."
+msgstr ""
+
 msgid "Download as new layer"
 msgstr ""
 
@@ -7812,9 +7946,6 @@ msgstr ""
 msgid "B"
 msgstr ""
 
-msgid "Date"
-msgstr ""
-
 msgid ""
 "Failed to update primitive with id {0} because current edit layer is null"
 msgstr ""
@@ -8669,9 +8800,6 @@ msgstr ""
 msgid "Save Layer"
 msgstr ""
 
-msgid "Notes"
-msgstr ""
-
 msgid "Notes layer"
 msgstr ""
 
@@ -8687,9 +8815,6 @@ msgstr ""
 msgid "outside downloaded area"
 msgstr ""
 
-msgid "version {0}"
-msgstr "កំណែ {0}"
-
 msgid "Merging layers"
 msgstr ""
 
@@ -12315,6 +12440,15 @@ msgstr ""
 msgid "Open changeset expected. Got closed changeset with id {0}."
 msgstr ""
 
+msgid "Note upload failed"
+msgstr ""
+
+msgid "Error parsing note response from server"
+msgstr ""
+
+msgid "Error encoding string: {0}"
+msgstr ""
+
 msgid "(Code={0})"
 msgstr ""
 
@@ -12363,13 +12497,13 @@ msgstr ""
 msgid "Parsing changeset content ..."
 msgstr ""
 
-msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
-msgid "Illegal numeric value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
-msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal numeric value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
 msgid "Missing mandatory attribute ''{0}'' of XML element {1}."
@@ -13161,9 +13295,6 @@ msgstr ""
 msgid "Failed to scan file ''{0}'' for plugin information. Skipping."
 msgstr ""
 
-msgid "Processing plugin site cache icon files..."
-msgstr ""
-
 msgid "Processing plugin files..."
 msgstr ""
 
@@ -13182,12 +13313,6 @@ msgstr ""
 msgid "Details:"
 msgstr ""
 
-msgid "Plugin icons download error"
-msgstr ""
-
-msgid "JOSM failed to download plugin icons:"
-msgstr ""
-
 msgid ""
 "Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
 "plugin site ''{1}''."
@@ -14073,7 +14198,9 @@ msgid ""
 "Creating and handling address nodes and buildings within Czech Republic."
 msgstr ""
 
-msgid "Allows to import various file formats into JOSM directly."
+msgid ""
+"Allows to import various file formats into JOSM directly. Currently "
+"supported: TangoGPS, Garmin Trainings Center TCX."
 msgstr ""
 
 msgid "Download your GPX tracks from openstreetmap.org"
@@ -14170,6 +14297,11 @@ msgid "A helper for IRS satellite adjustment."
 msgstr ""
 
 msgid ""
+"Provides Java Native Access (JNA) library. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
+msgid ""
 "Provides Java Topology Suite (JTS) library and related utilities. Not meant "
 "to be installed directly by users, but rather as a dependency for other "
 "plugins."
@@ -14507,22 +14639,41 @@ msgstr ""
 msgid "10%"
 msgstr ""
 
-msgid "-10%"
+msgid "-10%"
+msgstr ""
+
+msgid "10°"
+msgstr ""
+
+msgid "-10°"
+msgstr ""
+
+msgid "Oneway"
+msgstr ""
+
+msgid "Lit"
+msgstr ""
+
+msgid "Width (meters)"
 msgstr ""
 
-msgid "10°"
+msgid "Sidewalk"
 msgstr ""
 
-msgid "-10°"
+msgctxt "sidewalk"
+msgid "both"
 msgstr ""
 
-msgid "Oneway"
+msgctxt "sidewalk"
+msgid "left"
 msgstr ""
 
-msgid "Lit"
+msgctxt "sidewalk"
+msgid "right"
 msgstr ""
 
-msgid "Width (meters)"
+msgctxt "sidewalk"
+msgid "no"
 msgstr ""
 
 msgid "Service type"
@@ -14889,15 +15040,19 @@ msgstr ""
 msgid "May-Sep 09:30-12:30,14:15-19:30"
 msgstr ""
 
+msgctxt "parking"
 msgid "multi-storey"
 msgstr ""
 
+msgctxt "parking"
 msgid "surface"
 msgstr ""
 
+msgctxt "parking"
 msgid "underground"
 msgstr ""
 
+msgctxt "parking"
 msgid "rooftop"
 msgstr ""
 
@@ -15355,15 +15510,26 @@ msgstr ""
 msgid "Overtaking"
 msgstr ""
 
+msgctxt "overtaking"
+msgid "yes"
+msgstr ""
+
+msgctxt "overtaking"
 msgid "both"
 msgstr ""
 
+msgctxt "overtaking"
 msgid "forward"
 msgstr ""
 
+msgctxt "overtaking"
 msgid "backward"
 msgstr ""
 
+msgctxt "overtaking"
+msgid "no"
+msgstr ""
+
 msgid "Roundabout"
 msgstr ""
 
@@ -15657,6 +15823,12 @@ msgstr ""
 msgid "tiger"
 msgstr ""
 
+msgid "Button operated"
+msgstr ""
+
+msgid "Sound signals"
+msgstr ""
+
 msgid "Crossing attendant"
 msgstr ""
 
@@ -16178,9 +16350,6 @@ msgstr ""
 msgid "Traffic lights"
 msgstr ""
 
-msgid "Sound signals"
-msgstr ""
-
 msgid "Barrier"
 msgstr ""
 
@@ -18240,6 +18409,9 @@ msgstr ""
 msgid "Gasometer"
 msgstr ""
 
+msgid "Bunker Silo"
+msgstr ""
+
 msgid "Pipeline"
 msgstr ""
 
@@ -18386,15 +18558,15 @@ msgstr ""
 msgid "Monitoring:"
 msgstr ""
 
-msgid "Weather"
-msgstr ""
-
 msgid "Water level"
 msgstr ""
 
 msgid "Tide Level"
 msgstr ""
 
+msgid "Groundwater"
+msgstr ""
+
 msgid "Traffic"
 msgstr ""
 
@@ -18413,6 +18585,9 @@ msgstr ""
 msgid "Galileo Signals"
 msgstr ""
 
+msgid "Weather"
+msgstr ""
+
 msgid "Radiation"
 msgstr ""
 
@@ -18593,6 +18768,9 @@ msgstr ""
 msgid "pivot_pier"
 msgstr ""
 
+msgid "Bridge outline"
+msgstr ""
+
 msgid "Power Plant"
 msgstr ""
 
@@ -19200,6 +19378,15 @@ msgstr ""
 msgid "Pole"
 msgstr ""
 
+msgid "Pole with Transformer"
+msgstr ""
+
+msgid "Pole Attributes:"
+msgstr ""
+
+msgid "Transformer Attributes:"
+msgstr ""
+
 msgid "Power Line"
 msgstr ""
 
@@ -19249,9 +19436,15 @@ msgstr ""
 msgid "Power Cable"
 msgstr ""
 
+msgctxt "power cable"
+msgid "underground"
+msgstr ""
+
+msgctxt "power cable"
 msgid "underwater"
 msgstr ""
 
+msgctxt "power cable"
 msgid "overground"
 msgstr ""
 
@@ -19279,6 +19472,33 @@ msgstr ""
 msgid "Memorial"
 msgstr ""
 
+msgctxt "memorial"
+msgid "statue"
+msgstr ""
+
+msgctxt "memorial"
+msgid "bust"
+msgstr ""
+
+msgctxt "memorial"
+msgid "plaque"
+msgstr ""
+
+msgctxt "memorial"
+msgid "stele"
+msgstr ""
+
+msgctxt "memorial"
+msgid "stone"
+msgstr ""
+
+msgctxt "memorial"
+msgid "war_memorial"
+msgstr ""
+
+msgid "Inscription"
+msgstr ""
+
 msgid "Wayside Cross"
 msgstr ""
 
@@ -19348,6 +19568,9 @@ msgstr ""
 msgid "Beverages"
 msgstr ""
 
+msgid "Wine"
+msgstr ""
+
 msgid "Boutique"
 msgstr ""
 
@@ -19393,6 +19616,9 @@ msgstr ""
 msgid "Video Games"
 msgstr ""
 
+msgid "Music"
+msgstr ""
+
 msgid "Cash"
 msgstr ""
 
@@ -19420,6 +19646,9 @@ msgstr ""
 msgid "Curtain"
 msgstr ""
 
+msgid "Art"
+msgstr ""
+
 msgid "Frame"
 msgstr ""
 
@@ -19465,6 +19694,9 @@ msgstr ""
 msgid "Beauty"
 msgstr ""
 
+msgid "Tattoo"
+msgstr ""
+
 msgid "Optician"
 msgstr ""
 
@@ -19516,6 +19748,9 @@ msgstr ""
 msgid "Pet"
 msgstr ""
 
+msgid "Funeral Directors"
+msgstr ""
+
 msgid "Vending Machine"
 msgstr ""
 
@@ -19615,6 +19850,15 @@ msgstr ""
 msgid "National Park"
 msgstr ""
 
+msgid "Protected Area"
+msgstr ""
+
+msgid "Protected Class"
+msgstr ""
+
+msgid "Title or type of protection"
+msgstr ""
+
 msgid "Places"
 msgstr "ទីកន្លែង"
 
@@ -20691,7 +20935,13 @@ msgstr ""
 msgid "Estonia Ortho (Maaamet)"
 msgstr ""
 
-msgid "Estonia Multi (Maaamet)"
+msgid "Estonia Hillshade (Maaamet)"
+msgstr ""
+
+msgid "Estonia Cadastre (Maaamet)"
+msgstr ""
+
+msgid "Estonia Forestry (Maaamet)"
 msgstr ""
 
 msgid "Bordeaux - 2012"
@@ -20715,7 +20965,7 @@ msgstr ""
 msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
 msgstr ""
 
-msgid "CUGN Nancy - Orthophoto 2012"
+msgid "GrandNancy Orthophotographie 2012"
 msgstr ""
 
 msgid "Géobretagne - Brest 2010 - 10 cm"
@@ -20762,9 +21012,6 @@ msgid ""
 "- 1 m"
 msgstr ""
 
-msgid "Streets NRW Geofabrik.de"
-msgstr ""
-
 msgid "Hike & Bike"
 msgstr ""
 
@@ -20824,6 +21071,9 @@ msgstr ""
 msgid "NRW-Atlas: Topographische Karte 1:10000"
 msgstr ""
 
+msgid "Metropole Ruhr: Luftbilder (10 cm)"
+msgstr ""
+
 msgid "Drone Imagery (Haiti)"
 msgstr ""
 
@@ -21025,6 +21275,9 @@ msgstr ""
 msgid "Stadt Zürich Übersichtsplan (Strassen, Gebäude, Hausnummer)"
 msgstr ""
 
+msgid "Stadt Zürich Luftbild 2011"
+msgstr ""
+
 msgid "Orthofoto Kanton Solothurn RGB (SOGIS 2011/2012/2013)"
 msgstr ""
 
@@ -21043,7 +21296,7 @@ msgstr ""
 msgid "Canton de Fribourg 50cm (2005)"
 msgstr ""
 
-msgid "Stadt Bern 10cm/25cm (2008)"
+msgid "Stadt Bern 10cm/25cm (2012)"
 msgstr ""
 
 msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
@@ -21082,7 +21335,7 @@ msgstr ""
 msgid "OSM US TIGER 2012 Roads Overlay"
 msgstr ""
 
-msgid "New & Misaligned TIGER Roads (TIGER 2013)"
+msgid "New & Misaligned TIGER Roads (TIGER 2014)"
 msgstr ""
 
 msgid "MassGIS L3 Parcels"
@@ -21130,9 +21383,234 @@ msgstr ""
 msgid "NLS - Bartholomew Half Inch, 1897-1907"
 msgstr ""
 
+msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Annan 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgstr ""
+
 msgid "OS Town Plans, Cupar 1854 (NLS)"
 msgstr ""
 
+msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Elgin 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Forres 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Galashiels 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Girvan 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Greenock 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Haddington 1853 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Haddington 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Hamilton 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Irvine 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Jedburgh 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kelso 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Lanark 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Linlithgow 1856 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Musselburgh 1853 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Musselburgh 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Oban 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Peebles 1856 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Perth 1860 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Peterhead 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Selkirk 1865 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, St Andrews 1854 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, St Andrews 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stirling 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stonehaven 1864 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1847 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Strathaven 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wick 1872 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wigtown 1848 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wigtown 1894 (NLS)"
+msgstr ""
+
 msgid "Decreasing house numbers in addresses interpolation"
 msgstr ""
 
@@ -21186,17 +21664,37 @@ msgid "{0}={1} is deprecated. Please use instead a multipolygon."
 msgstr ""
 
 msgid ""
-"{0} is deprecated. Please specify ìnterval by using opening_hours syntax"
+"{0} is deprecated. Please specify interval by using opening_hours syntax"
 msgstr ""
 
 msgid ""
 "{0} is deprecated. Please delete this object and use a private layer instead"
 msgstr ""
 
-msgid "{0} on a node"
+msgid "{0}={1} is unspecific. Please replace ''{1}'' by a specific value."
+msgstr ""
+
+msgid "{0} should be replaced with {1}"
+msgstr ""
+
+msgid ""
+"{0}={1} is unspecific. Please replace ''{1}'' by ''left'', ''right'' or "
+"''both''."
+msgstr ""
+
+msgid "{0} on a node. Should be used on a way."
+msgstr ""
+
+msgid "{0} on a node. Should be drawn as an area."
 msgstr ""
 
-msgid "{0} on a node. Should be drawn as an area"
+msgid "{0}=* on a node. Should be used in a relation"
+msgstr ""
+
+msgid "{0} on a way. Should be used in a relation"
+msgstr ""
+
+msgid "{0} on a node"
 msgstr ""
 
 msgid "Building inside building"
@@ -25866,6 +26364,9 @@ msgstr ""
 msgid "Find"
 msgstr ""
 
+msgid "Show"
+msgstr "បង្ហាញ"
+
 msgid "Mark"
 msgstr ""
 
diff --git a/i18n/po/ko.po b/i18n/po/ko.po
index 0d64d73..96e90fb 100644
--- a/i18n/po/ko.po
+++ b/i18n/po/ko.po
@@ -1,8 +1,13 @@
+# Korean translation for josm
+# Copyright (c) 2007 Rosetta Contributors and Canonical Ltd 2007
+# This file is distributed under the same license as the josm package.
+# FIRST AUTHOR <EMAIL at ADDRESS>, 2007.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-21 03:38+0200\n"
+"POT-Creation-Date: 2014-12-10 03:42+0100\n"
 "PO-Revision-Date: 2014-09-26 15:59+0000\n"
 "Last-Translator: Myeongjin <aranet100 at gmail.com>\n"
 "Language-Team: Korean <ko at li.org>\n"
@@ -10,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-10-21 05:05+0000\n"
-"X-Generator: Launchpad (build 17203)\n"
+"X-Launchpad-Export-Date: 2014-12-10 04:57+0000\n"
+"X-Generator: Launchpad (build 17283)\n"
 "Language: ko\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -170,20 +175,6 @@ msgid "About JOSM..."
 msgstr "JOSM 정보..."
 
 msgid ""
-"Unexpected format of API base URL. Redirection to info or history page for "
-"OSM object will probably fail. API base URL is: ''{0}''"
-msgstr ""
-"예상치 못한 API 베이스 URL 포맷입니다. OSM 오브젝트에 대한 정보/역사 문서로 향하는 넘겨주기는 아마 실패할 것입니다. API "
-"베이스 URL은 \"{0}\" 입니다."
-
-msgid ""
-"Unexpected format of API base URL. Redirection to user page for OSM user "
-"will probably fail. API base URL is: ''{0}''"
-msgstr ""
-"예상치 못한 API 베이스 URL 포맷입니다. OSM 사용자 문서로 항햐는 넘겨주기는 아마 실패할 것입니다. API 베이스 URL은 "
-"\"{0}\" 입니다."
-
-msgid ""
 "You are about to launch {0} browser window.<br>This may both clutter your "
 "screen with browser windows<br>and take some time to finish."
 msgid_plural ""
@@ -1519,6 +1510,15 @@ msgstr "업로드할 변경내용이 없습니다."
 msgid "Nothing to upload. Get some data first."
 msgstr "업로드할 것이 없습니다."
 
+msgid "Upload note changes to server"
+msgstr ""
+
+msgid "Upload notes"
+msgstr ""
+
+msgid "Uploading notes to server"
+msgstr ""
+
 msgid "Upload selection"
 msgstr ""
 
@@ -1791,10 +1791,16 @@ msgstr ""
 msgid "Click the location where you wish to create a new note"
 msgstr ""
 
-msgid "Enter a comment for a new note"
+msgid "Create new note"
 msgstr ""
 
-msgid "Create new note"
+msgid "Create note"
+msgstr ""
+
+msgid "Enter a detailed comment to create a note"
+msgstr ""
+
+msgid "You must enter a comment to create a new note"
 msgstr ""
 
 msgid "Delete Mode"
@@ -2666,6 +2672,15 @@ msgstr ""
 msgid "Cycling dependencies"
 msgstr "순환참조"
 
+msgid "Uploading modified notes"
+msgstr ""
+
+msgid "Note {0} failed: {1}"
+msgstr ""
+
+msgid "Notes failed to upload"
+msgstr ""
+
 msgid ""
 "The following are results of automatic validation. Try fixing these, but be "
 "careful (don''t destroy valid data). When in doubt ignore them.<br>When you "
@@ -4885,6 +4900,12 @@ msgstr ""
 msgid "Conflict foreground: keep all tags"
 msgstr ""
 
+msgid "Conflict background: sum all numeric tags"
+msgstr ""
+
+msgid "Conflict foreground: sum all numeric tags"
+msgstr ""
+
 msgid "Conflict background: keep member"
 msgstr ""
 
@@ -5303,12 +5324,19 @@ msgstr "없음"
 msgid "all"
 msgstr ""
 
+msgid "sum"
+msgstr ""
+
 msgid "Please decide which values to keep"
 msgstr ""
 
 msgid "Value ''{0}'' is going to be applied for key ''{1}''"
 msgstr ""
 
+msgid ""
+"All numeric values sumed as ''{0}'' are going to be applied for key ''{1}''"
+msgstr ""
+
 msgid "The key ''{0}'' and all its values are going to be removed"
 msgstr ""
 
@@ -5671,24 +5699,6 @@ msgstr[1] ""
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
 
-msgid "Display the history of all selected items."
-msgstr ""
-
-msgid "Object with history"
-msgstr ""
-
-msgid "Reload"
-msgstr "새로고침"
-
-msgid "Reload all currently selected objects and refresh the list."
-msgstr ""
-
-msgid "Show"
-msgstr ""
-
-msgid "Display the history of the selected objects."
-msgstr ""
-
 msgid "Advanced object info"
 msgstr ""
 
@@ -6026,6 +6036,9 @@ msgstr ""
 msgid "Comment"
 msgstr ""
 
+msgid "Comment on note"
+msgstr ""
+
 msgid "Add comment to note:"
 msgstr ""
 
@@ -6035,9 +6048,6 @@ msgstr ""
 msgid "Close note with message:"
 msgstr ""
 
-msgid "Close Note"
-msgstr ""
-
 msgid "Create a new note"
 msgstr ""
 
@@ -6110,6 +6120,9 @@ msgstr ""
 msgid "Search for objects"
 msgstr ""
 
+msgid "Display the history of the selected objects."
+msgstr ""
+
 msgid "Zoom to selection"
 msgstr ""
 
@@ -6229,6 +6242,9 @@ msgstr ""
 msgid "Updating map ..."
 msgstr ""
 
+msgid "anonymous"
+msgstr ""
+
 msgid "Display the basic properties of the changeset"
 msgstr ""
 
@@ -6241,6 +6257,12 @@ msgstr ""
 msgid "Display the objects created, updated, and deleted by the changeset"
 msgstr ""
 
+msgid "Discussion"
+msgstr ""
+
+msgid "Display the public discussion around this changeset"
+msgstr ""
+
 msgid "Changeset Management Dialog"
 msgstr ""
 
@@ -6298,9 +6320,6 @@ msgctxt "changeset.state"
 msgid "Closed"
 msgstr ""
 
-msgid "anonymous"
-msgstr ""
-
 msgid "ID"
 msgstr ""
 
@@ -6316,6 +6335,9 @@ msgstr ""
 msgid "Closed at"
 msgstr ""
 
+msgid "Discussions"
+msgstr ""
+
 msgid "Downloading changeset content"
 msgstr ""
 
@@ -6427,6 +6449,15 @@ msgid ""
 "layer"
 msgstr ""
 
+msgid "Update changeset discussion"
+msgstr ""
+
+msgid "Update the changeset discussion from the OSM server"
+msgstr ""
+
+msgid "Date"
+msgstr ""
+
 msgid "Download changesets"
 msgstr ""
 
@@ -6844,7 +6875,7 @@ msgstr "value를 선택해 주십시오."
 msgid "Set number of recently added tags"
 msgstr ""
 
-msgid "Remember last used tags"
+msgid "Remember last used tags after a restart"
 msgstr ""
 
 msgid "Please enter the number of recently added tags to display"
@@ -7190,6 +7221,9 @@ msgstr ""
 msgid "Load parent relations"
 msgstr ""
 
+msgid "Reload"
+msgstr "새로고침"
+
 msgid "Loading parent relations"
 msgstr ""
 
@@ -7312,6 +7346,12 @@ msgstr "원본 GPS 데이터"
 msgid "Select to download GPS traces in the selected download area."
 msgstr ""
 
+msgid "Notes"
+msgstr ""
+
+msgid "Select to download notes in the selected download area."
+msgstr ""
+
 msgid "Download as new layer"
 msgstr ""
 
@@ -7617,9 +7657,6 @@ msgstr ""
 msgid "B"
 msgstr ""
 
-msgid "Date"
-msgstr ""
-
 msgid ""
 "Failed to update primitive with id {0} because current edit layer is null"
 msgstr ""
@@ -8479,9 +8516,6 @@ msgstr ""
 msgid "Save Layer"
 msgstr "layer 저장"
 
-msgid "Notes"
-msgstr ""
-
 msgid "Notes layer"
 msgstr ""
 
@@ -8497,9 +8531,6 @@ msgstr ""
 msgid "outside downloaded area"
 msgstr ""
 
-msgid "version {0}"
-msgstr ""
-
 msgid "Merging layers"
 msgstr ""
 
@@ -12125,6 +12156,15 @@ msgstr ""
 msgid "Open changeset expected. Got closed changeset with id {0}."
 msgstr ""
 
+msgid "Note upload failed"
+msgstr ""
+
+msgid "Error parsing note response from server"
+msgstr ""
+
+msgid "Error encoding string: {0}"
+msgstr ""
+
 msgid "(Code={0})"
 msgstr ""
 
@@ -12173,13 +12213,13 @@ msgstr ""
 msgid "Parsing changeset content ..."
 msgstr ""
 
-msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
-msgid "Illegal numeric value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
-msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal numeric value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
 msgid "Missing mandatory attribute ''{0}'' of XML element {1}."
@@ -12971,9 +13011,6 @@ msgstr ""
 msgid "Failed to scan file ''{0}'' for plugin information. Skipping."
 msgstr ""
 
-msgid "Processing plugin site cache icon files..."
-msgstr ""
-
 msgid "Processing plugin files..."
 msgstr ""
 
@@ -12992,12 +13029,6 @@ msgstr ""
 msgid "Details:"
 msgstr ""
 
-msgid "Plugin icons download error"
-msgstr ""
-
-msgid "JOSM failed to download plugin icons:"
-msgstr ""
-
 msgid ""
 "Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
 "plugin site ''{1}''."
@@ -13883,7 +13914,9 @@ msgid ""
 "Creating and handling address nodes and buildings within Czech Republic."
 msgstr ""
 
-msgid "Allows to import various file formats into JOSM directly."
+msgid ""
+"Allows to import various file formats into JOSM directly. Currently "
+"supported: TangoGPS, Garmin Trainings Center TCX."
 msgstr ""
 
 msgid "Download your GPX tracks from openstreetmap.org"
@@ -13980,6 +14013,11 @@ msgid "A helper for IRS satellite adjustment."
 msgstr ""
 
 msgid ""
+"Provides Java Native Access (JNA) library. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
+msgid ""
 "Provides Java Topology Suite (JTS) library and related utilities. Not meant "
 "to be installed directly by users, but rather as a dependency for other "
 "plugins."
@@ -14335,6 +14373,25 @@ msgstr ""
 msgid "Width (meters)"
 msgstr ""
 
+msgid "Sidewalk"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "both"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "left"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "right"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "no"
+msgstr ""
+
 msgid "Service type"
 msgstr ""
 
@@ -14699,15 +14756,19 @@ msgstr ""
 msgid "May-Sep 09:30-12:30,14:15-19:30"
 msgstr ""
 
+msgctxt "parking"
 msgid "multi-storey"
 msgstr ""
 
+msgctxt "parking"
 msgid "surface"
 msgstr ""
 
+msgctxt "parking"
 msgid "underground"
 msgstr ""
 
+msgctxt "parking"
 msgid "rooftop"
 msgstr ""
 
@@ -15165,15 +15226,26 @@ msgstr ""
 msgid "Overtaking"
 msgstr ""
 
+msgctxt "overtaking"
+msgid "yes"
+msgstr ""
+
+msgctxt "overtaking"
 msgid "both"
 msgstr ""
 
+msgctxt "overtaking"
 msgid "forward"
 msgstr ""
 
+msgctxt "overtaking"
 msgid "backward"
 msgstr ""
 
+msgctxt "overtaking"
+msgid "no"
+msgstr ""
+
 msgid "Roundabout"
 msgstr ""
 
@@ -15467,6 +15539,12 @@ msgstr ""
 msgid "tiger"
 msgstr ""
 
+msgid "Button operated"
+msgstr ""
+
+msgid "Sound signals"
+msgstr ""
+
 msgid "Crossing attendant"
 msgstr ""
 
@@ -15988,9 +16066,6 @@ msgstr ""
 msgid "Traffic lights"
 msgstr ""
 
-msgid "Sound signals"
-msgstr ""
-
 msgid "Barrier"
 msgstr ""
 
@@ -18050,6 +18125,9 @@ msgstr ""
 msgid "Gasometer"
 msgstr ""
 
+msgid "Bunker Silo"
+msgstr ""
+
 msgid "Pipeline"
 msgstr ""
 
@@ -18196,15 +18274,15 @@ msgstr ""
 msgid "Monitoring:"
 msgstr ""
 
-msgid "Weather"
-msgstr ""
-
 msgid "Water level"
 msgstr ""
 
 msgid "Tide Level"
 msgstr ""
 
+msgid "Groundwater"
+msgstr ""
+
 msgid "Traffic"
 msgstr ""
 
@@ -18223,6 +18301,9 @@ msgstr ""
 msgid "Galileo Signals"
 msgstr ""
 
+msgid "Weather"
+msgstr ""
+
 msgid "Radiation"
 msgstr ""
 
@@ -18403,6 +18484,9 @@ msgstr ""
 msgid "pivot_pier"
 msgstr ""
 
+msgid "Bridge outline"
+msgstr ""
+
 msgid "Power Plant"
 msgstr ""
 
@@ -19010,6 +19094,15 @@ msgstr ""
 msgid "Pole"
 msgstr ""
 
+msgid "Pole with Transformer"
+msgstr ""
+
+msgid "Pole Attributes:"
+msgstr ""
+
+msgid "Transformer Attributes:"
+msgstr ""
+
 msgid "Power Line"
 msgstr ""
 
@@ -19059,9 +19152,15 @@ msgstr ""
 msgid "Power Cable"
 msgstr ""
 
+msgctxt "power cable"
+msgid "underground"
+msgstr ""
+
+msgctxt "power cable"
 msgid "underwater"
 msgstr ""
 
+msgctxt "power cable"
 msgid "overground"
 msgstr ""
 
@@ -19089,6 +19188,33 @@ msgstr ""
 msgid "Memorial"
 msgstr ""
 
+msgctxt "memorial"
+msgid "statue"
+msgstr ""
+
+msgctxt "memorial"
+msgid "bust"
+msgstr ""
+
+msgctxt "memorial"
+msgid "plaque"
+msgstr ""
+
+msgctxt "memorial"
+msgid "stele"
+msgstr ""
+
+msgctxt "memorial"
+msgid "stone"
+msgstr ""
+
+msgctxt "memorial"
+msgid "war_memorial"
+msgstr ""
+
+msgid "Inscription"
+msgstr ""
+
 msgid "Wayside Cross"
 msgstr ""
 
@@ -19158,6 +19284,9 @@ msgstr ""
 msgid "Beverages"
 msgstr ""
 
+msgid "Wine"
+msgstr ""
+
 msgid "Boutique"
 msgstr ""
 
@@ -19203,6 +19332,9 @@ msgstr ""
 msgid "Video Games"
 msgstr ""
 
+msgid "Music"
+msgstr ""
+
 msgid "Cash"
 msgstr ""
 
@@ -19230,6 +19362,9 @@ msgstr ""
 msgid "Curtain"
 msgstr ""
 
+msgid "Art"
+msgstr ""
+
 msgid "Frame"
 msgstr ""
 
@@ -19275,6 +19410,9 @@ msgstr ""
 msgid "Beauty"
 msgstr ""
 
+msgid "Tattoo"
+msgstr ""
+
 msgid "Optician"
 msgstr ""
 
@@ -19326,6 +19464,9 @@ msgstr ""
 msgid "Pet"
 msgstr ""
 
+msgid "Funeral Directors"
+msgstr ""
+
 msgid "Vending Machine"
 msgstr ""
 
@@ -19425,6 +19566,15 @@ msgstr ""
 msgid "National Park"
 msgstr ""
 
+msgid "Protected Area"
+msgstr ""
+
+msgid "Protected Class"
+msgstr ""
+
+msgid "Title or type of protection"
+msgstr ""
+
 msgid "Places"
 msgstr ""
 
@@ -20501,7 +20651,13 @@ msgstr ""
 msgid "Estonia Ortho (Maaamet)"
 msgstr ""
 
-msgid "Estonia Multi (Maaamet)"
+msgid "Estonia Hillshade (Maaamet)"
+msgstr ""
+
+msgid "Estonia Cadastre (Maaamet)"
+msgstr ""
+
+msgid "Estonia Forestry (Maaamet)"
 msgstr ""
 
 msgid "Bordeaux - 2012"
@@ -20525,7 +20681,7 @@ msgstr ""
 msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
 msgstr ""
 
-msgid "CUGN Nancy - Orthophoto 2012"
+msgid "GrandNancy Orthophotographie 2012"
 msgstr ""
 
 msgid "Géobretagne - Brest 2010 - 10 cm"
@@ -20572,9 +20728,6 @@ msgid ""
 "- 1 m"
 msgstr ""
 
-msgid "Streets NRW Geofabrik.de"
-msgstr ""
-
 msgid "Hike & Bike"
 msgstr ""
 
@@ -20634,6 +20787,9 @@ msgstr ""
 msgid "NRW-Atlas: Topographische Karte 1:10000"
 msgstr ""
 
+msgid "Metropole Ruhr: Luftbilder (10 cm)"
+msgstr ""
+
 msgid "Drone Imagery (Haiti)"
 msgstr ""
 
@@ -20835,6 +20991,9 @@ msgstr ""
 msgid "Stadt Zürich Übersichtsplan (Strassen, Gebäude, Hausnummer)"
 msgstr ""
 
+msgid "Stadt Zürich Luftbild 2011"
+msgstr ""
+
 msgid "Orthofoto Kanton Solothurn RGB (SOGIS 2011/2012/2013)"
 msgstr ""
 
@@ -20853,7 +21012,7 @@ msgstr ""
 msgid "Canton de Fribourg 50cm (2005)"
 msgstr ""
 
-msgid "Stadt Bern 10cm/25cm (2008)"
+msgid "Stadt Bern 10cm/25cm (2012)"
 msgstr ""
 
 msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
@@ -20892,7 +21051,7 @@ msgstr ""
 msgid "OSM US TIGER 2012 Roads Overlay"
 msgstr ""
 
-msgid "New & Misaligned TIGER Roads (TIGER 2013)"
+msgid "New & Misaligned TIGER Roads (TIGER 2014)"
 msgstr ""
 
 msgid "MassGIS L3 Parcels"
@@ -20940,9 +21099,234 @@ msgstr ""
 msgid "NLS - Bartholomew Half Inch, 1897-1907"
 msgstr ""
 
+msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Annan 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgstr ""
+
 msgid "OS Town Plans, Cupar 1854 (NLS)"
 msgstr ""
 
+msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Elgin 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Forres 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Galashiels 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Girvan 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Greenock 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Haddington 1853 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Haddington 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Hamilton 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Irvine 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Jedburgh 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kelso 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Lanark 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Linlithgow 1856 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Musselburgh 1853 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Musselburgh 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Oban 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Peebles 1856 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Perth 1860 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Peterhead 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Selkirk 1865 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, St Andrews 1854 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, St Andrews 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stirling 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stonehaven 1864 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1847 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Strathaven 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wick 1872 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wigtown 1848 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wigtown 1894 (NLS)"
+msgstr ""
+
 msgid "Decreasing house numbers in addresses interpolation"
 msgstr ""
 
@@ -20996,17 +21380,37 @@ msgid "{0}={1} is deprecated. Please use instead a multipolygon."
 msgstr ""
 
 msgid ""
-"{0} is deprecated. Please specify ìnterval by using opening_hours syntax"
+"{0} is deprecated. Please specify interval by using opening_hours syntax"
 msgstr ""
 
 msgid ""
 "{0} is deprecated. Please delete this object and use a private layer instead"
 msgstr ""
 
-msgid "{0} on a node"
+msgid "{0}={1} is unspecific. Please replace ''{1}'' by a specific value."
 msgstr ""
 
-msgid "{0} on a node. Should be drawn as an area"
+msgid "{0} should be replaced with {1}"
+msgstr ""
+
+msgid ""
+"{0}={1} is unspecific. Please replace ''{1}'' by ''left'', ''right'' or "
+"''both''."
+msgstr ""
+
+msgid "{0} on a node. Should be used on a way."
+msgstr ""
+
+msgid "{0} on a node. Should be drawn as an area."
+msgstr ""
+
+msgid "{0}=* on a node. Should be used in a relation"
+msgstr ""
+
+msgid "{0} on a way. Should be used in a relation"
+msgstr ""
+
+msgid "{0} on a node"
 msgstr ""
 
 msgid "Building inside building"
@@ -25676,6 +26080,9 @@ msgstr ""
 msgid "Find"
 msgstr ""
 
+msgid "Show"
+msgstr ""
+
 msgid "Mark"
 msgstr ""
 
diff --git a/i18n/po/ky.po b/i18n/po/ky.po
index 8fd080f..06324fb 100644
--- a/i18n/po/ky.po
+++ b/i18n/po/ky.po
@@ -1,8 +1,13 @@
+# Kirghiz translation for josm
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the josm package.
+# FIRST AUTHOR <EMAIL at ADDRESS>, 2012.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL at ADDRESS>\n"
-"POT-Creation-Date: 2014-10-21 03:38+0200\n"
+"POT-Creation-Date: 2014-12-10 03:42+0100\n"
 "PO-Revision-Date: 2012-12-18 02:36+0000\n"
 "Last-Translator: chyngyz <Unknown>\n"
 "Language-Team: Kirghiz <ky at li.org>\n"
@@ -10,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-10-21 05:04+0000\n"
-"X-Generator: Launchpad (build 17203)\n"
+"X-Launchpad-Export-Date: 2014-12-10 04:57+0000\n"
+"X-Generator: Launchpad (build 17283)\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
 msgstr ""
@@ -167,16 +172,6 @@ msgid "About JOSM..."
 msgstr "JOSM жөнүндө..."
 
 msgid ""
-"Unexpected format of API base URL. Redirection to info or history page for "
-"OSM object will probably fail. API base URL is: ''{0}''"
-msgstr ""
-
-msgid ""
-"Unexpected format of API base URL. Redirection to user page for OSM user "
-"will probably fail. API base URL is: ''{0}''"
-msgstr ""
-
-msgid ""
 "You are about to launch {0} browser window.<br>This may both clutter your "
 "screen with browser windows<br>and take some time to finish."
 msgid_plural ""
@@ -1518,6 +1513,15 @@ msgstr ""
 msgid "Nothing to upload. Get some data first."
 msgstr ""
 
+msgid "Upload note changes to server"
+msgstr ""
+
+msgid "Upload notes"
+msgstr ""
+
+msgid "Uploading notes to server"
+msgstr ""
+
 msgid "Upload selection"
 msgstr ""
 
@@ -1790,10 +1794,16 @@ msgstr ""
 msgid "Click the location where you wish to create a new note"
 msgstr ""
 
-msgid "Enter a comment for a new note"
+msgid "Create new note"
 msgstr ""
 
-msgid "Create new note"
+msgid "Create note"
+msgstr ""
+
+msgid "Enter a detailed comment to create a note"
+msgstr ""
+
+msgid "You must enter a comment to create a new note"
 msgstr ""
 
 msgid "Delete Mode"
@@ -2664,6 +2674,15 @@ msgstr ""
 msgid "Cycling dependencies"
 msgstr ""
 
+msgid "Uploading modified notes"
+msgstr ""
+
+msgid "Note {0} failed: {1}"
+msgstr ""
+
+msgid "Notes failed to upload"
+msgstr ""
+
 msgid ""
 "The following are results of automatic validation. Try fixing these, but be "
 "careful (don''t destroy valid data). When in doubt ignore them.<br>When you "
@@ -4893,6 +4912,12 @@ msgstr ""
 msgid "Conflict foreground: keep all tags"
 msgstr ""
 
+msgid "Conflict background: sum all numeric tags"
+msgstr ""
+
+msgid "Conflict foreground: sum all numeric tags"
+msgstr ""
+
 msgid "Conflict background: keep member"
 msgstr ""
 
@@ -5311,12 +5336,19 @@ msgstr ""
 msgid "all"
 msgstr ""
 
+msgid "sum"
+msgstr ""
+
 msgid "Please decide which values to keep"
 msgstr ""
 
 msgid "Value ''{0}'' is going to be applied for key ''{1}''"
 msgstr ""
 
+msgid ""
+"All numeric values sumed as ''{0}'' are going to be applied for key ''{1}''"
+msgstr ""
+
 msgid "The key ''{0}'' and all its values are going to be removed"
 msgstr ""
 
@@ -5679,24 +5711,6 @@ msgstr[1] ""
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
 
-msgid "Display the history of all selected items."
-msgstr ""
-
-msgid "Object with history"
-msgstr ""
-
-msgid "Reload"
-msgstr ""
-
-msgid "Reload all currently selected objects and refresh the list."
-msgstr ""
-
-msgid "Show"
-msgstr ""
-
-msgid "Display the history of the selected objects."
-msgstr ""
-
 msgid "Advanced object info"
 msgstr ""
 
@@ -6034,6 +6048,9 @@ msgstr ""
 msgid "Comment"
 msgstr ""
 
+msgid "Comment on note"
+msgstr ""
+
 msgid "Add comment to note:"
 msgstr ""
 
@@ -6043,9 +6060,6 @@ msgstr ""
 msgid "Close note with message:"
 msgstr ""
 
-msgid "Close Note"
-msgstr ""
-
 msgid "Create a new note"
 msgstr ""
 
@@ -6118,6 +6132,9 @@ msgstr ""
 msgid "Search for objects"
 msgstr ""
 
+msgid "Display the history of the selected objects."
+msgstr ""
+
 msgid "Zoom to selection"
 msgstr ""
 
@@ -6237,6 +6254,9 @@ msgstr ""
 msgid "Updating map ..."
 msgstr ""
 
+msgid "anonymous"
+msgstr ""
+
 msgid "Display the basic properties of the changeset"
 msgstr ""
 
@@ -6249,6 +6269,12 @@ msgstr ""
 msgid "Display the objects created, updated, and deleted by the changeset"
 msgstr ""
 
+msgid "Discussion"
+msgstr ""
+
+msgid "Display the public discussion around this changeset"
+msgstr ""
+
 msgid "Changeset Management Dialog"
 msgstr ""
 
@@ -6306,9 +6332,6 @@ msgctxt "changeset.state"
 msgid "Closed"
 msgstr ""
 
-msgid "anonymous"
-msgstr ""
-
 msgid "ID"
 msgstr ""
 
@@ -6324,6 +6347,9 @@ msgstr ""
 msgid "Closed at"
 msgstr ""
 
+msgid "Discussions"
+msgstr ""
+
 msgid "Downloading changeset content"
 msgstr ""
 
@@ -6435,6 +6461,15 @@ msgid ""
 "layer"
 msgstr ""
 
+msgid "Update changeset discussion"
+msgstr ""
+
+msgid "Update the changeset discussion from the OSM server"
+msgstr ""
+
+msgid "Date"
+msgstr ""
+
 msgid "Download changesets"
 msgstr ""
 
@@ -6852,7 +6887,7 @@ msgstr ""
 msgid "Set number of recently added tags"
 msgstr ""
 
-msgid "Remember last used tags"
+msgid "Remember last used tags after a restart"
 msgstr ""
 
 msgid "Please enter the number of recently added tags to display"
@@ -7198,6 +7233,9 @@ msgstr ""
 msgid "Load parent relations"
 msgstr ""
 
+msgid "Reload"
+msgstr ""
+
 msgid "Loading parent relations"
 msgstr ""
 
@@ -7320,6 +7358,12 @@ msgstr ""
 msgid "Select to download GPS traces in the selected download area."
 msgstr ""
 
+msgid "Notes"
+msgstr ""
+
+msgid "Select to download notes in the selected download area."
+msgstr ""
+
 msgid "Download as new layer"
 msgstr ""
 
@@ -7625,9 +7669,6 @@ msgstr ""
 msgid "B"
 msgstr ""
 
-msgid "Date"
-msgstr ""
-
 msgid ""
 "Failed to update primitive with id {0} because current edit layer is null"
 msgstr ""
@@ -8482,9 +8523,6 @@ msgstr ""
 msgid "Save Layer"
 msgstr ""
 
-msgid "Notes"
-msgstr ""
-
 msgid "Notes layer"
 msgstr ""
 
@@ -8500,9 +8538,6 @@ msgstr ""
 msgid "outside downloaded area"
 msgstr ""
 
-msgid "version {0}"
-msgstr ""
-
 msgid "Merging layers"
 msgstr ""
 
@@ -12128,6 +12163,15 @@ msgstr ""
 msgid "Open changeset expected. Got closed changeset with id {0}."
 msgstr ""
 
+msgid "Note upload failed"
+msgstr ""
+
+msgid "Error parsing note response from server"
+msgstr ""
+
+msgid "Error encoding string: {0}"
+msgstr ""
+
 msgid "(Code={0})"
 msgstr ""
 
@@ -12176,13 +12220,13 @@ msgstr ""
 msgid "Parsing changeset content ..."
 msgstr ""
 
-msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
-msgid "Illegal numeric value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
-msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal numeric value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
 msgid "Missing mandatory attribute ''{0}'' of XML element {1}."
@@ -12974,9 +13018,6 @@ msgstr ""
 msgid "Failed to scan file ''{0}'' for plugin information. Skipping."
 msgstr ""
 
-msgid "Processing plugin site cache icon files..."
-msgstr ""
-
 msgid "Processing plugin files..."
 msgstr ""
 
@@ -12995,12 +13036,6 @@ msgstr ""
 msgid "Details:"
 msgstr ""
 
-msgid "Plugin icons download error"
-msgstr ""
-
-msgid "JOSM failed to download plugin icons:"
-msgstr ""
-
 msgid ""
 "Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
 "plugin site ''{1}''."
@@ -13886,7 +13921,9 @@ msgid ""
 "Creating and handling address nodes and buildings within Czech Republic."
 msgstr ""
 
-msgid "Allows to import various file formats into JOSM directly."
+msgid ""
+"Allows to import various file formats into JOSM directly. Currently "
+"supported: TangoGPS, Garmin Trainings Center TCX."
 msgstr ""
 
 msgid "Download your GPX tracks from openstreetmap.org"
@@ -13983,6 +14020,11 @@ msgid "A helper for IRS satellite adjustment."
 msgstr ""
 
 msgid ""
+"Provides Java Native Access (JNA) library. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
+msgid ""
 "Provides Java Topology Suite (JTS) library and related utilities. Not meant "
 "to be installed directly by users, but rather as a dependency for other "
 "plugins."
@@ -14338,6 +14380,25 @@ msgstr ""
 msgid "Width (meters)"
 msgstr ""
 
+msgid "Sidewalk"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "both"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "left"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "right"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "no"
+msgstr ""
+
 msgid "Service type"
 msgstr ""
 
@@ -14702,15 +14763,19 @@ msgstr ""
 msgid "May-Sep 09:30-12:30,14:15-19:30"
 msgstr ""
 
+msgctxt "parking"
 msgid "multi-storey"
 msgstr ""
 
+msgctxt "parking"
 msgid "surface"
 msgstr ""
 
+msgctxt "parking"
 msgid "underground"
 msgstr ""
 
+msgctxt "parking"
 msgid "rooftop"
 msgstr ""
 
@@ -15168,15 +15233,26 @@ msgstr ""
 msgid "Overtaking"
 msgstr ""
 
+msgctxt "overtaking"
+msgid "yes"
+msgstr ""
+
+msgctxt "overtaking"
 msgid "both"
 msgstr ""
 
+msgctxt "overtaking"
 msgid "forward"
 msgstr ""
 
+msgctxt "overtaking"
 msgid "backward"
 msgstr ""
 
+msgctxt "overtaking"
+msgid "no"
+msgstr ""
+
 msgid "Roundabout"
 msgstr ""
 
@@ -15470,6 +15546,12 @@ msgstr ""
 msgid "tiger"
 msgstr ""
 
+msgid "Button operated"
+msgstr ""
+
+msgid "Sound signals"
+msgstr ""
+
 msgid "Crossing attendant"
 msgstr ""
 
@@ -15991,9 +16073,6 @@ msgstr ""
 msgid "Traffic lights"
 msgstr ""
 
-msgid "Sound signals"
-msgstr ""
-
 msgid "Barrier"
 msgstr ""
 
@@ -18053,6 +18132,9 @@ msgstr ""
 msgid "Gasometer"
 msgstr ""
 
+msgid "Bunker Silo"
+msgstr ""
+
 msgid "Pipeline"
 msgstr ""
 
@@ -18199,15 +18281,15 @@ msgstr ""
 msgid "Monitoring:"
 msgstr ""
 
-msgid "Weather"
-msgstr ""
-
 msgid "Water level"
 msgstr ""
 
 msgid "Tide Level"
 msgstr ""
 
+msgid "Groundwater"
+msgstr ""
+
 msgid "Traffic"
 msgstr ""
 
@@ -18226,6 +18308,9 @@ msgstr ""
 msgid "Galileo Signals"
 msgstr ""
 
+msgid "Weather"
+msgstr ""
+
 msgid "Radiation"
 msgstr ""
 
@@ -18406,6 +18491,9 @@ msgstr ""
 msgid "pivot_pier"
 msgstr ""
 
+msgid "Bridge outline"
+msgstr ""
+
 msgid "Power Plant"
 msgstr ""
 
@@ -19013,6 +19101,15 @@ msgstr ""
 msgid "Pole"
 msgstr ""
 
+msgid "Pole with Transformer"
+msgstr ""
+
+msgid "Pole Attributes:"
+msgstr ""
+
+msgid "Transformer Attributes:"
+msgstr ""
+
 msgid "Power Line"
 msgstr ""
 
@@ -19062,9 +19159,15 @@ msgstr ""
 msgid "Power Cable"
 msgstr ""
 
+msgctxt "power cable"
+msgid "underground"
+msgstr ""
+
+msgctxt "power cable"
 msgid "underwater"
 msgstr ""
 
+msgctxt "power cable"
 msgid "overground"
 msgstr ""
 
@@ -19092,6 +19195,33 @@ msgstr ""
 msgid "Memorial"
 msgstr ""
 
+msgctxt "memorial"
+msgid "statue"
+msgstr ""
+
+msgctxt "memorial"
+msgid "bust"
+msgstr ""
+
+msgctxt "memorial"
+msgid "plaque"
+msgstr ""
+
+msgctxt "memorial"
+msgid "stele"
+msgstr ""
+
+msgctxt "memorial"
+msgid "stone"
+msgstr ""
+
+msgctxt "memorial"
+msgid "war_memorial"
+msgstr ""
+
+msgid "Inscription"
+msgstr ""
+
 msgid "Wayside Cross"
 msgstr ""
 
@@ -19161,6 +19291,9 @@ msgstr ""
 msgid "Beverages"
 msgstr ""
 
+msgid "Wine"
+msgstr ""
+
 msgid "Boutique"
 msgstr ""
 
@@ -19206,6 +19339,9 @@ msgstr ""
 msgid "Video Games"
 msgstr ""
 
+msgid "Music"
+msgstr ""
+
 msgid "Cash"
 msgstr ""
 
@@ -19233,6 +19369,9 @@ msgstr ""
 msgid "Curtain"
 msgstr ""
 
+msgid "Art"
+msgstr ""
+
 msgid "Frame"
 msgstr ""
 
@@ -19278,6 +19417,9 @@ msgstr ""
 msgid "Beauty"
 msgstr ""
 
+msgid "Tattoo"
+msgstr ""
+
 msgid "Optician"
 msgstr ""
 
@@ -19329,6 +19471,9 @@ msgstr ""
 msgid "Pet"
 msgstr ""
 
+msgid "Funeral Directors"
+msgstr ""
+
 msgid "Vending Machine"
 msgstr ""
 
@@ -19428,6 +19573,15 @@ msgstr ""
 msgid "National Park"
 msgstr ""
 
+msgid "Protected Area"
+msgstr ""
+
+msgid "Protected Class"
+msgstr ""
+
+msgid "Title or type of protection"
+msgstr ""
+
 msgid "Places"
 msgstr ""
 
@@ -20504,7 +20658,13 @@ msgstr ""
 msgid "Estonia Ortho (Maaamet)"
 msgstr ""
 
-msgid "Estonia Multi (Maaamet)"
+msgid "Estonia Hillshade (Maaamet)"
+msgstr ""
+
+msgid "Estonia Cadastre (Maaamet)"
+msgstr ""
+
+msgid "Estonia Forestry (Maaamet)"
 msgstr ""
 
 msgid "Bordeaux - 2012"
@@ -20528,7 +20688,7 @@ msgstr ""
 msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
 msgstr ""
 
-msgid "CUGN Nancy - Orthophoto 2012"
+msgid "GrandNancy Orthophotographie 2012"
 msgstr ""
 
 msgid "Géobretagne - Brest 2010 - 10 cm"
@@ -20575,9 +20735,6 @@ msgid ""
 "- 1 m"
 msgstr ""
 
-msgid "Streets NRW Geofabrik.de"
-msgstr ""
-
 msgid "Hike & Bike"
 msgstr ""
 
@@ -20637,6 +20794,9 @@ msgstr ""
 msgid "NRW-Atlas: Topographische Karte 1:10000"
 msgstr ""
 
+msgid "Metropole Ruhr: Luftbilder (10 cm)"
+msgstr ""
+
 msgid "Drone Imagery (Haiti)"
 msgstr ""
 
@@ -20838,6 +20998,9 @@ msgstr ""
 msgid "Stadt Zürich Übersichtsplan (Strassen, Gebäude, Hausnummer)"
 msgstr ""
 
+msgid "Stadt Zürich Luftbild 2011"
+msgstr ""
+
 msgid "Orthofoto Kanton Solothurn RGB (SOGIS 2011/2012/2013)"
 msgstr ""
 
@@ -20856,7 +21019,7 @@ msgstr ""
 msgid "Canton de Fribourg 50cm (2005)"
 msgstr ""
 
-msgid "Stadt Bern 10cm/25cm (2008)"
+msgid "Stadt Bern 10cm/25cm (2012)"
 msgstr ""
 
 msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
@@ -20895,7 +21058,7 @@ msgstr ""
 msgid "OSM US TIGER 2012 Roads Overlay"
 msgstr ""
 
-msgid "New & Misaligned TIGER Roads (TIGER 2013)"
+msgid "New & Misaligned TIGER Roads (TIGER 2014)"
 msgstr ""
 
 msgid "MassGIS L3 Parcels"
@@ -20943,9 +21106,234 @@ msgstr ""
 msgid "NLS - Bartholomew Half Inch, 1897-1907"
 msgstr ""
 
+msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Annan 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgstr ""
+
 msgid "OS Town Plans, Cupar 1854 (NLS)"
 msgstr ""
 
+msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Elgin 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Forres 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Galashiels 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Girvan 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Greenock 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Haddington 1853 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Haddington 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Hamilton 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Irvine 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Jedburgh 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kelso 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Lanark 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Linlithgow 1856 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Musselburgh 1853 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Musselburgh 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Oban 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Peebles 1856 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Perth 1860 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Peterhead 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Selkirk 1865 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, St Andrews 1854 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, St Andrews 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stirling 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stonehaven 1864 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1847 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Strathaven 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wick 1872 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wigtown 1848 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wigtown 1894 (NLS)"
+msgstr ""
+
 msgid "Decreasing house numbers in addresses interpolation"
 msgstr ""
 
@@ -20999,17 +21387,37 @@ msgid "{0}={1} is deprecated. Please use instead a multipolygon."
 msgstr ""
 
 msgid ""
-"{0} is deprecated. Please specify ìnterval by using opening_hours syntax"
+"{0} is deprecated. Please specify interval by using opening_hours syntax"
 msgstr ""
 
 msgid ""
 "{0} is deprecated. Please delete this object and use a private layer instead"
 msgstr ""
 
-msgid "{0} on a node"
+msgid "{0}={1} is unspecific. Please replace ''{1}'' by a specific value."
 msgstr ""
 
-msgid "{0} on a node. Should be drawn as an area"
+msgid "{0} should be replaced with {1}"
+msgstr ""
+
+msgid ""
+"{0}={1} is unspecific. Please replace ''{1}'' by ''left'', ''right'' or "
+"''both''."
+msgstr ""
+
+msgid "{0} on a node. Should be used on a way."
+msgstr ""
+
+msgid "{0} on a node. Should be drawn as an area."
+msgstr ""
+
+msgid "{0}=* on a node. Should be used in a relation"
+msgstr ""
+
+msgid "{0} on a way. Should be used in a relation"
+msgstr ""
+
+msgid "{0} on a node"
 msgstr ""
 
 msgid "Building inside building"
@@ -25679,6 +26087,9 @@ msgstr ""
 msgid "Find"
 msgstr ""
 
+msgid "Show"
+msgstr ""
+
 msgid "Mark"
 msgstr ""
 
diff --git a/i18n/po/lo.po b/i18n/po/lo.po
index bc50585..2a21260 100644
--- a/i18n/po/lo.po
+++ b/i18n/po/lo.po
@@ -1,8 +1,13 @@
+# Lao translation for josm
+# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
+# This file is distributed under the same license as the josm package.
+# FIRST AUTHOR <EMAIL at ADDRESS>, 2009.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-21 03:38+0200\n"
+"POT-Creation-Date: 2014-12-10 03:42+0100\n"
 "PO-Revision-Date: 2009-09-15 10:06+0000\n"
 "Last-Translator: Anousone <Unknown>\n"
 "Language-Team: Lao <lo at li.org>\n"
@@ -10,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-10-21 05:06+0000\n"
-"X-Generator: Launchpad (build 17203)\n"
+"X-Launchpad-Export-Date: 2014-12-10 04:58+0000\n"
+"X-Generator: Launchpad (build 17283)\n"
 "Language: \n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -168,16 +173,6 @@ msgid "About JOSM..."
 msgstr "ກ່ຽວກັບ JOSM..."
 
 msgid ""
-"Unexpected format of API base URL. Redirection to info or history page for "
-"OSM object will probably fail. API base URL is: ''{0}''"
-msgstr ""
-
-msgid ""
-"Unexpected format of API base URL. Redirection to user page for OSM user "
-"will probably fail. API base URL is: ''{0}''"
-msgstr ""
-
-msgid ""
 "You are about to launch {0} browser window.<br>This may both clutter your "
 "screen with browser windows<br>and take some time to finish."
 msgid_plural ""
@@ -1519,6 +1514,15 @@ msgstr ""
 msgid "Nothing to upload. Get some data first."
 msgstr ""
 
+msgid "Upload note changes to server"
+msgstr ""
+
+msgid "Upload notes"
+msgstr ""
+
+msgid "Uploading notes to server"
+msgstr ""
+
 msgid "Upload selection"
 msgstr ""
 
@@ -1791,10 +1795,16 @@ msgstr ""
 msgid "Click the location where you wish to create a new note"
 msgstr ""
 
-msgid "Enter a comment for a new note"
+msgid "Create new note"
 msgstr ""
 
-msgid "Create new note"
+msgid "Create note"
+msgstr ""
+
+msgid "Enter a detailed comment to create a note"
+msgstr ""
+
+msgid "You must enter a comment to create a new note"
 msgstr ""
 
 msgid "Delete Mode"
@@ -2665,6 +2675,15 @@ msgstr ""
 msgid "Cycling dependencies"
 msgstr ""
 
+msgid "Uploading modified notes"
+msgstr ""
+
+msgid "Note {0} failed: {1}"
+msgstr ""
+
+msgid "Notes failed to upload"
+msgstr ""
+
 msgid ""
 "The following are results of automatic validation. Try fixing these, but be "
 "careful (don''t destroy valid data). When in doubt ignore them.<br>When you "
@@ -4894,6 +4913,12 @@ msgstr ""
 msgid "Conflict foreground: keep all tags"
 msgstr ""
 
+msgid "Conflict background: sum all numeric tags"
+msgstr ""
+
+msgid "Conflict foreground: sum all numeric tags"
+msgstr ""
+
 msgid "Conflict background: keep member"
 msgstr ""
 
@@ -5312,12 +5337,19 @@ msgstr ""
 msgid "all"
 msgstr ""
 
+msgid "sum"
+msgstr ""
+
 msgid "Please decide which values to keep"
 msgstr ""
 
 msgid "Value ''{0}'' is going to be applied for key ''{1}''"
 msgstr ""
 
+msgid ""
+"All numeric values sumed as ''{0}'' are going to be applied for key ''{1}''"
+msgstr ""
+
 msgid "The key ''{0}'' and all its values are going to be removed"
 msgstr ""
 
@@ -5680,24 +5712,6 @@ msgstr[1] ""
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
 
-msgid "Display the history of all selected items."
-msgstr ""
-
-msgid "Object with history"
-msgstr ""
-
-msgid "Reload"
-msgstr ""
-
-msgid "Reload all currently selected objects and refresh the list."
-msgstr ""
-
-msgid "Show"
-msgstr ""
-
-msgid "Display the history of the selected objects."
-msgstr ""
-
 msgid "Advanced object info"
 msgstr ""
 
@@ -6035,6 +6049,9 @@ msgstr ""
 msgid "Comment"
 msgstr ""
 
+msgid "Comment on note"
+msgstr ""
+
 msgid "Add comment to note:"
 msgstr ""
 
@@ -6044,9 +6061,6 @@ msgstr ""
 msgid "Close note with message:"
 msgstr ""
 
-msgid "Close Note"
-msgstr ""
-
 msgid "Create a new note"
 msgstr ""
 
@@ -6119,6 +6133,9 @@ msgstr ""
 msgid "Search for objects"
 msgstr ""
 
+msgid "Display the history of the selected objects."
+msgstr ""
+
 msgid "Zoom to selection"
 msgstr ""
 
@@ -6238,6 +6255,9 @@ msgstr ""
 msgid "Updating map ..."
 msgstr ""
 
+msgid "anonymous"
+msgstr ""
+
 msgid "Display the basic properties of the changeset"
 msgstr ""
 
@@ -6250,6 +6270,12 @@ msgstr ""
 msgid "Display the objects created, updated, and deleted by the changeset"
 msgstr ""
 
+msgid "Discussion"
+msgstr ""
+
+msgid "Display the public discussion around this changeset"
+msgstr ""
+
 msgid "Changeset Management Dialog"
 msgstr ""
 
@@ -6307,9 +6333,6 @@ msgctxt "changeset.state"
 msgid "Closed"
 msgstr ""
 
-msgid "anonymous"
-msgstr ""
-
 msgid "ID"
 msgstr ""
 
@@ -6325,6 +6348,9 @@ msgstr ""
 msgid "Closed at"
 msgstr ""
 
+msgid "Discussions"
+msgstr ""
+
 msgid "Downloading changeset content"
 msgstr ""
 
@@ -6436,6 +6462,15 @@ msgid ""
 "layer"
 msgstr ""
 
+msgid "Update changeset discussion"
+msgstr ""
+
+msgid "Update the changeset discussion from the OSM server"
+msgstr ""
+
+msgid "Date"
+msgstr ""
+
 msgid "Download changesets"
 msgstr ""
 
@@ -6853,7 +6888,7 @@ msgstr ""
 msgid "Set number of recently added tags"
 msgstr ""
 
-msgid "Remember last used tags"
+msgid "Remember last used tags after a restart"
 msgstr ""
 
 msgid "Please enter the number of recently added tags to display"
@@ -7199,6 +7234,9 @@ msgstr ""
 msgid "Load parent relations"
 msgstr ""
 
+msgid "Reload"
+msgstr ""
+
 msgid "Loading parent relations"
 msgstr ""
 
@@ -7321,6 +7359,12 @@ msgstr ""
 msgid "Select to download GPS traces in the selected download area."
 msgstr ""
 
+msgid "Notes"
+msgstr ""
+
+msgid "Select to download notes in the selected download area."
+msgstr ""
+
 msgid "Download as new layer"
 msgstr ""
 
@@ -7626,9 +7670,6 @@ msgstr ""
 msgid "B"
 msgstr ""
 
-msgid "Date"
-msgstr ""
-
 msgid ""
 "Failed to update primitive with id {0} because current edit layer is null"
 msgstr ""
@@ -8483,9 +8524,6 @@ msgstr ""
 msgid "Save Layer"
 msgstr ""
 
-msgid "Notes"
-msgstr ""
-
 msgid "Notes layer"
 msgstr ""
 
@@ -8501,9 +8539,6 @@ msgstr ""
 msgid "outside downloaded area"
 msgstr ""
 
-msgid "version {0}"
-msgstr ""
-
 msgid "Merging layers"
 msgstr ""
 
@@ -12129,6 +12164,15 @@ msgstr ""
 msgid "Open changeset expected. Got closed changeset with id {0}."
 msgstr ""
 
+msgid "Note upload failed"
+msgstr ""
+
+msgid "Error parsing note response from server"
+msgstr ""
+
+msgid "Error encoding string: {0}"
+msgstr ""
+
 msgid "(Code={0})"
 msgstr ""
 
@@ -12177,13 +12221,13 @@ msgstr ""
 msgid "Parsing changeset content ..."
 msgstr ""
 
-msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
-msgid "Illegal numeric value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
-msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal numeric value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
 msgid "Missing mandatory attribute ''{0}'' of XML element {1}."
@@ -12975,9 +13019,6 @@ msgstr ""
 msgid "Failed to scan file ''{0}'' for plugin information. Skipping."
 msgstr ""
 
-msgid "Processing plugin site cache icon files..."
-msgstr ""
-
 msgid "Processing plugin files..."
 msgstr ""
 
@@ -12996,12 +13037,6 @@ msgstr ""
 msgid "Details:"
 msgstr ""
 
-msgid "Plugin icons download error"
-msgstr ""
-
-msgid "JOSM failed to download plugin icons:"
-msgstr ""
-
 msgid ""
 "Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
 "plugin site ''{1}''."
@@ -13887,7 +13922,9 @@ msgid ""
 "Creating and handling address nodes and buildings within Czech Republic."
 msgstr ""
 
-msgid "Allows to import various file formats into JOSM directly."
+msgid ""
+"Allows to import various file formats into JOSM directly. Currently "
+"supported: TangoGPS, Garmin Trainings Center TCX."
 msgstr ""
 
 msgid "Download your GPX tracks from openstreetmap.org"
@@ -13984,6 +14021,11 @@ msgid "A helper for IRS satellite adjustment."
 msgstr ""
 
 msgid ""
+"Provides Java Native Access (JNA) library. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
+msgid ""
 "Provides Java Topology Suite (JTS) library and related utilities. Not meant "
 "to be installed directly by users, but rather as a dependency for other "
 "plugins."
@@ -14339,6 +14381,25 @@ msgstr ""
 msgid "Width (meters)"
 msgstr ""
 
+msgid "Sidewalk"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "both"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "left"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "right"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "no"
+msgstr ""
+
 msgid "Service type"
 msgstr ""
 
@@ -14703,15 +14764,19 @@ msgstr ""
 msgid "May-Sep 09:30-12:30,14:15-19:30"
 msgstr ""
 
+msgctxt "parking"
 msgid "multi-storey"
 msgstr ""
 
+msgctxt "parking"
 msgid "surface"
 msgstr ""
 
+msgctxt "parking"
 msgid "underground"
 msgstr ""
 
+msgctxt "parking"
 msgid "rooftop"
 msgstr ""
 
@@ -15169,15 +15234,26 @@ msgstr ""
 msgid "Overtaking"
 msgstr ""
 
+msgctxt "overtaking"
+msgid "yes"
+msgstr ""
+
+msgctxt "overtaking"
 msgid "both"
 msgstr ""
 
+msgctxt "overtaking"
 msgid "forward"
 msgstr ""
 
+msgctxt "overtaking"
 msgid "backward"
 msgstr ""
 
+msgctxt "overtaking"
+msgid "no"
+msgstr ""
+
 msgid "Roundabout"
 msgstr ""
 
@@ -15471,6 +15547,12 @@ msgstr ""
 msgid "tiger"
 msgstr ""
 
+msgid "Button operated"
+msgstr ""
+
+msgid "Sound signals"
+msgstr ""
+
 msgid "Crossing attendant"
 msgstr ""
 
@@ -15992,9 +16074,6 @@ msgstr ""
 msgid "Traffic lights"
 msgstr ""
 
-msgid "Sound signals"
-msgstr ""
-
 msgid "Barrier"
 msgstr ""
 
@@ -18054,6 +18133,9 @@ msgstr ""
 msgid "Gasometer"
 msgstr ""
 
+msgid "Bunker Silo"
+msgstr ""
+
 msgid "Pipeline"
 msgstr ""
 
@@ -18200,15 +18282,15 @@ msgstr ""
 msgid "Monitoring:"
 msgstr ""
 
-msgid "Weather"
-msgstr ""
-
 msgid "Water level"
 msgstr ""
 
 msgid "Tide Level"
 msgstr ""
 
+msgid "Groundwater"
+msgstr ""
+
 msgid "Traffic"
 msgstr ""
 
@@ -18227,6 +18309,9 @@ msgstr ""
 msgid "Galileo Signals"
 msgstr ""
 
+msgid "Weather"
+msgstr ""
+
 msgid "Radiation"
 msgstr ""
 
@@ -18407,6 +18492,9 @@ msgstr ""
 msgid "pivot_pier"
 msgstr ""
 
+msgid "Bridge outline"
+msgstr ""
+
 msgid "Power Plant"
 msgstr ""
 
@@ -19014,6 +19102,15 @@ msgstr ""
 msgid "Pole"
 msgstr ""
 
+msgid "Pole with Transformer"
+msgstr ""
+
+msgid "Pole Attributes:"
+msgstr ""
+
+msgid "Transformer Attributes:"
+msgstr ""
+
 msgid "Power Line"
 msgstr ""
 
@@ -19063,9 +19160,15 @@ msgstr ""
 msgid "Power Cable"
 msgstr ""
 
+msgctxt "power cable"
+msgid "underground"
+msgstr ""
+
+msgctxt "power cable"
 msgid "underwater"
 msgstr ""
 
+msgctxt "power cable"
 msgid "overground"
 msgstr ""
 
@@ -19093,6 +19196,33 @@ msgstr ""
 msgid "Memorial"
 msgstr ""
 
+msgctxt "memorial"
+msgid "statue"
+msgstr ""
+
+msgctxt "memorial"
+msgid "bust"
+msgstr ""
+
+msgctxt "memorial"
+msgid "plaque"
+msgstr ""
+
+msgctxt "memorial"
+msgid "stele"
+msgstr ""
+
+msgctxt "memorial"
+msgid "stone"
+msgstr ""
+
+msgctxt "memorial"
+msgid "war_memorial"
+msgstr ""
+
+msgid "Inscription"
+msgstr ""
+
 msgid "Wayside Cross"
 msgstr ""
 
@@ -19162,6 +19292,9 @@ msgstr ""
 msgid "Beverages"
 msgstr ""
 
+msgid "Wine"
+msgstr ""
+
 msgid "Boutique"
 msgstr ""
 
@@ -19207,6 +19340,9 @@ msgstr ""
 msgid "Video Games"
 msgstr ""
 
+msgid "Music"
+msgstr ""
+
 msgid "Cash"
 msgstr ""
 
@@ -19234,6 +19370,9 @@ msgstr ""
 msgid "Curtain"
 msgstr ""
 
+msgid "Art"
+msgstr ""
+
 msgid "Frame"
 msgstr ""
 
@@ -19279,6 +19418,9 @@ msgstr ""
 msgid "Beauty"
 msgstr ""
 
+msgid "Tattoo"
+msgstr ""
+
 msgid "Optician"
 msgstr ""
 
@@ -19330,6 +19472,9 @@ msgstr ""
 msgid "Pet"
 msgstr ""
 
+msgid "Funeral Directors"
+msgstr ""
+
 msgid "Vending Machine"
 msgstr ""
 
@@ -19429,6 +19574,15 @@ msgstr ""
 msgid "National Park"
 msgstr ""
 
+msgid "Protected Area"
+msgstr ""
+
+msgid "Protected Class"
+msgstr ""
+
+msgid "Title or type of protection"
+msgstr ""
+
 msgid "Places"
 msgstr ""
 
@@ -20505,7 +20659,13 @@ msgstr ""
 msgid "Estonia Ortho (Maaamet)"
 msgstr ""
 
-msgid "Estonia Multi (Maaamet)"
+msgid "Estonia Hillshade (Maaamet)"
+msgstr ""
+
+msgid "Estonia Cadastre (Maaamet)"
+msgstr ""
+
+msgid "Estonia Forestry (Maaamet)"
 msgstr ""
 
 msgid "Bordeaux - 2012"
@@ -20529,7 +20689,7 @@ msgstr ""
 msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
 msgstr ""
 
-msgid "CUGN Nancy - Orthophoto 2012"
+msgid "GrandNancy Orthophotographie 2012"
 msgstr ""
 
 msgid "Géobretagne - Brest 2010 - 10 cm"
@@ -20576,9 +20736,6 @@ msgid ""
 "- 1 m"
 msgstr ""
 
-msgid "Streets NRW Geofabrik.de"
-msgstr ""
-
 msgid "Hike & Bike"
 msgstr ""
 
@@ -20638,6 +20795,9 @@ msgstr ""
 msgid "NRW-Atlas: Topographische Karte 1:10000"
 msgstr ""
 
+msgid "Metropole Ruhr: Luftbilder (10 cm)"
+msgstr ""
+
 msgid "Drone Imagery (Haiti)"
 msgstr ""
 
@@ -20839,6 +20999,9 @@ msgstr ""
 msgid "Stadt Zürich Übersichtsplan (Strassen, Gebäude, Hausnummer)"
 msgstr ""
 
+msgid "Stadt Zürich Luftbild 2011"
+msgstr ""
+
 msgid "Orthofoto Kanton Solothurn RGB (SOGIS 2011/2012/2013)"
 msgstr ""
 
@@ -20857,7 +21020,7 @@ msgstr ""
 msgid "Canton de Fribourg 50cm (2005)"
 msgstr ""
 
-msgid "Stadt Bern 10cm/25cm (2008)"
+msgid "Stadt Bern 10cm/25cm (2012)"
 msgstr ""
 
 msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
@@ -20896,7 +21059,7 @@ msgstr ""
 msgid "OSM US TIGER 2012 Roads Overlay"
 msgstr ""
 
-msgid "New & Misaligned TIGER Roads (TIGER 2013)"
+msgid "New & Misaligned TIGER Roads (TIGER 2014)"
 msgstr ""
 
 msgid "MassGIS L3 Parcels"
@@ -20944,9 +21107,234 @@ msgstr ""
 msgid "NLS - Bartholomew Half Inch, 1897-1907"
 msgstr ""
 
+msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Annan 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgstr ""
+
 msgid "OS Town Plans, Cupar 1854 (NLS)"
 msgstr ""
 
+msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Elgin 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Forres 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Galashiels 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Girvan 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Greenock 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Haddington 1853 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Haddington 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Hamilton 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Irvine 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Jedburgh 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kelso 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Lanark 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Linlithgow 1856 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Musselburgh 1853 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Musselburgh 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Oban 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Peebles 1856 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Perth 1860 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Peterhead 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Selkirk 1865 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, St Andrews 1854 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, St Andrews 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stirling 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stonehaven 1864 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1847 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Strathaven 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wick 1872 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wigtown 1848 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wigtown 1894 (NLS)"
+msgstr ""
+
 msgid "Decreasing house numbers in addresses interpolation"
 msgstr ""
 
@@ -21000,17 +21388,37 @@ msgid "{0}={1} is deprecated. Please use instead a multipolygon."
 msgstr ""
 
 msgid ""
-"{0} is deprecated. Please specify ìnterval by using opening_hours syntax"
+"{0} is deprecated. Please specify interval by using opening_hours syntax"
 msgstr ""
 
 msgid ""
 "{0} is deprecated. Please delete this object and use a private layer instead"
 msgstr ""
 
-msgid "{0} on a node"
+msgid "{0}={1} is unspecific. Please replace ''{1}'' by a specific value."
 msgstr ""
 
-msgid "{0} on a node. Should be drawn as an area"
+msgid "{0} should be replaced with {1}"
+msgstr ""
+
+msgid ""
+"{0}={1} is unspecific. Please replace ''{1}'' by ''left'', ''right'' or "
+"''both''."
+msgstr ""
+
+msgid "{0} on a node. Should be used on a way."
+msgstr ""
+
+msgid "{0} on a node. Should be drawn as an area."
+msgstr ""
+
+msgid "{0}=* on a node. Should be used in a relation"
+msgstr ""
+
+msgid "{0} on a way. Should be used in a relation"
+msgstr ""
+
+msgid "{0} on a node"
 msgstr ""
 
 msgid "Building inside building"
@@ -25680,6 +26088,9 @@ msgstr ""
 msgid "Find"
 msgstr ""
 
+msgid "Show"
+msgstr ""
+
 msgid "Mark"
 msgstr ""
 
diff --git a/i18n/po/lt.po b/i18n/po/lt.po
index b46124b..8793eab 100644
--- a/i18n/po/lt.po
+++ b/i18n/po/lt.po
@@ -1,8 +1,13 @@
+# Lithuanian translation for josm
+# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
+# This file is distributed under the same license as the josm package.
+# FIRST AUTHOR <EMAIL at ADDRESS>, 2009.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-21 03:38+0200\n"
+"POT-Creation-Date: 2014-12-10 03:42+0100\n"
 "PO-Revision-Date: 2014-06-17 02:41+0000\n"
 "Last-Translator: Mantas Kriaučiūnas <mantas at akl.lt>\n"
 "Language-Team: Lithuanian <lt at li.org>\n"
@@ -11,8 +16,8 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
 "(n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2014-10-21 05:07+0000\n"
-"X-Generator: Launchpad (build 17203)\n"
+"X-Launchpad-Export-Date: 2014-12-10 04:59+0000\n"
+"X-Generator: Launchpad (build 17283)\n"
 "Language: lt\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -169,16 +174,6 @@ msgid "About JOSM..."
 msgstr "Apie JOSM..."
 
 msgid ""
-"Unexpected format of API base URL. Redirection to info or history page for "
-"OSM object will probably fail. API base URL is: ''{0}''"
-msgstr ""
-
-msgid ""
-"Unexpected format of API base URL. Redirection to user page for OSM user "
-"will probably fail. API base URL is: ''{0}''"
-msgstr ""
-
-msgid ""
 "You are about to launch {0} browser window.<br>This may both clutter your "
 "screen with browser windows<br>and take some time to finish."
 msgid_plural ""
@@ -1549,6 +1544,15 @@ msgstr "Nėra pakeitimų išsiuntimui."
 msgid "Nothing to upload. Get some data first."
 msgstr "Nėra ką išsiūsti. Pirma gaukite duomenis."
 
+msgid "Upload note changes to server"
+msgstr ""
+
+msgid "Upload notes"
+msgstr ""
+
+msgid "Uploading notes to server"
+msgstr ""
+
 msgid "Upload selection"
 msgstr ""
 
@@ -1821,10 +1825,16 @@ msgstr ""
 msgid "Click the location where you wish to create a new note"
 msgstr ""
 
-msgid "Enter a comment for a new note"
+msgid "Create new note"
 msgstr ""
 
-msgid "Create new note"
+msgid "Create note"
+msgstr ""
+
+msgid "Enter a detailed comment to create a note"
+msgstr ""
+
+msgid "You must enter a comment to create a new note"
 msgstr ""
 
 msgid "Delete Mode"
@@ -2697,6 +2707,15 @@ msgstr ""
 msgid "Cycling dependencies"
 msgstr ""
 
+msgid "Uploading modified notes"
+msgstr ""
+
+msgid "Note {0} failed: {1}"
+msgstr ""
+
+msgid "Notes failed to upload"
+msgstr ""
+
 msgid ""
 "The following are results of automatic validation. Try fixing these, but be "
 "careful (don''t destroy valid data). When in doubt ignore them.<br>When you "
@@ -4934,6 +4953,12 @@ msgstr ""
 msgid "Conflict foreground: keep all tags"
 msgstr ""
 
+msgid "Conflict background: sum all numeric tags"
+msgstr ""
+
+msgid "Conflict foreground: sum all numeric tags"
+msgstr ""
+
 msgid "Conflict background: keep member"
 msgstr ""
 
@@ -5352,12 +5377,19 @@ msgstr ""
 msgid "all"
 msgstr ""
 
+msgid "sum"
+msgstr ""
+
 msgid "Please decide which values to keep"
 msgstr ""
 
 msgid "Value ''{0}'' is going to be applied for key ''{1}''"
 msgstr ""
 
+msgid ""
+"All numeric values sumed as ''{0}'' are going to be applied for key ''{1}''"
+msgstr ""
+
 msgid "The key ''{0}'' and all its values are going to be removed"
 msgstr ""
 
@@ -5720,24 +5752,6 @@ msgstr[1] ""
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
 
-msgid "Display the history of all selected items."
-msgstr ""
-
-msgid "Object with history"
-msgstr ""
-
-msgid "Reload"
-msgstr "Atnaujinti"
-
-msgid "Reload all currently selected objects and refresh the list."
-msgstr ""
-
-msgid "Show"
-msgstr "Rodyti"
-
-msgid "Display the history of the selected objects."
-msgstr "Parodyti pasirinktų objektų istoriją."
-
 msgid "Advanced object info"
 msgstr ""
 
@@ -6075,6 +6089,9 @@ msgstr ""
 msgid "Comment"
 msgstr "Komentaras"
 
+msgid "Comment on note"
+msgstr ""
+
 msgid "Add comment to note:"
 msgstr ""
 
@@ -6084,9 +6101,6 @@ msgstr ""
 msgid "Close note with message:"
 msgstr ""
 
-msgid "Close Note"
-msgstr ""
-
 msgid "Create a new note"
 msgstr ""
 
@@ -6159,6 +6173,9 @@ msgstr ""
 msgid "Search for objects"
 msgstr ""
 
+msgid "Display the history of the selected objects."
+msgstr "Parodyti pasirinktų objektų istoriją."
+
 msgid "Zoom to selection"
 msgstr ""
 
@@ -6279,6 +6296,9 @@ msgstr "Tvarkoma ({0}/{1}): ''{2}''"
 msgid "Updating map ..."
 msgstr "Atnaujinamas žemėlapis ..."
 
+msgid "anonymous"
+msgstr "anonimalus"
+
 msgid "Display the basic properties of the changeset"
 msgstr ""
 
@@ -6291,6 +6311,12 @@ msgstr "Turinys"
 msgid "Display the objects created, updated, and deleted by the changeset"
 msgstr ""
 
+msgid "Discussion"
+msgstr ""
+
+msgid "Display the public discussion around this changeset"
+msgstr ""
+
 msgid "Changeset Management Dialog"
 msgstr ""
 
@@ -6349,9 +6375,6 @@ msgctxt "changeset.state"
 msgid "Closed"
 msgstr "Užverta"
 
-msgid "anonymous"
-msgstr "anonimalus"
-
 msgid "ID"
 msgstr "ID"
 
@@ -6367,6 +6390,9 @@ msgstr "Sukurtas"
 msgid "Closed at"
 msgstr "Užvertas"
 
+msgid "Discussions"
+msgstr ""
+
 msgid "Downloading changeset content"
 msgstr "Parsiunčiamas pakeitimo turinys"
 
@@ -6478,6 +6504,15 @@ msgid ""
 "layer"
 msgstr ""
 
+msgid "Update changeset discussion"
+msgstr ""
+
+msgid "Update the changeset discussion from the OSM server"
+msgstr ""
+
+msgid "Date"
+msgstr "Data"
+
 msgid "Download changesets"
 msgstr ""
 
@@ -6895,7 +6930,7 @@ msgstr "Pasirinkite reikšmę"
 msgid "Set number of recently added tags"
 msgstr ""
 
-msgid "Remember last used tags"
+msgid "Remember last used tags after a restart"
 msgstr ""
 
 msgid "Please enter the number of recently added tags to display"
@@ -7241,6 +7276,9 @@ msgstr ""
 msgid "Load parent relations"
 msgstr ""
 
+msgid "Reload"
+msgstr "Atnaujinti"
+
 msgid "Loading parent relations"
 msgstr ""
 
@@ -7363,6 +7401,12 @@ msgstr "Nauji GPS duomenys"
 msgid "Select to download GPS traces in the selected download area."
 msgstr ""
 
+msgid "Notes"
+msgstr "Banknotai"
+
+msgid "Select to download notes in the selected download area."
+msgstr ""
+
 msgid "Download as new layer"
 msgstr "Atsiųsti kaip naują sluoksnį"
 
@@ -7670,9 +7714,6 @@ msgstr "A"
 msgid "B"
 msgstr "B"
 
-msgid "Date"
-msgstr "Data"
-
 msgid ""
 "Failed to update primitive with id {0} because current edit layer is null"
 msgstr ""
@@ -8532,9 +8573,6 @@ msgstr ""
 msgid "Save Layer"
 msgstr "Išsaugoti sluoksnį"
 
-msgid "Notes"
-msgstr "Banknotai"
-
 msgid "Notes layer"
 msgstr ""
 
@@ -8550,9 +8588,6 @@ msgstr "Duomenų sluoksnis {0}"
 msgid "outside downloaded area"
 msgstr ""
 
-msgid "version {0}"
-msgstr "versija {0}"
-
 msgid "Merging layers"
 msgstr ""
 
@@ -12194,6 +12229,15 @@ msgstr ""
 msgid "Open changeset expected. Got closed changeset with id {0}."
 msgstr ""
 
+msgid "Note upload failed"
+msgstr ""
+
+msgid "Error parsing note response from server"
+msgstr ""
+
+msgid "Error encoding string: {0}"
+msgstr ""
+
 msgid "(Code={0})"
 msgstr "(Code={0})"
 
@@ -12242,13 +12286,13 @@ msgstr ""
 msgid "Parsing changeset content ..."
 msgstr ""
 
-msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
-msgid "Illegal numeric value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
-msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal numeric value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
 msgid "Missing mandatory attribute ''{0}'' of XML element {1}."
@@ -13040,9 +13084,6 @@ msgstr "Apdorojamas failas „{0}“"
 msgid "Failed to scan file ''{0}'' for plugin information. Skipping."
 msgstr ""
 
-msgid "Processing plugin site cache icon files..."
-msgstr ""
-
 msgid "Processing plugin files..."
 msgstr "Apdorojami papildinių failai..."
 
@@ -13061,12 +13102,6 @@ msgstr ""
 msgid "Details:"
 msgstr "Išsamiau:"
 
-msgid "Plugin icons download error"
-msgstr ""
-
-msgid "JOSM failed to download plugin icons:"
-msgstr ""
-
 msgid ""
 "Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
 "plugin site ''{1}''."
@@ -13953,7 +13988,9 @@ msgid ""
 "Creating and handling address nodes and buildings within Czech Republic."
 msgstr ""
 
-msgid "Allows to import various file formats into JOSM directly."
+msgid ""
+"Allows to import various file formats into JOSM directly. Currently "
+"supported: TangoGPS, Garmin Trainings Center TCX."
 msgstr ""
 
 msgid "Download your GPX tracks from openstreetmap.org"
@@ -14050,6 +14087,11 @@ msgid "A helper for IRS satellite adjustment."
 msgstr ""
 
 msgid ""
+"Provides Java Native Access (JNA) library. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
+msgid ""
 "Provides Java Topology Suite (JTS) library and related utilities. Not meant "
 "to be installed directly by users, but rather as a dependency for other "
 "plugins."
@@ -14405,6 +14447,25 @@ msgstr "Apšviesta"
 msgid "Width (meters)"
 msgstr "Plotis (metrais)"
 
+msgid "Sidewalk"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "both"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "left"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "right"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "no"
+msgstr ""
+
 msgid "Service type"
 msgstr "Paslaugos tipas"
 
@@ -14770,17 +14831,21 @@ msgstr ""
 msgid "May-Sep 09:30-12:30,14:15-19:30"
 msgstr ""
 
+msgctxt "parking"
 msgid "multi-storey"
-msgstr "daugiaaukštis"
+msgstr ""
 
+msgctxt "parking"
 msgid "surface"
-msgstr "paviršius"
+msgstr ""
 
+msgctxt "parking"
 msgid "underground"
-msgstr "požeminis"
+msgstr ""
 
+msgctxt "parking"
 msgid "rooftop"
-msgstr "ant stogo"
+msgstr ""
 
 msgid "Reference number"
 msgstr "Nuorodos numeris"
@@ -15236,15 +15301,26 @@ msgstr "Ribotas ilgis (metrais)"
 msgid "Overtaking"
 msgstr ""
 
+msgctxt "overtaking"
+msgid "yes"
+msgstr ""
+
+msgctxt "overtaking"
 msgid "both"
-msgstr "abu"
+msgstr ""
 
+msgctxt "overtaking"
 msgid "forward"
 msgstr ""
 
+msgctxt "overtaking"
 msgid "backward"
 msgstr ""
 
+msgctxt "overtaking"
+msgid "no"
+msgstr ""
+
 msgid "Roundabout"
 msgstr "Žiedas"
 
@@ -15538,6 +15614,12 @@ msgstr ""
 msgid "tiger"
 msgstr ""
 
+msgid "Button operated"
+msgstr ""
+
+msgid "Sound signals"
+msgstr ""
+
 msgid "Crossing attendant"
 msgstr ""
 
@@ -16059,9 +16141,6 @@ msgstr "Pervaža"
 msgid "Traffic lights"
 msgstr "Šviesoforas"
 
-msgid "Sound signals"
-msgstr ""
-
 msgid "Barrier"
 msgstr "Užkarda"
 
@@ -18121,6 +18200,9 @@ msgstr ""
 msgid "Gasometer"
 msgstr ""
 
+msgid "Bunker Silo"
+msgstr ""
+
 msgid "Pipeline"
 msgstr "Vamzdynas"
 
@@ -18267,15 +18349,15 @@ msgstr ""
 msgid "Monitoring:"
 msgstr ""
 
-msgid "Weather"
-msgstr ""
-
 msgid "Water level"
 msgstr ""
 
 msgid "Tide Level"
 msgstr ""
 
+msgid "Groundwater"
+msgstr ""
+
 msgid "Traffic"
 msgstr ""
 
@@ -18294,6 +18376,9 @@ msgstr ""
 msgid "Galileo Signals"
 msgstr ""
 
+msgid "Weather"
+msgstr ""
+
 msgid "Radiation"
 msgstr ""
 
@@ -18474,6 +18559,9 @@ msgstr ""
 msgid "pivot_pier"
 msgstr ""
 
+msgid "Bridge outline"
+msgstr ""
+
 msgid "Power Plant"
 msgstr ""
 
@@ -19081,6 +19169,15 @@ msgstr ""
 msgid "Pole"
 msgstr ""
 
+msgid "Pole with Transformer"
+msgstr ""
+
+msgid "Pole Attributes:"
+msgstr ""
+
+msgid "Transformer Attributes:"
+msgstr ""
+
 msgid "Power Line"
 msgstr ""
 
@@ -19130,9 +19227,15 @@ msgstr ""
 msgid "Power Cable"
 msgstr ""
 
+msgctxt "power cable"
+msgid "underground"
+msgstr ""
+
+msgctxt "power cable"
 msgid "underwater"
 msgstr ""
 
+msgctxt "power cable"
 msgid "overground"
 msgstr ""
 
@@ -19160,6 +19263,33 @@ msgstr ""
 msgid "Memorial"
 msgstr ""
 
+msgctxt "memorial"
+msgid "statue"
+msgstr ""
+
+msgctxt "memorial"
+msgid "bust"
+msgstr ""
+
+msgctxt "memorial"
+msgid "plaque"
+msgstr ""
+
+msgctxt "memorial"
+msgid "stele"
+msgstr ""
+
+msgctxt "memorial"
+msgid "stone"
+msgstr ""
+
+msgctxt "memorial"
+msgid "war_memorial"
+msgstr ""
+
+msgid "Inscription"
+msgstr ""
+
 msgid "Wayside Cross"
 msgstr ""
 
@@ -19229,6 +19359,9 @@ msgstr ""
 msgid "Beverages"
 msgstr ""
 
+msgid "Wine"
+msgstr ""
+
 msgid "Boutique"
 msgstr ""
 
@@ -19274,6 +19407,9 @@ msgstr "Video"
 msgid "Video Games"
 msgstr ""
 
+msgid "Music"
+msgstr ""
+
 msgid "Cash"
 msgstr ""
 
@@ -19301,6 +19437,9 @@ msgstr ""
 msgid "Curtain"
 msgstr ""
 
+msgid "Art"
+msgstr ""
+
 msgid "Frame"
 msgstr ""
 
@@ -19346,6 +19485,9 @@ msgstr ""
 msgid "Beauty"
 msgstr ""
 
+msgid "Tattoo"
+msgstr ""
+
 msgid "Optician"
 msgstr ""
 
@@ -19397,6 +19539,9 @@ msgstr ""
 msgid "Pet"
 msgstr ""
 
+msgid "Funeral Directors"
+msgstr ""
+
 msgid "Vending Machine"
 msgstr ""
 
@@ -19496,6 +19641,15 @@ msgstr ""
 msgid "National Park"
 msgstr ""
 
+msgid "Protected Area"
+msgstr ""
+
+msgid "Protected Class"
+msgstr ""
+
+msgid "Title or type of protection"
+msgstr ""
+
 msgid "Places"
 msgstr ""
 
@@ -20572,7 +20726,13 @@ msgstr ""
 msgid "Estonia Ortho (Maaamet)"
 msgstr ""
 
-msgid "Estonia Multi (Maaamet)"
+msgid "Estonia Hillshade (Maaamet)"
+msgstr ""
+
+msgid "Estonia Cadastre (Maaamet)"
+msgstr ""
+
+msgid "Estonia Forestry (Maaamet)"
 msgstr ""
 
 msgid "Bordeaux - 2012"
@@ -20596,7 +20756,7 @@ msgstr ""
 msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
 msgstr ""
 
-msgid "CUGN Nancy - Orthophoto 2012"
+msgid "GrandNancy Orthophotographie 2012"
 msgstr ""
 
 msgid "Géobretagne - Brest 2010 - 10 cm"
@@ -20643,9 +20803,6 @@ msgid ""
 "- 1 m"
 msgstr ""
 
-msgid "Streets NRW Geofabrik.de"
-msgstr ""
-
 msgid "Hike & Bike"
 msgstr ""
 
@@ -20705,6 +20862,9 @@ msgstr ""
 msgid "NRW-Atlas: Topographische Karte 1:10000"
 msgstr ""
 
+msgid "Metropole Ruhr: Luftbilder (10 cm)"
+msgstr ""
+
 msgid "Drone Imagery (Haiti)"
 msgstr ""
 
@@ -20906,6 +21066,9 @@ msgstr ""
 msgid "Stadt Zürich Übersichtsplan (Strassen, Gebäude, Hausnummer)"
 msgstr ""
 
+msgid "Stadt Zürich Luftbild 2011"
+msgstr ""
+
 msgid "Orthofoto Kanton Solothurn RGB (SOGIS 2011/2012/2013)"
 msgstr ""
 
@@ -20924,7 +21087,7 @@ msgstr ""
 msgid "Canton de Fribourg 50cm (2005)"
 msgstr ""
 
-msgid "Stadt Bern 10cm/25cm (2008)"
+msgid "Stadt Bern 10cm/25cm (2012)"
 msgstr ""
 
 msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
@@ -20963,7 +21126,7 @@ msgstr ""
 msgid "OSM US TIGER 2012 Roads Overlay"
 msgstr ""
 
-msgid "New & Misaligned TIGER Roads (TIGER 2013)"
+msgid "New & Misaligned TIGER Roads (TIGER 2014)"
 msgstr ""
 
 msgid "MassGIS L3 Parcels"
@@ -21011,9 +21174,234 @@ msgstr ""
 msgid "NLS - Bartholomew Half Inch, 1897-1907"
 msgstr ""
 
+msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Annan 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgstr ""
+
 msgid "OS Town Plans, Cupar 1854 (NLS)"
 msgstr ""
 
+msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Elgin 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Forres 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Galashiels 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Girvan 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Greenock 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Haddington 1853 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Haddington 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Hamilton 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Irvine 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Jedburgh 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kelso 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Lanark 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Linlithgow 1856 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Musselburgh 1853 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Musselburgh 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Oban 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Peebles 1856 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Perth 1860 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Peterhead 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Selkirk 1865 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, St Andrews 1854 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, St Andrews 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stirling 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stonehaven 1864 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1847 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Strathaven 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wick 1872 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wigtown 1848 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wigtown 1894 (NLS)"
+msgstr ""
+
 msgid "Decreasing house numbers in addresses interpolation"
 msgstr ""
 
@@ -21067,17 +21455,37 @@ msgid "{0}={1} is deprecated. Please use instead a multipolygon."
 msgstr ""
 
 msgid ""
-"{0} is deprecated. Please specify ìnterval by using opening_hours syntax"
+"{0} is deprecated. Please specify interval by using opening_hours syntax"
 msgstr ""
 
 msgid ""
 "{0} is deprecated. Please delete this object and use a private layer instead"
 msgstr ""
 
-msgid "{0} on a node"
+msgid "{0}={1} is unspecific. Please replace ''{1}'' by a specific value."
 msgstr ""
 
-msgid "{0} on a node. Should be drawn as an area"
+msgid "{0} should be replaced with {1}"
+msgstr ""
+
+msgid ""
+"{0}={1} is unspecific. Please replace ''{1}'' by ''left'', ''right'' or "
+"''both''."
+msgstr ""
+
+msgid "{0} on a node. Should be used on a way."
+msgstr ""
+
+msgid "{0} on a node. Should be drawn as an area."
+msgstr ""
+
+msgid "{0}=* on a node. Should be used in a relation"
+msgstr ""
+
+msgid "{0} on a way. Should be used in a relation"
+msgstr ""
+
+msgid "{0} on a node"
 msgstr ""
 
 msgid "Building inside building"
@@ -25749,6 +26157,9 @@ msgstr ""
 msgid "Find"
 msgstr ""
 
+msgid "Show"
+msgstr "Rodyti"
+
 msgid "Mark"
 msgstr ""
 
diff --git a/i18n/po/lv.po b/i18n/po/lv.po
index 2b33efc..ee7341f 100644
--- a/i18n/po/lv.po
+++ b/i18n/po/lv.po
@@ -1,8 +1,13 @@
+# Latvian translation for josm
+# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
+# This file is distributed under the same license as the josm package.
+# FIRST AUTHOR <EMAIL at ADDRESS>, 2009.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-21 03:38+0200\n"
+"POT-Creation-Date: 2014-12-10 03:42+0100\n"
 "PO-Revision-Date: 2012-10-03 22:16+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad at dstoecker.de>\n"
 "Language-Team: Latvian <lv at li.org>\n"
@@ -10,8 +15,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2014-10-21 05:07+0000\n"
-"X-Generator: Launchpad (build 17203)\n"
+"X-Launchpad-Export-Date: 2014-12-10 04:58+0000\n"
+"X-Generator: Launchpad (build 17283)\n"
 "Language: lv\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -168,16 +173,6 @@ msgid "About JOSM..."
 msgstr "Par JOSM..."
 
 msgid ""
-"Unexpected format of API base URL. Redirection to info or history page for "
-"OSM object will probably fail. API base URL is: ''{0}''"
-msgstr ""
-
-msgid ""
-"Unexpected format of API base URL. Redirection to user page for OSM user "
-"will probably fail. API base URL is: ''{0}''"
-msgstr ""
-
-msgid ""
 "You are about to launch {0} browser window.<br>This may both clutter your "
 "screen with browser windows<br>and take some time to finish."
 msgid_plural ""
@@ -1530,6 +1525,15 @@ msgstr "Nav izmaiņu ko augšupielādēt."
 msgid "Nothing to upload. Get some data first."
 msgstr ""
 
+msgid "Upload note changes to server"
+msgstr ""
+
+msgid "Upload notes"
+msgstr ""
+
+msgid "Uploading notes to server"
+msgstr ""
+
 msgid "Upload selection"
 msgstr "Augšupielādējiet izvēlēto"
 
@@ -1802,10 +1806,16 @@ msgstr ""
 msgid "Click the location where you wish to create a new note"
 msgstr ""
 
-msgid "Enter a comment for a new note"
+msgid "Create new note"
 msgstr ""
 
-msgid "Create new note"
+msgid "Create note"
+msgstr ""
+
+msgid "Enter a detailed comment to create a note"
+msgstr ""
+
+msgid "You must enter a comment to create a new note"
 msgstr ""
 
 msgid "Delete Mode"
@@ -2676,6 +2686,15 @@ msgstr ""
 msgid "Cycling dependencies"
 msgstr ""
 
+msgid "Uploading modified notes"
+msgstr ""
+
+msgid "Note {0} failed: {1}"
+msgstr ""
+
+msgid "Notes failed to upload"
+msgstr ""
+
 msgid ""
 "The following are results of automatic validation. Try fixing these, but be "
 "careful (don''t destroy valid data). When in doubt ignore them.<br>When you "
@@ -4904,6 +4923,12 @@ msgstr ""
 msgid "Conflict foreground: keep all tags"
 msgstr ""
 
+msgid "Conflict background: sum all numeric tags"
+msgstr ""
+
+msgid "Conflict foreground: sum all numeric tags"
+msgstr ""
+
 msgid "Conflict background: keep member"
 msgstr ""
 
@@ -5322,12 +5347,19 @@ msgstr ""
 msgid "all"
 msgstr ""
 
+msgid "sum"
+msgstr ""
+
 msgid "Please decide which values to keep"
 msgstr ""
 
 msgid "Value ''{0}'' is going to be applied for key ''{1}''"
 msgstr ""
 
+msgid ""
+"All numeric values sumed as ''{0}'' are going to be applied for key ''{1}''"
+msgstr ""
+
 msgid "The key ''{0}'' and all its values are going to be removed"
 msgstr ""
 
@@ -5690,24 +5722,6 @@ msgstr[1] ""
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
 
-msgid "Display the history of all selected items."
-msgstr ""
-
-msgid "Object with history"
-msgstr ""
-
-msgid "Reload"
-msgstr "Pārlādēt"
-
-msgid "Reload all currently selected objects and refresh the list."
-msgstr ""
-
-msgid "Show"
-msgstr ""
-
-msgid "Display the history of the selected objects."
-msgstr ""
-
 msgid "Advanced object info"
 msgstr ""
 
@@ -6045,6 +6059,9 @@ msgstr ""
 msgid "Comment"
 msgstr ""
 
+msgid "Comment on note"
+msgstr ""
+
 msgid "Add comment to note:"
 msgstr ""
 
@@ -6054,9 +6071,6 @@ msgstr ""
 msgid "Close note with message:"
 msgstr ""
 
-msgid "Close Note"
-msgstr ""
-
 msgid "Create a new note"
 msgstr ""
 
@@ -6129,6 +6143,9 @@ msgstr ""
 msgid "Search for objects"
 msgstr ""
 
+msgid "Display the history of the selected objects."
+msgstr ""
+
 msgid "Zoom to selection"
 msgstr ""
 
@@ -6248,6 +6265,9 @@ msgstr ""
 msgid "Updating map ..."
 msgstr ""
 
+msgid "anonymous"
+msgstr ""
+
 msgid "Display the basic properties of the changeset"
 msgstr ""
 
@@ -6260,6 +6280,12 @@ msgstr ""
 msgid "Display the objects created, updated, and deleted by the changeset"
 msgstr ""
 
+msgid "Discussion"
+msgstr ""
+
+msgid "Display the public discussion around this changeset"
+msgstr ""
+
 msgid "Changeset Management Dialog"
 msgstr ""
 
@@ -6317,9 +6343,6 @@ msgctxt "changeset.state"
 msgid "Closed"
 msgstr ""
 
-msgid "anonymous"
-msgstr ""
-
 msgid "ID"
 msgstr ""
 
@@ -6335,6 +6358,9 @@ msgstr ""
 msgid "Closed at"
 msgstr ""
 
+msgid "Discussions"
+msgstr ""
+
 msgid "Downloading changeset content"
 msgstr ""
 
@@ -6446,6 +6472,15 @@ msgid ""
 "layer"
 msgstr ""
 
+msgid "Update changeset discussion"
+msgstr ""
+
+msgid "Update the changeset discussion from the OSM server"
+msgstr ""
+
+msgid "Date"
+msgstr ""
+
 msgid "Download changesets"
 msgstr ""
 
@@ -6863,7 +6898,7 @@ msgstr ""
 msgid "Set number of recently added tags"
 msgstr ""
 
-msgid "Remember last used tags"
+msgid "Remember last used tags after a restart"
 msgstr ""
 
 msgid "Please enter the number of recently added tags to display"
@@ -7209,6 +7244,9 @@ msgstr ""
 msgid "Load parent relations"
 msgstr ""
 
+msgid "Reload"
+msgstr "Pārlādēt"
+
 msgid "Loading parent relations"
 msgstr ""
 
@@ -7331,6 +7369,12 @@ msgstr ""
 msgid "Select to download GPS traces in the selected download area."
 msgstr ""
 
+msgid "Notes"
+msgstr ""
+
+msgid "Select to download notes in the selected download area."
+msgstr ""
+
 msgid "Download as new layer"
 msgstr ""
 
@@ -7636,9 +7680,6 @@ msgstr ""
 msgid "B"
 msgstr ""
 
-msgid "Date"
-msgstr ""
-
 msgid ""
 "Failed to update primitive with id {0} because current edit layer is null"
 msgstr ""
@@ -8493,9 +8534,6 @@ msgstr ""
 msgid "Save Layer"
 msgstr "Saglabāt slāni"
 
-msgid "Notes"
-msgstr ""
-
 msgid "Notes layer"
 msgstr ""
 
@@ -8511,9 +8549,6 @@ msgstr ""
 msgid "outside downloaded area"
 msgstr ""
 
-msgid "version {0}"
-msgstr ""
-
 msgid "Merging layers"
 msgstr ""
 
@@ -12143,6 +12178,15 @@ msgstr ""
 msgid "Open changeset expected. Got closed changeset with id {0}."
 msgstr ""
 
+msgid "Note upload failed"
+msgstr ""
+
+msgid "Error parsing note response from server"
+msgstr ""
+
+msgid "Error encoding string: {0}"
+msgstr ""
+
 msgid "(Code={0})"
 msgstr ""
 
@@ -12191,13 +12235,13 @@ msgstr ""
 msgid "Parsing changeset content ..."
 msgstr ""
 
-msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
-msgid "Illegal numeric value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
-msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal numeric value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
 msgid "Missing mandatory attribute ''{0}'' of XML element {1}."
@@ -12989,9 +13033,6 @@ msgstr ""
 msgid "Failed to scan file ''{0}'' for plugin information. Skipping."
 msgstr ""
 
-msgid "Processing plugin site cache icon files..."
-msgstr ""
-
 msgid "Processing plugin files..."
 msgstr ""
 
@@ -13010,12 +13051,6 @@ msgstr ""
 msgid "Details:"
 msgstr ""
 
-msgid "Plugin icons download error"
-msgstr ""
-
-msgid "JOSM failed to download plugin icons:"
-msgstr ""
-
 msgid ""
 "Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
 "plugin site ''{1}''."
@@ -13901,7 +13936,9 @@ msgid ""
 "Creating and handling address nodes and buildings within Czech Republic."
 msgstr ""
 
-msgid "Allows to import various file formats into JOSM directly."
+msgid ""
+"Allows to import various file formats into JOSM directly. Currently "
+"supported: TangoGPS, Garmin Trainings Center TCX."
 msgstr ""
 
 msgid "Download your GPX tracks from openstreetmap.org"
@@ -13998,6 +14035,11 @@ msgid "A helper for IRS satellite adjustment."
 msgstr ""
 
 msgid ""
+"Provides Java Native Access (JNA) library. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
+msgid ""
 "Provides Java Topology Suite (JTS) library and related utilities. Not meant "
 "to be installed directly by users, but rather as a dependency for other "
 "plugins."
@@ -14353,6 +14395,25 @@ msgstr ""
 msgid "Width (meters)"
 msgstr ""
 
+msgid "Sidewalk"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "both"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "left"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "right"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "no"
+msgstr ""
+
 msgid "Service type"
 msgstr ""
 
@@ -14717,15 +14778,19 @@ msgstr ""
 msgid "May-Sep 09:30-12:30,14:15-19:30"
 msgstr ""
 
+msgctxt "parking"
 msgid "multi-storey"
 msgstr ""
 
+msgctxt "parking"
 msgid "surface"
 msgstr ""
 
+msgctxt "parking"
 msgid "underground"
 msgstr ""
 
+msgctxt "parking"
 msgid "rooftop"
 msgstr ""
 
@@ -15183,15 +15248,26 @@ msgstr ""
 msgid "Overtaking"
 msgstr ""
 
+msgctxt "overtaking"
+msgid "yes"
+msgstr ""
+
+msgctxt "overtaking"
 msgid "both"
 msgstr ""
 
+msgctxt "overtaking"
 msgid "forward"
 msgstr ""
 
+msgctxt "overtaking"
 msgid "backward"
 msgstr ""
 
+msgctxt "overtaking"
+msgid "no"
+msgstr ""
+
 msgid "Roundabout"
 msgstr ""
 
@@ -15485,6 +15561,12 @@ msgstr ""
 msgid "tiger"
 msgstr ""
 
+msgid "Button operated"
+msgstr ""
+
+msgid "Sound signals"
+msgstr ""
+
 msgid "Crossing attendant"
 msgstr ""
 
@@ -16006,9 +16088,6 @@ msgstr ""
 msgid "Traffic lights"
 msgstr ""
 
-msgid "Sound signals"
-msgstr ""
-
 msgid "Barrier"
 msgstr ""
 
@@ -18068,6 +18147,9 @@ msgstr ""
 msgid "Gasometer"
 msgstr ""
 
+msgid "Bunker Silo"
+msgstr ""
+
 msgid "Pipeline"
 msgstr ""
 
@@ -18214,15 +18296,15 @@ msgstr ""
 msgid "Monitoring:"
 msgstr ""
 
-msgid "Weather"
-msgstr ""
-
 msgid "Water level"
 msgstr ""
 
 msgid "Tide Level"
 msgstr ""
 
+msgid "Groundwater"
+msgstr ""
+
 msgid "Traffic"
 msgstr ""
 
@@ -18241,6 +18323,9 @@ msgstr ""
 msgid "Galileo Signals"
 msgstr ""
 
+msgid "Weather"
+msgstr ""
+
 msgid "Radiation"
 msgstr ""
 
@@ -18421,6 +18506,9 @@ msgstr ""
 msgid "pivot_pier"
 msgstr ""
 
+msgid "Bridge outline"
+msgstr ""
+
 msgid "Power Plant"
 msgstr ""
 
@@ -19028,6 +19116,15 @@ msgstr ""
 msgid "Pole"
 msgstr ""
 
+msgid "Pole with Transformer"
+msgstr ""
+
+msgid "Pole Attributes:"
+msgstr ""
+
+msgid "Transformer Attributes:"
+msgstr ""
+
 msgid "Power Line"
 msgstr ""
 
@@ -19077,9 +19174,15 @@ msgstr ""
 msgid "Power Cable"
 msgstr ""
 
+msgctxt "power cable"
+msgid "underground"
+msgstr ""
+
+msgctxt "power cable"
 msgid "underwater"
 msgstr ""
 
+msgctxt "power cable"
 msgid "overground"
 msgstr ""
 
@@ -19107,6 +19210,33 @@ msgstr ""
 msgid "Memorial"
 msgstr ""
 
+msgctxt "memorial"
+msgid "statue"
+msgstr ""
+
+msgctxt "memorial"
+msgid "bust"
+msgstr ""
+
+msgctxt "memorial"
+msgid "plaque"
+msgstr ""
+
+msgctxt "memorial"
+msgid "stele"
+msgstr ""
+
+msgctxt "memorial"
+msgid "stone"
+msgstr ""
+
+msgctxt "memorial"
+msgid "war_memorial"
+msgstr ""
+
+msgid "Inscription"
+msgstr ""
+
 msgid "Wayside Cross"
 msgstr ""
 
@@ -19176,6 +19306,9 @@ msgstr ""
 msgid "Beverages"
 msgstr ""
 
+msgid "Wine"
+msgstr ""
+
 msgid "Boutique"
 msgstr ""
 
@@ -19221,6 +19354,9 @@ msgstr ""
 msgid "Video Games"
 msgstr ""
 
+msgid "Music"
+msgstr ""
+
 msgid "Cash"
 msgstr ""
 
@@ -19248,6 +19384,9 @@ msgstr ""
 msgid "Curtain"
 msgstr ""
 
+msgid "Art"
+msgstr ""
+
 msgid "Frame"
 msgstr ""
 
@@ -19293,6 +19432,9 @@ msgstr ""
 msgid "Beauty"
 msgstr ""
 
+msgid "Tattoo"
+msgstr ""
+
 msgid "Optician"
 msgstr ""
 
@@ -19344,6 +19486,9 @@ msgstr ""
 msgid "Pet"
 msgstr ""
 
+msgid "Funeral Directors"
+msgstr ""
+
 msgid "Vending Machine"
 msgstr ""
 
@@ -19443,6 +19588,15 @@ msgstr ""
 msgid "National Park"
 msgstr ""
 
+msgid "Protected Area"
+msgstr ""
+
+msgid "Protected Class"
+msgstr ""
+
+msgid "Title or type of protection"
+msgstr ""
+
 msgid "Places"
 msgstr ""
 
@@ -20519,7 +20673,13 @@ msgstr ""
 msgid "Estonia Ortho (Maaamet)"
 msgstr ""
 
-msgid "Estonia Multi (Maaamet)"
+msgid "Estonia Hillshade (Maaamet)"
+msgstr ""
+
+msgid "Estonia Cadastre (Maaamet)"
+msgstr ""
+
+msgid "Estonia Forestry (Maaamet)"
 msgstr ""
 
 msgid "Bordeaux - 2012"
@@ -20543,7 +20703,7 @@ msgstr ""
 msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
 msgstr ""
 
-msgid "CUGN Nancy - Orthophoto 2012"
+msgid "GrandNancy Orthophotographie 2012"
 msgstr ""
 
 msgid "Géobretagne - Brest 2010 - 10 cm"
@@ -20590,9 +20750,6 @@ msgid ""
 "- 1 m"
 msgstr ""
 
-msgid "Streets NRW Geofabrik.de"
-msgstr ""
-
 msgid "Hike & Bike"
 msgstr ""
 
@@ -20652,6 +20809,9 @@ msgstr ""
 msgid "NRW-Atlas: Topographische Karte 1:10000"
 msgstr ""
 
+msgid "Metropole Ruhr: Luftbilder (10 cm)"
+msgstr ""
+
 msgid "Drone Imagery (Haiti)"
 msgstr ""
 
@@ -20853,6 +21013,9 @@ msgstr ""
 msgid "Stadt Zürich Übersichtsplan (Strassen, Gebäude, Hausnummer)"
 msgstr ""
 
+msgid "Stadt Zürich Luftbild 2011"
+msgstr ""
+
 msgid "Orthofoto Kanton Solothurn RGB (SOGIS 2011/2012/2013)"
 msgstr ""
 
@@ -20871,7 +21034,7 @@ msgstr ""
 msgid "Canton de Fribourg 50cm (2005)"
 msgstr ""
 
-msgid "Stadt Bern 10cm/25cm (2008)"
+msgid "Stadt Bern 10cm/25cm (2012)"
 msgstr ""
 
 msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
@@ -20910,7 +21073,7 @@ msgstr ""
 msgid "OSM US TIGER 2012 Roads Overlay"
 msgstr ""
 
-msgid "New & Misaligned TIGER Roads (TIGER 2013)"
+msgid "New & Misaligned TIGER Roads (TIGER 2014)"
 msgstr ""
 
 msgid "MassGIS L3 Parcels"
@@ -20958,9 +21121,234 @@ msgstr ""
 msgid "NLS - Bartholomew Half Inch, 1897-1907"
 msgstr ""
 
+msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Annan 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgstr ""
+
 msgid "OS Town Plans, Cupar 1854 (NLS)"
 msgstr ""
 
+msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Elgin 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Forres 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Galashiels 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Girvan 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Greenock 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Haddington 1853 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Haddington 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Hamilton 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Irvine 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Jedburgh 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kelso 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Lanark 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Linlithgow 1856 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Musselburgh 1853 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Musselburgh 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Oban 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Peebles 1856 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Perth 1860 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Peterhead 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Selkirk 1865 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, St Andrews 1854 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, St Andrews 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stirling 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stonehaven 1864 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1847 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Strathaven 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wick 1872 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wigtown 1848 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wigtown 1894 (NLS)"
+msgstr ""
+
 msgid "Decreasing house numbers in addresses interpolation"
 msgstr ""
 
@@ -21014,17 +21402,37 @@ msgid "{0}={1} is deprecated. Please use instead a multipolygon."
 msgstr ""
 
 msgid ""
-"{0} is deprecated. Please specify ìnterval by using opening_hours syntax"
+"{0} is deprecated. Please specify interval by using opening_hours syntax"
 msgstr ""
 
 msgid ""
 "{0} is deprecated. Please delete this object and use a private layer instead"
 msgstr ""
 
-msgid "{0} on a node"
+msgid "{0}={1} is unspecific. Please replace ''{1}'' by a specific value."
 msgstr ""
 
-msgid "{0} on a node. Should be drawn as an area"
+msgid "{0} should be replaced with {1}"
+msgstr ""
+
+msgid ""
+"{0}={1} is unspecific. Please replace ''{1}'' by ''left'', ''right'' or "
+"''both''."
+msgstr ""
+
+msgid "{0} on a node. Should be used on a way."
+msgstr ""
+
+msgid "{0} on a node. Should be drawn as an area."
+msgstr ""
+
+msgid "{0}=* on a node. Should be used in a relation"
+msgstr ""
+
+msgid "{0} on a way. Should be used in a relation"
+msgstr ""
+
+msgid "{0} on a node"
 msgstr ""
 
 msgid "Building inside building"
@@ -25694,6 +26102,9 @@ msgstr ""
 msgid "Find"
 msgstr ""
 
+msgid "Show"
+msgstr ""
+
 msgid "Mark"
 msgstr ""
 
diff --git a/i18n/po/mk.po b/i18n/po/mk.po
index 4879640..2ee0ce1 100644
--- a/i18n/po/mk.po
+++ b/i18n/po/mk.po
@@ -1,8 +1,13 @@
+# Macedonian translation for josm
+# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
+# This file is distributed under the same license as the josm package.
+# FIRST AUTHOR <EMAIL at ADDRESS>, 2009.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-21 03:38+0200\n"
+"POT-Creation-Date: 2014-12-10 03:42+0100\n"
 "PO-Revision-Date: 2013-05-11 04:37+0000\n"
 "Last-Translator: Bojan Jankuloski <bojan.jankuloski at gmail.com>\n"
 "Language-Team: Macedonian <mk at li.org>\n"
@@ -10,8 +15,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n"
-"X-Launchpad-Export-Date: 2014-10-21 05:08+0000\n"
-"X-Generator: Launchpad (build 17203)\n"
+"X-Launchpad-Export-Date: 2014-12-10 04:59+0000\n"
+"X-Generator: Launchpad (build 17283)\n"
 "Language: mk\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -169,16 +174,6 @@ msgid "About JOSM..."
 msgstr "За JOSM..."
 
 msgid ""
-"Unexpected format of API base URL. Redirection to info or history page for "
-"OSM object will probably fail. API base URL is: ''{0}''"
-msgstr ""
-
-msgid ""
-"Unexpected format of API base URL. Redirection to user page for OSM user "
-"will probably fail. API base URL is: ''{0}''"
-msgstr ""
-
-msgid ""
 "You are about to launch {0} browser window.<br>This may both clutter your "
 "screen with browser windows<br>and take some time to finish."
 msgid_plural ""
@@ -1522,6 +1517,15 @@ msgstr ""
 msgid "Nothing to upload. Get some data first."
 msgstr ""
 
+msgid "Upload note changes to server"
+msgstr ""
+
+msgid "Upload notes"
+msgstr ""
+
+msgid "Uploading notes to server"
+msgstr ""
+
 msgid "Upload selection"
 msgstr ""
 
@@ -1794,10 +1798,16 @@ msgstr ""
 msgid "Click the location where you wish to create a new note"
 msgstr ""
 
-msgid "Enter a comment for a new note"
+msgid "Create new note"
 msgstr ""
 
-msgid "Create new note"
+msgid "Create note"
+msgstr ""
+
+msgid "Enter a detailed comment to create a note"
+msgstr ""
+
+msgid "You must enter a comment to create a new note"
 msgstr ""
 
 msgid "Delete Mode"
@@ -2668,6 +2678,15 @@ msgstr ""
 msgid "Cycling dependencies"
 msgstr ""
 
+msgid "Uploading modified notes"
+msgstr ""
+
+msgid "Note {0} failed: {1}"
+msgstr ""
+
+msgid "Notes failed to upload"
+msgstr ""
+
 msgid ""
 "The following are results of automatic validation. Try fixing these, but be "
 "careful (don''t destroy valid data). When in doubt ignore them.<br>When you "
@@ -4897,6 +4916,12 @@ msgstr ""
 msgid "Conflict foreground: keep all tags"
 msgstr ""
 
+msgid "Conflict background: sum all numeric tags"
+msgstr ""
+
+msgid "Conflict foreground: sum all numeric tags"
+msgstr ""
+
 msgid "Conflict background: keep member"
 msgstr ""
 
@@ -5315,12 +5340,19 @@ msgstr ""
 msgid "all"
 msgstr ""
 
+msgid "sum"
+msgstr ""
+
 msgid "Please decide which values to keep"
 msgstr ""
 
 msgid "Value ''{0}'' is going to be applied for key ''{1}''"
 msgstr ""
 
+msgid ""
+"All numeric values sumed as ''{0}'' are going to be applied for key ''{1}''"
+msgstr ""
+
 msgid "The key ''{0}'' and all its values are going to be removed"
 msgstr ""
 
@@ -5683,24 +5715,6 @@ msgstr[1] ""
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
 
-msgid "Display the history of all selected items."
-msgstr ""
-
-msgid "Object with history"
-msgstr ""
-
-msgid "Reload"
-msgstr ""
-
-msgid "Reload all currently selected objects and refresh the list."
-msgstr ""
-
-msgid "Show"
-msgstr ""
-
-msgid "Display the history of the selected objects."
-msgstr ""
-
 msgid "Advanced object info"
 msgstr ""
 
@@ -6038,6 +6052,9 @@ msgstr ""
 msgid "Comment"
 msgstr ""
 
+msgid "Comment on note"
+msgstr ""
+
 msgid "Add comment to note:"
 msgstr ""
 
@@ -6047,9 +6064,6 @@ msgstr ""
 msgid "Close note with message:"
 msgstr ""
 
-msgid "Close Note"
-msgstr ""
-
 msgid "Create a new note"
 msgstr ""
 
@@ -6122,6 +6136,9 @@ msgstr ""
 msgid "Search for objects"
 msgstr ""
 
+msgid "Display the history of the selected objects."
+msgstr ""
+
 msgid "Zoom to selection"
 msgstr ""
 
@@ -6241,6 +6258,9 @@ msgstr ""
 msgid "Updating map ..."
 msgstr ""
 
+msgid "anonymous"
+msgstr ""
+
 msgid "Display the basic properties of the changeset"
 msgstr ""
 
@@ -6253,6 +6273,12 @@ msgstr ""
 msgid "Display the objects created, updated, and deleted by the changeset"
 msgstr ""
 
+msgid "Discussion"
+msgstr ""
+
+msgid "Display the public discussion around this changeset"
+msgstr ""
+
 msgid "Changeset Management Dialog"
 msgstr ""
 
@@ -6310,9 +6336,6 @@ msgctxt "changeset.state"
 msgid "Closed"
 msgstr ""
 
-msgid "anonymous"
-msgstr ""
-
 msgid "ID"
 msgstr ""
 
@@ -6328,6 +6351,9 @@ msgstr ""
 msgid "Closed at"
 msgstr ""
 
+msgid "Discussions"
+msgstr ""
+
 msgid "Downloading changeset content"
 msgstr ""
 
@@ -6439,6 +6465,15 @@ msgid ""
 "layer"
 msgstr ""
 
+msgid "Update changeset discussion"
+msgstr ""
+
+msgid "Update the changeset discussion from the OSM server"
+msgstr ""
+
+msgid "Date"
+msgstr ""
+
 msgid "Download changesets"
 msgstr ""
 
@@ -6856,7 +6891,7 @@ msgstr ""
 msgid "Set number of recently added tags"
 msgstr ""
 
-msgid "Remember last used tags"
+msgid "Remember last used tags after a restart"
 msgstr ""
 
 msgid "Please enter the number of recently added tags to display"
@@ -7202,6 +7237,9 @@ msgstr ""
 msgid "Load parent relations"
 msgstr ""
 
+msgid "Reload"
+msgstr ""
+
 msgid "Loading parent relations"
 msgstr ""
 
@@ -7324,6 +7362,12 @@ msgstr ""
 msgid "Select to download GPS traces in the selected download area."
 msgstr ""
 
+msgid "Notes"
+msgstr ""
+
+msgid "Select to download notes in the selected download area."
+msgstr ""
+
 msgid "Download as new layer"
 msgstr ""
 
@@ -7629,9 +7673,6 @@ msgstr ""
 msgid "B"
 msgstr ""
 
-msgid "Date"
-msgstr ""
-
 msgid ""
 "Failed to update primitive with id {0} because current edit layer is null"
 msgstr ""
@@ -8486,9 +8527,6 @@ msgstr ""
 msgid "Save Layer"
 msgstr ""
 
-msgid "Notes"
-msgstr ""
-
 msgid "Notes layer"
 msgstr ""
 
@@ -8504,9 +8542,6 @@ msgstr ""
 msgid "outside downloaded area"
 msgstr ""
 
-msgid "version {0}"
-msgstr ""
-
 msgid "Merging layers"
 msgstr ""
 
@@ -12133,6 +12168,15 @@ msgstr ""
 msgid "Open changeset expected. Got closed changeset with id {0}."
 msgstr ""
 
+msgid "Note upload failed"
+msgstr ""
+
+msgid "Error parsing note response from server"
+msgstr ""
+
+msgid "Error encoding string: {0}"
+msgstr ""
+
 msgid "(Code={0})"
 msgstr ""
 
@@ -12181,13 +12225,13 @@ msgstr ""
 msgid "Parsing changeset content ..."
 msgstr ""
 
-msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
-msgid "Illegal numeric value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
-msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal numeric value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
 msgid "Missing mandatory attribute ''{0}'' of XML element {1}."
@@ -12979,9 +13023,6 @@ msgstr ""
 msgid "Failed to scan file ''{0}'' for plugin information. Skipping."
 msgstr ""
 
-msgid "Processing plugin site cache icon files..."
-msgstr ""
-
 msgid "Processing plugin files..."
 msgstr ""
 
@@ -13000,12 +13041,6 @@ msgstr ""
 msgid "Details:"
 msgstr ""
 
-msgid "Plugin icons download error"
-msgstr ""
-
-msgid "JOSM failed to download plugin icons:"
-msgstr ""
-
 msgid ""
 "Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
 "plugin site ''{1}''."
@@ -13891,7 +13926,9 @@ msgid ""
 "Creating and handling address nodes and buildings within Czech Republic."
 msgstr ""
 
-msgid "Allows to import various file formats into JOSM directly."
+msgid ""
+"Allows to import various file formats into JOSM directly. Currently "
+"supported: TangoGPS, Garmin Trainings Center TCX."
 msgstr ""
 
 msgid "Download your GPX tracks from openstreetmap.org"
@@ -13988,6 +14025,11 @@ msgid "A helper for IRS satellite adjustment."
 msgstr ""
 
 msgid ""
+"Provides Java Native Access (JNA) library. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
+msgid ""
 "Provides Java Topology Suite (JTS) library and related utilities. Not meant "
 "to be installed directly by users, but rather as a dependency for other "
 "plugins."
@@ -14343,6 +14385,25 @@ msgstr ""
 msgid "Width (meters)"
 msgstr ""
 
+msgid "Sidewalk"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "both"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "left"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "right"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "no"
+msgstr ""
+
 msgid "Service type"
 msgstr ""
 
@@ -14707,15 +14768,19 @@ msgstr ""
 msgid "May-Sep 09:30-12:30,14:15-19:30"
 msgstr ""
 
+msgctxt "parking"
 msgid "multi-storey"
 msgstr ""
 
+msgctxt "parking"
 msgid "surface"
 msgstr ""
 
+msgctxt "parking"
 msgid "underground"
 msgstr ""
 
+msgctxt "parking"
 msgid "rooftop"
 msgstr ""
 
@@ -15173,15 +15238,26 @@ msgstr ""
 msgid "Overtaking"
 msgstr ""
 
+msgctxt "overtaking"
+msgid "yes"
+msgstr ""
+
+msgctxt "overtaking"
 msgid "both"
 msgstr ""
 
+msgctxt "overtaking"
 msgid "forward"
 msgstr ""
 
+msgctxt "overtaking"
 msgid "backward"
 msgstr ""
 
+msgctxt "overtaking"
+msgid "no"
+msgstr ""
+
 msgid "Roundabout"
 msgstr ""
 
@@ -15475,6 +15551,12 @@ msgstr ""
 msgid "tiger"
 msgstr ""
 
+msgid "Button operated"
+msgstr ""
+
+msgid "Sound signals"
+msgstr ""
+
 msgid "Crossing attendant"
 msgstr ""
 
@@ -15996,9 +16078,6 @@ msgstr ""
 msgid "Traffic lights"
 msgstr ""
 
-msgid "Sound signals"
-msgstr ""
-
 msgid "Barrier"
 msgstr ""
 
@@ -18058,6 +18137,9 @@ msgstr ""
 msgid "Gasometer"
 msgstr ""
 
+msgid "Bunker Silo"
+msgstr ""
+
 msgid "Pipeline"
 msgstr ""
 
@@ -18204,15 +18286,15 @@ msgstr ""
 msgid "Monitoring:"
 msgstr ""
 
-msgid "Weather"
-msgstr ""
-
 msgid "Water level"
 msgstr ""
 
 msgid "Tide Level"
 msgstr ""
 
+msgid "Groundwater"
+msgstr ""
+
 msgid "Traffic"
 msgstr ""
 
@@ -18231,6 +18313,9 @@ msgstr ""
 msgid "Galileo Signals"
 msgstr ""
 
+msgid "Weather"
+msgstr ""
+
 msgid "Radiation"
 msgstr ""
 
@@ -18411,6 +18496,9 @@ msgstr ""
 msgid "pivot_pier"
 msgstr ""
 
+msgid "Bridge outline"
+msgstr ""
+
 msgid "Power Plant"
 msgstr ""
 
@@ -19018,6 +19106,15 @@ msgstr ""
 msgid "Pole"
 msgstr ""
 
+msgid "Pole with Transformer"
+msgstr ""
+
+msgid "Pole Attributes:"
+msgstr ""
+
+msgid "Transformer Attributes:"
+msgstr ""
+
 msgid "Power Line"
 msgstr ""
 
@@ -19067,9 +19164,15 @@ msgstr ""
 msgid "Power Cable"
 msgstr ""
 
+msgctxt "power cable"
+msgid "underground"
+msgstr ""
+
+msgctxt "power cable"
 msgid "underwater"
 msgstr ""
 
+msgctxt "power cable"
 msgid "overground"
 msgstr ""
 
@@ -19097,6 +19200,33 @@ msgstr ""
 msgid "Memorial"
 msgstr ""
 
+msgctxt "memorial"
+msgid "statue"
+msgstr ""
+
+msgctxt "memorial"
+msgid "bust"
+msgstr ""
+
+msgctxt "memorial"
+msgid "plaque"
+msgstr ""
+
+msgctxt "memorial"
+msgid "stele"
+msgstr ""
+
+msgctxt "memorial"
+msgid "stone"
+msgstr ""
+
+msgctxt "memorial"
+msgid "war_memorial"
+msgstr ""
+
+msgid "Inscription"
+msgstr ""
+
 msgid "Wayside Cross"
 msgstr ""
 
@@ -19166,6 +19296,9 @@ msgstr ""
 msgid "Beverages"
 msgstr ""
 
+msgid "Wine"
+msgstr ""
+
 msgid "Boutique"
 msgstr ""
 
@@ -19211,6 +19344,9 @@ msgstr ""
 msgid "Video Games"
 msgstr ""
 
+msgid "Music"
+msgstr ""
+
 msgid "Cash"
 msgstr ""
 
@@ -19238,6 +19374,9 @@ msgstr ""
 msgid "Curtain"
 msgstr ""
 
+msgid "Art"
+msgstr ""
+
 msgid "Frame"
 msgstr ""
 
@@ -19283,6 +19422,9 @@ msgstr ""
 msgid "Beauty"
 msgstr ""
 
+msgid "Tattoo"
+msgstr ""
+
 msgid "Optician"
 msgstr ""
 
@@ -19334,6 +19476,9 @@ msgstr ""
 msgid "Pet"
 msgstr ""
 
+msgid "Funeral Directors"
+msgstr ""
+
 msgid "Vending Machine"
 msgstr ""
 
@@ -19433,6 +19578,15 @@ msgstr ""
 msgid "National Park"
 msgstr ""
 
+msgid "Protected Area"
+msgstr ""
+
+msgid "Protected Class"
+msgstr ""
+
+msgid "Title or type of protection"
+msgstr ""
+
 msgid "Places"
 msgstr ""
 
@@ -20509,7 +20663,13 @@ msgstr ""
 msgid "Estonia Ortho (Maaamet)"
 msgstr ""
 
-msgid "Estonia Multi (Maaamet)"
+msgid "Estonia Hillshade (Maaamet)"
+msgstr ""
+
+msgid "Estonia Cadastre (Maaamet)"
+msgstr ""
+
+msgid "Estonia Forestry (Maaamet)"
 msgstr ""
 
 msgid "Bordeaux - 2012"
@@ -20533,7 +20693,7 @@ msgstr ""
 msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
 msgstr ""
 
-msgid "CUGN Nancy - Orthophoto 2012"
+msgid "GrandNancy Orthophotographie 2012"
 msgstr ""
 
 msgid "Géobretagne - Brest 2010 - 10 cm"
@@ -20580,9 +20740,6 @@ msgid ""
 "- 1 m"
 msgstr ""
 
-msgid "Streets NRW Geofabrik.de"
-msgstr ""
-
 msgid "Hike & Bike"
 msgstr ""
 
@@ -20642,6 +20799,9 @@ msgstr ""
 msgid "NRW-Atlas: Topographische Karte 1:10000"
 msgstr ""
 
+msgid "Metropole Ruhr: Luftbilder (10 cm)"
+msgstr ""
+
 msgid "Drone Imagery (Haiti)"
 msgstr ""
 
@@ -20843,6 +21003,9 @@ msgstr ""
 msgid "Stadt Zürich Übersichtsplan (Strassen, Gebäude, Hausnummer)"
 msgstr ""
 
+msgid "Stadt Zürich Luftbild 2011"
+msgstr ""
+
 msgid "Orthofoto Kanton Solothurn RGB (SOGIS 2011/2012/2013)"
 msgstr ""
 
@@ -20861,7 +21024,7 @@ msgstr ""
 msgid "Canton de Fribourg 50cm (2005)"
 msgstr ""
 
-msgid "Stadt Bern 10cm/25cm (2008)"
+msgid "Stadt Bern 10cm/25cm (2012)"
 msgstr ""
 
 msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
@@ -20900,7 +21063,7 @@ msgstr ""
 msgid "OSM US TIGER 2012 Roads Overlay"
 msgstr ""
 
-msgid "New & Misaligned TIGER Roads (TIGER 2013)"
+msgid "New & Misaligned TIGER Roads (TIGER 2014)"
 msgstr ""
 
 msgid "MassGIS L3 Parcels"
@@ -20948,9 +21111,234 @@ msgstr ""
 msgid "NLS - Bartholomew Half Inch, 1897-1907"
 msgstr ""
 
+msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Annan 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgstr ""
+
 msgid "OS Town Plans, Cupar 1854 (NLS)"
 msgstr ""
 
+msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Elgin 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Forres 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Galashiels 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Girvan 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Greenock 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Haddington 1853 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Haddington 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Hamilton 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Irvine 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Jedburgh 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kelso 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Lanark 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Linlithgow 1856 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Musselburgh 1853 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Musselburgh 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Oban 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Peebles 1856 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Perth 1860 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Peterhead 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Selkirk 1865 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, St Andrews 1854 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, St Andrews 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stirling 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stonehaven 1864 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1847 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Strathaven 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wick 1872 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wigtown 1848 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wigtown 1894 (NLS)"
+msgstr ""
+
 msgid "Decreasing house numbers in addresses interpolation"
 msgstr ""
 
@@ -21004,17 +21392,37 @@ msgid "{0}={1} is deprecated. Please use instead a multipolygon."
 msgstr ""
 
 msgid ""
-"{0} is deprecated. Please specify ìnterval by using opening_hours syntax"
+"{0} is deprecated. Please specify interval by using opening_hours syntax"
 msgstr ""
 
 msgid ""
 "{0} is deprecated. Please delete this object and use a private layer instead"
 msgstr ""
 
-msgid "{0} on a node"
+msgid "{0}={1} is unspecific. Please replace ''{1}'' by a specific value."
 msgstr ""
 
-msgid "{0} on a node. Should be drawn as an area"
+msgid "{0} should be replaced with {1}"
+msgstr ""
+
+msgid ""
+"{0}={1} is unspecific. Please replace ''{1}'' by ''left'', ''right'' or "
+"''both''."
+msgstr ""
+
+msgid "{0} on a node. Should be used on a way."
+msgstr ""
+
+msgid "{0} on a node. Should be drawn as an area."
+msgstr ""
+
+msgid "{0}=* on a node. Should be used in a relation"
+msgstr ""
+
+msgid "{0} on a way. Should be used in a relation"
+msgstr ""
+
+msgid "{0} on a node"
 msgstr ""
 
 msgid "Building inside building"
@@ -25684,6 +26092,9 @@ msgstr ""
 msgid "Find"
 msgstr ""
 
+msgid "Show"
+msgstr ""
+
 msgid "Mark"
 msgstr ""
 
diff --git a/i18n/po/ms.po b/i18n/po/ms.po
index 30de45c..235290d 100644
--- a/i18n/po/ms.po
+++ b/i18n/po/ms.po
@@ -1,8 +1,13 @@
+# Malay translation for josm
+# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
+# This file is distributed under the same license as the josm package.
+# FIRST AUTHOR <EMAIL at ADDRESS>, 2009.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-21 03:38+0200\n"
+"POT-Creation-Date: 2014-12-10 03:42+0100\n"
 "PO-Revision-Date: 2011-12-11 22:14+0000\n"
 "Last-Translator: abuyop <Unknown>\n"
 "Language-Team: Malay <ms at li.org>\n"
@@ -10,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-10-21 05:09+0000\n"
-"X-Generator: Launchpad (build 17203)\n"
+"X-Launchpad-Export-Date: 2014-12-10 05:00+0000\n"
+"X-Generator: Launchpad (build 17283)\n"
 "Language: ms\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -168,16 +173,6 @@ msgid "About JOSM..."
 msgstr "Tentang JOSM"
 
 msgid ""
-"Unexpected format of API base URL. Redirection to info or history page for "
-"OSM object will probably fail. API base URL is: ''{0}''"
-msgstr ""
-
-msgid ""
-"Unexpected format of API base URL. Redirection to user page for OSM user "
-"will probably fail. API base URL is: ''{0}''"
-msgstr ""
-
-msgid ""
 "You are about to launch {0} browser window.<br>This may both clutter your "
 "screen with browser windows<br>and take some time to finish."
 msgid_plural ""
@@ -1519,6 +1514,15 @@ msgstr ""
 msgid "Nothing to upload. Get some data first."
 msgstr ""
 
+msgid "Upload note changes to server"
+msgstr ""
+
+msgid "Upload notes"
+msgstr ""
+
+msgid "Uploading notes to server"
+msgstr ""
+
 msgid "Upload selection"
 msgstr ""
 
@@ -1791,10 +1795,16 @@ msgstr ""
 msgid "Click the location where you wish to create a new note"
 msgstr ""
 
-msgid "Enter a comment for a new note"
+msgid "Create new note"
 msgstr ""
 
-msgid "Create new note"
+msgid "Create note"
+msgstr ""
+
+msgid "Enter a detailed comment to create a note"
+msgstr ""
+
+msgid "You must enter a comment to create a new note"
 msgstr ""
 
 msgid "Delete Mode"
@@ -2665,6 +2675,15 @@ msgstr ""
 msgid "Cycling dependencies"
 msgstr ""
 
+msgid "Uploading modified notes"
+msgstr ""
+
+msgid "Note {0} failed: {1}"
+msgstr ""
+
+msgid "Notes failed to upload"
+msgstr ""
+
 msgid ""
 "The following are results of automatic validation. Try fixing these, but be "
 "careful (don''t destroy valid data). When in doubt ignore them.<br>When you "
@@ -4894,6 +4913,12 @@ msgstr ""
 msgid "Conflict foreground: keep all tags"
 msgstr ""
 
+msgid "Conflict background: sum all numeric tags"
+msgstr ""
+
+msgid "Conflict foreground: sum all numeric tags"
+msgstr ""
+
 msgid "Conflict background: keep member"
 msgstr ""
 
@@ -5312,12 +5337,19 @@ msgstr ""
 msgid "all"
 msgstr ""
 
+msgid "sum"
+msgstr ""
+
 msgid "Please decide which values to keep"
 msgstr ""
 
 msgid "Value ''{0}'' is going to be applied for key ''{1}''"
 msgstr ""
 
+msgid ""
+"All numeric values sumed as ''{0}'' are going to be applied for key ''{1}''"
+msgstr ""
+
 msgid "The key ''{0}'' and all its values are going to be removed"
 msgstr ""
 
@@ -5680,24 +5712,6 @@ msgstr[1] ""
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
 
-msgid "Display the history of all selected items."
-msgstr ""
-
-msgid "Object with history"
-msgstr ""
-
-msgid "Reload"
-msgstr ""
-
-msgid "Reload all currently selected objects and refresh the list."
-msgstr ""
-
-msgid "Show"
-msgstr ""
-
-msgid "Display the history of the selected objects."
-msgstr ""
-
 msgid "Advanced object info"
 msgstr ""
 
@@ -6035,6 +6049,9 @@ msgstr ""
 msgid "Comment"
 msgstr ""
 
+msgid "Comment on note"
+msgstr ""
+
 msgid "Add comment to note:"
 msgstr ""
 
@@ -6044,9 +6061,6 @@ msgstr ""
 msgid "Close note with message:"
 msgstr ""
 
-msgid "Close Note"
-msgstr ""
-
 msgid "Create a new note"
 msgstr ""
 
@@ -6119,6 +6133,9 @@ msgstr ""
 msgid "Search for objects"
 msgstr ""
 
+msgid "Display the history of the selected objects."
+msgstr ""
+
 msgid "Zoom to selection"
 msgstr ""
 
@@ -6238,6 +6255,9 @@ msgstr ""
 msgid "Updating map ..."
 msgstr ""
 
+msgid "anonymous"
+msgstr ""
+
 msgid "Display the basic properties of the changeset"
 msgstr ""
 
@@ -6250,6 +6270,12 @@ msgstr ""
 msgid "Display the objects created, updated, and deleted by the changeset"
 msgstr ""
 
+msgid "Discussion"
+msgstr ""
+
+msgid "Display the public discussion around this changeset"
+msgstr ""
+
 msgid "Changeset Management Dialog"
 msgstr ""
 
@@ -6307,9 +6333,6 @@ msgctxt "changeset.state"
 msgid "Closed"
 msgstr ""
 
-msgid "anonymous"
-msgstr ""
-
 msgid "ID"
 msgstr ""
 
@@ -6325,6 +6348,9 @@ msgstr ""
 msgid "Closed at"
 msgstr ""
 
+msgid "Discussions"
+msgstr ""
+
 msgid "Downloading changeset content"
 msgstr ""
 
@@ -6436,6 +6462,15 @@ msgid ""
 "layer"
 msgstr ""
 
+msgid "Update changeset discussion"
+msgstr ""
+
+msgid "Update the changeset discussion from the OSM server"
+msgstr ""
+
+msgid "Date"
+msgstr ""
+
 msgid "Download changesets"
 msgstr ""
 
@@ -6853,7 +6888,7 @@ msgstr ""
 msgid "Set number of recently added tags"
 msgstr ""
 
-msgid "Remember last used tags"
+msgid "Remember last used tags after a restart"
 msgstr ""
 
 msgid "Please enter the number of recently added tags to display"
@@ -7199,6 +7234,9 @@ msgstr ""
 msgid "Load parent relations"
 msgstr ""
 
+msgid "Reload"
+msgstr ""
+
 msgid "Loading parent relations"
 msgstr ""
 
@@ -7321,6 +7359,12 @@ msgstr ""
 msgid "Select to download GPS traces in the selected download area."
 msgstr ""
 
+msgid "Notes"
+msgstr ""
+
+msgid "Select to download notes in the selected download area."
+msgstr ""
+
 msgid "Download as new layer"
 msgstr ""
 
@@ -7626,9 +7670,6 @@ msgstr ""
 msgid "B"
 msgstr ""
 
-msgid "Date"
-msgstr ""
-
 msgid ""
 "Failed to update primitive with id {0} because current edit layer is null"
 msgstr ""
@@ -8483,9 +8524,6 @@ msgstr ""
 msgid "Save Layer"
 msgstr ""
 
-msgid "Notes"
-msgstr ""
-
 msgid "Notes layer"
 msgstr ""
 
@@ -8501,9 +8539,6 @@ msgstr ""
 msgid "outside downloaded area"
 msgstr ""
 
-msgid "version {0}"
-msgstr ""
-
 msgid "Merging layers"
 msgstr ""
 
@@ -12129,6 +12164,15 @@ msgstr ""
 msgid "Open changeset expected. Got closed changeset with id {0}."
 msgstr ""
 
+msgid "Note upload failed"
+msgstr ""
+
+msgid "Error parsing note response from server"
+msgstr ""
+
+msgid "Error encoding string: {0}"
+msgstr ""
+
 msgid "(Code={0})"
 msgstr ""
 
@@ -12177,13 +12221,13 @@ msgstr ""
 msgid "Parsing changeset content ..."
 msgstr ""
 
-msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
-msgid "Illegal numeric value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
-msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal numeric value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
 msgid "Missing mandatory attribute ''{0}'' of XML element {1}."
@@ -12975,9 +13019,6 @@ msgstr ""
 msgid "Failed to scan file ''{0}'' for plugin information. Skipping."
 msgstr ""
 
-msgid "Processing plugin site cache icon files..."
-msgstr ""
-
 msgid "Processing plugin files..."
 msgstr ""
 
@@ -12996,12 +13037,6 @@ msgstr ""
 msgid "Details:"
 msgstr ""
 
-msgid "Plugin icons download error"
-msgstr ""
-
-msgid "JOSM failed to download plugin icons:"
-msgstr ""
-
 msgid ""
 "Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
 "plugin site ''{1}''."
@@ -13887,7 +13922,9 @@ msgid ""
 "Creating and handling address nodes and buildings within Czech Republic."
 msgstr ""
 
-msgid "Allows to import various file formats into JOSM directly."
+msgid ""
+"Allows to import various file formats into JOSM directly. Currently "
+"supported: TangoGPS, Garmin Trainings Center TCX."
 msgstr ""
 
 msgid "Download your GPX tracks from openstreetmap.org"
@@ -13984,6 +14021,11 @@ msgid "A helper for IRS satellite adjustment."
 msgstr ""
 
 msgid ""
+"Provides Java Native Access (JNA) library. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
+msgid ""
 "Provides Java Topology Suite (JTS) library and related utilities. Not meant "
 "to be installed directly by users, but rather as a dependency for other "
 "plugins."
@@ -14339,6 +14381,25 @@ msgstr ""
 msgid "Width (meters)"
 msgstr ""
 
+msgid "Sidewalk"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "both"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "left"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "right"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "no"
+msgstr ""
+
 msgid "Service type"
 msgstr ""
 
@@ -14703,15 +14764,19 @@ msgstr ""
 msgid "May-Sep 09:30-12:30,14:15-19:30"
 msgstr ""
 
+msgctxt "parking"
 msgid "multi-storey"
 msgstr ""
 
+msgctxt "parking"
 msgid "surface"
 msgstr ""
 
+msgctxt "parking"
 msgid "underground"
 msgstr ""
 
+msgctxt "parking"
 msgid "rooftop"
 msgstr ""
 
@@ -15169,15 +15234,26 @@ msgstr ""
 msgid "Overtaking"
 msgstr ""
 
+msgctxt "overtaking"
+msgid "yes"
+msgstr ""
+
+msgctxt "overtaking"
 msgid "both"
 msgstr ""
 
+msgctxt "overtaking"
 msgid "forward"
 msgstr ""
 
+msgctxt "overtaking"
 msgid "backward"
 msgstr ""
 
+msgctxt "overtaking"
+msgid "no"
+msgstr ""
+
 msgid "Roundabout"
 msgstr ""
 
@@ -15471,6 +15547,12 @@ msgstr ""
 msgid "tiger"
 msgstr ""
 
+msgid "Button operated"
+msgstr ""
+
+msgid "Sound signals"
+msgstr ""
+
 msgid "Crossing attendant"
 msgstr ""
 
@@ -15992,9 +16074,6 @@ msgstr ""
 msgid "Traffic lights"
 msgstr ""
 
-msgid "Sound signals"
-msgstr ""
-
 msgid "Barrier"
 msgstr ""
 
@@ -18054,6 +18133,9 @@ msgstr ""
 msgid "Gasometer"
 msgstr ""
 
+msgid "Bunker Silo"
+msgstr ""
+
 msgid "Pipeline"
 msgstr ""
 
@@ -18200,15 +18282,15 @@ msgstr ""
 msgid "Monitoring:"
 msgstr ""
 
-msgid "Weather"
-msgstr ""
-
 msgid "Water level"
 msgstr ""
 
 msgid "Tide Level"
 msgstr ""
 
+msgid "Groundwater"
+msgstr ""
+
 msgid "Traffic"
 msgstr ""
 
@@ -18227,6 +18309,9 @@ msgstr ""
 msgid "Galileo Signals"
 msgstr ""
 
+msgid "Weather"
+msgstr ""
+
 msgid "Radiation"
 msgstr ""
 
@@ -18407,6 +18492,9 @@ msgstr ""
 msgid "pivot_pier"
 msgstr ""
 
+msgid "Bridge outline"
+msgstr ""
+
 msgid "Power Plant"
 msgstr ""
 
@@ -19014,6 +19102,15 @@ msgstr ""
 msgid "Pole"
 msgstr ""
 
+msgid "Pole with Transformer"
+msgstr ""
+
+msgid "Pole Attributes:"
+msgstr ""
+
+msgid "Transformer Attributes:"
+msgstr ""
+
 msgid "Power Line"
 msgstr ""
 
@@ -19063,9 +19160,15 @@ msgstr ""
 msgid "Power Cable"
 msgstr ""
 
+msgctxt "power cable"
+msgid "underground"
+msgstr ""
+
+msgctxt "power cable"
 msgid "underwater"
 msgstr ""
 
+msgctxt "power cable"
 msgid "overground"
 msgstr ""
 
@@ -19093,6 +19196,33 @@ msgstr ""
 msgid "Memorial"
 msgstr ""
 
+msgctxt "memorial"
+msgid "statue"
+msgstr ""
+
+msgctxt "memorial"
+msgid "bust"
+msgstr ""
+
+msgctxt "memorial"
+msgid "plaque"
+msgstr ""
+
+msgctxt "memorial"
+msgid "stele"
+msgstr ""
+
+msgctxt "memorial"
+msgid "stone"
+msgstr ""
+
+msgctxt "memorial"
+msgid "war_memorial"
+msgstr ""
+
+msgid "Inscription"
+msgstr ""
+
 msgid "Wayside Cross"
 msgstr ""
 
@@ -19162,6 +19292,9 @@ msgstr ""
 msgid "Beverages"
 msgstr ""
 
+msgid "Wine"
+msgstr ""
+
 msgid "Boutique"
 msgstr ""
 
@@ -19207,6 +19340,9 @@ msgstr ""
 msgid "Video Games"
 msgstr ""
 
+msgid "Music"
+msgstr ""
+
 msgid "Cash"
 msgstr ""
 
@@ -19234,6 +19370,9 @@ msgstr ""
 msgid "Curtain"
 msgstr ""
 
+msgid "Art"
+msgstr ""
+
 msgid "Frame"
 msgstr ""
 
@@ -19279,6 +19418,9 @@ msgstr ""
 msgid "Beauty"
 msgstr ""
 
+msgid "Tattoo"
+msgstr ""
+
 msgid "Optician"
 msgstr ""
 
@@ -19330,6 +19472,9 @@ msgstr ""
 msgid "Pet"
 msgstr ""
 
+msgid "Funeral Directors"
+msgstr ""
+
 msgid "Vending Machine"
 msgstr ""
 
@@ -19429,6 +19574,15 @@ msgstr ""
 msgid "National Park"
 msgstr ""
 
+msgid "Protected Area"
+msgstr ""
+
+msgid "Protected Class"
+msgstr ""
+
+msgid "Title or type of protection"
+msgstr ""
+
 msgid "Places"
 msgstr ""
 
@@ -20505,7 +20659,13 @@ msgstr ""
 msgid "Estonia Ortho (Maaamet)"
 msgstr ""
 
-msgid "Estonia Multi (Maaamet)"
+msgid "Estonia Hillshade (Maaamet)"
+msgstr ""
+
+msgid "Estonia Cadastre (Maaamet)"
+msgstr ""
+
+msgid "Estonia Forestry (Maaamet)"
 msgstr ""
 
 msgid "Bordeaux - 2012"
@@ -20529,7 +20689,7 @@ msgstr ""
 msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
 msgstr ""
 
-msgid "CUGN Nancy - Orthophoto 2012"
+msgid "GrandNancy Orthophotographie 2012"
 msgstr ""
 
 msgid "Géobretagne - Brest 2010 - 10 cm"
@@ -20576,9 +20736,6 @@ msgid ""
 "- 1 m"
 msgstr ""
 
-msgid "Streets NRW Geofabrik.de"
-msgstr ""
-
 msgid "Hike & Bike"
 msgstr ""
 
@@ -20638,6 +20795,9 @@ msgstr ""
 msgid "NRW-Atlas: Topographische Karte 1:10000"
 msgstr ""
 
+msgid "Metropole Ruhr: Luftbilder (10 cm)"
+msgstr ""
+
 msgid "Drone Imagery (Haiti)"
 msgstr ""
 
@@ -20839,6 +20999,9 @@ msgstr ""
 msgid "Stadt Zürich Übersichtsplan (Strassen, Gebäude, Hausnummer)"
 msgstr ""
 
+msgid "Stadt Zürich Luftbild 2011"
+msgstr ""
+
 msgid "Orthofoto Kanton Solothurn RGB (SOGIS 2011/2012/2013)"
 msgstr ""
 
@@ -20857,7 +21020,7 @@ msgstr ""
 msgid "Canton de Fribourg 50cm (2005)"
 msgstr ""
 
-msgid "Stadt Bern 10cm/25cm (2008)"
+msgid "Stadt Bern 10cm/25cm (2012)"
 msgstr ""
 
 msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
@@ -20896,7 +21059,7 @@ msgstr ""
 msgid "OSM US TIGER 2012 Roads Overlay"
 msgstr ""
 
-msgid "New & Misaligned TIGER Roads (TIGER 2013)"
+msgid "New & Misaligned TIGER Roads (TIGER 2014)"
 msgstr ""
 
 msgid "MassGIS L3 Parcels"
@@ -20944,9 +21107,234 @@ msgstr ""
 msgid "NLS - Bartholomew Half Inch, 1897-1907"
 msgstr ""
 
+msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Annan 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgstr ""
+
 msgid "OS Town Plans, Cupar 1854 (NLS)"
 msgstr ""
 
+msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Elgin 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Forres 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Galashiels 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Girvan 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Greenock 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Haddington 1853 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Haddington 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Hamilton 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Irvine 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Jedburgh 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kelso 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Lanark 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Linlithgow 1856 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Musselburgh 1853 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Musselburgh 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Oban 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Peebles 1856 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Perth 1860 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Peterhead 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Selkirk 1865 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, St Andrews 1854 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, St Andrews 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stirling 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stonehaven 1864 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1847 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Strathaven 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wick 1872 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wigtown 1848 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wigtown 1894 (NLS)"
+msgstr ""
+
 msgid "Decreasing house numbers in addresses interpolation"
 msgstr ""
 
@@ -21000,17 +21388,37 @@ msgid "{0}={1} is deprecated. Please use instead a multipolygon."
 msgstr ""
 
 msgid ""
-"{0} is deprecated. Please specify ìnterval by using opening_hours syntax"
+"{0} is deprecated. Please specify interval by using opening_hours syntax"
 msgstr ""
 
 msgid ""
 "{0} is deprecated. Please delete this object and use a private layer instead"
 msgstr ""
 
-msgid "{0} on a node"
+msgid "{0}={1} is unspecific. Please replace ''{1}'' by a specific value."
 msgstr ""
 
-msgid "{0} on a node. Should be drawn as an area"
+msgid "{0} should be replaced with {1}"
+msgstr ""
+
+msgid ""
+"{0}={1} is unspecific. Please replace ''{1}'' by ''left'', ''right'' or "
+"''both''."
+msgstr ""
+
+msgid "{0} on a node. Should be used on a way."
+msgstr ""
+
+msgid "{0} on a node. Should be drawn as an area."
+msgstr ""
+
+msgid "{0}=* on a node. Should be used in a relation"
+msgstr ""
+
+msgid "{0} on a way. Should be used in a relation"
+msgstr ""
+
+msgid "{0} on a node"
 msgstr ""
 
 msgid "Building inside building"
@@ -25680,6 +26088,9 @@ msgstr ""
 msgid "Find"
 msgstr ""
 
+msgid "Show"
+msgstr ""
+
 msgid "Mark"
 msgstr ""
 
diff --git a/i18n/po/nb.po b/i18n/po/nb.po
index 7207245..b67ae43 100644
--- a/i18n/po/nb.po
+++ b/i18n/po/nb.po
@@ -1,8 +1,13 @@
+# Norwegian Bokmal translation for josm
+# Copyright (c) 2007 Rosetta Contributors and Canonical Ltd 2007
+# This file is distributed under the same license as the josm package.
+# FIRST AUTHOR <EMAIL at ADDRESS>, 2007.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-21 03:38+0200\n"
+"POT-Creation-Date: 2014-12-10 03:42+0100\n"
 "PO-Revision-Date: 2014-03-19 14:25+0000\n"
 "Last-Translator: Magnus Meyer Hustveit <Unknown>\n"
 "Language-Team: Norwegian Bokmal <nb at li.org>\n"
@@ -10,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-10-21 05:11+0000\n"
-"X-Generator: Launchpad (build 17203)\n"
+"X-Launchpad-Export-Date: 2014-12-10 05:03+0000\n"
+"X-Generator: Launchpad (build 17283)\n"
 "Language: nb\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -168,16 +173,6 @@ msgid "About JOSM..."
 msgstr "Om JOSM"
 
 msgid ""
-"Unexpected format of API base URL. Redirection to info or history page for "
-"OSM object will probably fail. API base URL is: ''{0}''"
-msgstr ""
-
-msgid ""
-"Unexpected format of API base URL. Redirection to user page for OSM user "
-"will probably fail. API base URL is: ''{0}''"
-msgstr ""
-
-msgid ""
 "You are about to launch {0} browser window.<br>This may both clutter your "
 "screen with browser windows<br>and take some time to finish."
 msgid_plural ""
@@ -1536,6 +1531,15 @@ msgstr "Ingen endringer å laste opp."
 msgid "Nothing to upload. Get some data first."
 msgstr "Ingen endringer å laste opp. Finn frem data først."
 
+msgid "Upload note changes to server"
+msgstr ""
+
+msgid "Upload notes"
+msgstr ""
+
+msgid "Uploading notes to server"
+msgstr ""
+
 msgid "Upload selection"
 msgstr ""
 
@@ -1808,10 +1812,16 @@ msgstr ""
 msgid "Click the location where you wish to create a new note"
 msgstr ""
 
-msgid "Enter a comment for a new note"
+msgid "Create new note"
 msgstr ""
 
-msgid "Create new note"
+msgid "Create note"
+msgstr ""
+
+msgid "Enter a detailed comment to create a note"
+msgstr ""
+
+msgid "You must enter a comment to create a new note"
 msgstr ""
 
 msgid "Delete Mode"
@@ -2695,6 +2705,15 @@ msgstr ""
 msgid "Cycling dependencies"
 msgstr ""
 
+msgid "Uploading modified notes"
+msgstr ""
+
+msgid "Note {0} failed: {1}"
+msgstr ""
+
+msgid "Notes failed to upload"
+msgstr ""
+
 msgid ""
 "The following are results of automatic validation. Try fixing these, but be "
 "careful (don''t destroy valid data). When in doubt ignore them.<br>When you "
@@ -4938,6 +4957,12 @@ msgstr ""
 msgid "Conflict foreground: keep all tags"
 msgstr ""
 
+msgid "Conflict background: sum all numeric tags"
+msgstr ""
+
+msgid "Conflict foreground: sum all numeric tags"
+msgstr ""
+
 msgid "Conflict background: keep member"
 msgstr ""
 
@@ -5384,12 +5409,19 @@ msgstr "ingen"
 msgid "all"
 msgstr "alle"
 
+msgid "sum"
+msgstr ""
+
 msgid "Please decide which values to keep"
 msgstr ""
 
 msgid "Value ''{0}'' is going to be applied for key ''{1}''"
 msgstr ""
 
+msgid ""
+"All numeric values sumed as ''{0}'' are going to be applied for key ''{1}''"
+msgstr ""
+
 msgid "The key ''{0}'' and all its values are going to be removed"
 msgstr ""
 
@@ -5752,24 +5784,6 @@ msgstr[1] ""
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
 
-msgid "Display the history of all selected items."
-msgstr "Vis historikk på alle valgte objekt."
-
-msgid "Object with history"
-msgstr ""
-
-msgid "Reload"
-msgstr "Last inn på nytt"
-
-msgid "Reload all currently selected objects and refresh the list."
-msgstr "Les inn og oppfrisk liste over alle valgte objekt."
-
-msgid "Show"
-msgstr "Vis"
-
-msgid "Display the history of the selected objects."
-msgstr ""
-
 msgid "Advanced object info"
 msgstr ""
 
@@ -6107,6 +6121,9 @@ msgstr ""
 msgid "Comment"
 msgstr ""
 
+msgid "Comment on note"
+msgstr ""
+
 msgid "Add comment to note:"
 msgstr ""
 
@@ -6116,9 +6133,6 @@ msgstr ""
 msgid "Close note with message:"
 msgstr ""
 
-msgid "Close Note"
-msgstr ""
-
 msgid "Create a new note"
 msgstr ""
 
@@ -6191,6 +6205,9 @@ msgstr "Aktuelt utvalg"
 msgid "Search for objects"
 msgstr ""
 
+msgid "Display the history of the selected objects."
+msgstr ""
+
 msgid "Zoom to selection"
 msgstr "Zoom til utvalg"
 
@@ -6310,6 +6327,9 @@ msgstr ""
 msgid "Updating map ..."
 msgstr ""
 
+msgid "anonymous"
+msgstr ""
+
 msgid "Display the basic properties of the changeset"
 msgstr ""
 
@@ -6322,6 +6342,12 @@ msgstr ""
 msgid "Display the objects created, updated, and deleted by the changeset"
 msgstr ""
 
+msgid "Discussion"
+msgstr ""
+
+msgid "Display the public discussion around this changeset"
+msgstr ""
+
 msgid "Changeset Management Dialog"
 msgstr ""
 
@@ -6379,9 +6405,6 @@ msgctxt "changeset.state"
 msgid "Closed"
 msgstr ""
 
-msgid "anonymous"
-msgstr ""
-
 msgid "ID"
 msgstr ""
 
@@ -6397,6 +6420,9 @@ msgstr ""
 msgid "Closed at"
 msgstr ""
 
+msgid "Discussions"
+msgstr ""
+
 msgid "Downloading changeset content"
 msgstr ""
 
@@ -6508,6 +6534,15 @@ msgid ""
 "layer"
 msgstr ""
 
+msgid "Update changeset discussion"
+msgstr ""
+
+msgid "Update the changeset discussion from the OSM server"
+msgstr ""
+
+msgid "Date"
+msgstr "Dato"
+
 msgid "Download changesets"
 msgstr ""
 
@@ -6925,7 +6960,7 @@ msgstr "Velg en verdi"
 msgid "Set number of recently added tags"
 msgstr ""
 
-msgid "Remember last used tags"
+msgid "Remember last used tags after a restart"
 msgstr ""
 
 msgid "Please enter the number of recently added tags to display"
@@ -7271,6 +7306,9 @@ msgstr ""
 msgid "Load parent relations"
 msgstr ""
 
+msgid "Reload"
+msgstr "Last inn på nytt"
+
 msgid "Loading parent relations"
 msgstr ""
 
@@ -7395,6 +7433,12 @@ msgstr "GPS-rådata"
 msgid "Select to download GPS traces in the selected download area."
 msgstr ""
 
+msgid "Notes"
+msgstr "Sedler"
+
+msgid "Select to download notes in the selected download area."
+msgstr ""
+
 msgid "Download as new layer"
 msgstr "Last ned som nytt lag"
 
@@ -7707,9 +7751,6 @@ msgstr ""
 msgid "B"
 msgstr ""
 
-msgid "Date"
-msgstr "Dato"
-
 msgid ""
 "Failed to update primitive with id {0} because current edit layer is null"
 msgstr ""
@@ -8576,9 +8617,6 @@ msgstr ""
 msgid "Save Layer"
 msgstr "Lagre lag"
 
-msgid "Notes"
-msgstr "Sedler"
-
 msgid "Notes layer"
 msgstr ""
 
@@ -8594,9 +8632,6 @@ msgstr "Datalag {0}"
 msgid "outside downloaded area"
 msgstr "utenfor nedlastet område"
 
-msgid "version {0}"
-msgstr "versjon {0}"
-
 msgid "Merging layers"
 msgstr ""
 
@@ -12283,6 +12318,15 @@ msgstr ""
 msgid "Open changeset expected. Got closed changeset with id {0}."
 msgstr ""
 
+msgid "Note upload failed"
+msgstr ""
+
+msgid "Error parsing note response from server"
+msgstr ""
+
+msgid "Error encoding string: {0}"
+msgstr ""
+
 msgid "(Code={0})"
 msgstr "(Kode={0})"
 
@@ -12333,13 +12377,13 @@ msgstr ""
 msgid "Parsing changeset content ..."
 msgstr ""
 
-msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
-msgid "Illegal numeric value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
-msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal numeric value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
 msgid "Missing mandatory attribute ''{0}'' of XML element {1}."
@@ -13136,9 +13180,6 @@ msgstr ""
 msgid "Failed to scan file ''{0}'' for plugin information. Skipping."
 msgstr ""
 
-msgid "Processing plugin site cache icon files..."
-msgstr ""
-
 msgid "Processing plugin files..."
 msgstr ""
 
@@ -13157,12 +13198,6 @@ msgstr ""
 msgid "Details:"
 msgstr ""
 
-msgid "Plugin icons download error"
-msgstr ""
-
-msgid "JOSM failed to download plugin icons:"
-msgstr ""
-
 msgid ""
 "Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
 "plugin site ''{1}''."
@@ -14054,8 +14089,10 @@ msgid ""
 "Creating and handling address nodes and buildings within Czech Republic."
 msgstr "Lag og håntere addressenoder og bygninger i den Tsjekkiske Republikk"
 
-msgid "Allows to import various file formats into JOSM directly."
-msgstr "Lar deg importere forskjellige dataformater direkte i JOSM."
+msgid ""
+"Allows to import various file formats into JOSM directly. Currently "
+"supported: TangoGPS, Garmin Trainings Center TCX."
+msgstr ""
 
 msgid "Download your GPX tracks from openstreetmap.org"
 msgstr ""
@@ -14157,6 +14194,11 @@ msgid "A helper for IRS satellite adjustment."
 msgstr ""
 
 msgid ""
+"Provides Java Native Access (JNA) library. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
+msgid ""
 "Provides Java Topology Suite (JTS) library and related utilities. Not meant "
 "to be installed directly by users, but rather as a dependency for other "
 "plugins."
@@ -14524,6 +14566,25 @@ msgstr ""
 msgid "Width (meters)"
 msgstr "Bredde ( meter)"
 
+msgid "Sidewalk"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "both"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "left"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "right"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "no"
+msgstr ""
+
 msgid "Service type"
 msgstr ""
 
@@ -14888,15 +14949,19 @@ msgstr ""
 msgid "May-Sep 09:30-12:30,14:15-19:30"
 msgstr ""
 
+msgctxt "parking"
 msgid "multi-storey"
-msgstr "P-hus"
+msgstr ""
 
+msgctxt "parking"
 msgid "surface"
-msgstr "Overflateparkering"
+msgstr ""
 
+msgctxt "parking"
 msgid "underground"
-msgstr "P-kjeller"
+msgstr ""
 
+msgctxt "parking"
 msgid "rooftop"
 msgstr ""
 
@@ -15354,15 +15419,26 @@ msgstr ""
 msgid "Overtaking"
 msgstr ""
 
+msgctxt "overtaking"
+msgid "yes"
+msgstr ""
+
+msgctxt "overtaking"
 msgid "both"
 msgstr ""
 
+msgctxt "overtaking"
 msgid "forward"
 msgstr ""
 
+msgctxt "overtaking"
 msgid "backward"
 msgstr ""
 
+msgctxt "overtaking"
+msgid "no"
+msgstr ""
+
 msgid "Roundabout"
 msgstr "Rundkjøring"
 
@@ -15656,6 +15732,12 @@ msgstr "pegasus"
 msgid "tiger"
 msgstr "tiger"
 
+msgid "Button operated"
+msgstr ""
+
+msgid "Sound signals"
+msgstr ""
+
 msgid "Crossing attendant"
 msgstr "Betjent fotgjengerfelt"
 
@@ -16177,9 +16259,6 @@ msgstr "Planovergang"
 msgid "Traffic lights"
 msgstr ""
 
-msgid "Sound signals"
-msgstr ""
-
 msgid "Barrier"
 msgstr ""
 
@@ -18239,6 +18318,9 @@ msgstr "Vindmølle"
 msgid "Gasometer"
 msgstr "Gassbeholder"
 
+msgid "Bunker Silo"
+msgstr ""
+
 msgid "Pipeline"
 msgstr "Rørledning"
 
@@ -18385,15 +18467,15 @@ msgstr ""
 msgid "Monitoring:"
 msgstr ""
 
-msgid "Weather"
-msgstr ""
-
 msgid "Water level"
 msgstr ""
 
 msgid "Tide Level"
 msgstr ""
 
+msgid "Groundwater"
+msgstr ""
+
 msgid "Traffic"
 msgstr ""
 
@@ -18412,6 +18494,9 @@ msgstr ""
 msgid "Galileo Signals"
 msgstr ""
 
+msgid "Weather"
+msgstr ""
+
 msgid "Radiation"
 msgstr ""
 
@@ -18592,6 +18677,9 @@ msgstr ""
 msgid "pivot_pier"
 msgstr ""
 
+msgid "Bridge outline"
+msgstr ""
+
 msgid "Power Plant"
 msgstr ""
 
@@ -19199,6 +19287,15 @@ msgstr ""
 msgid "Pole"
 msgstr ""
 
+msgid "Pole with Transformer"
+msgstr ""
+
+msgid "Pole Attributes:"
+msgstr ""
+
+msgid "Transformer Attributes:"
+msgstr ""
+
 msgid "Power Line"
 msgstr "Kraftlinje"
 
@@ -19248,9 +19345,15 @@ msgstr ""
 msgid "Power Cable"
 msgstr ""
 
+msgctxt "power cable"
+msgid "underground"
+msgstr ""
+
+msgctxt "power cable"
 msgid "underwater"
 msgstr ""
 
+msgctxt "power cable"
 msgid "overground"
 msgstr ""
 
@@ -19278,6 +19381,33 @@ msgstr "Monument"
 msgid "Memorial"
 msgstr "Minneplatte"
 
+msgctxt "memorial"
+msgid "statue"
+msgstr ""
+
+msgctxt "memorial"
+msgid "bust"
+msgstr ""
+
+msgctxt "memorial"
+msgid "plaque"
+msgstr ""
+
+msgctxt "memorial"
+msgid "stele"
+msgstr ""
+
+msgctxt "memorial"
+msgid "stone"
+msgstr ""
+
+msgctxt "memorial"
+msgid "war_memorial"
+msgstr ""
+
+msgid "Inscription"
+msgstr ""
+
 msgid "Wayside Cross"
 msgstr "Kors i veikant"
 
@@ -19347,6 +19477,9 @@ msgstr "Sprit og vin"
 msgid "Beverages"
 msgstr "Drikke"
 
+msgid "Wine"
+msgstr ""
+
 msgid "Boutique"
 msgstr ""
 
@@ -19392,6 +19525,9 @@ msgstr "Video"
 msgid "Video Games"
 msgstr ""
 
+msgid "Music"
+msgstr ""
+
 msgid "Cash"
 msgstr "Valuta"
 
@@ -19419,6 +19555,9 @@ msgstr ""
 msgid "Curtain"
 msgstr ""
 
+msgid "Art"
+msgstr ""
+
 msgid "Frame"
 msgstr ""
 
@@ -19464,6 +19603,9 @@ msgstr ""
 msgid "Beauty"
 msgstr ""
 
+msgid "Tattoo"
+msgstr ""
+
 msgid "Optician"
 msgstr "Optiker"
 
@@ -19515,6 +19657,9 @@ msgstr ""
 msgid "Pet"
 msgstr ""
 
+msgid "Funeral Directors"
+msgstr ""
+
 msgid "Vending Machine"
 msgstr ""
 
@@ -19614,6 +19759,15 @@ msgstr ""
 msgid "National Park"
 msgstr ""
 
+msgid "Protected Area"
+msgstr ""
+
+msgid "Protected Class"
+msgstr ""
+
+msgid "Title or type of protection"
+msgstr ""
+
 msgid "Places"
 msgstr "Steder"
 
@@ -20690,7 +20844,13 @@ msgstr ""
 msgid "Estonia Ortho (Maaamet)"
 msgstr ""
 
-msgid "Estonia Multi (Maaamet)"
+msgid "Estonia Hillshade (Maaamet)"
+msgstr ""
+
+msgid "Estonia Cadastre (Maaamet)"
+msgstr ""
+
+msgid "Estonia Forestry (Maaamet)"
 msgstr ""
 
 msgid "Bordeaux - 2012"
@@ -20714,7 +20874,7 @@ msgstr ""
 msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
 msgstr ""
 
-msgid "CUGN Nancy - Orthophoto 2012"
+msgid "GrandNancy Orthophotographie 2012"
 msgstr ""
 
 msgid "Géobretagne - Brest 2010 - 10 cm"
@@ -20761,9 +20921,6 @@ msgid ""
 "- 1 m"
 msgstr ""
 
-msgid "Streets NRW Geofabrik.de"
-msgstr ""
-
 msgid "Hike & Bike"
 msgstr ""
 
@@ -20823,6 +20980,9 @@ msgstr ""
 msgid "NRW-Atlas: Topographische Karte 1:10000"
 msgstr ""
 
+msgid "Metropole Ruhr: Luftbilder (10 cm)"
+msgstr ""
+
 msgid "Drone Imagery (Haiti)"
 msgstr ""
 
@@ -21024,6 +21184,9 @@ msgstr ""
 msgid "Stadt Zürich Übersichtsplan (Strassen, Gebäude, Hausnummer)"
 msgstr ""
 
+msgid "Stadt Zürich Luftbild 2011"
+msgstr ""
+
 msgid "Orthofoto Kanton Solothurn RGB (SOGIS 2011/2012/2013)"
 msgstr ""
 
@@ -21042,7 +21205,7 @@ msgstr ""
 msgid "Canton de Fribourg 50cm (2005)"
 msgstr ""
 
-msgid "Stadt Bern 10cm/25cm (2008)"
+msgid "Stadt Bern 10cm/25cm (2012)"
 msgstr ""
 
 msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
@@ -21081,7 +21244,7 @@ msgstr ""
 msgid "OSM US TIGER 2012 Roads Overlay"
 msgstr ""
 
-msgid "New & Misaligned TIGER Roads (TIGER 2013)"
+msgid "New & Misaligned TIGER Roads (TIGER 2014)"
 msgstr ""
 
 msgid "MassGIS L3 Parcels"
@@ -21129,9 +21292,234 @@ msgstr ""
 msgid "NLS - Bartholomew Half Inch, 1897-1907"
 msgstr ""
 
+msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Annan 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgstr ""
+
 msgid "OS Town Plans, Cupar 1854 (NLS)"
 msgstr ""
 
+msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Elgin 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Forres 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Galashiels 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Girvan 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Greenock 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Haddington 1853 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Haddington 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Hamilton 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Irvine 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Jedburgh 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kelso 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Lanark 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Linlithgow 1856 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Musselburgh 1853 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Musselburgh 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Oban 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Peebles 1856 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Perth 1860 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Peterhead 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Selkirk 1865 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, St Andrews 1854 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, St Andrews 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stirling 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stonehaven 1864 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1847 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Strathaven 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wick 1872 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wigtown 1848 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wigtown 1894 (NLS)"
+msgstr ""
+
 msgid "Decreasing house numbers in addresses interpolation"
 msgstr ""
 
@@ -21185,17 +21573,37 @@ msgid "{0}={1} is deprecated. Please use instead a multipolygon."
 msgstr ""
 
 msgid ""
-"{0} is deprecated. Please specify ìnterval by using opening_hours syntax"
+"{0} is deprecated. Please specify interval by using opening_hours syntax"
 msgstr ""
 
 msgid ""
 "{0} is deprecated. Please delete this object and use a private layer instead"
 msgstr ""
 
-msgid "{0} on a node"
+msgid "{0}={1} is unspecific. Please replace ''{1}'' by a specific value."
 msgstr ""
 
-msgid "{0} on a node. Should be drawn as an area"
+msgid "{0} should be replaced with {1}"
+msgstr ""
+
+msgid ""
+"{0}={1} is unspecific. Please replace ''{1}'' by ''left'', ''right'' or "
+"''both''."
+msgstr ""
+
+msgid "{0} on a node. Should be used on a way."
+msgstr ""
+
+msgid "{0} on a node. Should be drawn as an area."
+msgstr ""
+
+msgid "{0}=* on a node. Should be used in a relation"
+msgstr ""
+
+msgid "{0} on a way. Should be used in a relation"
+msgstr ""
+
+msgid "{0} on a node"
 msgstr ""
 
 msgid "Building inside building"
@@ -25902,6 +26310,9 @@ msgstr ""
 msgid "Find"
 msgstr ""
 
+msgid "Show"
+msgstr "Vis"
+
 msgid "Mark"
 msgstr ""
 
diff --git a/i18n/po/nds.po b/i18n/po/nds.po
index 733dee7..6f4c6c6 100644
--- a/i18n/po/nds.po
+++ b/i18n/po/nds.po
@@ -1,8 +1,13 @@
+# German, Low translation for josm
+# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
+# This file is distributed under the same license as the josm package.
+# FIRST AUTHOR <EMAIL at ADDRESS>, 2009.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-21 03:38+0200\n"
+"POT-Creation-Date: 2014-12-10 03:42+0100\n"
 "PO-Revision-Date: 2009-11-29 09:01+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad at dstoecker.de>\n"
 "Language-Team: German, Low <nds at li.org>\n"
@@ -10,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-10-21 05:10+0000\n"
-"X-Generator: Launchpad (build 17203)\n"
+"X-Launchpad-Export-Date: 2014-12-10 05:01+0000\n"
+"X-Generator: Launchpad (build 17283)\n"
 "Language: \n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -168,16 +173,6 @@ msgid "About JOSM..."
 msgstr ""
 
 msgid ""
-"Unexpected format of API base URL. Redirection to info or history page for "
-"OSM object will probably fail. API base URL is: ''{0}''"
-msgstr ""
-
-msgid ""
-"Unexpected format of API base URL. Redirection to user page for OSM user "
-"will probably fail. API base URL is: ''{0}''"
-msgstr ""
-
-msgid ""
 "You are about to launch {0} browser window.<br>This may both clutter your "
 "screen with browser windows<br>and take some time to finish."
 msgid_plural ""
@@ -1519,6 +1514,15 @@ msgstr ""
 msgid "Nothing to upload. Get some data first."
 msgstr ""
 
+msgid "Upload note changes to server"
+msgstr ""
+
+msgid "Upload notes"
+msgstr ""
+
+msgid "Uploading notes to server"
+msgstr ""
+
 msgid "Upload selection"
 msgstr ""
 
@@ -1791,10 +1795,16 @@ msgstr ""
 msgid "Click the location where you wish to create a new note"
 msgstr ""
 
-msgid "Enter a comment for a new note"
+msgid "Create new note"
 msgstr ""
 
-msgid "Create new note"
+msgid "Create note"
+msgstr ""
+
+msgid "Enter a detailed comment to create a note"
+msgstr ""
+
+msgid "You must enter a comment to create a new note"
 msgstr ""
 
 msgid "Delete Mode"
@@ -2665,6 +2675,15 @@ msgstr ""
 msgid "Cycling dependencies"
 msgstr ""
 
+msgid "Uploading modified notes"
+msgstr ""
+
+msgid "Note {0} failed: {1}"
+msgstr ""
+
+msgid "Notes failed to upload"
+msgstr ""
+
 msgid ""
 "The following are results of automatic validation. Try fixing these, but be "
 "careful (don''t destroy valid data). When in doubt ignore them.<br>When you "
@@ -4893,6 +4912,12 @@ msgstr ""
 msgid "Conflict foreground: keep all tags"
 msgstr ""
 
+msgid "Conflict background: sum all numeric tags"
+msgstr ""
+
+msgid "Conflict foreground: sum all numeric tags"
+msgstr ""
+
 msgid "Conflict background: keep member"
 msgstr ""
 
@@ -5311,12 +5336,19 @@ msgstr ""
 msgid "all"
 msgstr ""
 
+msgid "sum"
+msgstr ""
+
 msgid "Please decide which values to keep"
 msgstr ""
 
 msgid "Value ''{0}'' is going to be applied for key ''{1}''"
 msgstr ""
 
+msgid ""
+"All numeric values sumed as ''{0}'' are going to be applied for key ''{1}''"
+msgstr ""
+
 msgid "The key ''{0}'' and all its values are going to be removed"
 msgstr ""
 
@@ -5679,24 +5711,6 @@ msgstr[1] ""
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
 
-msgid "Display the history of all selected items."
-msgstr ""
-
-msgid "Object with history"
-msgstr ""
-
-msgid "Reload"
-msgstr ""
-
-msgid "Reload all currently selected objects and refresh the list."
-msgstr ""
-
-msgid "Show"
-msgstr ""
-
-msgid "Display the history of the selected objects."
-msgstr ""
-
 msgid "Advanced object info"
 msgstr ""
 
@@ -6034,6 +6048,9 @@ msgstr ""
 msgid "Comment"
 msgstr ""
 
+msgid "Comment on note"
+msgstr ""
+
 msgid "Add comment to note:"
 msgstr ""
 
@@ -6043,9 +6060,6 @@ msgstr ""
 msgid "Close note with message:"
 msgstr ""
 
-msgid "Close Note"
-msgstr ""
-
 msgid "Create a new note"
 msgstr ""
 
@@ -6118,6 +6132,9 @@ msgstr ""
 msgid "Search for objects"
 msgstr ""
 
+msgid "Display the history of the selected objects."
+msgstr ""
+
 msgid "Zoom to selection"
 msgstr ""
 
@@ -6237,6 +6254,9 @@ msgstr ""
 msgid "Updating map ..."
 msgstr ""
 
+msgid "anonymous"
+msgstr ""
+
 msgid "Display the basic properties of the changeset"
 msgstr ""
 
@@ -6249,6 +6269,12 @@ msgstr ""
 msgid "Display the objects created, updated, and deleted by the changeset"
 msgstr ""
 
+msgid "Discussion"
+msgstr ""
+
+msgid "Display the public discussion around this changeset"
+msgstr ""
+
 msgid "Changeset Management Dialog"
 msgstr ""
 
@@ -6306,9 +6332,6 @@ msgctxt "changeset.state"
 msgid "Closed"
 msgstr ""
 
-msgid "anonymous"
-msgstr ""
-
 msgid "ID"
 msgstr ""
 
@@ -6324,6 +6347,9 @@ msgstr ""
 msgid "Closed at"
 msgstr ""
 
+msgid "Discussions"
+msgstr ""
+
 msgid "Downloading changeset content"
 msgstr ""
 
@@ -6435,6 +6461,15 @@ msgid ""
 "layer"
 msgstr ""
 
+msgid "Update changeset discussion"
+msgstr ""
+
+msgid "Update the changeset discussion from the OSM server"
+msgstr ""
+
+msgid "Date"
+msgstr ""
+
 msgid "Download changesets"
 msgstr ""
 
@@ -6852,7 +6887,7 @@ msgstr ""
 msgid "Set number of recently added tags"
 msgstr ""
 
-msgid "Remember last used tags"
+msgid "Remember last used tags after a restart"
 msgstr ""
 
 msgid "Please enter the number of recently added tags to display"
@@ -7198,6 +7233,9 @@ msgstr ""
 msgid "Load parent relations"
 msgstr ""
 
+msgid "Reload"
+msgstr ""
+
 msgid "Loading parent relations"
 msgstr ""
 
@@ -7320,6 +7358,12 @@ msgstr ""
 msgid "Select to download GPS traces in the selected download area."
 msgstr ""
 
+msgid "Notes"
+msgstr ""
+
+msgid "Select to download notes in the selected download area."
+msgstr ""
+
 msgid "Download as new layer"
 msgstr ""
 
@@ -7625,9 +7669,6 @@ msgstr ""
 msgid "B"
 msgstr ""
 
-msgid "Date"
-msgstr ""
-
 msgid ""
 "Failed to update primitive with id {0} because current edit layer is null"
 msgstr ""
@@ -8482,9 +8523,6 @@ msgstr ""
 msgid "Save Layer"
 msgstr ""
 
-msgid "Notes"
-msgstr ""
-
 msgid "Notes layer"
 msgstr ""
 
@@ -8500,9 +8538,6 @@ msgstr ""
 msgid "outside downloaded area"
 msgstr ""
 
-msgid "version {0}"
-msgstr ""
-
 msgid "Merging layers"
 msgstr ""
 
@@ -12128,6 +12163,15 @@ msgstr ""
 msgid "Open changeset expected. Got closed changeset with id {0}."
 msgstr ""
 
+msgid "Note upload failed"
+msgstr ""
+
+msgid "Error parsing note response from server"
+msgstr ""
+
+msgid "Error encoding string: {0}"
+msgstr ""
+
 msgid "(Code={0})"
 msgstr ""
 
@@ -12176,13 +12220,13 @@ msgstr ""
 msgid "Parsing changeset content ..."
 msgstr ""
 
-msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
-msgid "Illegal numeric value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
-msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal numeric value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
 msgid "Missing mandatory attribute ''{0}'' of XML element {1}."
@@ -12974,9 +13018,6 @@ msgstr ""
 msgid "Failed to scan file ''{0}'' for plugin information. Skipping."
 msgstr ""
 
-msgid "Processing plugin site cache icon files..."
-msgstr ""
-
 msgid "Processing plugin files..."
 msgstr ""
 
@@ -12995,12 +13036,6 @@ msgstr ""
 msgid "Details:"
 msgstr ""
 
-msgid "Plugin icons download error"
-msgstr ""
-
-msgid "JOSM failed to download plugin icons:"
-msgstr ""
-
 msgid ""
 "Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
 "plugin site ''{1}''."
@@ -13886,7 +13921,9 @@ msgid ""
 "Creating and handling address nodes and buildings within Czech Republic."
 msgstr ""
 
-msgid "Allows to import various file formats into JOSM directly."
+msgid ""
+"Allows to import various file formats into JOSM directly. Currently "
+"supported: TangoGPS, Garmin Trainings Center TCX."
 msgstr ""
 
 msgid "Download your GPX tracks from openstreetmap.org"
@@ -13983,6 +14020,11 @@ msgid "A helper for IRS satellite adjustment."
 msgstr ""
 
 msgid ""
+"Provides Java Native Access (JNA) library. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
+msgid ""
 "Provides Java Topology Suite (JTS) library and related utilities. Not meant "
 "to be installed directly by users, but rather as a dependency for other "
 "plugins."
@@ -14338,6 +14380,25 @@ msgstr ""
 msgid "Width (meters)"
 msgstr ""
 
+msgid "Sidewalk"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "both"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "left"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "right"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "no"
+msgstr ""
+
 msgid "Service type"
 msgstr ""
 
@@ -14702,15 +14763,19 @@ msgstr ""
 msgid "May-Sep 09:30-12:30,14:15-19:30"
 msgstr ""
 
+msgctxt "parking"
 msgid "multi-storey"
 msgstr ""
 
+msgctxt "parking"
 msgid "surface"
 msgstr ""
 
+msgctxt "parking"
 msgid "underground"
 msgstr ""
 
+msgctxt "parking"
 msgid "rooftop"
 msgstr ""
 
@@ -15168,15 +15233,26 @@ msgstr ""
 msgid "Overtaking"
 msgstr ""
 
+msgctxt "overtaking"
+msgid "yes"
+msgstr ""
+
+msgctxt "overtaking"
 msgid "both"
 msgstr ""
 
+msgctxt "overtaking"
 msgid "forward"
 msgstr ""
 
+msgctxt "overtaking"
 msgid "backward"
 msgstr ""
 
+msgctxt "overtaking"
+msgid "no"
+msgstr ""
+
 msgid "Roundabout"
 msgstr ""
 
@@ -15470,6 +15546,12 @@ msgstr ""
 msgid "tiger"
 msgstr ""
 
+msgid "Button operated"
+msgstr ""
+
+msgid "Sound signals"
+msgstr ""
+
 msgid "Crossing attendant"
 msgstr ""
 
@@ -15991,9 +16073,6 @@ msgstr ""
 msgid "Traffic lights"
 msgstr ""
 
-msgid "Sound signals"
-msgstr ""
-
 msgid "Barrier"
 msgstr ""
 
@@ -18053,6 +18132,9 @@ msgstr ""
 msgid "Gasometer"
 msgstr ""
 
+msgid "Bunker Silo"
+msgstr ""
+
 msgid "Pipeline"
 msgstr ""
 
@@ -18199,15 +18281,15 @@ msgstr ""
 msgid "Monitoring:"
 msgstr ""
 
-msgid "Weather"
-msgstr ""
-
 msgid "Water level"
 msgstr ""
 
 msgid "Tide Level"
 msgstr ""
 
+msgid "Groundwater"
+msgstr ""
+
 msgid "Traffic"
 msgstr ""
 
@@ -18226,6 +18308,9 @@ msgstr ""
 msgid "Galileo Signals"
 msgstr ""
 
+msgid "Weather"
+msgstr ""
+
 msgid "Radiation"
 msgstr ""
 
@@ -18406,6 +18491,9 @@ msgstr ""
 msgid "pivot_pier"
 msgstr ""
 
+msgid "Bridge outline"
+msgstr ""
+
 msgid "Power Plant"
 msgstr ""
 
@@ -19013,6 +19101,15 @@ msgstr ""
 msgid "Pole"
 msgstr ""
 
+msgid "Pole with Transformer"
+msgstr ""
+
+msgid "Pole Attributes:"
+msgstr ""
+
+msgid "Transformer Attributes:"
+msgstr ""
+
 msgid "Power Line"
 msgstr ""
 
@@ -19062,9 +19159,15 @@ msgstr ""
 msgid "Power Cable"
 msgstr ""
 
+msgctxt "power cable"
+msgid "underground"
+msgstr ""
+
+msgctxt "power cable"
 msgid "underwater"
 msgstr ""
 
+msgctxt "power cable"
 msgid "overground"
 msgstr ""
 
@@ -19092,6 +19195,33 @@ msgstr ""
 msgid "Memorial"
 msgstr ""
 
+msgctxt "memorial"
+msgid "statue"
+msgstr ""
+
+msgctxt "memorial"
+msgid "bust"
+msgstr ""
+
+msgctxt "memorial"
+msgid "plaque"
+msgstr ""
+
+msgctxt "memorial"
+msgid "stele"
+msgstr ""
+
+msgctxt "memorial"
+msgid "stone"
+msgstr ""
+
+msgctxt "memorial"
+msgid "war_memorial"
+msgstr ""
+
+msgid "Inscription"
+msgstr ""
+
 msgid "Wayside Cross"
 msgstr ""
 
@@ -19161,6 +19291,9 @@ msgstr ""
 msgid "Beverages"
 msgstr ""
 
+msgid "Wine"
+msgstr ""
+
 msgid "Boutique"
 msgstr ""
 
@@ -19206,6 +19339,9 @@ msgstr ""
 msgid "Video Games"
 msgstr ""
 
+msgid "Music"
+msgstr ""
+
 msgid "Cash"
 msgstr ""
 
@@ -19233,6 +19369,9 @@ msgstr ""
 msgid "Curtain"
 msgstr ""
 
+msgid "Art"
+msgstr ""
+
 msgid "Frame"
 msgstr ""
 
@@ -19278,6 +19417,9 @@ msgstr ""
 msgid "Beauty"
 msgstr ""
 
+msgid "Tattoo"
+msgstr ""
+
 msgid "Optician"
 msgstr ""
 
@@ -19329,6 +19471,9 @@ msgstr ""
 msgid "Pet"
 msgstr ""
 
+msgid "Funeral Directors"
+msgstr ""
+
 msgid "Vending Machine"
 msgstr ""
 
@@ -19428,6 +19573,15 @@ msgstr ""
 msgid "National Park"
 msgstr ""
 
+msgid "Protected Area"
+msgstr ""
+
+msgid "Protected Class"
+msgstr ""
+
+msgid "Title or type of protection"
+msgstr ""
+
 msgid "Places"
 msgstr ""
 
@@ -20504,7 +20658,13 @@ msgstr ""
 msgid "Estonia Ortho (Maaamet)"
 msgstr ""
 
-msgid "Estonia Multi (Maaamet)"
+msgid "Estonia Hillshade (Maaamet)"
+msgstr ""
+
+msgid "Estonia Cadastre (Maaamet)"
+msgstr ""
+
+msgid "Estonia Forestry (Maaamet)"
 msgstr ""
 
 msgid "Bordeaux - 2012"
@@ -20528,7 +20688,7 @@ msgstr ""
 msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
 msgstr ""
 
-msgid "CUGN Nancy - Orthophoto 2012"
+msgid "GrandNancy Orthophotographie 2012"
 msgstr ""
 
 msgid "Géobretagne - Brest 2010 - 10 cm"
@@ -20575,9 +20735,6 @@ msgid ""
 "- 1 m"
 msgstr ""
 
-msgid "Streets NRW Geofabrik.de"
-msgstr ""
-
 msgid "Hike & Bike"
 msgstr ""
 
@@ -20637,6 +20794,9 @@ msgstr ""
 msgid "NRW-Atlas: Topographische Karte 1:10000"
 msgstr ""
 
+msgid "Metropole Ruhr: Luftbilder (10 cm)"
+msgstr ""
+
 msgid "Drone Imagery (Haiti)"
 msgstr ""
 
@@ -20838,6 +20998,9 @@ msgstr ""
 msgid "Stadt Zürich Übersichtsplan (Strassen, Gebäude, Hausnummer)"
 msgstr ""
 
+msgid "Stadt Zürich Luftbild 2011"
+msgstr ""
+
 msgid "Orthofoto Kanton Solothurn RGB (SOGIS 2011/2012/2013)"
 msgstr ""
 
@@ -20856,7 +21019,7 @@ msgstr ""
 msgid "Canton de Fribourg 50cm (2005)"
 msgstr ""
 
-msgid "Stadt Bern 10cm/25cm (2008)"
+msgid "Stadt Bern 10cm/25cm (2012)"
 msgstr ""
 
 msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
@@ -20895,7 +21058,7 @@ msgstr ""
 msgid "OSM US TIGER 2012 Roads Overlay"
 msgstr ""
 
-msgid "New & Misaligned TIGER Roads (TIGER 2013)"
+msgid "New & Misaligned TIGER Roads (TIGER 2014)"
 msgstr ""
 
 msgid "MassGIS L3 Parcels"
@@ -20943,9 +21106,234 @@ msgstr ""
 msgid "NLS - Bartholomew Half Inch, 1897-1907"
 msgstr ""
 
+msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Annan 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgstr ""
+
 msgid "OS Town Plans, Cupar 1854 (NLS)"
 msgstr ""
 
+msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Elgin 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Forres 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Galashiels 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Girvan 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Greenock 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Haddington 1853 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Haddington 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Hamilton 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Irvine 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Jedburgh 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kelso 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Lanark 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Linlithgow 1856 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Musselburgh 1853 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Musselburgh 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Oban 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Peebles 1856 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Perth 1860 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Peterhead 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Selkirk 1865 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, St Andrews 1854 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, St Andrews 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stirling 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stonehaven 1864 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1847 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Strathaven 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wick 1872 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wigtown 1848 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wigtown 1894 (NLS)"
+msgstr ""
+
 msgid "Decreasing house numbers in addresses interpolation"
 msgstr ""
 
@@ -20999,17 +21387,37 @@ msgid "{0}={1} is deprecated. Please use instead a multipolygon."
 msgstr ""
 
 msgid ""
-"{0} is deprecated. Please specify ìnterval by using opening_hours syntax"
+"{0} is deprecated. Please specify interval by using opening_hours syntax"
 msgstr ""
 
 msgid ""
 "{0} is deprecated. Please delete this object and use a private layer instead"
 msgstr ""
 
-msgid "{0} on a node"
+msgid "{0}={1} is unspecific. Please replace ''{1}'' by a specific value."
 msgstr ""
 
-msgid "{0} on a node. Should be drawn as an area"
+msgid "{0} should be replaced with {1}"
+msgstr ""
+
+msgid ""
+"{0}={1} is unspecific. Please replace ''{1}'' by ''left'', ''right'' or "
+"''both''."
+msgstr ""
+
+msgid "{0} on a node. Should be used on a way."
+msgstr ""
+
+msgid "{0} on a node. Should be drawn as an area."
+msgstr ""
+
+msgid "{0}=* on a node. Should be used in a relation"
+msgstr ""
+
+msgid "{0} on a way. Should be used in a relation"
+msgstr ""
+
+msgid "{0} on a node"
 msgstr ""
 
 msgid "Building inside building"
@@ -25679,6 +26087,9 @@ msgstr ""
 msgid "Find"
 msgstr ""
 
+msgid "Show"
+msgstr ""
+
 msgid "Mark"
 msgstr ""
 
diff --git a/i18n/po/nl.po b/i18n/po/nl.po
index 221009e..504a840 100644
--- a/i18n/po/nl.po
+++ b/i18n/po/nl.po
@@ -1,8 +1,13 @@
+# Dutch translation for josm
+# Copyright (c) 2007 Rosetta Contributors and Canonical Ltd 2007
+# This file is distributed under the same license as the josm package.
+# FIRST AUTHOR <EMAIL at ADDRESS>, 2007.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-21 03:38+0200\n"
+"POT-Creation-Date: 2014-12-10 03:42+0100\n"
 "PO-Revision-Date: 2014-06-10 11:21+0000\n"
 "Last-Translator: Jan Cnops <jan.cnops at scarlet.be>\n"
 "Language-Team: Dutch\n"
@@ -10,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-10-21 04:46+0000\n"
-"X-Generator: Launchpad (build 17203)\n"
+"X-Launchpad-Export-Date: 2014-12-10 04:43+0000\n"
+"X-Generator: Launchpad (build 17283)\n"
 "Language: nl\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -174,21 +179,6 @@ msgid "About JOSM..."
 msgstr "Over JOSM..."
 
 msgid ""
-"Unexpected format of API base URL. Redirection to info or history page for "
-"OSM object will probably fail. API base URL is: ''{0}''"
-msgstr ""
-"Onverwachte indeling van de API basis-URL. Doorsturen naar pagina voor "
-"informatie of geschiedenis zal waarschijnlijk mislukken. API basis-URL is: "
-"''{0}''"
-
-msgid ""
-"Unexpected format of API base URL. Redirection to user page for OSM user "
-"will probably fail. API base URL is: ''{0}''"
-msgstr ""
-"Onverwachte indeling van de API basis-URL. Doorsturen naar gebruikerspagina "
-"voor OSM-gebruiker zal waarschijnlijk mislukken. API basis-URL is: ''{0}''"
-
-msgid ""
 "You are about to launch {0} browser window.<br>This may both clutter your "
 "screen with browser windows<br>and take some time to finish."
 msgid_plural ""
@@ -1697,6 +1687,15 @@ msgstr "Geen wijzigingen om te uploaden."
 msgid "Nothing to upload. Get some data first."
 msgstr "Niets te uploaden. Verzamel eerst enkele gegevens."
 
+msgid "Upload note changes to server"
+msgstr ""
+
+msgid "Upload notes"
+msgstr ""
+
+msgid "Uploading notes to server"
+msgstr ""
+
 msgid "Upload selection"
 msgstr "Selectie uploaden"
 
@@ -1989,10 +1988,16 @@ msgstr ""
 msgid "Click the location where you wish to create a new note"
 msgstr ""
 
-msgid "Enter a comment for a new note"
+msgid "Create new note"
 msgstr ""
 
-msgid "Create new note"
+msgid "Create note"
+msgstr ""
+
+msgid "Enter a detailed comment to create a note"
+msgstr ""
+
+msgid "You must enter a comment to create a new note"
 msgstr ""
 
 msgid "Delete Mode"
@@ -2970,6 +2975,15 @@ msgstr "... verwijst naar relatie"
 msgid "Cycling dependencies"
 msgstr "Cirkelverwijzingen"
 
+msgid "Uploading modified notes"
+msgstr ""
+
+msgid "Note {0} failed: {1}"
+msgstr ""
+
+msgid "Notes failed to upload"
+msgstr ""
+
 msgid ""
 "The following are results of automatic validation. Try fixing these, but be "
 "careful (don''t destroy valid data). When in doubt ignore them.<br>When you "
@@ -5364,6 +5378,12 @@ msgstr "Conflict op achtergrond: behoud alle tags"
 msgid "Conflict foreground: keep all tags"
 msgstr "Conflict op voorgrond: behoud alle tags"
 
+msgid "Conflict background: sum all numeric tags"
+msgstr ""
+
+msgid "Conflict foreground: sum all numeric tags"
+msgstr ""
+
 msgid "Conflict background: keep member"
 msgstr "Conflict op achtergrond: behoud lid"
 
@@ -5835,12 +5855,19 @@ msgstr "geen"
 msgid "all"
 msgstr "alles"
 
+msgid "sum"
+msgstr ""
+
 msgid "Please decide which values to keep"
 msgstr "Bepaal welke waardes behouden moeten blijven"
 
 msgid "Value ''{0}'' is going to be applied for key ''{1}''"
 msgstr "Waarde ''{0}'' zal worden toegepast voor sleutel ''{1}''"
 
+msgid ""
+"All numeric values sumed as ''{0}'' are going to be applied for key ''{1}''"
+msgstr ""
+
 msgid "The key ''{0}'' and all its values are going to be removed"
 msgstr "De sleutel ''{0}'' en al zijn waarden zullen worden verwijderd"
 
@@ -6250,24 +6277,6 @@ msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
 "</p><p>Dialoogvenster Filter afsluiten om alle objecten te zien.<p></html>"
 
-msgid "Display the history of all selected items."
-msgstr "De geschiedenis van alle geselecteerde items tonen."
-
-msgid "Object with history"
-msgstr "Object met historie"
-
-msgid "Reload"
-msgstr "Herladen"
-
-msgid "Reload all currently selected objects and refresh the list."
-msgstr "Alle huidige geselecteerde objecten herladen en de lijst verversen."
-
-msgid "Show"
-msgstr "Weergeven"
-
-msgid "Display the history of the selected objects."
-msgstr "Historie voor de geselecteerde objecten tonen."
-
 msgid "Advanced object info"
 msgstr "Geavanceerde objectinformatie"
 
@@ -6632,6 +6641,9 @@ msgstr ""
 msgid "Comment"
 msgstr "Commentaar"
 
+msgid "Comment on note"
+msgstr ""
+
 msgid "Add comment to note:"
 msgstr ""
 
@@ -6641,9 +6653,6 @@ msgstr ""
 msgid "Close note with message:"
 msgstr ""
 
-msgid "Close Note"
-msgstr ""
-
 msgid "Create a new note"
 msgstr ""
 
@@ -6718,6 +6727,9 @@ msgstr "Huidige selectie"
 msgid "Search for objects"
 msgstr "Zoeken naar objecten"
 
+msgid "Display the history of the selected objects."
+msgstr "Historie voor de geselecteerde objecten tonen."
+
 msgid "Zoom to selection"
 msgstr "Op selectie inzoomen"
 
@@ -6843,6 +6855,9 @@ msgstr "({0}/{1}): ''{2}'' worden hersteld"
 msgid "Updating map ..."
 msgstr "Kaart wordt bijgewerkt ..."
 
+msgid "anonymous"
+msgstr "anoniem"
+
 msgid "Display the basic properties of the changeset"
 msgstr "Toon de basiseigenschappen van de wijzigingenset"
 
@@ -6856,6 +6871,12 @@ msgid "Display the objects created, updated, and deleted by the changeset"
 msgstr ""
 "De gecreëerde/bijgewerkte en verwijderde objecten tonen per wijzigingenset"
 
+msgid "Discussion"
+msgstr ""
+
+msgid "Display the public discussion around this changeset"
+msgstr ""
+
 msgid "Changeset Management Dialog"
 msgstr "Venster Beheren wijzigingenset"
 
@@ -6923,9 +6944,6 @@ msgctxt "changeset.state"
 msgid "Closed"
 msgstr "Afgesloten"
 
-msgid "anonymous"
-msgstr "anoniem"
-
 msgid "ID"
 msgstr "ID"
 
@@ -6941,6 +6959,9 @@ msgstr "Gemaakt op"
 msgid "Closed at"
 msgstr "Afgesloten op"
 
+msgid "Discussions"
+msgstr ""
+
 msgid "Downloading changeset content"
 msgstr "Downloaden van inhoud wijzigingenset"
 
@@ -7066,6 +7087,15 @@ msgstr ""
 "Zoom in op de objecten in de inhoud van deze wijzigingenset in de huidige "
 "gegevenslaag"
 
+msgid "Update changeset discussion"
+msgstr ""
+
+msgid "Update the changeset discussion from the OSM server"
+msgstr ""
+
+msgid "Date"
+msgstr "Datum"
+
 msgid "Download changesets"
 msgstr "Wijzigingensets downloaden"
 
@@ -7545,8 +7575,8 @@ msgstr "Selecteer een waarde"
 msgid "Set number of recently added tags"
 msgstr "Stel aantal recent toegevoegde tags in"
 
-msgid "Remember last used tags"
-msgstr "Onthoud laatst gebruikte tag"
+msgid "Remember last used tags after a restart"
+msgstr ""
 
 msgid "Please enter the number of recently added tags to display"
 msgstr ""
@@ -7938,6 +7968,9 @@ msgstr "Inclusief directe kinderen van ouder-relaties"
 msgid "Load parent relations"
 msgstr "Ouder-relaties laden"
 
+msgid "Reload"
+msgstr "Herladen"
+
 msgid "Loading parent relations"
 msgstr "Ouder-relaties worden geladen"
 
@@ -8069,6 +8102,12 @@ msgstr "Ruwe GPS-gegevens"
 msgid "Select to download GPS traces in the selected download area."
 msgstr "Selecteren om GPS-sporen voor het geselecteerde gebied te downloaden"
 
+msgid "Notes"
+msgstr "Bankbiljetten"
+
+msgid "Select to download notes in the selected download area."
+msgstr ""
+
 msgid "Download as new layer"
 msgstr "Als nieuwe laag downloaden"
 
@@ -8421,9 +8460,6 @@ msgstr "T"
 msgid "B"
 msgstr "B"
 
-msgid "Date"
-msgstr "Datum"
-
 msgid ""
 "Failed to update primitive with id {0} because current edit layer is null"
 msgstr ""
@@ -9433,9 +9469,6 @@ msgstr ""
 msgid "Save Layer"
 msgstr "Laag opslaan"
 
-msgid "Notes"
-msgstr "Bankbiljetten"
-
 msgid "Notes layer"
 msgstr ""
 
@@ -9451,9 +9484,6 @@ msgstr "Gegevenslaag {0}"
 msgid "outside downloaded area"
 msgstr "buiten gedownload gebied"
 
-msgid "version {0}"
-msgstr "versie {0}"
-
 msgid "Merging layers"
 msgstr "Lagen samenvoegen"
 
@@ -13519,6 +13549,15 @@ msgid "Open changeset expected. Got closed changeset with id {0}."
 msgstr ""
 "Geopende wijzigingenset verwacht. Kreeg gesloten wijzigingenset met ID {0}."
 
+msgid "Note upload failed"
+msgstr ""
+
+msgid "Error parsing note response from server"
+msgstr ""
+
+msgid "Error encoding string: {0}"
+msgstr ""
+
 msgid "(Code={0})"
 msgstr "(Code={0})"
 
@@ -13575,15 +13614,15 @@ msgstr ""
 msgid "Parsing changeset content ..."
 msgstr "Parsen van inhoud wijzigingenset ..."
 
+msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
+msgstr "Ongeldige Booleaanse waarde voor attribuut ''{0}''. Kreeg ''{1}''."
+
 msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
 msgstr "Ongeldige waarde voor attribuut ''{0}''. Kreeg ''{1}''."
 
 msgid "Illegal numeric value for attribute ''{0}''. Got ''{1}''."
 msgstr "Ongeldige numerieke waarde voor attribuut ''{0}''. Kreeg ''{1}''."
 
-msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
-msgstr "Ongeldige Booleaanse waarde voor attribuut ''{0}''. Kreeg ''{1}''."
-
 msgid "Missing mandatory attribute ''{0}'' of XML element {1}."
 msgstr "Ontbrekend verplicht attribuut ''{0}'' van XML-element {1}."
 
@@ -14472,10 +14511,6 @@ msgstr ""
 "Scannen van bestand ''{0}'' voor informatie over plug-in mislukt. "
 "Overgeslagen."
 
-msgid "Processing plugin site cache icon files..."
-msgstr ""
-"Verwerken van bestanden voor pictogrammen in cache voor site van plug-in..."
-
 msgid "Processing plugin files..."
 msgstr "Verwerken van bestanden van plug-in..."
 
@@ -14494,12 +14529,6 @@ msgstr "JOSM kon de plug-inlijst niet downloaden:"
 msgid "Details:"
 msgstr "Details:"
 
-msgid "Plugin icons download error"
-msgstr "Fout bij downloaden pictogrammen voor plug-in"
-
-msgid "JOSM failed to download plugin icons:"
-msgstr "JOSM kon de pictogrammen voor plug-in niet downloaden:"
-
 msgid ""
 "Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
 "plugin site ''{1}''."
@@ -15581,10 +15610,10 @@ msgstr ""
 "Maken en afhandelen van adresknopen en gebouwen binnen de Tsjechische "
 "Republiek."
 
-msgid "Allows to import various file formats into JOSM directly."
+msgid ""
+"Allows to import various file formats into JOSM directly. Currently "
+"supported: TangoGPS, Garmin Trainings Center TCX."
 msgstr ""
-"Maakt het mogelijk om verschillende bestandsindelingen direct in JOSM te "
-"importeren."
 
 msgid "Download your GPX tracks from openstreetmap.org"
 msgstr "Downloaden van uw GPX-sporen vanaf openstreetmap.org"
@@ -15706,6 +15735,11 @@ msgid "A helper for IRS satellite adjustment."
 msgstr "Een hulpprogramma voor aanpassen van IRS-satelliet."
 
 msgid ""
+"Provides Java Native Access (JNA) library. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
+msgid ""
 "Provides Java Topology Suite (JTS) library and related utilities. Not meant "
 "to be installed directly by users, but rather as a dependency for other "
 "plugins."
@@ -16136,6 +16170,25 @@ msgstr "Verlicht"
 msgid "Width (meters)"
 msgstr "Breedte (meters)"
 
+msgid "Sidewalk"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "both"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "left"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "right"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "no"
+msgstr ""
+
 msgid "Service type"
 msgstr "Type Service"
 
@@ -16504,17 +16557,21 @@ msgstr ""
 msgid "May-Sep 09:30-12:30,14:15-19:30"
 msgstr ""
 
+msgctxt "parking"
 msgid "multi-storey"
-msgstr "meerlaags"
+msgstr ""
 
+msgctxt "parking"
 msgid "surface"
-msgstr "oppervlak"
+msgstr ""
 
+msgctxt "parking"
 msgid "underground"
-msgstr "ondergronds"
+msgstr ""
 
+msgctxt "parking"
 msgid "rooftop"
-msgstr "dak"
+msgstr ""
 
 msgid "Reference number"
 msgstr "Referentienummer"
@@ -16970,14 +17027,25 @@ msgstr "Max. lengte (meters)"
 msgid "Overtaking"
 msgstr "Inhalen"
 
+msgctxt "overtaking"
+msgid "yes"
+msgstr ""
+
+msgctxt "overtaking"
 msgid "both"
-msgstr "beide"
+msgstr ""
 
+msgctxt "overtaking"
 msgid "forward"
-msgstr "voorwaarts"
+msgstr ""
 
+msgctxt "overtaking"
 msgid "backward"
-msgstr "achterwaarts"
+msgstr ""
+
+msgctxt "overtaking"
+msgid "no"
+msgstr ""
 
 msgid "Roundabout"
 msgstr "Rotonde"
@@ -17285,6 +17353,12 @@ msgstr "pegasus"
 msgid "tiger"
 msgstr "tiger"
 
+msgid "Button operated"
+msgstr ""
+
+msgid "Sound signals"
+msgstr "Signalering (acoustisch)"
+
 msgid "Crossing attendant"
 msgstr "Klaar-over"
 
@@ -17806,9 +17880,6 @@ msgstr "Bewaakte spoorwegovergang"
 msgid "Traffic lights"
 msgstr "Verkeerslichten"
 
-msgid "Sound signals"
-msgstr "Signalering (acoustisch)"
-
 msgid "Barrier"
 msgstr "Barrière"
 
@@ -19869,6 +19940,9 @@ msgstr "Windmolen"
 msgid "Gasometer"
 msgstr "Olieopslag"
 
+msgid "Bunker Silo"
+msgstr ""
+
 msgid "Pipeline"
 msgstr "Pijpleiding"
 
@@ -20015,15 +20089,15 @@ msgstr "Meetstation"
 msgid "Monitoring:"
 msgstr "Meten:"
 
-msgid "Weather"
-msgstr "Weer"
-
 msgid "Water level"
 msgstr "Waterniveau"
 
 msgid "Tide Level"
 msgstr "Getijdennniveau"
 
+msgid "Groundwater"
+msgstr ""
+
 msgid "Traffic"
 msgstr "Verkeer"
 
@@ -20042,6 +20116,9 @@ msgstr "GLONASS-signalen"
 msgid "Galileo Signals"
 msgstr "Galileo-signalen"
 
+msgid "Weather"
+msgstr "Weer"
+
 msgid "Radiation"
 msgstr "Straling"
 
@@ -20222,6 +20299,9 @@ msgstr ""
 msgid "pivot_pier"
 msgstr ""
 
+msgid "Bridge outline"
+msgstr ""
+
 msgid "Power Plant"
 msgstr "Electriciteitscentrale"
 
@@ -20831,6 +20911,15 @@ msgstr ""
 msgid "Pole"
 msgstr "Electriciteitsmast"
 
+msgid "Pole with Transformer"
+msgstr ""
+
+msgid "Pole Attributes:"
+msgstr ""
+
+msgid "Transformer Attributes:"
+msgstr ""
+
 msgid "Power Line"
 msgstr "Hoogspanningskabel"
 
@@ -20880,9 +20969,15 @@ msgstr ""
 msgid "Power Cable"
 msgstr ""
 
+msgctxt "power cable"
+msgid "underground"
+msgstr ""
+
+msgctxt "power cable"
 msgid "underwater"
 msgstr ""
 
+msgctxt "power cable"
 msgid "overground"
 msgstr ""
 
@@ -20910,6 +21005,33 @@ msgstr "Monument"
 msgid "Memorial"
 msgstr "Gedenkplaats"
 
+msgctxt "memorial"
+msgid "statue"
+msgstr ""
+
+msgctxt "memorial"
+msgid "bust"
+msgstr ""
+
+msgctxt "memorial"
+msgid "plaque"
+msgstr ""
+
+msgctxt "memorial"
+msgid "stele"
+msgstr ""
+
+msgctxt "memorial"
+msgid "stone"
+msgstr ""
+
+msgctxt "memorial"
+msgid "war_memorial"
+msgstr ""
+
+msgid "Inscription"
+msgstr ""
+
 msgid "Wayside Cross"
 msgstr "Wegkruis"
 
@@ -20979,6 +21101,9 @@ msgstr "Slijterij"
 msgid "Beverages"
 msgstr "Drankwinkel"
 
+msgid "Wine"
+msgstr ""
+
 msgid "Boutique"
 msgstr "Boetiek"
 
@@ -21024,6 +21149,9 @@ msgstr "Videotheek"
 msgid "Video Games"
 msgstr ""
 
+msgid "Music"
+msgstr ""
+
 msgid "Cash"
 msgstr "Geldzaken"
 
@@ -21051,6 +21179,9 @@ msgstr "Keukenzaak"
 msgid "Curtain"
 msgstr "Gordijnenwinkel"
 
+msgid "Art"
+msgstr ""
+
 msgid "Frame"
 msgstr "Lijstenwinkel"
 
@@ -21096,6 +21227,9 @@ msgstr ""
 msgid "Beauty"
 msgstr ""
 
+msgid "Tattoo"
+msgstr ""
+
 msgid "Optician"
 msgstr "Opticien"
 
@@ -21147,6 +21281,9 @@ msgstr ""
 msgid "Pet"
 msgstr ""
 
+msgid "Funeral Directors"
+msgstr ""
+
 msgid "Vending Machine"
 msgstr ""
 
@@ -21246,6 +21383,15 @@ msgstr "Postcode"
 msgid "National Park"
 msgstr ""
 
+msgid "Protected Area"
+msgstr ""
+
+msgid "Protected Class"
+msgstr ""
+
+msgid "Title or type of protection"
+msgstr ""
+
 msgid "Places"
 msgstr "Locaties"
 
@@ -22322,7 +22468,13 @@ msgstr ""
 msgid "Estonia Ortho (Maaamet)"
 msgstr ""
 
-msgid "Estonia Multi (Maaamet)"
+msgid "Estonia Hillshade (Maaamet)"
+msgstr ""
+
+msgid "Estonia Cadastre (Maaamet)"
+msgstr ""
+
+msgid "Estonia Forestry (Maaamet)"
 msgstr ""
 
 msgid "Bordeaux - 2012"
@@ -22346,7 +22498,7 @@ msgstr ""
 msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
 msgstr ""
 
-msgid "CUGN Nancy - Orthophoto 2012"
+msgid "GrandNancy Orthophotographie 2012"
 msgstr ""
 
 msgid "Géobretagne - Brest 2010 - 10 cm"
@@ -22393,9 +22545,6 @@ msgid ""
 "- 1 m"
 msgstr ""
 
-msgid "Streets NRW Geofabrik.de"
-msgstr ""
-
 msgid "Hike & Bike"
 msgstr ""
 
@@ -22455,6 +22604,9 @@ msgstr ""
 msgid "NRW-Atlas: Topographische Karte 1:10000"
 msgstr ""
 
+msgid "Metropole Ruhr: Luftbilder (10 cm)"
+msgstr ""
+
 msgid "Drone Imagery (Haiti)"
 msgstr ""
 
@@ -22656,6 +22808,9 @@ msgstr ""
 msgid "Stadt Zürich Übersichtsplan (Strassen, Gebäude, Hausnummer)"
 msgstr ""
 
+msgid "Stadt Zürich Luftbild 2011"
+msgstr ""
+
 msgid "Orthofoto Kanton Solothurn RGB (SOGIS 2011/2012/2013)"
 msgstr ""
 
@@ -22674,7 +22829,7 @@ msgstr ""
 msgid "Canton de Fribourg 50cm (2005)"
 msgstr ""
 
-msgid "Stadt Bern 10cm/25cm (2008)"
+msgid "Stadt Bern 10cm/25cm (2012)"
 msgstr ""
 
 msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
@@ -22713,7 +22868,7 @@ msgstr ""
 msgid "OSM US TIGER 2012 Roads Overlay"
 msgstr ""
 
-msgid "New & Misaligned TIGER Roads (TIGER 2013)"
+msgid "New & Misaligned TIGER Roads (TIGER 2014)"
 msgstr ""
 
 msgid "MassGIS L3 Parcels"
@@ -22761,9 +22916,234 @@ msgstr ""
 msgid "NLS - Bartholomew Half Inch, 1897-1907"
 msgstr ""
 
+msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Annan 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgstr ""
+
 msgid "OS Town Plans, Cupar 1854 (NLS)"
 msgstr ""
 
+msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Elgin 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Forres 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Galashiels 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Girvan 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Greenock 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Haddington 1853 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Haddington 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Hamilton 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Irvine 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Jedburgh 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kelso 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Lanark 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Linlithgow 1856 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Musselburgh 1853 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Musselburgh 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Oban 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Peebles 1856 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Perth 1860 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Peterhead 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Selkirk 1865 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, St Andrews 1854 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, St Andrews 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stirling 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stonehaven 1864 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1847 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Strathaven 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wick 1872 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wigtown 1848 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wigtown 1894 (NLS)"
+msgstr ""
+
 msgid "Decreasing house numbers in addresses interpolation"
 msgstr ""
 
@@ -22817,19 +23197,39 @@ msgid "{0}={1} is deprecated. Please use instead a multipolygon."
 msgstr ""
 
 msgid ""
-"{0} is deprecated. Please specify ìnterval by using opening_hours syntax"
+"{0} is deprecated. Please specify interval by using opening_hours syntax"
 msgstr ""
 
 msgid ""
 "{0} is deprecated. Please delete this object and use a private layer instead"
 msgstr ""
 
-msgid "{0} on a node"
-msgstr "{0} op een knoop"
+msgid "{0}={1} is unspecific. Please replace ''{1}'' by a specific value."
+msgstr ""
 
-msgid "{0} on a node. Should be drawn as an area"
+msgid "{0} should be replaced with {1}"
 msgstr ""
 
+msgid ""
+"{0}={1} is unspecific. Please replace ''{1}'' by ''left'', ''right'' or "
+"''both''."
+msgstr ""
+
+msgid "{0} on a node. Should be used on a way."
+msgstr ""
+
+msgid "{0} on a node. Should be drawn as an area."
+msgstr ""
+
+msgid "{0}=* on a node. Should be used in a relation"
+msgstr ""
+
+msgid "{0} on a way. Should be used in a relation"
+msgstr ""
+
+msgid "{0} on a node"
+msgstr "{0} op een knoop"
+
 msgid "Building inside building"
 msgstr "Gebouw binnen gebouw"
 
@@ -27913,6 +28313,9 @@ msgstr "Haltes voorstellen"
 msgid "Find"
 msgstr "Zoeken"
 
+msgid "Show"
+msgstr "Weergeven"
+
 msgid "Mark"
 msgstr "Markeren"
 
diff --git a/i18n/po/nn.po b/i18n/po/nn.po
index ca5c2b1..46380ac 100644
--- a/i18n/po/nn.po
+++ b/i18n/po/nn.po
@@ -1,8 +1,13 @@
+# Norwegian Nynorsk translation for josm
+# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
+# This file is distributed under the same license as the josm package.
+# FIRST AUTHOR <EMAIL at ADDRESS>, 2009.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-21 03:38+0200\n"
+"POT-Creation-Date: 2014-12-10 03:42+0100\n"
 "PO-Revision-Date: 2009-07-15 12:49+0000\n"
 "Last-Translator: Skippern <Unknown>\n"
 "Language-Team: Norwegian Nynorsk <nn at li.org>\n"
@@ -10,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-10-21 05:11+0000\n"
-"X-Generator: Launchpad (build 17203)\n"
+"X-Launchpad-Export-Date: 2014-12-10 05:02+0000\n"
+"X-Generator: Launchpad (build 17283)\n"
 "Language: nn\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -168,16 +173,6 @@ msgid "About JOSM..."
 msgstr "Om JOSM"
 
 msgid ""
-"Unexpected format of API base URL. Redirection to info or history page for "
-"OSM object will probably fail. API base URL is: ''{0}''"
-msgstr ""
-
-msgid ""
-"Unexpected format of API base URL. Redirection to user page for OSM user "
-"will probably fail. API base URL is: ''{0}''"
-msgstr ""
-
-msgid ""
 "You are about to launch {0} browser window.<br>This may both clutter your "
 "screen with browser windows<br>and take some time to finish."
 msgid_plural ""
@@ -1519,6 +1514,15 @@ msgstr ""
 msgid "Nothing to upload. Get some data first."
 msgstr ""
 
+msgid "Upload note changes to server"
+msgstr ""
+
+msgid "Upload notes"
+msgstr ""
+
+msgid "Uploading notes to server"
+msgstr ""
+
 msgid "Upload selection"
 msgstr ""
 
@@ -1791,10 +1795,16 @@ msgstr ""
 msgid "Click the location where you wish to create a new note"
 msgstr ""
 
-msgid "Enter a comment for a new note"
+msgid "Create new note"
 msgstr ""
 
-msgid "Create new note"
+msgid "Create note"
+msgstr ""
+
+msgid "Enter a detailed comment to create a note"
+msgstr ""
+
+msgid "You must enter a comment to create a new note"
 msgstr ""
 
 msgid "Delete Mode"
@@ -2665,6 +2675,15 @@ msgstr ""
 msgid "Cycling dependencies"
 msgstr ""
 
+msgid "Uploading modified notes"
+msgstr ""
+
+msgid "Note {0} failed: {1}"
+msgstr ""
+
+msgid "Notes failed to upload"
+msgstr ""
+
 msgid ""
 "The following are results of automatic validation. Try fixing these, but be "
 "careful (don''t destroy valid data). When in doubt ignore them.<br>When you "
@@ -4894,6 +4913,12 @@ msgstr ""
 msgid "Conflict foreground: keep all tags"
 msgstr ""
 
+msgid "Conflict background: sum all numeric tags"
+msgstr ""
+
+msgid "Conflict foreground: sum all numeric tags"
+msgstr ""
+
 msgid "Conflict background: keep member"
 msgstr ""
 
@@ -5312,12 +5337,19 @@ msgstr ""
 msgid "all"
 msgstr ""
 
+msgid "sum"
+msgstr ""
+
 msgid "Please decide which values to keep"
 msgstr ""
 
 msgid "Value ''{0}'' is going to be applied for key ''{1}''"
 msgstr ""
 
+msgid ""
+"All numeric values sumed as ''{0}'' are going to be applied for key ''{1}''"
+msgstr ""
+
 msgid "The key ''{0}'' and all its values are going to be removed"
 msgstr ""
 
@@ -5680,24 +5712,6 @@ msgstr[1] ""
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
 
-msgid "Display the history of all selected items."
-msgstr ""
-
-msgid "Object with history"
-msgstr ""
-
-msgid "Reload"
-msgstr ""
-
-msgid "Reload all currently selected objects and refresh the list."
-msgstr ""
-
-msgid "Show"
-msgstr ""
-
-msgid "Display the history of the selected objects."
-msgstr ""
-
 msgid "Advanced object info"
 msgstr ""
 
@@ -6035,6 +6049,9 @@ msgstr ""
 msgid "Comment"
 msgstr ""
 
+msgid "Comment on note"
+msgstr ""
+
 msgid "Add comment to note:"
 msgstr ""
 
@@ -6044,9 +6061,6 @@ msgstr ""
 msgid "Close note with message:"
 msgstr ""
 
-msgid "Close Note"
-msgstr ""
-
 msgid "Create a new note"
 msgstr ""
 
@@ -6119,6 +6133,9 @@ msgstr ""
 msgid "Search for objects"
 msgstr ""
 
+msgid "Display the history of the selected objects."
+msgstr ""
+
 msgid "Zoom to selection"
 msgstr ""
 
@@ -6238,6 +6255,9 @@ msgstr ""
 msgid "Updating map ..."
 msgstr ""
 
+msgid "anonymous"
+msgstr ""
+
 msgid "Display the basic properties of the changeset"
 msgstr ""
 
@@ -6250,6 +6270,12 @@ msgstr ""
 msgid "Display the objects created, updated, and deleted by the changeset"
 msgstr ""
 
+msgid "Discussion"
+msgstr ""
+
+msgid "Display the public discussion around this changeset"
+msgstr ""
+
 msgid "Changeset Management Dialog"
 msgstr ""
 
@@ -6307,9 +6333,6 @@ msgctxt "changeset.state"
 msgid "Closed"
 msgstr ""
 
-msgid "anonymous"
-msgstr ""
-
 msgid "ID"
 msgstr ""
 
@@ -6325,6 +6348,9 @@ msgstr ""
 msgid "Closed at"
 msgstr ""
 
+msgid "Discussions"
+msgstr ""
+
 msgid "Downloading changeset content"
 msgstr ""
 
@@ -6436,6 +6462,15 @@ msgid ""
 "layer"
 msgstr ""
 
+msgid "Update changeset discussion"
+msgstr ""
+
+msgid "Update the changeset discussion from the OSM server"
+msgstr ""
+
+msgid "Date"
+msgstr ""
+
 msgid "Download changesets"
 msgstr ""
 
@@ -6853,7 +6888,7 @@ msgstr ""
 msgid "Set number of recently added tags"
 msgstr ""
 
-msgid "Remember last used tags"
+msgid "Remember last used tags after a restart"
 msgstr ""
 
 msgid "Please enter the number of recently added tags to display"
@@ -7199,6 +7234,9 @@ msgstr ""
 msgid "Load parent relations"
 msgstr ""
 
+msgid "Reload"
+msgstr ""
+
 msgid "Loading parent relations"
 msgstr ""
 
@@ -7321,6 +7359,12 @@ msgstr ""
 msgid "Select to download GPS traces in the selected download area."
 msgstr ""
 
+msgid "Notes"
+msgstr ""
+
+msgid "Select to download notes in the selected download area."
+msgstr ""
+
 msgid "Download as new layer"
 msgstr ""
 
@@ -7626,9 +7670,6 @@ msgstr ""
 msgid "B"
 msgstr ""
 
-msgid "Date"
-msgstr ""
-
 msgid ""
 "Failed to update primitive with id {0} because current edit layer is null"
 msgstr ""
@@ -8483,9 +8524,6 @@ msgstr ""
 msgid "Save Layer"
 msgstr ""
 
-msgid "Notes"
-msgstr ""
-
 msgid "Notes layer"
 msgstr ""
 
@@ -8501,9 +8539,6 @@ msgstr ""
 msgid "outside downloaded area"
 msgstr ""
 
-msgid "version {0}"
-msgstr ""
-
 msgid "Merging layers"
 msgstr ""
 
@@ -12129,6 +12164,15 @@ msgstr ""
 msgid "Open changeset expected. Got closed changeset with id {0}."
 msgstr ""
 
+msgid "Note upload failed"
+msgstr ""
+
+msgid "Error parsing note response from server"
+msgstr ""
+
+msgid "Error encoding string: {0}"
+msgstr ""
+
 msgid "(Code={0})"
 msgstr ""
 
@@ -12177,13 +12221,13 @@ msgstr ""
 msgid "Parsing changeset content ..."
 msgstr ""
 
-msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
-msgid "Illegal numeric value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
-msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal numeric value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
 msgid "Missing mandatory attribute ''{0}'' of XML element {1}."
@@ -12975,9 +13019,6 @@ msgstr ""
 msgid "Failed to scan file ''{0}'' for plugin information. Skipping."
 msgstr ""
 
-msgid "Processing plugin site cache icon files..."
-msgstr ""
-
 msgid "Processing plugin files..."
 msgstr ""
 
@@ -12996,12 +13037,6 @@ msgstr ""
 msgid "Details:"
 msgstr ""
 
-msgid "Plugin icons download error"
-msgstr ""
-
-msgid "JOSM failed to download plugin icons:"
-msgstr ""
-
 msgid ""
 "Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
 "plugin site ''{1}''."
@@ -13887,7 +13922,9 @@ msgid ""
 "Creating and handling address nodes and buildings within Czech Republic."
 msgstr ""
 
-msgid "Allows to import various file formats into JOSM directly."
+msgid ""
+"Allows to import various file formats into JOSM directly. Currently "
+"supported: TangoGPS, Garmin Trainings Center TCX."
 msgstr ""
 
 msgid "Download your GPX tracks from openstreetmap.org"
@@ -13984,6 +14021,11 @@ msgid "A helper for IRS satellite adjustment."
 msgstr ""
 
 msgid ""
+"Provides Java Native Access (JNA) library. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
+msgid ""
 "Provides Java Topology Suite (JTS) library and related utilities. Not meant "
 "to be installed directly by users, but rather as a dependency for other "
 "plugins."
@@ -14339,6 +14381,25 @@ msgstr ""
 msgid "Width (meters)"
 msgstr ""
 
+msgid "Sidewalk"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "both"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "left"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "right"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "no"
+msgstr ""
+
 msgid "Service type"
 msgstr ""
 
@@ -14703,15 +14764,19 @@ msgstr ""
 msgid "May-Sep 09:30-12:30,14:15-19:30"
 msgstr ""
 
+msgctxt "parking"
 msgid "multi-storey"
 msgstr ""
 
+msgctxt "parking"
 msgid "surface"
 msgstr ""
 
+msgctxt "parking"
 msgid "underground"
 msgstr ""
 
+msgctxt "parking"
 msgid "rooftop"
 msgstr ""
 
@@ -15169,15 +15234,26 @@ msgstr ""
 msgid "Overtaking"
 msgstr ""
 
+msgctxt "overtaking"
+msgid "yes"
+msgstr ""
+
+msgctxt "overtaking"
 msgid "both"
 msgstr ""
 
+msgctxt "overtaking"
 msgid "forward"
 msgstr ""
 
+msgctxt "overtaking"
 msgid "backward"
 msgstr ""
 
+msgctxt "overtaking"
+msgid "no"
+msgstr ""
+
 msgid "Roundabout"
 msgstr ""
 
@@ -15471,6 +15547,12 @@ msgstr ""
 msgid "tiger"
 msgstr ""
 
+msgid "Button operated"
+msgstr ""
+
+msgid "Sound signals"
+msgstr ""
+
 msgid "Crossing attendant"
 msgstr ""
 
@@ -15992,9 +16074,6 @@ msgstr ""
 msgid "Traffic lights"
 msgstr ""
 
-msgid "Sound signals"
-msgstr ""
-
 msgid "Barrier"
 msgstr ""
 
@@ -18054,6 +18133,9 @@ msgstr ""
 msgid "Gasometer"
 msgstr ""
 
+msgid "Bunker Silo"
+msgstr ""
+
 msgid "Pipeline"
 msgstr ""
 
@@ -18200,15 +18282,15 @@ msgstr ""
 msgid "Monitoring:"
 msgstr ""
 
-msgid "Weather"
-msgstr ""
-
 msgid "Water level"
 msgstr ""
 
 msgid "Tide Level"
 msgstr ""
 
+msgid "Groundwater"
+msgstr ""
+
 msgid "Traffic"
 msgstr ""
 
@@ -18227,6 +18309,9 @@ msgstr ""
 msgid "Galileo Signals"
 msgstr ""
 
+msgid "Weather"
+msgstr ""
+
 msgid "Radiation"
 msgstr ""
 
@@ -18407,6 +18492,9 @@ msgstr ""
 msgid "pivot_pier"
 msgstr ""
 
+msgid "Bridge outline"
+msgstr ""
+
 msgid "Power Plant"
 msgstr ""
 
@@ -19014,6 +19102,15 @@ msgstr ""
 msgid "Pole"
 msgstr ""
 
+msgid "Pole with Transformer"
+msgstr ""
+
+msgid "Pole Attributes:"
+msgstr ""
+
+msgid "Transformer Attributes:"
+msgstr ""
+
 msgid "Power Line"
 msgstr ""
 
@@ -19063,9 +19160,15 @@ msgstr ""
 msgid "Power Cable"
 msgstr ""
 
+msgctxt "power cable"
+msgid "underground"
+msgstr ""
+
+msgctxt "power cable"
 msgid "underwater"
 msgstr ""
 
+msgctxt "power cable"
 msgid "overground"
 msgstr ""
 
@@ -19093,6 +19196,33 @@ msgstr ""
 msgid "Memorial"
 msgstr ""
 
+msgctxt "memorial"
+msgid "statue"
+msgstr ""
+
+msgctxt "memorial"
+msgid "bust"
+msgstr ""
+
+msgctxt "memorial"
+msgid "plaque"
+msgstr ""
+
+msgctxt "memorial"
+msgid "stele"
+msgstr ""
+
+msgctxt "memorial"
+msgid "stone"
+msgstr ""
+
+msgctxt "memorial"
+msgid "war_memorial"
+msgstr ""
+
+msgid "Inscription"
+msgstr ""
+
 msgid "Wayside Cross"
 msgstr ""
 
@@ -19162,6 +19292,9 @@ msgstr ""
 msgid "Beverages"
 msgstr ""
 
+msgid "Wine"
+msgstr ""
+
 msgid "Boutique"
 msgstr ""
 
@@ -19207,6 +19340,9 @@ msgstr ""
 msgid "Video Games"
 msgstr ""
 
+msgid "Music"
+msgstr ""
+
 msgid "Cash"
 msgstr ""
 
@@ -19234,6 +19370,9 @@ msgstr ""
 msgid "Curtain"
 msgstr ""
 
+msgid "Art"
+msgstr ""
+
 msgid "Frame"
 msgstr ""
 
@@ -19279,6 +19418,9 @@ msgstr ""
 msgid "Beauty"
 msgstr ""
 
+msgid "Tattoo"
+msgstr ""
+
 msgid "Optician"
 msgstr ""
 
@@ -19330,6 +19472,9 @@ msgstr ""
 msgid "Pet"
 msgstr ""
 
+msgid "Funeral Directors"
+msgstr ""
+
 msgid "Vending Machine"
 msgstr ""
 
@@ -19429,6 +19574,15 @@ msgstr ""
 msgid "National Park"
 msgstr ""
 
+msgid "Protected Area"
+msgstr ""
+
+msgid "Protected Class"
+msgstr ""
+
+msgid "Title or type of protection"
+msgstr ""
+
 msgid "Places"
 msgstr ""
 
@@ -20505,7 +20659,13 @@ msgstr ""
 msgid "Estonia Ortho (Maaamet)"
 msgstr ""
 
-msgid "Estonia Multi (Maaamet)"
+msgid "Estonia Hillshade (Maaamet)"
+msgstr ""
+
+msgid "Estonia Cadastre (Maaamet)"
+msgstr ""
+
+msgid "Estonia Forestry (Maaamet)"
 msgstr ""
 
 msgid "Bordeaux - 2012"
@@ -20529,7 +20689,7 @@ msgstr ""
 msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
 msgstr ""
 
-msgid "CUGN Nancy - Orthophoto 2012"
+msgid "GrandNancy Orthophotographie 2012"
 msgstr ""
 
 msgid "Géobretagne - Brest 2010 - 10 cm"
@@ -20576,9 +20736,6 @@ msgid ""
 "- 1 m"
 msgstr ""
 
-msgid "Streets NRW Geofabrik.de"
-msgstr ""
-
 msgid "Hike & Bike"
 msgstr ""
 
@@ -20638,6 +20795,9 @@ msgstr ""
 msgid "NRW-Atlas: Topographische Karte 1:10000"
 msgstr ""
 
+msgid "Metropole Ruhr: Luftbilder (10 cm)"
+msgstr ""
+
 msgid "Drone Imagery (Haiti)"
 msgstr ""
 
@@ -20839,6 +20999,9 @@ msgstr ""
 msgid "Stadt Zürich Übersichtsplan (Strassen, Gebäude, Hausnummer)"
 msgstr ""
 
+msgid "Stadt Zürich Luftbild 2011"
+msgstr ""
+
 msgid "Orthofoto Kanton Solothurn RGB (SOGIS 2011/2012/2013)"
 msgstr ""
 
@@ -20857,7 +21020,7 @@ msgstr ""
 msgid "Canton de Fribourg 50cm (2005)"
 msgstr ""
 
-msgid "Stadt Bern 10cm/25cm (2008)"
+msgid "Stadt Bern 10cm/25cm (2012)"
 msgstr ""
 
 msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
@@ -20896,7 +21059,7 @@ msgstr ""
 msgid "OSM US TIGER 2012 Roads Overlay"
 msgstr ""
 
-msgid "New & Misaligned TIGER Roads (TIGER 2013)"
+msgid "New & Misaligned TIGER Roads (TIGER 2014)"
 msgstr ""
 
 msgid "MassGIS L3 Parcels"
@@ -20944,9 +21107,234 @@ msgstr ""
 msgid "NLS - Bartholomew Half Inch, 1897-1907"
 msgstr ""
 
+msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Annan 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgstr ""
+
 msgid "OS Town Plans, Cupar 1854 (NLS)"
 msgstr ""
 
+msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Elgin 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Forres 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Galashiels 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Girvan 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Greenock 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Haddington 1853 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Haddington 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Hamilton 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Irvine 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Jedburgh 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kelso 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Lanark 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Linlithgow 1856 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Musselburgh 1853 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Musselburgh 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Oban 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Peebles 1856 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Perth 1860 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Peterhead 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Selkirk 1865 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, St Andrews 1854 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, St Andrews 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stirling 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stonehaven 1864 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1847 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Strathaven 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wick 1872 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wigtown 1848 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wigtown 1894 (NLS)"
+msgstr ""
+
 msgid "Decreasing house numbers in addresses interpolation"
 msgstr ""
 
@@ -21000,17 +21388,37 @@ msgid "{0}={1} is deprecated. Please use instead a multipolygon."
 msgstr ""
 
 msgid ""
-"{0} is deprecated. Please specify ìnterval by using opening_hours syntax"
+"{0} is deprecated. Please specify interval by using opening_hours syntax"
 msgstr ""
 
 msgid ""
 "{0} is deprecated. Please delete this object and use a private layer instead"
 msgstr ""
 
-msgid "{0} on a node"
+msgid "{0}={1} is unspecific. Please replace ''{1}'' by a specific value."
 msgstr ""
 
-msgid "{0} on a node. Should be drawn as an area"
+msgid "{0} should be replaced with {1}"
+msgstr ""
+
+msgid ""
+"{0}={1} is unspecific. Please replace ''{1}'' by ''left'', ''right'' or "
+"''both''."
+msgstr ""
+
+msgid "{0} on a node. Should be used on a way."
+msgstr ""
+
+msgid "{0} on a node. Should be drawn as an area."
+msgstr ""
+
+msgid "{0}=* on a node. Should be used in a relation"
+msgstr ""
+
+msgid "{0} on a way. Should be used in a relation"
+msgstr ""
+
+msgid "{0} on a node"
 msgstr ""
 
 msgid "Building inside building"
@@ -25680,6 +26088,9 @@ msgstr ""
 msgid "Find"
 msgstr ""
 
+msgid "Show"
+msgstr ""
+
 msgid "Mark"
 msgstr ""
 
diff --git a/i18n/po/oc.po b/i18n/po/oc.po
index 8cc173a..8671343 100644
--- a/i18n/po/oc.po
+++ b/i18n/po/oc.po
@@ -1,8 +1,13 @@
+# Occitan (post 1500) translation for josm
+# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
+# This file is distributed under the same license as the josm package.
+# FIRST AUTHOR <EMAIL at ADDRESS>, 2009.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-21 03:38+0200\n"
+"POT-Creation-Date: 2014-12-10 03:42+0100\n"
 "PO-Revision-Date: 2012-10-03 22:14+0000\n"
 "Last-Translator: Cédric VALMARY (Tot en òc) <cvalmary at yahoo.fr>\n"
 "Language-Team: Occitan (post 1500) <oc at li.org>\n"
@@ -10,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-10-21 05:12+0000\n"
-"X-Generator: Launchpad (build 17203)\n"
+"X-Launchpad-Export-Date: 2014-12-10 05:04+0000\n"
+"X-Generator: Launchpad (build 17283)\n"
 "Language: \n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -169,16 +174,6 @@ msgid "About JOSM..."
 msgstr "A prepaus de JOSM..."
 
 msgid ""
-"Unexpected format of API base URL. Redirection to info or history page for "
-"OSM object will probably fail. API base URL is: ''{0}''"
-msgstr ""
-
-msgid ""
-"Unexpected format of API base URL. Redirection to user page for OSM user "
-"will probably fail. API base URL is: ''{0}''"
-msgstr ""
-
-msgid ""
 "You are about to launch {0} browser window.<br>This may both clutter your "
 "screen with browser windows<br>and take some time to finish."
 msgid_plural ""
@@ -1526,6 +1521,15 @@ msgstr ""
 msgid "Nothing to upload. Get some data first."
 msgstr ""
 
+msgid "Upload note changes to server"
+msgstr ""
+
+msgid "Upload notes"
+msgstr ""
+
+msgid "Uploading notes to server"
+msgstr ""
+
 msgid "Upload selection"
 msgstr "Mandar la seleccion"
 
@@ -1798,10 +1802,16 @@ msgstr ""
 msgid "Click the location where you wish to create a new note"
 msgstr ""
 
-msgid "Enter a comment for a new note"
+msgid "Create new note"
 msgstr ""
 
-msgid "Create new note"
+msgid "Create note"
+msgstr ""
+
+msgid "Enter a detailed comment to create a note"
+msgstr ""
+
+msgid "You must enter a comment to create a new note"
 msgstr ""
 
 msgid "Delete Mode"
@@ -2672,6 +2682,15 @@ msgstr ""
 msgid "Cycling dependencies"
 msgstr ""
 
+msgid "Uploading modified notes"
+msgstr ""
+
+msgid "Note {0} failed: {1}"
+msgstr ""
+
+msgid "Notes failed to upload"
+msgstr ""
+
 msgid ""
 "The following are results of automatic validation. Try fixing these, but be "
 "careful (don''t destroy valid data). When in doubt ignore them.<br>When you "
@@ -4901,6 +4920,12 @@ msgstr ""
 msgid "Conflict foreground: keep all tags"
 msgstr ""
 
+msgid "Conflict background: sum all numeric tags"
+msgstr ""
+
+msgid "Conflict foreground: sum all numeric tags"
+msgstr ""
+
 msgid "Conflict background: keep member"
 msgstr ""
 
@@ -5319,12 +5344,19 @@ msgstr "pas cap"
 msgid "all"
 msgstr "totas"
 
+msgid "sum"
+msgstr ""
+
 msgid "Please decide which values to keep"
 msgstr ""
 
 msgid "Value ''{0}'' is going to be applied for key ''{1}''"
 msgstr ""
 
+msgid ""
+"All numeric values sumed as ''{0}'' are going to be applied for key ''{1}''"
+msgstr ""
+
 msgid "The key ''{0}'' and all its values are going to be removed"
 msgstr ""
 
@@ -5687,24 +5719,6 @@ msgstr[1] ""
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
 
-msgid "Display the history of all selected items."
-msgstr ""
-
-msgid "Object with history"
-msgstr ""
-
-msgid "Reload"
-msgstr "Tornar cargar"
-
-msgid "Reload all currently selected objects and refresh the list."
-msgstr ""
-
-msgid "Show"
-msgstr "Afichar"
-
-msgid "Display the history of the selected objects."
-msgstr ""
-
 msgid "Advanced object info"
 msgstr ""
 
@@ -6042,6 +6056,9 @@ msgstr ""
 msgid "Comment"
 msgstr "Comentari"
 
+msgid "Comment on note"
+msgstr ""
+
 msgid "Add comment to note:"
 msgstr ""
 
@@ -6051,9 +6068,6 @@ msgstr ""
 msgid "Close note with message:"
 msgstr ""
 
-msgid "Close Note"
-msgstr ""
-
 msgid "Create a new note"
 msgstr ""
 
@@ -6126,6 +6140,9 @@ msgstr ""
 msgid "Search for objects"
 msgstr ""
 
+msgid "Display the history of the selected objects."
+msgstr ""
+
 msgid "Zoom to selection"
 msgstr ""
 
@@ -6245,6 +6262,9 @@ msgstr ""
 msgid "Updating map ..."
 msgstr ""
 
+msgid "anonymous"
+msgstr "anonime"
+
 msgid "Display the basic properties of the changeset"
 msgstr ""
 
@@ -6257,6 +6277,12 @@ msgstr "Contengut"
 msgid "Display the objects created, updated, and deleted by the changeset"
 msgstr ""
 
+msgid "Discussion"
+msgstr ""
+
+msgid "Display the public discussion around this changeset"
+msgstr ""
+
 msgid "Changeset Management Dialog"
 msgstr ""
 
@@ -6314,9 +6340,6 @@ msgctxt "changeset.state"
 msgid "Closed"
 msgstr "Tampat"
 
-msgid "anonymous"
-msgstr "anonime"
-
 msgid "ID"
 msgstr "Identificant (ID)"
 
@@ -6332,6 +6355,9 @@ msgstr ""
 msgid "Closed at"
 msgstr ""
 
+msgid "Discussions"
+msgstr ""
+
 msgid "Downloading changeset content"
 msgstr ""
 
@@ -6443,6 +6469,15 @@ msgid ""
 "layer"
 msgstr ""
 
+msgid "Update changeset discussion"
+msgstr ""
+
+msgid "Update the changeset discussion from the OSM server"
+msgstr ""
+
+msgid "Date"
+msgstr ""
+
 msgid "Download changesets"
 msgstr ""
 
@@ -6860,7 +6895,7 @@ msgstr ""
 msgid "Set number of recently added tags"
 msgstr ""
 
-msgid "Remember last used tags"
+msgid "Remember last used tags after a restart"
 msgstr ""
 
 msgid "Please enter the number of recently added tags to display"
@@ -7206,6 +7241,9 @@ msgstr ""
 msgid "Load parent relations"
 msgstr ""
 
+msgid "Reload"
+msgstr "Tornar cargar"
+
 msgid "Loading parent relations"
 msgstr ""
 
@@ -7328,6 +7366,12 @@ msgstr ""
 msgid "Select to download GPS traces in the selected download area."
 msgstr ""
 
+msgid "Notes"
+msgstr ""
+
+msgid "Select to download notes in the selected download area."
+msgstr ""
+
 msgid "Download as new layer"
 msgstr ""
 
@@ -7633,9 +7677,6 @@ msgstr ""
 msgid "B"
 msgstr ""
 
-msgid "Date"
-msgstr ""
-
 msgid ""
 "Failed to update primitive with id {0} because current edit layer is null"
 msgstr ""
@@ -8490,9 +8531,6 @@ msgstr ""
 msgid "Save Layer"
 msgstr "Salvar lo calc"
 
-msgid "Notes"
-msgstr ""
-
 msgid "Notes layer"
 msgstr ""
 
@@ -8508,9 +8546,6 @@ msgstr ""
 msgid "outside downloaded area"
 msgstr ""
 
-msgid "version {0}"
-msgstr "version {0}"
-
 msgid "Merging layers"
 msgstr ""
 
@@ -12140,6 +12175,15 @@ msgstr ""
 msgid "Open changeset expected. Got closed changeset with id {0}."
 msgstr ""
 
+msgid "Note upload failed"
+msgstr ""
+
+msgid "Error parsing note response from server"
+msgstr ""
+
+msgid "Error encoding string: {0}"
+msgstr ""
+
 msgid "(Code={0})"
 msgstr ""
 
@@ -12188,13 +12232,13 @@ msgstr ""
 msgid "Parsing changeset content ..."
 msgstr ""
 
-msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
-msgid "Illegal numeric value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
-msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal numeric value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
 msgid "Missing mandatory attribute ''{0}'' of XML element {1}."
@@ -12986,9 +13030,6 @@ msgstr ""
 msgid "Failed to scan file ''{0}'' for plugin information. Skipping."
 msgstr ""
 
-msgid "Processing plugin site cache icon files..."
-msgstr ""
-
 msgid "Processing plugin files..."
 msgstr ""
 
@@ -13007,12 +13048,6 @@ msgstr ""
 msgid "Details:"
 msgstr ""
 
-msgid "Plugin icons download error"
-msgstr ""
-
-msgid "JOSM failed to download plugin icons:"
-msgstr ""
-
 msgid ""
 "Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
 "plugin site ''{1}''."
@@ -13898,7 +13933,9 @@ msgid ""
 "Creating and handling address nodes and buildings within Czech Republic."
 msgstr ""
 
-msgid "Allows to import various file formats into JOSM directly."
+msgid ""
+"Allows to import various file formats into JOSM directly. Currently "
+"supported: TangoGPS, Garmin Trainings Center TCX."
 msgstr ""
 
 msgid "Download your GPX tracks from openstreetmap.org"
@@ -13995,6 +14032,11 @@ msgid "A helper for IRS satellite adjustment."
 msgstr ""
 
 msgid ""
+"Provides Java Native Access (JNA) library. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
+msgid ""
 "Provides Java Topology Suite (JTS) library and related utilities. Not meant "
 "to be installed directly by users, but rather as a dependency for other "
 "plugins."
@@ -14350,6 +14392,25 @@ msgstr ""
 msgid "Width (meters)"
 msgstr ""
 
+msgid "Sidewalk"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "both"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "left"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "right"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "no"
+msgstr ""
+
 msgid "Service type"
 msgstr ""
 
@@ -14714,15 +14775,19 @@ msgstr ""
 msgid "May-Sep 09:30-12:30,14:15-19:30"
 msgstr ""
 
+msgctxt "parking"
 msgid "multi-storey"
 msgstr ""
 
+msgctxt "parking"
 msgid "surface"
 msgstr ""
 
+msgctxt "parking"
 msgid "underground"
 msgstr ""
 
+msgctxt "parking"
 msgid "rooftop"
 msgstr ""
 
@@ -15180,15 +15245,26 @@ msgstr ""
 msgid "Overtaking"
 msgstr ""
 
+msgctxt "overtaking"
+msgid "yes"
+msgstr ""
+
+msgctxt "overtaking"
 msgid "both"
 msgstr ""
 
+msgctxt "overtaking"
 msgid "forward"
 msgstr ""
 
+msgctxt "overtaking"
 msgid "backward"
 msgstr ""
 
+msgctxt "overtaking"
+msgid "no"
+msgstr ""
+
 msgid "Roundabout"
 msgstr ""
 
@@ -15482,6 +15558,12 @@ msgstr ""
 msgid "tiger"
 msgstr ""
 
+msgid "Button operated"
+msgstr ""
+
+msgid "Sound signals"
+msgstr ""
+
 msgid "Crossing attendant"
 msgstr ""
 
@@ -16003,9 +16085,6 @@ msgstr ""
 msgid "Traffic lights"
 msgstr ""
 
-msgid "Sound signals"
-msgstr ""
-
 msgid "Barrier"
 msgstr ""
 
@@ -18065,6 +18144,9 @@ msgstr ""
 msgid "Gasometer"
 msgstr ""
 
+msgid "Bunker Silo"
+msgstr ""
+
 msgid "Pipeline"
 msgstr ""
 
@@ -18211,15 +18293,15 @@ msgstr ""
 msgid "Monitoring:"
 msgstr ""
 
-msgid "Weather"
-msgstr ""
-
 msgid "Water level"
 msgstr ""
 
 msgid "Tide Level"
 msgstr ""
 
+msgid "Groundwater"
+msgstr ""
+
 msgid "Traffic"
 msgstr ""
 
@@ -18238,6 +18320,9 @@ msgstr ""
 msgid "Galileo Signals"
 msgstr ""
 
+msgid "Weather"
+msgstr ""
+
 msgid "Radiation"
 msgstr ""
 
@@ -18418,6 +18503,9 @@ msgstr ""
 msgid "pivot_pier"
 msgstr ""
 
+msgid "Bridge outline"
+msgstr ""
+
 msgid "Power Plant"
 msgstr ""
 
@@ -19025,6 +19113,15 @@ msgstr ""
 msgid "Pole"
 msgstr ""
 
+msgid "Pole with Transformer"
+msgstr ""
+
+msgid "Pole Attributes:"
+msgstr ""
+
+msgid "Transformer Attributes:"
+msgstr ""
+
 msgid "Power Line"
 msgstr ""
 
@@ -19074,9 +19171,15 @@ msgstr ""
 msgid "Power Cable"
 msgstr ""
 
+msgctxt "power cable"
+msgid "underground"
+msgstr ""
+
+msgctxt "power cable"
 msgid "underwater"
 msgstr ""
 
+msgctxt "power cable"
 msgid "overground"
 msgstr ""
 
@@ -19104,6 +19207,33 @@ msgstr ""
 msgid "Memorial"
 msgstr ""
 
+msgctxt "memorial"
+msgid "statue"
+msgstr ""
+
+msgctxt "memorial"
+msgid "bust"
+msgstr ""
+
+msgctxt "memorial"
+msgid "plaque"
+msgstr ""
+
+msgctxt "memorial"
+msgid "stele"
+msgstr ""
+
+msgctxt "memorial"
+msgid "stone"
+msgstr ""
+
+msgctxt "memorial"
+msgid "war_memorial"
+msgstr ""
+
+msgid "Inscription"
+msgstr ""
+
 msgid "Wayside Cross"
 msgstr ""
 
@@ -19173,6 +19303,9 @@ msgstr ""
 msgid "Beverages"
 msgstr ""
 
+msgid "Wine"
+msgstr ""
+
 msgid "Boutique"
 msgstr ""
 
@@ -19218,6 +19351,9 @@ msgstr ""
 msgid "Video Games"
 msgstr ""
 
+msgid "Music"
+msgstr ""
+
 msgid "Cash"
 msgstr ""
 
@@ -19245,6 +19381,9 @@ msgstr ""
 msgid "Curtain"
 msgstr ""
 
+msgid "Art"
+msgstr ""
+
 msgid "Frame"
 msgstr ""
 
@@ -19290,6 +19429,9 @@ msgstr ""
 msgid "Beauty"
 msgstr ""
 
+msgid "Tattoo"
+msgstr ""
+
 msgid "Optician"
 msgstr ""
 
@@ -19341,6 +19483,9 @@ msgstr ""
 msgid "Pet"
 msgstr ""
 
+msgid "Funeral Directors"
+msgstr ""
+
 msgid "Vending Machine"
 msgstr ""
 
@@ -19440,6 +19585,15 @@ msgstr ""
 msgid "National Park"
 msgstr ""
 
+msgid "Protected Area"
+msgstr ""
+
+msgid "Protected Class"
+msgstr ""
+
+msgid "Title or type of protection"
+msgstr ""
+
 msgid "Places"
 msgstr ""
 
@@ -20516,7 +20670,13 @@ msgstr ""
 msgid "Estonia Ortho (Maaamet)"
 msgstr ""
 
-msgid "Estonia Multi (Maaamet)"
+msgid "Estonia Hillshade (Maaamet)"
+msgstr ""
+
+msgid "Estonia Cadastre (Maaamet)"
+msgstr ""
+
+msgid "Estonia Forestry (Maaamet)"
 msgstr ""
 
 msgid "Bordeaux - 2012"
@@ -20540,7 +20700,7 @@ msgstr ""
 msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
 msgstr ""
 
-msgid "CUGN Nancy - Orthophoto 2012"
+msgid "GrandNancy Orthophotographie 2012"
 msgstr ""
 
 msgid "Géobretagne - Brest 2010 - 10 cm"
@@ -20587,9 +20747,6 @@ msgid ""
 "- 1 m"
 msgstr ""
 
-msgid "Streets NRW Geofabrik.de"
-msgstr ""
-
 msgid "Hike & Bike"
 msgstr ""
 
@@ -20649,6 +20806,9 @@ msgstr ""
 msgid "NRW-Atlas: Topographische Karte 1:10000"
 msgstr ""
 
+msgid "Metropole Ruhr: Luftbilder (10 cm)"
+msgstr ""
+
 msgid "Drone Imagery (Haiti)"
 msgstr ""
 
@@ -20850,6 +21010,9 @@ msgstr ""
 msgid "Stadt Zürich Übersichtsplan (Strassen, Gebäude, Hausnummer)"
 msgstr ""
 
+msgid "Stadt Zürich Luftbild 2011"
+msgstr ""
+
 msgid "Orthofoto Kanton Solothurn RGB (SOGIS 2011/2012/2013)"
 msgstr ""
 
@@ -20868,7 +21031,7 @@ msgstr ""
 msgid "Canton de Fribourg 50cm (2005)"
 msgstr ""
 
-msgid "Stadt Bern 10cm/25cm (2008)"
+msgid "Stadt Bern 10cm/25cm (2012)"
 msgstr ""
 
 msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
@@ -20907,7 +21070,7 @@ msgstr ""
 msgid "OSM US TIGER 2012 Roads Overlay"
 msgstr ""
 
-msgid "New & Misaligned TIGER Roads (TIGER 2013)"
+msgid "New & Misaligned TIGER Roads (TIGER 2014)"
 msgstr ""
 
 msgid "MassGIS L3 Parcels"
@@ -20955,9 +21118,234 @@ msgstr ""
 msgid "NLS - Bartholomew Half Inch, 1897-1907"
 msgstr ""
 
+msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Annan 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgstr ""
+
 msgid "OS Town Plans, Cupar 1854 (NLS)"
 msgstr ""
 
+msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Elgin 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Forres 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Galashiels 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Girvan 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Greenock 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Haddington 1853 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Haddington 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Hamilton 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Irvine 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Jedburgh 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kelso 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Lanark 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Linlithgow 1856 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Musselburgh 1853 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Musselburgh 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Oban 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Peebles 1856 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Perth 1860 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Peterhead 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Selkirk 1865 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, St Andrews 1854 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, St Andrews 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stirling 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stonehaven 1864 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1847 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Strathaven 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wick 1872 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wigtown 1848 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wigtown 1894 (NLS)"
+msgstr ""
+
 msgid "Decreasing house numbers in addresses interpolation"
 msgstr ""
 
@@ -21011,17 +21399,37 @@ msgid "{0}={1} is deprecated. Please use instead a multipolygon."
 msgstr ""
 
 msgid ""
-"{0} is deprecated. Please specify ìnterval by using opening_hours syntax"
+"{0} is deprecated. Please specify interval by using opening_hours syntax"
 msgstr ""
 
 msgid ""
 "{0} is deprecated. Please delete this object and use a private layer instead"
 msgstr ""
 
-msgid "{0} on a node"
+msgid "{0}={1} is unspecific. Please replace ''{1}'' by a specific value."
 msgstr ""
 
-msgid "{0} on a node. Should be drawn as an area"
+msgid "{0} should be replaced with {1}"
+msgstr ""
+
+msgid ""
+"{0}={1} is unspecific. Please replace ''{1}'' by ''left'', ''right'' or "
+"''both''."
+msgstr ""
+
+msgid "{0} on a node. Should be used on a way."
+msgstr ""
+
+msgid "{0} on a node. Should be drawn as an area."
+msgstr ""
+
+msgid "{0}=* on a node. Should be used in a relation"
+msgstr ""
+
+msgid "{0} on a way. Should be used in a relation"
+msgstr ""
+
+msgid "{0} on a node"
 msgstr ""
 
 msgid "Building inside building"
@@ -25691,6 +26099,9 @@ msgstr ""
 msgid "Find"
 msgstr ""
 
+msgid "Show"
+msgstr "Afichar"
+
 msgid "Mark"
 msgstr ""
 
diff --git a/i18n/po/pa.po b/i18n/po/pa.po
index 9c786e6..8aca5c4 100644
--- a/i18n/po/pa.po
+++ b/i18n/po/pa.po
@@ -1,8 +1,13 @@
+# Punjabi translation for josm
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the josm package.
+# FIRST AUTHOR <EMAIL at ADDRESS>, 2011.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-21 03:38+0200\n"
+"POT-Creation-Date: 2014-12-10 03:42+0100\n"
 "PO-Revision-Date: 2011-05-06 15:52+0000\n"
 "Last-Translator: A S Alam <aalam at users.sf.net>\n"
 "Language-Team: Punjabi <pa at li.org>\n"
@@ -10,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-10-21 05:13+0000\n"
-"X-Generator: Launchpad (build 17203)\n"
+"X-Launchpad-Export-Date: 2014-12-10 05:04+0000\n"
+"X-Generator: Launchpad (build 17283)\n"
 "Language: pa\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -168,16 +173,6 @@ msgid "About JOSM..."
 msgstr ""
 
 msgid ""
-"Unexpected format of API base URL. Redirection to info or history page for "
-"OSM object will probably fail. API base URL is: ''{0}''"
-msgstr ""
-
-msgid ""
-"Unexpected format of API base URL. Redirection to user page for OSM user "
-"will probably fail. API base URL is: ''{0}''"
-msgstr ""
-
-msgid ""
 "You are about to launch {0} browser window.<br>This may both clutter your "
 "screen with browser windows<br>and take some time to finish."
 msgid_plural ""
@@ -1519,6 +1514,15 @@ msgstr ""
 msgid "Nothing to upload. Get some data first."
 msgstr ""
 
+msgid "Upload note changes to server"
+msgstr ""
+
+msgid "Upload notes"
+msgstr ""
+
+msgid "Uploading notes to server"
+msgstr ""
+
 msgid "Upload selection"
 msgstr ""
 
@@ -1791,10 +1795,16 @@ msgstr ""
 msgid "Click the location where you wish to create a new note"
 msgstr ""
 
-msgid "Enter a comment for a new note"
+msgid "Create new note"
 msgstr ""
 
-msgid "Create new note"
+msgid "Create note"
+msgstr ""
+
+msgid "Enter a detailed comment to create a note"
+msgstr ""
+
+msgid "You must enter a comment to create a new note"
 msgstr ""
 
 msgid "Delete Mode"
@@ -2665,6 +2675,15 @@ msgstr ""
 msgid "Cycling dependencies"
 msgstr ""
 
+msgid "Uploading modified notes"
+msgstr ""
+
+msgid "Note {0} failed: {1}"
+msgstr ""
+
+msgid "Notes failed to upload"
+msgstr ""
+
 msgid ""
 "The following are results of automatic validation. Try fixing these, but be "
 "careful (don''t destroy valid data). When in doubt ignore them.<br>When you "
@@ -4894,6 +4913,12 @@ msgstr ""
 msgid "Conflict foreground: keep all tags"
 msgstr ""
 
+msgid "Conflict background: sum all numeric tags"
+msgstr ""
+
+msgid "Conflict foreground: sum all numeric tags"
+msgstr ""
+
 msgid "Conflict background: keep member"
 msgstr ""
 
@@ -5312,12 +5337,19 @@ msgstr ""
 msgid "all"
 msgstr ""
 
+msgid "sum"
+msgstr ""
+
 msgid "Please decide which values to keep"
 msgstr ""
 
 msgid "Value ''{0}'' is going to be applied for key ''{1}''"
 msgstr ""
 
+msgid ""
+"All numeric values sumed as ''{0}'' are going to be applied for key ''{1}''"
+msgstr ""
+
 msgid "The key ''{0}'' and all its values are going to be removed"
 msgstr ""
 
@@ -5680,24 +5712,6 @@ msgstr[1] ""
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
 
-msgid "Display the history of all selected items."
-msgstr ""
-
-msgid "Object with history"
-msgstr ""
-
-msgid "Reload"
-msgstr ""
-
-msgid "Reload all currently selected objects and refresh the list."
-msgstr ""
-
-msgid "Show"
-msgstr ""
-
-msgid "Display the history of the selected objects."
-msgstr ""
-
 msgid "Advanced object info"
 msgstr ""
 
@@ -6035,6 +6049,9 @@ msgstr ""
 msgid "Comment"
 msgstr ""
 
+msgid "Comment on note"
+msgstr ""
+
 msgid "Add comment to note:"
 msgstr ""
 
@@ -6044,9 +6061,6 @@ msgstr ""
 msgid "Close note with message:"
 msgstr ""
 
-msgid "Close Note"
-msgstr ""
-
 msgid "Create a new note"
 msgstr ""
 
@@ -6119,6 +6133,9 @@ msgstr ""
 msgid "Search for objects"
 msgstr ""
 
+msgid "Display the history of the selected objects."
+msgstr ""
+
 msgid "Zoom to selection"
 msgstr ""
 
@@ -6238,6 +6255,9 @@ msgstr ""
 msgid "Updating map ..."
 msgstr ""
 
+msgid "anonymous"
+msgstr ""
+
 msgid "Display the basic properties of the changeset"
 msgstr ""
 
@@ -6250,6 +6270,12 @@ msgstr ""
 msgid "Display the objects created, updated, and deleted by the changeset"
 msgstr ""
 
+msgid "Discussion"
+msgstr ""
+
+msgid "Display the public discussion around this changeset"
+msgstr ""
+
 msgid "Changeset Management Dialog"
 msgstr ""
 
@@ -6307,9 +6333,6 @@ msgctxt "changeset.state"
 msgid "Closed"
 msgstr ""
 
-msgid "anonymous"
-msgstr ""
-
 msgid "ID"
 msgstr ""
 
@@ -6325,6 +6348,9 @@ msgstr ""
 msgid "Closed at"
 msgstr ""
 
+msgid "Discussions"
+msgstr ""
+
 msgid "Downloading changeset content"
 msgstr ""
 
@@ -6436,6 +6462,15 @@ msgid ""
 "layer"
 msgstr ""
 
+msgid "Update changeset discussion"
+msgstr ""
+
+msgid "Update the changeset discussion from the OSM server"
+msgstr ""
+
+msgid "Date"
+msgstr ""
+
 msgid "Download changesets"
 msgstr ""
 
@@ -6853,7 +6888,7 @@ msgstr ""
 msgid "Set number of recently added tags"
 msgstr ""
 
-msgid "Remember last used tags"
+msgid "Remember last used tags after a restart"
 msgstr ""
 
 msgid "Please enter the number of recently added tags to display"
@@ -7199,6 +7234,9 @@ msgstr ""
 msgid "Load parent relations"
 msgstr ""
 
+msgid "Reload"
+msgstr ""
+
 msgid "Loading parent relations"
 msgstr ""
 
@@ -7321,6 +7359,12 @@ msgstr ""
 msgid "Select to download GPS traces in the selected download area."
 msgstr ""
 
+msgid "Notes"
+msgstr ""
+
+msgid "Select to download notes in the selected download area."
+msgstr ""
+
 msgid "Download as new layer"
 msgstr ""
 
@@ -7626,9 +7670,6 @@ msgstr ""
 msgid "B"
 msgstr ""
 
-msgid "Date"
-msgstr ""
-
 msgid ""
 "Failed to update primitive with id {0} because current edit layer is null"
 msgstr ""
@@ -8483,9 +8524,6 @@ msgstr ""
 msgid "Save Layer"
 msgstr ""
 
-msgid "Notes"
-msgstr ""
-
 msgid "Notes layer"
 msgstr ""
 
@@ -8501,9 +8539,6 @@ msgstr ""
 msgid "outside downloaded area"
 msgstr ""
 
-msgid "version {0}"
-msgstr ""
-
 msgid "Merging layers"
 msgstr ""
 
@@ -12129,6 +12164,15 @@ msgstr ""
 msgid "Open changeset expected. Got closed changeset with id {0}."
 msgstr ""
 
+msgid "Note upload failed"
+msgstr ""
+
+msgid "Error parsing note response from server"
+msgstr ""
+
+msgid "Error encoding string: {0}"
+msgstr ""
+
 msgid "(Code={0})"
 msgstr ""
 
@@ -12177,13 +12221,13 @@ msgstr ""
 msgid "Parsing changeset content ..."
 msgstr ""
 
-msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
-msgid "Illegal numeric value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
-msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal numeric value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
 msgid "Missing mandatory attribute ''{0}'' of XML element {1}."
@@ -12975,9 +13019,6 @@ msgstr ""
 msgid "Failed to scan file ''{0}'' for plugin information. Skipping."
 msgstr ""
 
-msgid "Processing plugin site cache icon files..."
-msgstr ""
-
 msgid "Processing plugin files..."
 msgstr ""
 
@@ -12996,12 +13037,6 @@ msgstr ""
 msgid "Details:"
 msgstr ""
 
-msgid "Plugin icons download error"
-msgstr ""
-
-msgid "JOSM failed to download plugin icons:"
-msgstr ""
-
 msgid ""
 "Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
 "plugin site ''{1}''."
@@ -13887,7 +13922,9 @@ msgid ""
 "Creating and handling address nodes and buildings within Czech Republic."
 msgstr ""
 
-msgid "Allows to import various file formats into JOSM directly."
+msgid ""
+"Allows to import various file formats into JOSM directly. Currently "
+"supported: TangoGPS, Garmin Trainings Center TCX."
 msgstr ""
 
 msgid "Download your GPX tracks from openstreetmap.org"
@@ -13984,6 +14021,11 @@ msgid "A helper for IRS satellite adjustment."
 msgstr ""
 
 msgid ""
+"Provides Java Native Access (JNA) library. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
+msgid ""
 "Provides Java Topology Suite (JTS) library and related utilities. Not meant "
 "to be installed directly by users, but rather as a dependency for other "
 "plugins."
@@ -14339,6 +14381,25 @@ msgstr ""
 msgid "Width (meters)"
 msgstr ""
 
+msgid "Sidewalk"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "both"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "left"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "right"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "no"
+msgstr ""
+
 msgid "Service type"
 msgstr ""
 
@@ -14703,15 +14764,19 @@ msgstr ""
 msgid "May-Sep 09:30-12:30,14:15-19:30"
 msgstr ""
 
+msgctxt "parking"
 msgid "multi-storey"
 msgstr ""
 
+msgctxt "parking"
 msgid "surface"
 msgstr ""
 
+msgctxt "parking"
 msgid "underground"
 msgstr ""
 
+msgctxt "parking"
 msgid "rooftop"
 msgstr ""
 
@@ -15169,15 +15234,26 @@ msgstr ""
 msgid "Overtaking"
 msgstr ""
 
+msgctxt "overtaking"
+msgid "yes"
+msgstr ""
+
+msgctxt "overtaking"
 msgid "both"
 msgstr ""
 
+msgctxt "overtaking"
 msgid "forward"
 msgstr ""
 
+msgctxt "overtaking"
 msgid "backward"
 msgstr ""
 
+msgctxt "overtaking"
+msgid "no"
+msgstr ""
+
 msgid "Roundabout"
 msgstr ""
 
@@ -15471,6 +15547,12 @@ msgstr ""
 msgid "tiger"
 msgstr ""
 
+msgid "Button operated"
+msgstr ""
+
+msgid "Sound signals"
+msgstr ""
+
 msgid "Crossing attendant"
 msgstr ""
 
@@ -15992,9 +16074,6 @@ msgstr ""
 msgid "Traffic lights"
 msgstr ""
 
-msgid "Sound signals"
-msgstr ""
-
 msgid "Barrier"
 msgstr ""
 
@@ -18054,6 +18133,9 @@ msgstr ""
 msgid "Gasometer"
 msgstr ""
 
+msgid "Bunker Silo"
+msgstr ""
+
 msgid "Pipeline"
 msgstr ""
 
@@ -18200,15 +18282,15 @@ msgstr ""
 msgid "Monitoring:"
 msgstr ""
 
-msgid "Weather"
-msgstr ""
-
 msgid "Water level"
 msgstr ""
 
 msgid "Tide Level"
 msgstr ""
 
+msgid "Groundwater"
+msgstr ""
+
 msgid "Traffic"
 msgstr ""
 
@@ -18227,6 +18309,9 @@ msgstr ""
 msgid "Galileo Signals"
 msgstr ""
 
+msgid "Weather"
+msgstr ""
+
 msgid "Radiation"
 msgstr ""
 
@@ -18407,6 +18492,9 @@ msgstr ""
 msgid "pivot_pier"
 msgstr ""
 
+msgid "Bridge outline"
+msgstr ""
+
 msgid "Power Plant"
 msgstr ""
 
@@ -19014,6 +19102,15 @@ msgstr ""
 msgid "Pole"
 msgstr ""
 
+msgid "Pole with Transformer"
+msgstr ""
+
+msgid "Pole Attributes:"
+msgstr ""
+
+msgid "Transformer Attributes:"
+msgstr ""
+
 msgid "Power Line"
 msgstr ""
 
@@ -19063,9 +19160,15 @@ msgstr ""
 msgid "Power Cable"
 msgstr ""
 
+msgctxt "power cable"
+msgid "underground"
+msgstr ""
+
+msgctxt "power cable"
 msgid "underwater"
 msgstr ""
 
+msgctxt "power cable"
 msgid "overground"
 msgstr ""
 
@@ -19093,6 +19196,33 @@ msgstr ""
 msgid "Memorial"
 msgstr ""
 
+msgctxt "memorial"
+msgid "statue"
+msgstr ""
+
+msgctxt "memorial"
+msgid "bust"
+msgstr ""
+
+msgctxt "memorial"
+msgid "plaque"
+msgstr ""
+
+msgctxt "memorial"
+msgid "stele"
+msgstr ""
+
+msgctxt "memorial"
+msgid "stone"
+msgstr ""
+
+msgctxt "memorial"
+msgid "war_memorial"
+msgstr ""
+
+msgid "Inscription"
+msgstr ""
+
 msgid "Wayside Cross"
 msgstr ""
 
@@ -19162,6 +19292,9 @@ msgstr ""
 msgid "Beverages"
 msgstr ""
 
+msgid "Wine"
+msgstr ""
+
 msgid "Boutique"
 msgstr ""
 
@@ -19207,6 +19340,9 @@ msgstr ""
 msgid "Video Games"
 msgstr ""
 
+msgid "Music"
+msgstr ""
+
 msgid "Cash"
 msgstr ""
 
@@ -19234,6 +19370,9 @@ msgstr ""
 msgid "Curtain"
 msgstr ""
 
+msgid "Art"
+msgstr ""
+
 msgid "Frame"
 msgstr ""
 
@@ -19279,6 +19418,9 @@ msgstr ""
 msgid "Beauty"
 msgstr ""
 
+msgid "Tattoo"
+msgstr ""
+
 msgid "Optician"
 msgstr ""
 
@@ -19330,6 +19472,9 @@ msgstr ""
 msgid "Pet"
 msgstr ""
 
+msgid "Funeral Directors"
+msgstr ""
+
 msgid "Vending Machine"
 msgstr ""
 
@@ -19429,6 +19574,15 @@ msgstr ""
 msgid "National Park"
 msgstr ""
 
+msgid "Protected Area"
+msgstr ""
+
+msgid "Protected Class"
+msgstr ""
+
+msgid "Title or type of protection"
+msgstr ""
+
 msgid "Places"
 msgstr ""
 
@@ -20505,7 +20659,13 @@ msgstr ""
 msgid "Estonia Ortho (Maaamet)"
 msgstr ""
 
-msgid "Estonia Multi (Maaamet)"
+msgid "Estonia Hillshade (Maaamet)"
+msgstr ""
+
+msgid "Estonia Cadastre (Maaamet)"
+msgstr ""
+
+msgid "Estonia Forestry (Maaamet)"
 msgstr ""
 
 msgid "Bordeaux - 2012"
@@ -20529,7 +20689,7 @@ msgstr ""
 msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
 msgstr ""
 
-msgid "CUGN Nancy - Orthophoto 2012"
+msgid "GrandNancy Orthophotographie 2012"
 msgstr ""
 
 msgid "Géobretagne - Brest 2010 - 10 cm"
@@ -20576,9 +20736,6 @@ msgid ""
 "- 1 m"
 msgstr ""
 
-msgid "Streets NRW Geofabrik.de"
-msgstr ""
-
 msgid "Hike & Bike"
 msgstr ""
 
@@ -20638,6 +20795,9 @@ msgstr ""
 msgid "NRW-Atlas: Topographische Karte 1:10000"
 msgstr ""
 
+msgid "Metropole Ruhr: Luftbilder (10 cm)"
+msgstr ""
+
 msgid "Drone Imagery (Haiti)"
 msgstr ""
 
@@ -20839,6 +20999,9 @@ msgstr ""
 msgid "Stadt Zürich Übersichtsplan (Strassen, Gebäude, Hausnummer)"
 msgstr ""
 
+msgid "Stadt Zürich Luftbild 2011"
+msgstr ""
+
 msgid "Orthofoto Kanton Solothurn RGB (SOGIS 2011/2012/2013)"
 msgstr ""
 
@@ -20857,7 +21020,7 @@ msgstr ""
 msgid "Canton de Fribourg 50cm (2005)"
 msgstr ""
 
-msgid "Stadt Bern 10cm/25cm (2008)"
+msgid "Stadt Bern 10cm/25cm (2012)"
 msgstr ""
 
 msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
@@ -20896,7 +21059,7 @@ msgstr ""
 msgid "OSM US TIGER 2012 Roads Overlay"
 msgstr ""
 
-msgid "New & Misaligned TIGER Roads (TIGER 2013)"
+msgid "New & Misaligned TIGER Roads (TIGER 2014)"
 msgstr ""
 
 msgid "MassGIS L3 Parcels"
@@ -20944,9 +21107,234 @@ msgstr ""
 msgid "NLS - Bartholomew Half Inch, 1897-1907"
 msgstr ""
 
+msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Annan 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgstr ""
+
 msgid "OS Town Plans, Cupar 1854 (NLS)"
 msgstr ""
 
+msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Elgin 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Forres 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Galashiels 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Girvan 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Greenock 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Haddington 1853 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Haddington 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Hamilton 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Irvine 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Jedburgh 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kelso 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Lanark 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Linlithgow 1856 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Musselburgh 1853 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Musselburgh 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Oban 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Peebles 1856 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Perth 1860 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Peterhead 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Selkirk 1865 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, St Andrews 1854 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, St Andrews 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stirling 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stonehaven 1864 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1847 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Strathaven 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wick 1872 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wigtown 1848 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wigtown 1894 (NLS)"
+msgstr ""
+
 msgid "Decreasing house numbers in addresses interpolation"
 msgstr ""
 
@@ -21000,17 +21388,37 @@ msgid "{0}={1} is deprecated. Please use instead a multipolygon."
 msgstr ""
 
 msgid ""
-"{0} is deprecated. Please specify ìnterval by using opening_hours syntax"
+"{0} is deprecated. Please specify interval by using opening_hours syntax"
 msgstr ""
 
 msgid ""
 "{0} is deprecated. Please delete this object and use a private layer instead"
 msgstr ""
 
-msgid "{0} on a node"
+msgid "{0}={1} is unspecific. Please replace ''{1}'' by a specific value."
 msgstr ""
 
-msgid "{0} on a node. Should be drawn as an area"
+msgid "{0} should be replaced with {1}"
+msgstr ""
+
+msgid ""
+"{0}={1} is unspecific. Please replace ''{1}'' by ''left'', ''right'' or "
+"''both''."
+msgstr ""
+
+msgid "{0} on a node. Should be used on a way."
+msgstr ""
+
+msgid "{0} on a node. Should be drawn as an area."
+msgstr ""
+
+msgid "{0}=* on a node. Should be used in a relation"
+msgstr ""
+
+msgid "{0} on a way. Should be used in a relation"
+msgstr ""
+
+msgid "{0} on a node"
 msgstr ""
 
 msgid "Building inside building"
@@ -25680,6 +26088,9 @@ msgstr ""
 msgid "Find"
 msgstr ""
 
+msgid "Show"
+msgstr ""
+
 msgid "Mark"
 msgstr ""
 
diff --git a/i18n/po/pl.po b/i18n/po/pl.po
index c0fe20e..65bb0db 100644
--- a/i18n/po/pl.po
+++ b/i18n/po/pl.po
@@ -1,18 +1,23 @@
+# This file is distributed under the same license as the josm package.
+# PAWEŁ MADEJ <nysander at quanteam.pl>, 2008.
+# Nabuchodonozor <nabuchodonozor.2nd at gmail.com>, 2008.
+# MARCIN FLORYAN <mfloryan at mmsqaure.com>, 2008.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-21 03:38+0200\n"
-"PO-Revision-Date: 2014-10-06 21:02+0000\n"
-"Last-Translator: Zbigniew Czernik <Unknown>\n"
+"POT-Creation-Date: 2014-12-10 03:42+0100\n"
+"PO-Revision-Date: 2014-11-16 06:21+0000\n"
+"Last-Translator: Daniel Koć <daniel at xn--ko-wla.pl>\n"
 "Language-Team: Polish <josm-lang-pl at googlegroups.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2014-10-21 05:15+0000\n"
-"X-Generator: Launchpad (build 17203)\n"
+"X-Launchpad-Export-Date: 2014-12-10 05:06+0000\n"
+"X-Generator: Launchpad (build 17283)\n"
 "Language: pl\n"
 "X-Poedit-Bookmarks: 1098,-1,-1,-1,-1,-1,-1,-1,-1,-1\n"
 "X-Poedit-Basepath: /home/mfloryan/dev/josm/i18n/\n"
@@ -185,21 +190,6 @@ msgid "About JOSM..."
 msgstr "O JOSM..."
 
 msgid ""
-"Unexpected format of API base URL. Redirection to info or history page for "
-"OSM object will probably fail. API base URL is: ''{0}''"
-msgstr ""
-"Nieoczekiwany format adresu URL API. Przekierowanie do informacji albo "
-"historii dla obiektu OSM prawdopodobnie nie powiedzie się. Bazowy adres URL "
-"dla API: \"{0}\""
-
-msgid ""
-"Unexpected format of API base URL. Redirection to user page for OSM user "
-"will probably fail. API base URL is: ''{0}''"
-msgstr ""
-"Nieoczekiwany format adresu URL API. Przekierowanie do strony użytkownika "
-"OSM prawdopodobnie nie powiedzie się. Bazowy adres URL dla API: \"{0}\""
-
-msgid ""
 "You are about to launch {0} browser window.<br>This may both clutter your "
 "screen with browser windows<br>and take some time to finish."
 msgid_plural ""
@@ -649,7 +639,7 @@ msgstr ""
 "Jedna z wybranych dróg nie jest zamknięta i dlatego nie może być łączona."
 
 msgid "Join area confirmation"
-msgstr "Potwierdzenie przy łaczeniu obszarów"
+msgstr "Potwierdzenie przy łączeniu obszarów"
 
 msgid "The selected way has nodes outside of the downloaded data region."
 msgid_plural ""
@@ -1226,7 +1216,7 @@ msgid "Report bug"
 msgstr "Zgłoś błąd"
 
 msgid "Report a ticket to JOSM bugtracker"
-msgstr ""
+msgstr "Wyślij zgłoszenie do JOSM bugtracker"
 
 msgid "Restart"
 msgstr "Uruchom ponownie"
@@ -1675,6 +1665,15 @@ msgstr "Brak zmian do wysłania."
 msgid "Nothing to upload. Get some data first."
 msgstr "Nie ma nic do wysłania. Wprowadź jakieś dane."
 
+msgid "Upload note changes to server"
+msgstr ""
+
+msgid "Upload notes"
+msgstr ""
+
+msgid "Uploading notes to server"
+msgstr ""
+
 msgid "Upload selection"
 msgstr "Wyślij wybrane elementy"
 
@@ -1961,19 +1960,25 @@ msgid "Error during download"
 msgstr "Błąd podczas pobierania"
 
 msgid "Add a new Note"
-msgstr ""
+msgstr "Wprowadź nową uwagę"
 
 msgid "Add note mode"
-msgstr ""
+msgstr "Dodaj tryb uwag"
 
 msgid "Click the location where you wish to create a new note"
-msgstr ""
-
-msgid "Enter a comment for a new note"
-msgstr ""
+msgstr "Kliknij gdzie chcesz dodać uwagę"
 
 msgid "Create new note"
-msgstr ""
+msgstr "Stwórz nową uwagę"
+
+msgid "Create note"
+msgstr "Stwórz uwagę"
+
+msgid "Enter a detailed comment to create a note"
+msgstr "Wprowadź szczegółówy opis do uwagi"
+
+msgid "You must enter a comment to create a new note"
+msgstr "Aby dodać uwagę musisz wprowadzić opis"
 
 msgid "Delete Mode"
 msgstr "Tryb kasowania"
@@ -2141,7 +2146,7 @@ msgid "Improve Way Accuracy mode"
 msgstr "Tryb poprawiania dokładności linii"
 
 msgid "improve way accuracy helper line"
-msgstr ""
+msgstr "linia pomocnicza do poprawniania dokładności"
 
 msgid "Click on the way to start improving its shape."
 msgstr "Kliknij drogę by zacząć poprawiać jej kształt."
@@ -2895,6 +2900,7 @@ msgstr "Brak parametru dla NOT"
 
 msgid "Automatically truncating value of tag ''{0}'' on deleted object {1}"
 msgstr ""
+"Automatyczne wycinanie wartości tagu ''{0}'' z usuniętego obiektu {1}"
 
 msgid ""
 "Length of value for tag ''{0}'' on object {1} exceeds the max. allowed "
@@ -2939,6 +2945,15 @@ msgstr "... odwołuje się do relacji"
 msgid "Cycling dependencies"
 msgstr "Zapętlone zależności."
 
+msgid "Uploading modified notes"
+msgstr "Wysyłanie zmodyfikowanych uwag"
+
+msgid "Note {0} failed: {1}"
+msgstr "Wysyłanie uwagi {0} nie powiodło się: {1}"
+
+msgid "Notes failed to upload"
+msgstr "Wysyłanie uwag nie powiodło się"
+
 msgid ""
 "The following are results of automatic validation. Try fixing these, but be "
 "careful (don''t destroy valid data). When in doubt ignore them.<br>When you "
@@ -3024,25 +3039,25 @@ msgstr "Ustawiono {0}={1} dla relacji \"{2}\""
 
 msgid "Remove \"{0}\" for {1} object"
 msgid_plural "Remove \"{0}\" for {1} objects"
-msgstr[0] "Usuń \"{0}\" dla {1} objektu"
+msgstr[0] "Usuń \"{0}\" dla {1} obiektu"
 msgstr[1] "Usuń \"{0}\" dla {1} objektów"
 msgstr[2] "Usuń \"{0}\" dla {1} objektów"
 
 msgid "Set {0}={1} for {2} object"
 msgid_plural "Set {0}={1} for {2} objects"
-msgstr[0] "Ustaw {0}={1} dla {2} objektu"
+msgstr[0] "Ustaw {0}={1} dla {2} obiektu"
 msgstr[1] "Ustaw {0}={1} dla {2} objektów"
 msgstr[2] "Ustaw {0}={1} dla {2} objektów"
 
 msgid "Deleted {0} tags for {1} object"
 msgid_plural "Deleted {0} tags for {1} objects"
-msgstr[0] "Usunięto {0} tagów dla {1} objektu"
+msgstr[0] "Usunięto {0} tagów dla {1} obiektu"
 msgstr[1] "Usunięto {0} tagów dla {1} objektów"
 msgstr[2] "Usunięto {0} tagów dla {1} objektów"
 
 msgid "Set {0} tags for {1} object"
 msgid_plural "Set {0} tags for {1} objects"
-msgstr[0] "Ustaw {0} tagów dla {1} objektu"
+msgstr[0] "Ustaw {0} tagów dla {1} obiektu"
 msgstr[1] "Ustaw {0} tagów dla {1} objektów"
 msgstr[2] "Ustaw {0} tagów dla {1} objektów"
 
@@ -3073,7 +3088,7 @@ msgstr "Usunięto relację {0}"
 
 msgid "Delete {0} object"
 msgid_plural "Delete {0} objects"
-msgstr[0] "Usunięto {0} objekt"
+msgstr[0] "Usunięto {0} obiekt"
 msgstr[1] "Usunięto {0} objekty"
 msgstr[2] "Usunięto {0} objektów"
 
@@ -3332,7 +3347,7 @@ msgstr "Nie można utworzyć pliku {0}, inna nazwa pliku zostanie użyta"
 
 msgid "IOError while creating file, autosave will be skipped: {0}"
 msgstr ""
-"Błąd IO podczas tworzenia pliku, automatyczny zapis bedzie pominięty: {0}"
+"Błąd IO podczas tworzenia pliku, automatyczny zapis zostanie pominięty: {0}"
 
 msgid "Unable to delete old backup file {0}"
 msgstr "Nie można usunąć poprzedniego pliku backup {0}"
@@ -3359,7 +3374,7 @@ msgid "Enter text"
 msgstr "Wprowadź tekst"
 
 msgid "Installing plugins"
-msgstr "Instalowanie pluginu"
+msgstr "Instalowanie wtyczek"
 
 msgid ""
 "<html>Settings file asks to append preferences to <b>{0}</b>,<br/> but its "
@@ -3544,13 +3559,13 @@ msgstr ""
 "zestawie danych nie ma tego obiektu"
 
 msgid "Missing merge target for node with id {0}"
-msgstr "Brakuje celu do  złączenia z węzłem {0}"
+msgstr "Brakuje celu do złączenia z węzłem {0}"
 
 msgid "Missing merge target for relation with id {0}"
 msgstr "Brakuje celu do złączenia z relacją {0}"
 
 msgid "Missing merge target of type {0} with id {1}"
-msgstr ""
+msgstr "Brakuje celu do złączenia typu {0} z identyfikatorem {1}"
 
 msgid "Conflict in ''visible'' attribute for object of type {0} with id {1}"
 msgstr "Konflikt w \"widocznych\" atrybutach na obiekcie typu {0} o id {1}."
@@ -3841,7 +3856,7 @@ msgid "URL contains non-ascii characters"
 msgstr "Adres URL zawiera znaki spoza ASCII"
 
 msgid "URL is invalid"
-msgstr ""
+msgstr "URL jest nieprawidłowy"
 
 msgid "URL contains an invalid protocol: {0}"
 msgstr "Adres URL zawiera nieprawidłowy protokół: {0}"
@@ -3856,7 +3871,7 @@ msgid "URL contains an invalid query: {0}"
 msgstr "Adres URL zawiera nieprawidłowe zapytanie: {0}"
 
 msgid "URL contains an invalid fragment: {0}"
-msgstr ""
+msgstr "Adres URL zawiera nieprawidłowy fragment: {0}"
 
 msgid "Addresses"
 msgstr "Adresy"
@@ -3891,9 +3906,12 @@ msgstr ""
 msgid ""
 "Way contains more than {0} nodes. It should be replaced by a multipolygon"
 msgstr ""
+"Linia zawiera więcej niż {0} węzłów. Powinna zostać zastąpiona przez wielokąt"
 
 msgid "Way contains more than {0} nodes. It should be split or simplified"
 msgstr ""
+"Linia zawiera więcej niż {0} węzłów. Powinna zostać podzielona lub "
+"uproszczona"
 
 msgid "Barriers and entrances"
 msgstr "Przeszkody/bariery i wejścia"
@@ -4061,10 +4079,10 @@ msgid "Unknown source:maxspeed context: {0}"
 msgstr "Nieznana zawartość source:maxspeed: {0}"
 
 msgid "Internet tags"
-msgstr ""
+msgstr "Tagi internetowe"
 
 msgid "Checks for errors in internet-related tags."
-msgstr ""
+msgstr "Sprawdza błędy w tagach związanych z Internetem"
 
 msgid "''{0}'': {1}"
 msgstr "''{0}'': {1}"
@@ -4073,7 +4091,7 @@ msgid "Lane tags"
 msgstr "Tagowanie pasów jezdni"
 
 msgid "Test that validates ''lane:'' tags."
-msgstr ""
+msgstr "Test sprawdzający tagi''lane:''"
 
 msgid "Number of {0} greater than {1}"
 msgstr "Numer {0} większy niż {1}"
@@ -4091,7 +4109,7 @@ msgid "Number of lane dependent values inconsistent in backward direction"
 msgstr ""
 
 msgid "Tag checker (MapCSS based)"
-msgstr "Walidator tagów (bazowany na MapCSS)"
+msgstr "Walidator tagów (bazujący na MapCSS)"
 
 msgid "This test checks for errors in tag keys and values."
 msgstr "Ten test szuka błędów w kluczach i wartościach."
@@ -4124,13 +4142,13 @@ msgid "Area style way is not closed"
 msgstr "Niezamknięty obszar"
 
 msgid "No outer way for multipolygon"
-msgstr "Brak zewnętrznej linii multipolygonu"
+msgstr "Brak zewnętrznej linii wielokąta"
 
 msgid "Role for ''{0}'' should be ''{1}''"
 msgstr "Rola dla ''{0}'' powinna być ''{1}''"
 
 msgid "No area style for multipolygon"
-msgstr ""
+msgstr "Brak stylu dla obszaru wielokąta"
 
 msgid ""
 "Multipolygon relation should be tagged with area tags and not the outer way"
@@ -4149,10 +4167,10 @@ msgid "Style for outer way mismatches polygon"
 msgstr ""
 
 msgid "Area style on outer way"
-msgstr ""
+msgstr "Styl obszaru dla linii zewnętrznej"
 
 msgid "Multipolygon is not closed"
-msgstr "Multipolygon nie jest zamknięty"
+msgstr "Wielokąt nie jest zamknięty"
 
 msgid "Multipolygon inner way is outside"
 msgstr "Wewnętrzna droga w relacji multipolygon znajduje się na zewnątrz"
@@ -4167,7 +4185,7 @@ msgid "Non-Way in multipolygon"
 msgstr "Obiekt niebędący drogą w relacji multipolygon"
 
 msgid "Missing name:* translation"
-msgstr "Brakująca nazwa:* tłumaczenie"
+msgstr "Brakujące tłumaczenie tagów name:*"
 
 msgid ""
 "This test finds multilingual objects whose ''name'' attribute is not equal "
@@ -4191,19 +4209,19 @@ msgid "opening_hours value can be prettified"
 msgstr "wartość opening_hours może być upiększona"
 
 msgid "Unexpected token:"
-msgstr ""
+msgstr "Nieoczekiwany token:"
 
 msgid "Unexpected token (school holiday parser):"
 msgstr ""
 
 msgid "Unexpected token in number range:"
-msgstr ""
+msgstr "Nieoczekiwany token w zakresie liczb:"
 
 msgid "Unexpected token in week range:"
-msgstr ""
+msgstr "Nieoczekiwany token w zakresie tygodni:"
 
 msgid "Unexpected token in weekday range:"
-msgstr ""
+msgstr "Nieoczekiwany token w zakresie dni tygodnia:"
 
 msgid "Unexpected token in month range:"
 msgstr ""
@@ -4438,7 +4456,7 @@ msgid "Turnrestrictions"
 msgstr "Ograniczenia skrętu"
 
 msgid "This test checks if turnrestrictions are valid."
-msgstr ""
+msgstr "Ten test sprawdza poprawość ograniczeń skrętu"
 
 msgid "Unknown role"
 msgstr "Nieznana rola"
@@ -4468,13 +4486,13 @@ msgid "No \"via\" node or way found"
 msgstr "Nie znaleziono drogi lub węzła z rolą \"via\""
 
 msgid "The \"from\" way does not start or end at a \"via\" node."
-msgstr ""
+msgstr "Linia \"from\" nie rozpoczyna się lub nie kończy w węźle\"via\"."
 
 msgid "Superfluous turnrestriction as \"to\" way is oneway"
 msgstr "Zbędne ograniczenie skrętu w drogę jednokierunkową"
 
 msgid "The \"to\" way does not start or end at a \"via\" node."
-msgstr ""
+msgstr "Linia \"to\" nie rozpoczyna się lub nie kończy w węźle \"via\"."
 
 msgid "The \"from\" and the first \"via\" way are not connected."
 msgstr "Droga \"z\" nie jest połączona z pierwsza drogą \"przez\"."
@@ -4831,7 +4849,7 @@ msgid "Print debugging messages to console"
 msgstr "Drukuj wiadomości debugowania do konsoli"
 
 msgid "Disable access to the given resource(s), separated by comma"
-msgstr ""
+msgstr "Wyłącz dostęp do danego zasobu (ów), oddzielone przecinkiem"
 
 msgid "options provided as Java system properties"
 msgstr "opcja dostarczano jako ustawienia systemowe Javy"
@@ -4866,7 +4884,7 @@ msgid "Make sure you load some data if you use --selection."
 msgstr "Upewnij się że ładujesz jakieś dane jeśli używasz --selection"
 
 msgid "Printing debugging messages to console"
-msgstr ""
+msgstr "Wypisywanie komunikatów debugowania na konsoli"
 
 msgid "Enabled detailed debug level (trace)"
 msgstr "Włączony poziom dokładnego debugowania (trace)"
@@ -4875,7 +4893,7 @@ msgid "Initializing"
 msgstr "Inicjalizacja"
 
 msgid "Updating plugins"
-msgstr "Aktualizowanie pluginów"
+msgstr "Aktualizowanie wtyczek"
 
 msgid "Installing updated plugins"
 msgstr "Instalacja zaktualizowanych wtyczek"
@@ -4952,10 +4970,10 @@ msgid ""
 "missing proxy configuration.<br>Would you like to change your proxy settings "
 "now?"
 msgstr ""
-"JOSM próbował uzyskać dostęp do następujących zasobów: <br> {0} ale <b> nie "
-"powiodło się </ b>, aby to zrobić, z powodu następujących błędów w sieci: "
-"<br> {1} To może być ze względu na brakującą konfigurację proxy. <br> Czy "
-"chcesz zmienić teraz swoje ustawienia proxy?"
+"JOSM próbował uzyskać dostęp do następujących zasobów:<br>{0}ale mu się "
+"<b>nie udało :(</b>. Wystąpiły błędy w sieci: <br> {1}To może być ze względu "
+"na brakującą konfigurację proxy. <br> Czy chcesz zmienić teraz swoje "
+"ustawienia proxy?"
 
 msgid "File"
 msgstr "Plik"
@@ -5307,6 +5325,12 @@ msgstr "Konfilkt tła: zachowaj wszystkie tagi"
 msgid "Conflict foreground: keep all tags"
 msgstr "Konfilkt pierwszego planu: zachowaj wszystkie tagi"
 
+msgid "Conflict background: sum all numeric tags"
+msgstr ""
+
+msgid "Conflict foreground: sum all numeric tags"
+msgstr ""
+
 msgid "Conflict background: keep member"
 msgstr "Konfilkt tła: zatrzymaj członka"
 
@@ -5646,7 +5670,7 @@ msgid "<undefined>"
 msgstr "<niezdefinowane>"
 
 msgid "The merged dataset will not include a tag with key {0}"
-msgstr ""
+msgstr "Połączony zestaw nie będzie zawierał tagu z kluczem {0}"
 
 msgid "My dataset does not include a tag with key {0}"
 msgstr "Mój zestaw nie zawieta tagu z kluczem {0}"
@@ -5688,7 +5712,7 @@ msgid "Conflicts when combining ways - combined way is ''{0}''"
 msgstr "Konflikt podczas łączenia dróg - łączona jest droga \"{0}\""
 
 msgid "Conflicts when merging nodes - target node is ''{0}''"
-msgstr ""
+msgstr "Konflikt podczas łączenia węzłów - doelowy węzeł to ''{0}''"
 
 msgid "No conflicts to resolve"
 msgstr "Brak konfliktów do rozwiązania"
@@ -5748,12 +5772,19 @@ msgstr "żadne"
 msgid "all"
 msgstr "wszystkie"
 
+msgid "sum"
+msgstr ""
+
 msgid "Please decide which values to keep"
 msgstr "Proszę zdecydować które wartości mają pozostać"
 
 msgid "Value ''{0}'' is going to be applied for key ''{1}''"
 msgstr "Wartość \"{0}\" zostanie przypisana do klucza \"{1}\""
 
+msgid ""
+"All numeric values sumed as ''{0}'' are going to be applied for key ''{1}''"
+msgstr ""
+
 msgid "The key ''{0}'' and all its values are going to be removed"
 msgstr "Klucz \"{0}\" i wszystkie jego wartości zostaną usunięte"
 
@@ -5982,7 +6013,8 @@ msgstr "Otwiera listę konfliktów do rozwiązania."
 msgid "Conflict: {0} unresolved"
 msgid_plural "Conflicts: {0} unresolved"
 msgstr[0] ""
-msgstr[1] ""
+msgstr[1] "Konflikt: {0} nierozwiązany"
+msgstr[2] "Konflikty: {0} nierozwiązane"
 
 msgid "Rel.:{0} / Ways:{1} / Nodes:{2}"
 msgstr "Rel.:{0} / Linie:{1} / Węzły:{2}"
@@ -6128,38 +6160,20 @@ msgstr "<h2>Filtr aktywny</h2>"
 
 msgid "<p><b>{0}</b> object hidden"
 msgid_plural "<p><b>{0}</b> objects hidden"
-msgstr[0] "<p><b>{0}</b> objekt ukryty"
-msgstr[1] "<p><b>{0}</b> objekty ukryte"
-msgstr[2] "<p><b>{0}</b> objektów ukrytych"
+msgstr[0] "<p><b>{0}</b> obiekt ukryty"
+msgstr[1] "<p><b>{0}</b> obiekty ukryte"
+msgstr[2] "<p><b>{0}</b> obiektów ukrytych"
 
 msgid "<b>{0}</b> object disabled"
 msgid_plural "<b>{0}</b> objects disabled"
-msgstr[0] "<b>{0}</b> objekt wyłączony"
-msgstr[1] "<b>{0}</b> objekty wyłączone"
-msgstr[2] "<b>{0}</b> objektów wyłączonych"
+msgstr[0] "<b>{0}</b> obiekt wyłączony"
+msgstr[1] "<b>{0}</b> obiekty wyłączone"
+msgstr[2] "<b>{0}</b> obiektów wyłączonych"
 
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
 "</p><p>Zamknij okno filtrów aby zobaczyć wszystkie obiekty.<p></html>"
 
-msgid "Display the history of all selected items."
-msgstr "Wyświetla historię wszystkich zaznaczonych elementów."
-
-msgid "Object with history"
-msgstr "Obiekt z historią"
-
-msgid "Reload"
-msgstr "Odśwież"
-
-msgid "Reload all currently selected objects and refresh the list."
-msgstr "Ponownie wczytuje wszystkie zaznaczone obiekty i odświeża listę."
-
-msgid "Show"
-msgstr "Pokaż"
-
-msgid "Display the history of the selected objects."
-msgstr "Wyświetl historię zaznaczonego obiektu."
-
 msgid "Advanced object info"
 msgstr "Szczegółowe informacje o obiekcie"
 
@@ -6294,15 +6308,15 @@ msgstr ""
 "Lista wygenerowanych styli:\n"
 
 msgid "The 2 selected objects have identical style caches."
-msgstr "Dwa wybrane objekty mają identyczne cache stylu."
+msgstr "Dwa wybrane obiekty mają identyczne cache stylu."
 
 msgid "The 2 selected objects have different style caches."
-msgstr "Dwa wybrane objekty mają rózne cache stylu."
+msgstr "Dwa wybrane obiekty mają rózne cache stylu."
 
 msgid ""
 "Warning: The 2 selected objects have equal, but not identical style caches."
 msgstr ""
-"Uwaga: Dwa wybrane objekty mają podobną, ale nie identyczną pamięć podręczną "
+"Uwaga: Dwa wybrane obiekty mają podobną, ale nie identyczną pamięć podręczną "
 "stylu."
 
 msgid "xml"
@@ -6492,7 +6506,7 @@ msgid "URL:"
 msgstr "URL:"
 
 msgid "Built-in Style, internal path:"
-msgstr ""
+msgstr "Styl wbudowany, wewnętrzna ścieżka:"
 
 msgid "Path:"
 msgstr "Ścieżka:"
@@ -6510,43 +6524,43 @@ msgid "No"
 msgstr "Nie"
 
 msgid "Style settings"
-msgstr ""
+msgstr "Ustawienia stylu"
 
 msgid "Customize the style"
-msgstr ""
+msgstr "Dostosuj styl"
 
 msgid "Add comment"
-msgstr ""
+msgstr "Dodaj komentarz"
 
 msgid "Comment"
 msgstr "Komentarz"
 
+msgid "Comment on note"
+msgstr "Komentarz do uwagi"
+
 msgid "Add comment to note:"
-msgstr ""
+msgstr "Dodaj komentarz do uwagi:"
 
 msgid "Close note"
-msgstr ""
+msgstr "Zamknij uwagę"
 
 msgid "Close note with message:"
-msgstr ""
-
-msgid "Close Note"
-msgstr ""
+msgstr "Zamknij uwagę z komunikatem:"
 
 msgid "Create a new note"
-msgstr ""
+msgstr "Utwórz nową uwagę"
 
 msgid "Create"
 msgstr "Utwórz"
 
 msgid "Reopen note"
-msgstr ""
+msgstr "Ponownie otwórz uwagę"
 
 msgid "Reopen"
-msgstr ""
+msgstr "Otwórz ponownie"
 
 msgid "Reopen note with message:"
-msgstr ""
+msgstr "Otwórz ponownie uwagę z komunikatem:"
 
 msgid "Object type:"
 msgstr "Typ obiektu:"
@@ -6611,6 +6625,9 @@ msgstr "Bieżące zaznaczenie"
 msgid "Search for objects"
 msgstr "Wyszukuje obiekty"
 
+msgid "Display the history of the selected objects."
+msgstr "Wyświetl historię zaznaczonego obiektu."
+
 msgid "Zoom to selection"
 msgstr "Powiększ do zaznaczenia"
 
@@ -6621,7 +6638,7 @@ msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}"
 msgstr "Zazn.: Rel.:{0} / Linie:{1} / Węzły:{2}"
 
 msgid "Unselectable now"
-msgstr ""
+msgstr "Nie da się teraz zaznaczyć"
 
 msgid "Selection: {0}"
 msgstr "Zaznaczenie: {0}"
@@ -6734,6 +6751,9 @@ msgstr "Naprawianie ({0}/{1}): ''{2}''"
 msgid "Updating map ..."
 msgstr "Aktualizowanie mapy..."
 
+msgid "anonymous"
+msgstr "gość"
+
 msgid "Display the basic properties of the changeset"
 msgstr "Wyświetla podstawowe właściwości zestawu zmian"
 
@@ -6747,6 +6767,12 @@ msgid "Display the objects created, updated, and deleted by the changeset"
 msgstr ""
 "Wyświetla obiekty stworzone, zaktualizowane i usunięte w zestawie zmian"
 
+msgid "Discussion"
+msgstr "Dyskusja"
+
+msgid "Display the public discussion around this changeset"
+msgstr "Wyświetl publiczną dyskusję na temat tego zestawu zmian"
+
 msgid "Changeset Management Dialog"
 msgstr "Menedżer zestawów zmian"
 
@@ -6808,9 +6834,6 @@ msgctxt "changeset.state"
 msgid "Closed"
 msgstr "Zamknięty"
 
-msgid "anonymous"
-msgstr "gość"
-
 msgid "ID"
 msgstr "ID"
 
@@ -6826,6 +6849,9 @@ msgstr "Utworzony"
 msgid "Closed at"
 msgstr "Zamknięty"
 
+msgid "Discussions"
+msgstr "Dyskusje"
+
 msgid "Downloading changeset content"
 msgstr "Pobieranie zawartości zestawu zmian"
 
@@ -6915,7 +6941,7 @@ msgid "Open/Closed:"
 msgstr "Otwarty/Zamknięty:"
 
 msgid "Created by:"
-msgstr "Stworzony przez:"
+msgstr "Utworzony przez:"
 
 msgid "Created on:"
 msgstr "Utworzony:"
@@ -6949,6 +6975,15 @@ msgid ""
 msgstr ""
 "Powiększa obiekty zawarte w zestawie zmian w edytowanej warstwie danych"
 
+msgid "Update changeset discussion"
+msgstr "Aktualizuj dyskusję nad zestawem zmian"
+
+msgid "Update the changeset discussion from the OSM server"
+msgstr "Atualizuje dyskusję nad zestawem zmian z serwera OSM"
+
+msgid "Date"
+msgstr "Data"
+
 msgid "Download changesets"
 msgstr "Pobierz zestawy zmian"
 
@@ -7216,10 +7251,10 @@ msgid "Querying and downloading changesets"
 msgstr "Odpytywanie i pobieranie zestawów zmian"
 
 msgid "Determine user id for current user..."
-msgstr ""
+msgstr "Ustal id bieżącego użytkownika..."
 
 msgid "Query and download changesets ..."
-msgstr ""
+msgstr "Odpytaj i pobierz zestawy zmian..."
 
 msgid "URL: "
 msgstr "URL: "
@@ -7320,7 +7355,7 @@ msgid "Copy the value of the selected tag to clipboard"
 msgstr "Kopiuj wartość wybranego tagu do schowka"
 
 msgid "Copy selected Key(s)/Value(s)"
-msgstr "Kopiuj zaznaczone pary klucz/wartość"
+msgstr "Kopiuj zaznaczone pary klucz(e)/wartość(i)"
 
 msgid "Copy the key and value of the selected tag(s) to clipboard"
 msgstr ""
@@ -7354,7 +7389,7 @@ msgid "Replace"
 msgstr "Zamień"
 
 msgid "The new key is already used, overwrite values?"
-msgstr ""
+msgstr "Nowy klucz jest już używany, nadpisać wartości?"
 
 msgid "Change value?"
 msgid_plural "Change values?"
@@ -7372,7 +7407,7 @@ msgid "An empty value deletes the tag."
 msgstr "Pusta wartość usunie znacznik."
 
 msgid "You changed the key from ''{0}'' to ''{1}''."
-msgstr ""
+msgstr "Zmieniono klucz z ''{0}'' to ''{1}''."
 
 msgid "Change properties of up to {0} object"
 msgid_plural "Change properties of up to {0} objects"
@@ -7401,8 +7436,8 @@ msgstr "Proszę wybierz wartość"
 msgid "Set number of recently added tags"
 msgstr "Ustal liczbę ostatnio dodanych tagów"
 
-msgid "Remember last used tags"
-msgstr "Zapamiętaj ostatnio używane tagi"
+msgid "Remember last used tags after a restart"
+msgstr "Pmiętaj ostatnio używane tagi po restarcie"
 
 msgid "Please enter the number of recently added tags to display"
 msgstr "Podaj liczbę wyświetlanych ostatnio dodanych tagów"
@@ -7414,22 +7449,23 @@ msgid "Recently added tags"
 msgstr "Ostatnio dodane tagi"
 
 msgid "Choose recent tag {0}"
-msgstr ""
+msgstr "Wybierz ostatnio dodany tag {0}"
 
 msgid "Use this tag again"
 msgstr "Użyj tego tagu ponownie"
 
 msgid "Apply recent tag {0}"
-msgstr ""
+msgstr "Zastosuj ostatnio dodany tag {0}"
 
 msgid "The key ''{0}'' is already used"
 msgstr "Klucz \"{0}\" jest już używany"
 
 msgid "You changed the value of ''{0}'' from ''{1}'' to ''{2}''."
-msgstr ""
+msgstr "Zmieniono wartość ''{0}'' z ''{1}'' na ''{2}''."
 
 msgid "Edit the relation the currently selected relation member refers to."
 msgstr ""
+"Edytuj relację, do której odnosi się aktualnie zaznaczony członek relacji."
 
 msgid "Download all child relations (recursively)"
 msgstr "Pobierz wszystkie relacje podrzędne (rekursywnie)"
@@ -7466,7 +7502,7 @@ msgid "Downloading relation {0}"
 msgstr "Pobieranie relacji {0}"
 
 msgid "Ignoring exception because task was canceled. Exception: {0}"
-msgstr ""
+msgstr "Ignorowanie wyjątku z powodu anulowania zadania. Wyjątek: {0}"
 
 msgid "Downloading {0} incomplete object"
 msgid_plural "Downloading {0} incomplete objects"
@@ -7779,6 +7815,9 @@ msgstr ""
 msgid "Load parent relations"
 msgstr "Wczytuje relacje nadrzędne"
 
+msgid "Reload"
+msgstr "Odśwież"
+
 msgid "Loading parent relations"
 msgstr "Wczytywanie relacji nadrzędnych"
 
@@ -7906,6 +7945,12 @@ msgstr "czyste dane GPS"
 msgid "Select to download GPS traces in the selected download area."
 msgstr "Wybierz by pobrać ślady GPS z zaznaczonego obszaru."
 
+msgid "Notes"
+msgstr "Uwagi"
+
+msgid "Select to download notes in the selected download area."
+msgstr "Zaznacz aby pobrać uwagi w zaznaczonego obszaru."
+
 msgid "Download as new layer"
 msgstr "Pobierz jako nową warstwę"
 
@@ -8022,10 +8067,10 @@ msgid "Error occured with query ''{0}'': ''{1}''"
 msgstr ""
 
 msgid "Name server returned invalid data. Please try again."
-msgstr ""
+msgstr "Serwer nazw zwrócił nieprawidłowe dane. Spróbuj ponownie."
 
 msgid "Bad response"
-msgstr ""
+msgstr "Nieprawidłowa odpowiedź"
 
 msgid "Type"
 msgstr "Rodzaj"
@@ -8041,6 +8086,7 @@ msgstr "Przeglądarka pomocy JOSM"
 
 msgid "Failed to read CSS file ''help-browser.css''. Exception is: {0}"
 msgstr ""
+"Próba wczytania pliku CSS ''help-browser.css'' nie powiodła się. Wyjątek: {0}"
 
 msgid ""
 "<html><p class=\"warning-header\">Help content for help topic missing</p><p "
@@ -8217,10 +8263,10 @@ msgid "Show changeset {0}"
 msgstr "Pokaż zestaw zmian {0}"
 
 msgid "User info"
-msgstr ""
+msgstr "Informacje o użytkowniku"
 
 msgid "Launch browser with information about the user"
-msgstr ""
+msgstr "Uruchom przeglądarkę z informacjami na temat tego użytkownika"
 
 msgid "Show user {0}"
 msgstr "Pokaż użytkownika {0}"
@@ -8234,9 +8280,6 @@ msgstr "A"
 msgid "B"
 msgstr "B"
 
-msgid "Date"
-msgstr "Data"
-
 msgid ""
 "Failed to update primitive with id {0} because current edit layer is null"
 msgstr ""
@@ -8349,7 +8392,7 @@ msgid "Specify the data source for the changes"
 msgstr "Podaj źródło danych dla zmian"
 
 msgid "obtain from current layers"
-msgstr ""
+msgstr "pobierz z bieżących warstw"
 
 msgid "Enter a source"
 msgstr "Wprowadź źródło"
@@ -8535,12 +8578,14 @@ msgstr "Brak tożsamości użytkownika"
 msgid ""
 "Failed to retrieve user infos for the current JOSM user. Exception was: {0}"
 msgstr ""
+"Pobieranie informacji na temat bieżącego użytkownika JOSM nie powiodło się. "
+"Wyjątek: {0}"
 
 msgid "Download objects"
 msgstr "Pobrane obiekty"
 
 msgid "Initializing nodes to download ..."
-msgstr "Inicjalizuję węzły do pobranie..."
+msgstr "Inicjalizuję węzły do pobrania..."
 
 msgid "Object could not be downloaded"
 msgid_plural "Some objects could not be downloaded"
@@ -8558,7 +8603,7 @@ msgid ""
 "The server replied with response code 404.<br>This usually means, the server "
 "does not know an object with the requested id."
 msgstr ""
-"Serwer odpowiedział kodem http 404.<br>Zazwyczaj oznacza to, że serwer nie "
+"Serwer odpowiedział kodem HTTP 404.<br>Zazwyczaj oznacza to, że serwer nie "
 "wie nic na temat żądanego ID."
 
 msgid "missing objects:"
@@ -9051,6 +9096,7 @@ msgstr "Anuluj przesyłanie"
 
 msgid "Unexpected value for key ''{0}'' in preferences, got ''{1}''"
 msgstr ""
+"Nieoczekiwana wartość klucza ''{0}'' w preferencjach, otrzymano ''{1}''"
 
 msgid "Please select the upload strategy:"
 msgstr "Wybierz metodę przesyłania:"
@@ -9230,17 +9276,14 @@ msgstr ""
 msgid "Save Layer"
 msgstr "Zapisz warstwę"
 
-msgid "Notes"
-msgstr "na banknoty"
-
 msgid "Notes layer"
-msgstr ""
+msgstr "Warstwa uwag"
 
 msgid "Total notes:"
-msgstr ""
+msgstr "Wszystkich uwag:"
 
 msgid "Changes need uploading?"
-msgstr ""
+msgstr "Zmiany wymagają wysłania?"
 
 msgid "Data Layer {0}"
 msgstr "Warstwa danych {0}"
@@ -9248,9 +9291,6 @@ msgstr "Warstwa danych {0}"
 msgid "outside downloaded area"
 msgstr "poza pobranym obszarem"
 
-msgid "version {0}"
-msgstr "wersja {0}"
-
 msgid "Merging layers"
 msgstr "Łączenie warstw"
 
@@ -9270,7 +9310,7 @@ msgid "API version: {0}"
 msgstr "Wersja API: {0}"
 
 msgid "Upload is discouraged"
-msgstr ""
+msgstr "Odradzamy wysyłanie"
 
 msgid "Convert to GPX layer"
 msgstr "Konwertuj na warstwę GPX"
@@ -9515,7 +9555,7 @@ msgstr ""
 "GPS</html>"
 
 msgid "Auto-Guess"
-msgstr ""
+msgstr "Automatyczne zgadywanie"
 
 msgid "Matches first photo with first gpx point"
 msgstr "Dopasowuje pierwsze zdjęcie do pierwszego punktu GPX"
@@ -9524,7 +9564,7 @@ msgid "Manual adjust"
 msgstr "Ręczne dopasowanie"
 
 msgid "Override position for: "
-msgstr "Nadpisz pozycje: "
+msgstr "Nadpisz pozycję: "
 
 msgid "Images with geo location in exif data ({0}/{1})"
 msgstr "zdjęć z pozycją geograficzną w danych exif ({0}/{1})"
@@ -9542,10 +9582,10 @@ msgid "Offset:"
 msgstr "Przesunięcie:"
 
 msgid "Correlate images with GPX track"
-msgstr ""
+msgstr "Skoreluj zdjęcia ze ścieżką GPX"
 
 msgid "Correlate"
-msgstr ""
+msgstr "Skoreluj"
 
 msgid "Invalid timezone"
 msgstr "Nieprawidłowa strefa czasowa"
@@ -9821,7 +9861,7 @@ msgid "Select to download OSM data."
 msgstr "Zaznacz by pobrać dane OSM."
 
 msgid "Select to download GPS traces."
-msgstr ""
+msgstr "Zaznacz by pobrać trasy GPS."
 
 msgid "Download everything within:"
 msgstr "Pobierz wszystko pomiędzy:"
@@ -9833,7 +9873,7 @@ msgid "Maximum area per request:"
 msgstr "Maksymalny obszar na zapytanie:"
 
 msgid "sq km"
-msgstr ""
+msgstr "km kw."
 
 msgid "Download near:"
 msgstr "Pobierz w pobliżu:"
@@ -9863,7 +9903,7 @@ msgid "Precache imagery tiles along this track"
 msgstr "Załaduj do pamięci podręcznej podkład mapy wzdłuż tej trasy"
 
 msgid "Precaching WMS"
-msgstr ""
+msgstr "Wstępne buforowanie WMS"
 
 msgid "Please select the imagery layer."
 msgstr "Wybierz podkład mapy."
@@ -9878,7 +9918,7 @@ msgid "No imagery layers"
 msgstr "Brak podkładów mapy"
 
 msgid "Velocity, km/h"
-msgstr ""
+msgstr "Prędkość, km/h"
 
 msgid "HDOP, m"
 msgstr ""
@@ -10195,7 +10235,7 @@ msgstr "Autoryzuj"
 
 msgid "Click to redirect you to the authorization form on the JOSM web site"
 msgstr ""
-"Kliknij by przenieść się do formularza edycji praw dostępu na witrynie JOSM."
+"Kliknij aby przenieść się do formularza edycji praw dostępu na witrynie JOSM."
 
 msgid "Back"
 msgstr "Wstecz"
@@ -10204,7 +10244,7 @@ msgid "Run the automatic authorization steps again"
 msgstr "Uruchom ponownie kroki automatycznego uwierzytelnienia."
 
 msgid "Test Access Token"
-msgstr "Testuj Klucz Dostępu"
+msgstr "Testuj klucz dostępu"
 
 msgid "Please enter your OSM user name"
 msgstr "Proszę wprowadć swoją nazwę użytkownika OSM."
@@ -10232,7 +10272,7 @@ msgstr ""
 "procesu uwierzytelniania,<br>np. półautomatyczny lub ręczny.</html>"
 
 msgid "OAuth authorization failed"
-msgstr "Uwierzytelnianie OAuth nie udało się"
+msgstr "Uwierzytelnianie OAuth nie powiodło się"
 
 msgid ""
 "<html>The automatic process for retrieving an OAuth Access Token<br>from the "
@@ -10253,13 +10293,13 @@ msgid ""
 msgstr ""
 
 msgid "Access Token"
-msgstr "Klucz Dostępu"
+msgstr "Klucz dostępu"
 
 msgid "Advanced OAuth parameters"
 msgstr "Zaawansowane parametry OAuth"
 
 msgid "Enter the OAuth Access Token"
-msgstr "Wprowadź Klucz Dostępu OAuth"
+msgstr "Wprowadź klucz dostępu OAuth"
 
 msgid "Enter advanced OAuth properties"
 msgstr "Wprowadź ustawienia OAuth"
@@ -10300,13 +10340,13 @@ msgid "Please select an authorization procedure: "
 msgstr "Proszę wybrać procedurę uwierzytelniania: "
 
 msgid "Get an Access Token for ''{0}''"
-msgstr "Pobierz Klucz Dostępu do ''{0}''"
+msgstr "Pobierz klucz dostępu do ''{0}''"
 
 msgid "Close the dialog and cancel authorization"
 msgstr "Zamknij okno i anuluj uwierzytelnianie"
 
 msgid "Close the dialog and accept the Access Token"
-msgstr "Zamknij okno i zaakceptuj Klucz Dostępu"
+msgstr "Zamknij okno i zaakceptuj klucz dostępu"
 
 msgid "Failed to cancel running OAuth operation"
 msgstr ""
@@ -10364,7 +10404,7 @@ msgid ""
 "Select to grant JOSM the right to download your private GPS traces into JOSM "
 "layers"
 msgstr ""
-"Zaznacz by nadac JOSM prawo do pobierania twoich prywatnych śladów GPS do "
+"Zaznacz by nadać JOSM prawo do pobierania twoich prywatnych śladów GPS do "
 "warstw JOSM."
 
 msgid "Allow to read your preferences"
@@ -10381,23 +10421,23 @@ msgstr ""
 "Zaznacz by nadac JOSM prawo do wysyłania twoich preferencji witryny OSM"
 
 msgid "Allow modifications of notes"
-msgstr ""
+msgstr "Pozwól na modyfikowanie uwag"
 
 msgid "Select to grant JOSM the right to modify notes on your behalf"
-msgstr ""
+msgstr "Zaznacz aby pozwolić JOSM na modyfikowanie uwag w twoim imieniu"
 
 msgid "Retrieving OAuth Access Token..."
-msgstr "Pobieranie Klucza Dostępu OAuth"
+msgstr "Pobieranie klucza dostępu OAuth"
 
 msgid "<html>Retrieving an OAuth Access Token from ''{0}'' failed.</html>"
 msgstr ""
-"<html>Pobieranie Klucza Dostępu OAuth z ''{0}'' nie udało się.</html>"
+"<html>Pobieranie klucza dostępu OAuth z ''{0}'' nie udało się.</html>"
 
 msgid "Request Failed"
 msgstr "Zapytanie nie udało się"
 
 msgid "Retrieving OAuth Request Token..."
-msgstr "Pobieranie Żetonu Żądania OAuth..."
+msgstr "Pobieranie żetonu żądania OAuth..."
 
 msgid "<html>Retrieving an OAuth Request Token from ''{0}'' failed.</html>"
 msgstr ""
@@ -10423,7 +10463,7 @@ msgid "<html>Step 2/3: Authorize and retrieve an Access Token</html>"
 msgstr "<html>Krok 2/3: Uwierzytelnianie i pobieranie Klucza Dostępu</html>"
 
 msgid "Request Access Token"
-msgstr ""
+msgstr "Żądanie klucza dostępu"
 
 msgid ""
 "<html>JOSM successfully retrieved a Request Token. JOSM is now launching an "
@@ -10453,15 +10493,15 @@ msgid ""
 "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 pomyślnie pobrał Klucz Dostępu. Możesz teraz go zaakceptować. "
+"<html>JOSM pomyślnie pobrał klucz dostępu. Możesz teraz go zaakceptować. "
 "JOSM będzie używał go w przyszłości w celu uwierzytelnienia i uzyskania praw "
 "do serwera OSM.<br><br>Klucz dostępu: </html>"
 
 msgid "Click to retrieve a Request Token"
-msgstr "Kliknij by pobrać Żeton Żądania"
+msgstr "Kliknij by pobrać żeton żądania"
 
 msgid "Retrieve Access Token"
-msgstr ""
+msgstr "Pobierz żeton żądania"
 
 msgid "Click to retrieve an Access Token"
 msgstr ""
@@ -10568,13 +10608,13 @@ msgid "Minimum JOSM Version:"
 msgstr "Minimalna wersja JOSM:"
 
 msgid "by {0}"
-msgstr "przez {0}"
+msgstr "autor: {0}"
 
 msgid "Name (optional):"
 msgstr "Nazwa (opcjonalna):"
 
 msgid "URL / File:"
-msgstr "URL/ Plik:"
+msgstr "URL/Plik:"
 
 msgid "active"
 msgstr "aktywne"
@@ -10698,7 +10738,7 @@ msgid "Export selected items"
 msgstr "Eksportuj zaznaczone obiekty"
 
 msgid "JOSM custom settings files (*.xml)"
-msgstr ""
+msgstr "Pliki z własnymi ustawieniami JOSM (*.xml)"
 
 msgid "Please select some preference keys not marked as default"
 msgstr ""
@@ -10748,7 +10788,7 @@ msgid ""
 "keyboard, etc. <br />Are you sure you want to continue?"
 msgstr ""
 "Zamierzasz właśnie przywrócić ustawienia domyślnie.<br/>Wszystkie Twoje "
-"dotychczasowe ustawienia zostaną usunięte: pluginy,  podkłady mapy, filtry, "
+"dotychczasowe ustawienia zostaną usunięte: wtyczki,  podkłady mapy, filtry, "
 "przyciski, paski narzędziowe, skróty klawiatury itp.<br/>Czy na pewno chcesz "
 "kontynuować ?"
 
@@ -10789,7 +10829,7 @@ msgid "Please select the row to edit."
 msgstr "Proszę wybrać wiersz do edycji"
 
 msgid "Select Setting Type:"
-msgstr ""
+msgstr "Wybierz typ ustawienia:"
 
 msgid "Simple"
 msgstr "Prosty"
@@ -10831,10 +10871,10 @@ msgid "Value: "
 msgstr "Wartość: "
 
 msgid "Audio Settings"
-msgstr "Ustawienia audio"
+msgstr "Ustawienia dźwięku"
 
 msgid "Settings for the audio player and audio markers."
-msgstr "Ustawienia odtwarzacza audio oraz znaczników audio."
+msgstr "Ustawienia odtwarzacza oraz znaczników dźwięku."
 
 msgid "Display the Audio menu."
 msgstr "Wyświetlaj menu \"Dźwięk\""
@@ -11002,7 +11042,7 @@ msgstr "Rysuje granice obszaru danych pobranych z serwera."
 
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr ""
-"Rysuje węzły wirtualne podczas pracy w trybie zaznaczania dla łatwej "
+"Rysuje węzły wirtualne podczas pracy w trybie zaznaczania dla wygodnej "
 "modyfikacji dróg."
 
 msgid "Draw the inactive data layers in a different color."
@@ -11035,7 +11075,7 @@ msgid "Options that affect drawing performance"
 msgstr "Ustawienia wpływające na wydajność rysowania"
 
 msgid "Segment drawing options"
-msgstr ""
+msgstr "Opcje rysowania segmentu"
 
 msgid "Select and draw mode options"
 msgstr "Ustawienia trybu zaznacz i rysuj"
@@ -11121,7 +11161,7 @@ msgid "Fast drawing (looks uglier)"
 msgstr "Szybsze rysowanie (wygląda gorzej)"
 
 msgid "Dynamic color range based on data limits"
-msgstr ""
+msgstr "Dynamiczny zestaw kolorów w zależności od ograniczeń danych"
 
 msgid "Smooth GPX graphics (antialiasing)"
 msgstr "Wygładzaj linie GPX (antyaliasing)"
@@ -11174,7 +11214,8 @@ msgid ""
 "Do not draw arrows if they are not at least this distance away from the last "
 "one."
 msgstr ""
-"Nie rysuj strzałek jeśli nie są one oddalone co najmniej tyle od siebie."
+"Nie rysuj strzałek jeśli nie są one oddalone co najmniej o taką odległość od "
+"siebie."
 
 msgid "Minimum distance (pixels)"
 msgstr "Minimalna odległość (w pikselach)"
@@ -11253,13 +11294,13 @@ msgid "Show localized name in selection lists"
 msgstr "Wyświetlaj zlokalizowane nazwy na listach"
 
 msgid "Modeless working (Potlatch style)"
-msgstr ""
+msgstr "Praca bez wybierania trybu (jak w Potlatchu)"
 
 msgid "Dynamic buttons in side menus"
 msgstr "Ukrywaj przyciski w bocznym panelu"
 
 msgid "Display ISO dates"
-msgstr ""
+msgstr "Wyświetlaj daty w formacie ISO"
 
 msgid "Use native file choosers (nicer, but do not support file filters)"
 msgstr ""
@@ -11268,7 +11309,7 @@ msgid "Show localized name in selection lists, if available"
 msgstr "Wyświetla zlokalizowane nazwy na listach, jeśli są dostępne"
 
 msgid "Do not require to switch modes (potlatch style workflow)"
-msgstr ""
+msgstr "Nie wymaga zmieniania trybu (styl pracy jak w Potlatchu)"
 
 msgid ""
 "Display buttons in right side menus only when mouse is inside the element"
@@ -11277,7 +11318,7 @@ msgstr ""
 "jest wewnątrz danego narzędzia"
 
 msgid "ISO 8601"
-msgstr ""
+msgstr "ISO 8601"
 
 msgid ""
 "Format dates according to {0}. Today''s date will be displayed as {1} "
@@ -11431,7 +11472,7 @@ msgid "Remove entry"
 msgstr "Usuń wpis"
 
 msgid "copy selected defaults"
-msgstr ""
+msgstr "skopiuj zaznaczone wartości domyślne"
 
 msgid "Please select at least one row to copy."
 msgstr "Wybierz co najmniej jeden wiersz do skopiowania."
@@ -11600,10 +11641,10 @@ msgstr ""
 "''{1}''"
 
 msgid "JOSM default (XML; old version)"
-msgstr ""
+msgstr "JOSM domyślny (XML; stara wersja)"
 
 msgid "JOSM default (MapCSS)"
-msgstr ""
+msgstr "JOSM domyślny (MapCSS)"
 
 msgid ""
 "Internal style to be used as base for runtime switchable overlay styles"
@@ -11663,7 +11704,7 @@ msgid ""
 "<html>Unable to parse tagging preset source: {0}. Do you really want to use "
 "it?<br><br><table width=600>Error is: {1}</table></html>"
 msgstr ""
-"<html>Niemożna przetworzyć źródła szablonu tagowania: {0}. Czy naprawdę "
+"<html>Nie można przetworzyć źródła szablonu tagowania: {0}. Czy naprawdę "
 "chcesz go użyć?<br><br><table width=600>Błąd: {1}</table></html>"
 
 msgid "Sort presets menu"
@@ -11724,14 +11765,14 @@ msgid ""
 "Please click on <strong>Download list</strong> to download and display a "
 "list of available plugins."
 msgstr ""
-"Proszę kliknąć <strong>Ś</strong> to download and display a list of "
-"available plugins."
+"Proszę kliknąć <strong>Pobierz listę</strong> aby pobrać i wyświetlić listę "
+"dostępnych wtyczek."
 
 msgid "Plugin {0} is still required by this plugin:"
 msgid_plural "Plugin {0} is still required by these {1} plugins:"
-msgstr[0] "Plugin {0} jest wciąż wymagany przez ten plugin:"
-msgstr[1] "Plugin {0} jest wciąż wymagany przez te {1} pluginy:"
-msgstr[2] "Plugin {0} jest wciąż wymagany przez te {1} pluginów:"
+msgstr[0] "Wtyczka {0} jest wciąż wymagana przez tę wtyczkę:"
+msgstr[1] "Wtyczka {0} jest wciąż wymagana przez te {1} wtyczki:"
+msgstr[2] "Wtyczka {0} jest wciąż wymagana przez te {1} wtyczek:"
 
 msgid "{0}: Version {1} (local: {2})"
 msgstr "{0}: Wersja {1} (lokalna: {2})"
@@ -11779,7 +11820,7 @@ msgid "Plugin update policy"
 msgstr "Aktualizowanie wtyczek"
 
 msgid "Accept the new plugin sites and close the dialog"
-msgstr "Akceptuje nową listę wtyczek i zabyka okno"
+msgstr "Akceptuje nową listę wtyczek i zamyka okno"
 
 msgid "Configure Plugin Sites"
 msgstr "Konfiguracja stron wtyczek"
@@ -11885,10 +11926,10 @@ msgid "Scaling factor"
 msgstr "Współczynnik skalowania"
 
 msgid "Ellipsoid name"
-msgstr ""
+msgstr "Nazwa elipsoidy"
 
 msgid "Ellipsoid parameters"
-msgstr ""
+msgstr "Parametry elipsoidy"
 
 msgid "Datum name"
 msgstr ""
@@ -11988,7 +12029,7 @@ msgid "Swiss Grid (Switzerland)"
 msgstr "Siatka szwajcarska (stosowana w Szwajcarii)"
 
 msgid "<i>CH1903 / LV03 (without local corrections)</i>"
-msgstr ""
+msgstr "<i>CH1903 / LV03 (bez korekty lokalnej)</i>"
 
 msgid "Guadeloupe Fort-Marigot 1949"
 msgstr "Gwadelupa Fort-Marigot 1949"
@@ -12000,7 +12041,7 @@ msgid "Martinique Fort Desaix 1952"
 msgstr "Martynika Fort Desaix 1952"
 
 msgid "Reunion RGR92"
-msgstr ""
+msgstr "Reunion RGR92"
 
 msgid "Guyane RGFG95"
 msgstr "Gujana RGFG95"
@@ -12050,8 +12091,8 @@ msgid ""
 "(https) on localhost.<br>These ports are not configurable because they are "
 "referenced by external applications talking to JOSM."
 msgstr ""
-"JOSM nasłuchuje tylko na <b>porcie {0}</b> (http) oraz na <b>porcie {1}</b> "
-"(https) na maszynie lokalnej.<br>Te porty nie są konfigurowalne, ponieważ "
+"JOSM nasłuchuje tylko na <b>porcie {0}</b> (HTTP) oraz na <b>porcie {1}</b> "
+"(HTTPS) na maszynie lokalnej.<br>Te porty nie są konfigurowalne, ponieważ "
 "odwołują się do nich inne aplikacje komunikujące się z JOSM-em."
 
 msgid "Enable remote control"
@@ -12061,10 +12102,10 @@ msgid "Enable HTTPS support"
 msgstr "Włącz obsługę HTTPS"
 
 msgid "Install..."
-msgstr ""
+msgstr "Zainstaluj..."
 
 msgid "Uninstall..."
-msgstr ""
+msgstr "Odinstaluj..."
 
 msgid "Install JOSM localhost certificate to system/browser root keystores"
 msgstr ""
@@ -12074,25 +12115,25 @@ msgid ""
 msgstr ""
 
 msgid "Certificate:"
-msgstr ""
+msgstr "Certyfikat:"
 
 msgid "Certificate has been successfully installed."
-msgstr ""
+msgstr "Certyfikat został pomyślnie zainstalowany."
 
 msgid "Certificate is already installed. Nothing to do."
-msgstr ""
+msgstr "Certyfikat już jest zainstalowany. Nie trzeba nic robić."
 
 msgid "Removing certificate {0} from root keystore."
-msgstr ""
+msgstr "Usuwanie certyfikatu {0} z głównej bazy."
 
 msgid "Certificate has been successfully uninstalled."
-msgstr ""
+msgstr "Certyfikat został pomyślnie odinstalowany."
 
 msgid "Certificate is not installed. Nothing to do."
-msgstr ""
+msgstr "Certyfikat nie jest zainstalowany. Nie trzeba nic robić."
 
 msgid "Permitted actions:"
-msgstr "Dozwolone czynności"
+msgstr "Dozwolone czynności:"
 
 msgid "Testing OSM API URL ''{0}''"
 msgstr "Testowanie adresu URL dla API OSM \"{0}\""
@@ -12118,7 +12159,7 @@ msgid ""
 msgstr ""
 
 msgid "Connection to API failed"
-msgstr ""
+msgstr "Połączenie z API nie powiodło się."
 
 msgid ""
 "<html>Failed to retrieve a list of changesets from the OSM API server "
@@ -12202,12 +12243,12 @@ msgid "Click to step through the OAuth authorization process"
 msgstr ""
 
 msgid "New Access Token"
-msgstr ""
+msgstr "Nowy klucz dostępu"
 
 msgid ""
 "Click to step through the OAuth authorization process and generate a new "
 "Access Token"
-msgstr ""
+msgstr "Klucz dostępu"
 
 msgid "Click test access to the OSM server with the current access token"
 msgstr ""
@@ -12371,13 +12412,13 @@ msgid "Checks for missing tag or suspicious combinations"
 msgstr ""
 
 msgid "Deprecated features"
-msgstr ""
+msgstr "Porzucone funkcje"
 
 msgid "Checks for deprecated features"
 msgstr ""
 
 msgid "Geometry"
-msgstr ""
+msgstr "Geometria"
 
 msgid "Checks for geometry errors"
 msgstr ""
@@ -12392,7 +12433,7 @@ msgid "Checks for wrong multiple values"
 msgstr ""
 
 msgid "Numeric values"
-msgstr ""
+msgstr "Wartości numeryczne"
 
 msgid "Checks for wrong numeric values"
 msgstr ""
@@ -12413,7 +12454,7 @@ msgid "Checks for errors on relations"
 msgstr ""
 
 msgid "Unnecessary tags"
-msgstr ""
+msgstr "Zbędne tagi"
 
 msgid "Checks for unnecessary tags"
 msgstr "Sprawdzanie niepotrzebnych tagów"
@@ -12431,7 +12472,7 @@ msgid "Choose Tag checker rules to enable"
 msgstr ""
 
 msgid "Use ignore list."
-msgstr "Użyj listę ignorowanych"
+msgstr "Użyj listy ignorowanych"
 
 msgid "Use the ignore list to suppress warnings."
 msgstr "Używa listę ignorowanych problemów by pominąć niektóre ostrzeżenia."
@@ -12464,7 +12505,7 @@ msgid "Tests"
 msgstr "Testowanie"
 
 msgid "Choose tests to enable"
-msgstr ""
+msgstr "Wybierz które testy mają być aktywne"
 
 msgid "multiple"
 msgstr ""
@@ -12493,7 +12534,7 @@ msgid "Elements of type {0} are supported."
 msgstr "Elementy typu {0} nie są wspierane."
 
 msgid "Edit also …"
-msgstr ""
+msgstr "Edytuj też..."
 
 msgid "Apply Preset"
 msgstr "Zastosuj szablon"
@@ -12514,10 +12555,10 @@ msgid "Selection unsuitable!"
 msgstr "Nieodpowiednie zaznaczenie."
 
 msgid "Change Tags"
-msgstr ""
+msgstr "Zmień tagi"
 
 msgid "Add or remove toolbar button"
-msgstr ""
+msgstr "Dodaj lub usuń przycisk z paska narzędzi"
 
 msgid "Unknown requisite: {0}"
 msgstr ""
@@ -12620,7 +12661,7 @@ msgid "Search in tags"
 msgstr "Szukaj w tagach"
 
 msgid "Add toolbar button"
-msgstr ""
+msgstr "Dodaj przycisk do paska narzędzi"
 
 msgid ""
 "Adjustable {0} not registered yet. Cannot set participation in synchronized "
@@ -12640,7 +12681,7 @@ msgid "All files (*.*)"
 msgstr "Wszystkie pliki (*.*)"
 
 msgid "Received error page:"
-msgstr ""
+msgstr "Strona błędu:"
 
 msgid "Min. latitude"
 msgstr "Min. szerokość"
@@ -12959,13 +13000,13 @@ msgid "folder"
 msgstr "katalog"
 
 msgid "Looking for image files"
-msgstr ""
+msgstr "Szukam plików obrazu"
 
 msgid "No image files found."
 msgstr "Nie znaleziono plików obrazu."
 
 msgid "get number of unread messages"
-msgstr ""
+msgstr "pobierz ilość nieprzeczytanych wiadomości"
 
 msgid "You have {0} unread message."
 msgid_plural "You have {0} unread messages."
@@ -12977,7 +13018,7 @@ msgid "Click here to see your inbox."
 msgstr "Kliknij tutaj, by przejść do swojej skrzynki odbiorczej"
 
 msgid "Message notifier"
-msgstr ""
+msgstr "Powiadamianie"
 
 msgid "{0} not available (offline mode)"
 msgstr ""
@@ -13048,13 +13089,13 @@ msgid "NMEA import failure!"
 msgstr "Import NMEA zakończony niepowodzeniem!"
 
 msgid "Note Files"
-msgstr ""
+msgstr "Pliki uwag"
 
 msgid "OSM API"
 msgstr "OSM API"
 
 msgid "JOSM website"
-msgstr ""
+msgstr "Strona internetowa JOSM"
 
 msgid "Unable to access ''{0}'': {1} not available (offline mode)"
 msgstr ""
@@ -13128,6 +13169,15 @@ msgstr ""
 msgid "Open changeset expected. Got closed changeset with id {0}."
 msgstr "Oczekiwano otwartego zestawu zmian. Otrzymano zamknięty z id {0}."
 
+msgid "Note upload failed"
+msgstr "Wysyłanie uwag nie powiodło się"
+
+msgid "Error parsing note response from server"
+msgstr ""
+
+msgid "Error encoding string: {0}"
+msgstr ""
+
 msgid "(Code={0})"
 msgstr "(Kod={0})"
 
@@ -13156,7 +13206,7 @@ msgid "Open OsmChange file"
 msgstr ""
 
 msgid "Unsupported version: {0}"
-msgstr "Nie wspierana wersja: {0}"
+msgstr "Nieobsługiwana wersja: {0}"
 
 msgid ""
 "Unsupported start element ''{0}'' in changeset content at position "
@@ -13178,14 +13228,14 @@ msgstr ""
 msgid "Parsing changeset content ..."
 msgstr "Przetwarzam zawartość zestawu zmian..."
 
+msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
+msgstr ""
+
 msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
-msgstr "Nielegalna wartość atrybutu ''{0}''. Otrzymano ''{1}''"
+msgstr "Niedozwolona wartość atrybutu ''{0}''. Otrzymano ''{1}''"
 
 msgid "Illegal numeric value for attribute ''{0}''. Got ''{1}''."
-msgstr "Nielegalna numeryczna wartość atrybutu ''{0}''. Otrzymano ''{1}''."
-
-msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
-msgstr ""
+msgstr "Niedozwolona numeryczna wartość atrybutu ''{0}''. Otrzymano ''{1}''."
 
 msgid "Missing mandatory attribute ''{0}'' of XML element {1}."
 msgstr ""
@@ -13271,7 +13321,7 @@ msgid "Incomplete <member> specification with ref=0"
 msgstr "Niekompletny opis <member> z ref=0"
 
 msgid "Missing key or value attribute in tag."
-msgstr ""
+msgstr "Brakujący klucz lub wartość tagu."
 
 msgid "Undefined element ''{0}'' found in input stream. Skipping."
 msgstr ""
@@ -13359,7 +13409,7 @@ msgid "Contacting Server..."
 msgstr "Łączenie z serwerem..."
 
 msgid "Downloading OSM notes..."
-msgstr ""
+msgstr "Pobieranie uwag OSM"
 
 msgid "Failed to open connection to API {0}."
 msgstr "Błąd otwarcia połączenia z API {0}."
@@ -13382,7 +13432,7 @@ msgid "Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}."
 msgstr ""
 
 msgid "Reading user info ..."
-msgstr "Wczytywanie informacji użytkownika..."
+msgstr "Wczytywanie informacji o użytkowniku..."
 
 msgid "Starting to upload with one request per primitive ..."
 msgstr "Rozpoczęcie wysyłania, jedno żadanie na element ..."
@@ -13442,13 +13492,13 @@ msgid "<delete from {0} objects>"
 msgstr ""
 
 msgid "Old values of"
-msgstr ""
+msgstr "Stare wartości"
 
 msgid "Add tags to selected objects"
 msgstr "Dodaj znaczniki do wybranych obiektów"
 
 msgid "Add selected tags"
-msgstr ""
+msgstr "Dodaj zaznaczone tagi"
 
 msgid "Add all tags"
 msgstr "Dodaj wszystkie tagi"
@@ -13463,7 +13513,7 @@ msgid "Assume"
 msgstr ""
 
 msgid "Existing values"
-msgstr ""
+msgstr "Obecne wartości"
 
 msgid "Enable the checkbox to accept the value"
 msgstr ""
@@ -13532,7 +13582,7 @@ msgid "There is no layer opened to add way"
 msgstr ""
 
 msgid "Add way"
-msgstr "Dodaj drogę"
+msgstr "Dodaj linię"
 
 msgid ""
 "Remote Control has been asked to report its supported features. This enables "
@@ -13566,7 +13616,7 @@ msgid "Remote Control has been asked to load the following data:"
 msgstr ""
 
 msgid "Loading data"
-msgstr ""
+msgstr "Wczytywanie danych"
 
 msgid ""
 "Remote Control has been asked to load objects (specified by their id) from "
@@ -13753,7 +13803,7 @@ msgid "integrated into main program"
 msgstr "zintegrowano z głównym programem"
 
 msgid "replaced by new {0} plugin"
-msgstr "zastąpiony przez nowy plugin {0}"
+msgstr "zastąpiona przez nową wtyczkę {0}"
 
 msgid "no longer required"
 msgstr "dłużej nie wymagany"
@@ -13773,7 +13823,7 @@ msgid ""
 msgstr ""
 
 msgid "Plugin update"
-msgstr ""
+msgstr "Aktualizacja wtyczek"
 
 msgid ""
 "You updated your JOSM software.<br>To prevent problems the plugins should be "
@@ -13786,31 +13836,31 @@ msgid "Last plugin update more than {0} days ago."
 msgstr "Ostatnia aktualizacja wtyczek odbyła się przed {0} dniami."
 
 msgid "Click to update the activated plugins"
-msgstr "Kliknij aby aktualizować aktywowane pluginy"
+msgstr "Kliknij aby aktualizować aktywowane wtyczki"
 
 msgid "Skip update"
-msgstr "Pomiń"
+msgstr "Pomiń aktualizację"
 
 msgid "Click to skip updating the activated plugins"
-msgstr "Kliknij aby pominąć aktualizację aktywowanych pluginów"
+msgstr "Kliknij aby pominąć aktualizację aktywnych wtyczek"
 
 msgid ""
 "Skipping plugin update after JOSM upgrade. Automatic update at startup is "
 "disabled."
 msgstr ""
-"Pomijanie aktualizacji pluginów po uaktualnieniu JOSM. Automatyczna "
+"Pomijanie aktualizacji wtyczek po uaktualnieniu JOSM. Automatyczna "
 "aktualizacja przy starcie została wyłączona."
 
 msgid ""
 "Skipping plugin update after elapsed update interval. Automatic update at "
 "startup is disabled."
-msgstr "Pomijanie aktualizacji pluginów"
+msgstr "Pomijanie aktualizacji wtyczek"
 
 msgid ""
 "Running plugin update after JOSM upgrade. Automatic update at startup is "
 "enabled."
 msgstr ""
-"Uruchamianie aktualizacji pluginów po aktualizacji JOSM. Automatyczna "
+"Uruchamianie aktualizacji wtyczek po aktualizacji JOSM. Automatyczna "
 "aktualizacja przy starcie jest włączona."
 
 msgid ""
@@ -13872,12 +13922,12 @@ msgstr[2] "JOSM nie mógł odnaleźć informacji o następujących wtyczkach:"
 
 msgid "The plugin is not going to be loaded."
 msgid_plural "The plugins are not going to be loaded."
-msgstr[0] "Plugin nie będzie załadowany"
-msgstr[1] "Pluginy nie będą załadowane"
-msgstr[2] "Pluginy nie będą załadowane"
+msgstr[0] "Wtyczka nie będzie załadowana"
+msgstr[1] "Wtyczki nie będą załadowane"
+msgstr[2] "Wtyczki nie będą załadowane"
 
 msgid "Determine plugins to load..."
-msgstr "Określanie pluginów do załadowania..."
+msgstr "Określanie wtyczek do załadowania..."
 
 msgid "Removing deprecated plugins..."
 msgstr "Usuwanie przestarzałych wtyczek..."
@@ -13898,7 +13948,7 @@ msgid_plural ""
 "Please open the Preference Dialog after JOSM has started and try to update "
 "them manually."
 msgstr[0] ""
-"Proszę otworzyć okno Ustawienia po starcie JOSM i spróbować zaktualizować go "
+"Proszę otworzyć okno Ustawienia po starcie JOSM i spróbować zaktualizować je "
 "ponownie."
 msgstr[1] ""
 "Proszę otworzyć okno Ustawienia po starcie JOSM i spróbować zaktualizować je "
@@ -13908,13 +13958,13 @@ msgstr[2] ""
 "ponownie."
 
 msgid "Plugin update failed"
-msgstr "Aktualizacja Pluginu zakończona niepowodzeniem"
+msgstr "Aktualizacja wtyczek nie powiodła się"
 
 msgid "Failed to find plugin {0}"
-msgstr "Nie udało się odnaleźć pluginu {0}"
+msgstr "Nie udało się odnaleźć wtyczki {0}"
 
 msgid "Failed to download plugin information list"
-msgstr "Nie udało się pobrać listy informacji o pluginach"
+msgstr "Nie udało się pobrać listy informacji o wtyczkach"
 
 msgid "Disable plugin"
 msgstr "Zablokuj wtyczkę"
@@ -13929,14 +13979,14 @@ msgid "Click to keep the plugin ''{0}''"
 msgstr "Kliknij aby zachować wtyczkę \"{0}\""
 
 msgid "Failed to delete outdated plugin ''{0}''."
-msgstr "Nie udało się usunąć nieaktualnego pluginu ''{0}''."
+msgstr "Nie udało się usunąć nieaktualnej wtyczki ''{0}''."
 
 msgid ""
 "Failed to install already downloaded plugin ''{0}''. Skipping installation. "
 "JOSM is still going to load the old plugin version."
 msgstr ""
-"Nie udało się zainstalować pobranego pluginu \"{0}\". Pomijanie instalacji. "
-"JOSM mimo wszystko spróbuje załadować starą wersję pluginu."
+"Nie udało się zainstalować pobranej wtyczki \"{0}\". Pomijanie instalacji. "
+"JOSM mimo wszystko spróbuje załadować starą wersję wtyczki."
 
 msgid ""
 "Failed to install plugin ''{0}'' from temporary download file ''{1}''. {2}"
@@ -14033,9 +14083,6 @@ msgstr "Przetwarzanie pliku ''{0}''"
 msgid "Failed to scan file ''{0}'' for plugin information. Skipping."
 msgstr ""
 
-msgid "Processing plugin site cache icon files..."
-msgstr ""
-
 msgid "Processing plugin files..."
 msgstr "Przetwarzanie plików wtyczki..."
 
@@ -14054,12 +14101,6 @@ msgstr ""
 msgid "Details:"
 msgstr "Szczegóły:"
 
-msgid "Plugin icons download error"
-msgstr "Błąd pobierania ikon Pluginów"
-
-msgid "JOSM failed to download plugin icons:"
-msgstr ""
-
 msgid ""
 "Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
 "plugin site ''{1}''."
@@ -14423,7 +14464,7 @@ msgid ""
 msgstr ""
 
 msgid "Failed to locate image ''{0}''"
-msgstr ""
+msgstr "Nie udało się zlokalizować obraz ''{0}''"
 
 msgid "Failed to handle zip file ''{0}''. Exception was: {1}"
 msgstr ""
@@ -14447,10 +14488,10 @@ msgid "zoom"
 msgstr ""
 
 msgid "latitude"
-msgstr ""
+msgstr "szerokość geograficzna"
 
 msgid "longitude"
-msgstr ""
+msgstr "długość geograficzna"
 
 msgid "URL does not contain {0}/{1}/{2}"
 msgstr ""
@@ -14683,7 +14724,7 @@ msgstr "las"
 
 msgctxt "landuse"
 msgid "meadow"
-msgstr ""
+msgstr "łąka"
 
 msgctxt "landuse"
 msgid "farmland"
@@ -14985,8 +15026,10 @@ msgid ""
 "Creating and handling address nodes and buildings within Czech Republic."
 msgstr ""
 
-msgid "Allows to import various file formats into JOSM directly."
-msgstr "Pozwala na bezpośredni import do JOSM plików w różnych formatach."
+msgid ""
+"Allows to import various file formats into JOSM directly. Currently "
+"supported: TangoGPS, Garmin Trainings Center TCX."
+msgstr ""
 
 msgid "Download your GPX tracks from openstreetmap.org"
 msgstr "Ściąga z openstreetmap.org twoje ślady GPX."
@@ -15086,6 +15129,11 @@ msgid "A helper for IRS satellite adjustment."
 msgstr ""
 
 msgid ""
+"Provides Java Native Access (JNA) library. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
+msgid ""
 "Provides Java Topology Suite (JTS) library and related utilities. Not meant "
 "to be installed directly by users, but rather as a dependency for other "
 "plugins."
@@ -15109,9 +15157,9 @@ msgid ""
 "Provides the Log4j library for other JOSM plugins. Not meant to be installed "
 "directly by users, but rather as a dependency for other plugins."
 msgstr ""
-"Dostarcza bibliotekę Log4j dla innych pluginów JOSM. Nie ma potrzeby "
+"Dostarcza bibliotekę Log4j dla innych wtyczek JOSM. Nie ma potrzeby "
 "instalacji bezpośrednio przez użytkownika, jedynie jako zależność dla innych "
-"pluginów."
+"wtyczek."
 
 msgid ""
 "The MapDust Plug-In shows the MapDust bug reports on the map. You can "
@@ -15453,6 +15501,25 @@ msgstr "Jednokierunkowa"
 msgid "Width (meters)"
 msgstr "Szerokość (w metrach)"
 
+msgid "Sidewalk"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "both"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "left"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "right"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "no"
+msgstr ""
+
 msgid "Service type"
 msgstr ""
 
@@ -15564,7 +15631,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 ""
@@ -15809,7 +15876,7 @@ msgid "Fee"
 msgstr "Opłata"
 
 msgid "06:00-20:00"
-msgstr ""
+msgstr "06:00-20:00"
 
 msgid "Mo-Fr 09:00-18:00,Sa 08:00-14:00"
 msgstr ""
@@ -15817,17 +15884,21 @@ msgstr ""
 msgid "May-Sep 09:30-12:30,14:15-19:30"
 msgstr ""
 
+msgctxt "parking"
 msgid "multi-storey"
-msgstr "wielopoziomowy"
+msgstr ""
 
+msgctxt "parking"
 msgid "surface"
-msgstr "terenowy"
+msgstr ""
 
+msgctxt "parking"
 msgid "underground"
-msgstr "podziemny"
+msgstr ""
 
+msgctxt "parking"
 msgid "rooftop"
-msgstr "na dachu"
+msgstr ""
 
 msgid "Reference number"
 msgstr "Numer referencyjny"
@@ -16010,10 +16081,10 @@ msgid "low"
 msgstr "niski"
 
 msgid "750000;200000"
-msgstr ""
+msgstr "750000;200000"
 
 msgid "110000;20000"
-msgstr ""
+msgstr "110000;20000"
 
 msgid "Branch operator"
 msgstr ""
@@ -16283,14 +16354,25 @@ msgstr "Maks. długość (w metrach)"
 msgid "Overtaking"
 msgstr "Wyprzedzanie"
 
+msgctxt "overtaking"
+msgid "yes"
+msgstr ""
+
+msgctxt "overtaking"
 msgid "both"
-msgstr "oba"
+msgstr ""
 
+msgctxt "overtaking"
 msgid "forward"
-msgstr "naprzód"
+msgstr ""
 
+msgctxt "overtaking"
 msgid "backward"
-msgstr "wstecz"
+msgstr ""
+
+msgctxt "overtaking"
+msgid "no"
+msgstr ""
 
 msgid "Roundabout"
 msgstr "Rondo"
@@ -16437,7 +16519,7 @@ msgstr ""
 
 msgctxt "trail_visibility"
 msgid "bad"
-msgstr ""
+msgstr "złe"
 
 msgctxt "trail_visibility"
 msgid "horrible"
@@ -16445,7 +16527,7 @@ msgstr ""
 
 msgctxt "trail_visibility"
 msgid "no"
-msgstr ""
+msgstr "nie"
 
 msgid "Ski"
 msgstr "Narty"
@@ -16585,6 +16667,12 @@ msgstr ""
 msgid "tiger"
 msgstr ""
 
+msgid "Button operated"
+msgstr ""
+
+msgid "Sound signals"
+msgstr "Sygnalizacja dźwiękowa"
+
 msgid "Crossing attendant"
 msgstr "opiekun na przejściu dla pieszych"
 
@@ -16598,7 +16686,7 @@ msgid "Stop"
 msgstr "Znak stop"
 
 msgid "Give Way"
-msgstr ""
+msgstr "Ustąp pierwszeństwa"
 
 msgid "Mini-Roundabout"
 msgstr "Mini rondo"
@@ -16640,7 +16728,7 @@ msgid "Turning Circle"
 msgstr "Miejsce do zawracania"
 
 msgid "Turning Loop"
-msgstr ""
+msgstr "Rondo do zawracania"
 
 msgid "City Limit"
 msgstr "Granica miasta"
@@ -16761,10 +16849,10 @@ msgid "Kerb"
 msgstr "Krawężnik"
 
 msgid "limited"
-msgstr "limitowane"
+msgstr "ograniczone"
 
 msgid "Entrance (Barrier Opening)"
-msgstr ""
+msgstr "Przejście prze ogrodzenie"
 
 msgid "Gate"
 msgstr "Brama"
@@ -16773,7 +16861,7 @@ msgid "Lift Gate"
 msgstr "Szlaban"
 
 msgid "Swing Gate"
-msgstr ""
+msgstr "Szlaban obrotowy"
 
 msgctxt "swing_gate"
 msgid "single"
@@ -16784,13 +16872,13 @@ msgid "double"
 msgstr ""
 
 msgid "Hampshire Gate"
-msgstr ""
+msgstr "Ogrodzenie odsuwane (Hampshire)"
 
 msgid "Bump Gate"
-msgstr ""
+msgstr "Brama kontaktowa"
 
 msgid "Kissing Gate"
-msgstr ""
+msgstr "Brama ze śluzą"
 
 msgid "Chain"
 msgstr "Łańcuch"
@@ -17106,9 +17194,6 @@ msgstr "Przejazd kolejowy"
 msgid "Traffic lights"
 msgstr "Sygnalizacja świetlna"
 
-msgid "Sound signals"
-msgstr "Sygnalizacja dźwiękowa"
-
 msgid "Barrier"
 msgstr "Bariera"
 
@@ -17801,7 +17886,7 @@ msgid "Motel"
 msgstr "Motel"
 
 msgid "Guest House/Bed & Breakfast"
-msgstr ""
+msgstr "Pokoje gościnne"
 
 msgid "Chalet"
 msgstr "Chata górska"
@@ -17813,7 +17898,7 @@ msgid "Alpine Hut"
 msgstr "Chata alpejska"
 
 msgid "Caravan Site/RV Park"
-msgstr ""
+msgstr "Kemping samochodowy"
 
 msgid "Number of places"
 msgstr "Ilość miejsc"
@@ -18109,7 +18194,7 @@ msgid "charcoal"
 msgstr "węgiel drewny"
 
 msgid "Firepit"
-msgstr ""
+msgstr "Ognisko"
 
 msgid "Fishing"
 msgstr "Miejsce do wędkowania"
@@ -18365,10 +18450,10 @@ msgid "License Classes"
 msgstr "Kategorie prawa jazdy"
 
 msgid "A;A1;B;BE;C"
-msgstr ""
+msgstr "A;A1;B;BE;C"
 
 msgid "A;A1;B;B1;C;C1;D;D1;BE;CE;C1E;DE;D1E"
-msgstr ""
+msgstr "A;A1;B;B1;C;C1;D;D1;BE;CE;C1E;DE;D1E"
 
 msgid "Health"
 msgstr "Zdrowie"
@@ -18458,7 +18543,7 @@ msgid "urinal"
 msgstr ""
 
 msgid "Shower"
-msgstr ""
+msgstr "Prysznic"
 
 msgid "Post Box"
 msgstr "Skrzynka pocztowa"
@@ -18811,7 +18896,7 @@ msgid "water_park"
 msgstr "park wodny"
 
 msgid "Scuba Diving"
-msgstr ""
+msgstr "Nurkowanie"
 
 msgid "Piste type"
 msgstr "Rodzaj trasy"
@@ -19168,6 +19253,9 @@ msgstr "Wiatrak"
 msgid "Gasometer"
 msgstr "Zbiornik gazu"
 
+msgid "Bunker Silo"
+msgstr ""
+
 msgid "Pipeline"
 msgstr "Rurociąg"
 
@@ -19285,7 +19373,7 @@ msgid "Water Works"
 msgstr "Filtry"
 
 msgid "Wastewater Treatment Plant"
-msgstr ""
+msgstr "Oczyszczalnia ścieków"
 
 msgid "Watermill"
 msgstr "Młyn wodny"
@@ -19314,15 +19402,15 @@ msgstr "Stacja pomiarowa"
 msgid "Monitoring:"
 msgstr "Monitoring"
 
-msgid "Weather"
-msgstr "Pogoda"
-
 msgid "Water level"
 msgstr "Poziom wody"
 
 msgid "Tide Level"
 msgstr "Pływy"
 
+msgid "Groundwater"
+msgstr ""
+
 msgid "Traffic"
 msgstr "Ruch uliczny"
 
@@ -19341,6 +19429,9 @@ msgstr "Sygnały GLONASS"
 msgid "Galileo Signals"
 msgstr "Sygnały Galileo"
 
+msgid "Weather"
+msgstr "Pogoda"
+
 msgid "Radiation"
 msgstr "Promieniowanie"
 
@@ -19357,7 +19448,7 @@ msgid "Manually"
 msgstr ""
 
 msgid "Remote"
-msgstr ""
+msgstr "Zdalny"
 
 msgid "Display:"
 msgstr ""
@@ -19435,7 +19526,7 @@ msgid "Height in meter (m)"
 msgstr "Wysokość (m)"
 
 msgid "Bridges"
-msgstr ""
+msgstr "Mosty"
 
 msgid "aqueduct"
 msgstr "akwedukt"
@@ -19486,7 +19577,7 @@ msgid "humpback"
 msgstr ""
 
 msgid "Movable Bridge"
-msgstr ""
+msgstr "Most ruchomy"
 
 msgid "bascule"
 msgstr ""
@@ -19507,7 +19598,7 @@ msgid "transporter"
 msgstr ""
 
 msgid "Bridge Support"
-msgstr ""
+msgstr "Filar mostu"
 
 msgid "pier"
 msgstr ""
@@ -19521,6 +19612,9 @@ msgstr ""
 msgid "pivot_pier"
 msgstr ""
 
+msgid "Bridge outline"
+msgstr ""
+
 msgid "Power Plant"
 msgstr "Elektrownia"
 
@@ -19745,7 +19839,7 @@ msgstr ""
 
 msgctxt "generator method"
 msgid "stream"
-msgstr ""
+msgstr "strumień"
 
 msgid "horizontal_axis"
 msgstr ""
@@ -19772,7 +19866,7 @@ msgid "Wind Turbine"
 msgstr ""
 
 msgid "Power Substation"
-msgstr ""
+msgstr "Podstacja elektryczna"
 
 msgid "Type of substation"
 msgstr ""
@@ -19831,7 +19925,7 @@ msgid "Gas insulated"
 msgstr ""
 
 msgid "Power Transformer"
-msgstr ""
+msgstr "Stacja transformatorowa"
 
 msgid "Type of transformer"
 msgstr "Typ transformatora"
@@ -19856,7 +19950,7 @@ msgid "Phases"
 msgstr ""
 
 msgid "Power Switchgear"
-msgstr ""
+msgstr "Rozdzielnia"
 
 msgid ""
 "(Please only use this tag if more detailed mapping using busbars and bays is "
@@ -19864,7 +19958,7 @@ msgid ""
 msgstr ""
 
 msgid "Power Busbar"
-msgstr ""
+msgstr "Szyna prądowa"
 
 msgid "Power Bay"
 msgstr ""
@@ -19873,7 +19967,7 @@ msgid "Power Switch"
 msgstr ""
 
 msgid "Power Converter"
-msgstr ""
+msgstr "Konwerter napięcia (HVDC)"
 
 msgid "Type of converter"
 msgstr ""
@@ -20128,6 +20222,15 @@ msgstr ""
 msgid "Pole"
 msgstr "Słup"
 
+msgid "Pole with Transformer"
+msgstr ""
+
+msgid "Pole Attributes:"
+msgstr ""
+
+msgid "Transformer Attributes:"
+msgstr ""
+
 msgid "Power Line"
 msgstr "Linia elektryczna"
 
@@ -20177,11 +20280,17 @@ msgstr ""
 msgid "Power Cable"
 msgstr "Kable elektryczne"
 
+msgctxt "power cable"
+msgid "underground"
+msgstr ""
+
+msgctxt "power cable"
 msgid "underwater"
-msgstr "podwodne"
+msgstr ""
 
+msgctxt "power cable"
 msgid "overground"
-msgstr "napowietrzne"
+msgstr ""
 
 msgid "Historic Places"
 msgstr "Miejsca historyczne"
@@ -20207,6 +20316,33 @@ msgstr "Pomnik"
 msgid "Memorial"
 msgstr "Miejsce pamięci"
 
+msgctxt "memorial"
+msgid "statue"
+msgstr ""
+
+msgctxt "memorial"
+msgid "bust"
+msgstr ""
+
+msgctxt "memorial"
+msgid "plaque"
+msgstr ""
+
+msgctxt "memorial"
+msgid "stele"
+msgstr ""
+
+msgctxt "memorial"
+msgid "stone"
+msgstr ""
+
+msgctxt "memorial"
+msgid "war_memorial"
+msgstr ""
+
+msgid "Inscription"
+msgstr ""
+
 msgid "Wayside Cross"
 msgstr "Krzyż przydrożny"
 
@@ -20244,7 +20380,7 @@ msgid "Deli (Fine Food)"
 msgstr "Delikatesy"
 
 msgid "Candy Store"
-msgstr ""
+msgstr "Cukiernia"
 
 msgid "Tea"
 msgstr "Wyroby herbaciane"
@@ -20253,7 +20389,7 @@ msgid "Coffee"
 msgstr "Wyroby kawowe"
 
 msgid "Public Market"
-msgstr ""
+msgstr "Targowisko"
 
 msgid "Organic"
 msgstr "Naturalna żywność"
@@ -20276,6 +20412,9 @@ msgstr "Sklep monopolowy"
 msgid "Beverages"
 msgstr "Sklep z napojami"
 
+msgid "Wine"
+msgstr "Wina"
+
 msgid "Boutique"
 msgstr "Butik"
 
@@ -20319,6 +20458,9 @@ msgid "Video"
 msgstr "Wideo"
 
 msgid "Video Games"
+msgstr "Gry wideo"
+
+msgid "Music"
 msgstr ""
 
 msgid "Cash"
@@ -20337,7 +20479,7 @@ msgid "Pawnbroker"
 msgstr "Lombard"
 
 msgid "Home decoration"
-msgstr ""
+msgstr "Wyposażenie domu"
 
 msgid "Furniture"
 msgstr "Sklep meblowy"
@@ -20348,6 +20490,9 @@ msgstr "Akcesoria kuchenne"
 msgid "Curtain"
 msgstr "Sklep z zasłonami"
 
+msgid "Art"
+msgstr "Sztuka"
+
 msgid "Frame"
 msgstr "Sklep z ramami do obrazów"
 
@@ -20355,25 +20500,25 @@ msgid "Bed"
 msgstr "Sklep z meblami do sypialni"
 
 msgid "Interior Decoration"
-msgstr ""
+msgstr "Dekoracje"
 
 msgid "Antiques"
-msgstr ""
+msgstr "Antyki"
 
 msgid "Printed Material"
-msgstr ""
+msgstr "Materiały drukowane"
 
 msgid "Stationery"
 msgstr "Sklep papierniczy"
 
 msgid "Copy Shop"
-msgstr ""
+msgstr "Punkt kopiowania"
 
 msgid "Book Store"
 msgstr "Księgarnia"
 
 msgid "Newspaper Stand"
-msgstr ""
+msgstr "Sklepik z prasą"
 
 msgid "Ticket"
 msgstr "Bilety"
@@ -20388,10 +20533,13 @@ msgid "Chemist"
 msgstr "Drogeria"
 
 msgid "Hairdresser/Barber"
-msgstr ""
+msgstr "Fryzjer"
 
 msgid "Beauty"
-msgstr ""
+msgstr "Salon piękności"
+
+msgid "Tattoo"
+msgstr "Tatuaże"
 
 msgid "Optician"
 msgstr "Optyk"
@@ -20400,7 +20548,7 @@ msgid "Jewellery"
 msgstr "Jubiler"
 
 msgid "Gift/Souvenir"
-msgstr ""
+msgstr "Upominki/pamiątki"
 
 msgid "Erotic"
 msgstr "Artykuły erotyczne"
@@ -20412,7 +20560,7 @@ msgid "Garden Centre"
 msgstr "Centrum ogrodnicze"
 
 msgid "Do-It-Yourself Store"
-msgstr ""
+msgstr "Sklep dla majsterkowiczów"
 
 msgid "Hardware"
 msgstr "Sklep z narzędziami"
@@ -20439,14 +20587,17 @@ msgid "Lottery"
 msgstr "Loteria"
 
 msgid "Bag"
-msgstr "Torba"
+msgstr "Torebki i walizki"
 
 msgid "Pet"
-msgstr "Zwierze domowe"
+msgstr "Zwierzęta domowe"
 
-msgid "Vending Machine"
+msgid "Funeral Directors"
 msgstr ""
 
+msgid "Vending Machine"
+msgstr "Automat sprzedający"
+
 msgid "Vending products"
 msgstr "Sprzedawane produkty"
 
@@ -20543,6 +20694,15 @@ msgstr "Kod pocztowy"
 msgid "National Park"
 msgstr "Park narodowy"
 
+msgid "Protected Area"
+msgstr ""
+
+msgid "Protected Class"
+msgstr ""
+
+msgid "Title or type of protection"
+msgstr ""
+
 msgid "Places"
 msgstr "Miejsca"
 
@@ -20651,7 +20811,7 @@ msgid "Islet"
 msgstr "Wysepka"
 
 msgid "Ridge"
-msgstr ""
+msgstr "Grzbiet górski"
 
 msgid "A mountain or hill ridge."
 msgstr ""
@@ -20749,7 +20909,7 @@ msgid "Large area covered with sand."
 msgstr ""
 
 msgid "Bare Rock"
-msgstr ""
+msgstr "Lita skała"
 
 msgid ""
 "For areas of solid visible rock that is sparsely vegetated or not vegetated "
@@ -21101,13 +21261,13 @@ msgid "potential"
 msgstr ""
 
 msgid "Contact (Common Schema)"
-msgstr ""
+msgstr "Kontakt (schemat prosty)"
 
 msgid "Image"
 msgstr "Obraz"
 
 msgid "Contact (Schema with ''contact:*'' Prefix)"
-msgstr ""
+msgstr "Kontakt (z prefiksem contact:*)"
 
 msgid "outer segment"
 msgstr "Zewnętrzny segment"
@@ -21146,7 +21306,7 @@ msgid "Label point"
 msgstr "Miejsce napisu"
 
 msgid "Site"
-msgstr ""
+msgstr "Teren"
 
 msgid "Site name"
 msgstr ""
@@ -21333,7 +21493,7 @@ msgid "member"
 msgstr "członek"
 
 msgid "Associated Street"
-msgstr ""
+msgstr "Powiązanie z ulicą"
 
 msgid "house"
 msgstr "dom"
@@ -21354,7 +21514,7 @@ msgid "anything related to the street"
 msgstr ""
 
 msgid "Destination Sign"
-msgstr ""
+msgstr "Znak wskazujący do celu"
 
 msgid "Destination written on sign (w/o distance)"
 msgstr "Cel podróży na znaku (bez odległości)"
@@ -21620,7 +21780,13 @@ msgstr ""
 msgid "Estonia Ortho (Maaamet)"
 msgstr ""
 
-msgid "Estonia Multi (Maaamet)"
+msgid "Estonia Hillshade (Maaamet)"
+msgstr ""
+
+msgid "Estonia Cadastre (Maaamet)"
+msgstr ""
+
+msgid "Estonia Forestry (Maaamet)"
 msgstr ""
 
 msgid "Bordeaux - 2012"
@@ -21644,7 +21810,7 @@ msgstr ""
 msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
 msgstr ""
 
-msgid "CUGN Nancy - Orthophoto 2012"
+msgid "GrandNancy Orthophotographie 2012"
 msgstr ""
 
 msgid "Géobretagne - Brest 2010 - 10 cm"
@@ -21691,9 +21857,6 @@ msgid ""
 "- 1 m"
 msgstr ""
 
-msgid "Streets NRW Geofabrik.de"
-msgstr ""
-
 msgid "Hike & Bike"
 msgstr ""
 
@@ -21753,6 +21916,9 @@ msgstr ""
 msgid "NRW-Atlas: Topographische Karte 1:10000"
 msgstr ""
 
+msgid "Metropole Ruhr: Luftbilder (10 cm)"
+msgstr ""
+
 msgid "Drone Imagery (Haiti)"
 msgstr ""
 
@@ -21954,6 +22120,9 @@ msgstr ""
 msgid "Stadt Zürich Übersichtsplan (Strassen, Gebäude, Hausnummer)"
 msgstr ""
 
+msgid "Stadt Zürich Luftbild 2011"
+msgstr ""
+
 msgid "Orthofoto Kanton Solothurn RGB (SOGIS 2011/2012/2013)"
 msgstr ""
 
@@ -21972,7 +22141,7 @@ msgstr ""
 msgid "Canton de Fribourg 50cm (2005)"
 msgstr ""
 
-msgid "Stadt Bern 10cm/25cm (2008)"
+msgid "Stadt Bern 10cm/25cm (2012)"
 msgstr ""
 
 msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
@@ -22011,7 +22180,7 @@ msgstr ""
 msgid "OSM US TIGER 2012 Roads Overlay"
 msgstr ""
 
-msgid "New & Misaligned TIGER Roads (TIGER 2013)"
+msgid "New & Misaligned TIGER Roads (TIGER 2014)"
 msgstr ""
 
 msgid "MassGIS L3 Parcels"
@@ -22059,9 +22228,234 @@ msgstr ""
 msgid "NLS - Bartholomew Half Inch, 1897-1907"
 msgstr ""
 
+msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Annan 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgstr ""
+
 msgid "OS Town Plans, Cupar 1854 (NLS)"
 msgstr ""
 
+msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Elgin 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Forres 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Galashiels 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Girvan 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Greenock 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Haddington 1853 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Haddington 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Hamilton 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Irvine 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Jedburgh 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kelso 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Lanark 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Linlithgow 1856 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Musselburgh 1853 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Musselburgh 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Oban 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Peebles 1856 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Perth 1860 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Peterhead 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Selkirk 1865 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, St Andrews 1854 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, St Andrews 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stirling 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stonehaven 1864 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1847 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Strathaven 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wick 1872 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wigtown 1848 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wigtown 1894 (NLS)"
+msgstr ""
+
 msgid "Decreasing house numbers in addresses interpolation"
 msgstr ""
 
@@ -22115,17 +22509,37 @@ msgid "{0}={1} is deprecated. Please use instead a multipolygon."
 msgstr ""
 
 msgid ""
-"{0} is deprecated. Please specify ìnterval by using opening_hours syntax"
+"{0} is deprecated. Please specify interval by using opening_hours syntax"
 msgstr ""
 
 msgid ""
 "{0} is deprecated. Please delete this object and use a private layer instead"
 msgstr ""
 
-msgid "{0} on a node"
+msgid "{0}={1} is unspecific. Please replace ''{1}'' by a specific value."
 msgstr ""
 
-msgid "{0} on a node. Should be drawn as an area"
+msgid "{0} should be replaced with {1}"
+msgstr ""
+
+msgid ""
+"{0}={1} is unspecific. Please replace ''{1}'' by ''left'', ''right'' or "
+"''both''."
+msgstr ""
+
+msgid "{0} on a node. Should be used on a way."
+msgstr ""
+
+msgid "{0} on a node. Should be drawn as an area."
+msgstr ""
+
+msgid "{0}=* on a node. Should be used in a relation"
+msgstr ""
+
+msgid "{0} on a way. Should be used in a relation"
+msgstr ""
+
+msgid "{0} on a node"
 msgstr ""
 
 msgid "Building inside building"
@@ -26826,6 +27240,9 @@ msgstr ""
 msgid "Find"
 msgstr "Szukaj"
 
+msgid "Show"
+msgstr "Pokaż"
+
 msgid "Mark"
 msgstr ""
 
@@ -27731,8 +28148,8 @@ msgid ""
 "download version {0} from\n"
 "{1}."
 msgstr ""
-"Uruchomiona wersja Tracer2Server nie jest kompatybilna z tym pluginem. "
-"Proszę pobrać i uruchomić wersję {0} z\n"
+"Uruchomiona wersja Tracer2Server nie jest kompatybilna z tą wtyczką. Proszę "
+"pobrać i uruchomić wersję {0} z\n"
 "{1}."
 
 msgid ""
@@ -28946,7 +29363,7 @@ msgid "Zoom to objects"
 msgstr ""
 
 msgid "Remove tag"
-msgstr ""
+msgstr "Usuń tag"
 
 msgid "Delete tags from multiple objects"
 msgstr ""
@@ -28958,7 +29375,7 @@ msgid "Set tags for multiple objects"
 msgstr ""
 
 msgid "Delete from history"
-msgstr ""
+msgstr "Usuń z historii"
 
 msgid "Find primitives with these tags"
 msgstr ""
diff --git a/i18n/po/pt.po b/i18n/po/pt.po
index c629e77..f4b1ee9 100644
--- a/i18n/po/pt.po
+++ b/i18n/po/pt.po
@@ -1,17 +1,22 @@
+# Portuguese translation for josm
+# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
+# This file is distributed under the same license as the josm package.
+# FIRST AUTHOR <EMAIL at ADDRESS>, 2009.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-21 03:38+0200\n"
-"PO-Revision-Date: 2014-06-18 13:52+0000\n"
-"Last-Translator: Ricardo Martins <rikhard.martins at gmail.com>\n"
+"POT-Creation-Date: 2014-12-10 03:42+0100\n"
+"PO-Revision-Date: 2014-12-01 00:01+0000\n"
+"Last-Translator: Rui <xande6ruz at yandex.com>\n"
 "Language-Team: Portuguese <pt at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2014-10-21 05:16+0000\n"
-"X-Generator: Launchpad (build 17203)\n"
+"X-Launchpad-Export-Date: 2014-12-10 05:06+0000\n"
+"X-Generator: Launchpad (build 17283)\n"
 "Language: pt\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -112,6 +117,9 @@ msgid ""
 "can <ul><li>update your Java (JRE) or</li><li>use an earlier (Java {2} "
 "compatible) version of JOSM.</li></ul>More Info:"
 msgstr ""
+"<h2>O JOSM necessita da de Java na versão {0}.</h2>Versão Java instalada: "
+"{1}.<br>Pode <ul><li>atualizar o Java (JRE) ou</li><li>usar uma versão do "
+"JOSM anterior (compatível com o Java {2}).</li></ul>Mais informação em:"
 
 msgid "Exit JOSM"
 msgstr "Sair do JOSM"
@@ -168,31 +176,27 @@ msgid "About JOSM..."
 msgstr "Sobre o JOSM..."
 
 msgid ""
-"Unexpected format of API base URL. Redirection to info or history page for "
-"OSM object will probably fail. API base URL is: ''{0}''"
-msgstr ""
-
-msgid ""
-"Unexpected format of API base URL. Redirection to user page for OSM user "
-"will probably fail. API base URL is: ''{0}''"
-msgstr ""
-
-msgid ""
 "You are about to launch {0} browser window.<br>This may both clutter your "
 "screen with browser windows<br>and take some time to finish."
 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] ""
+"Está prestes a abrir {0} janela no navegador de internet.<br>Pode "
+"eventualmente encher o ecrã de janelas do navegador abertas<br>e levar algum "
+"tempo a carregar."
 msgstr[1] ""
+"Está prestes a abrir {0} janelas no navegador de internet.<br>Pode "
+"eventualmente encher o ecrã de janelas do navegador abertas<br>e levar algum "
+"tempo a carregar."
 
 msgid "Continue"
 msgstr "Continuar"
 
 msgid "Click to continue and to open {0} browser"
 msgid_plural "Click to continue and to open {0} browsers"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Clique para continuar e abrir no navegador {0}"
+msgstr[1] "Clique para continuar e abrir no navegadores {0}"
 
 msgid "Cancel"
 msgstr "Cancelar"
@@ -279,6 +283,8 @@ msgstr "É impossível determinar o centro dos nós seleccionados."
 msgid ""
 "One or more nodes involved in this action is outside of the downloaded area."
 msgstr ""
+"Pelo menos um dos nós envolvidos nesta ação encpntra-se fora da área "
+"descarregada."
 
 msgid "Align Nodes in Line"
 msgstr "Alinhar Nós em Linha"
@@ -290,13 +296,15 @@ msgid "Please select at least three nodes."
 msgstr "Por favor, selecione no mínimo 3 nós."
 
 msgid "Can not align a polygon. Abort."
-msgstr ""
+msgstr "Não foi possível alinhar o polígono. Ação não concluída."
 
 msgid "Intersection of three or more ways can not be solved. Abort."
 msgstr ""
+"Não foi possível fazer a interseção de três ou mais linhas. Ação não "
+"concluída."
 
 msgid "Two parallels ways found. Abort."
-msgstr ""
+msgstr "Foram encontradas duas linhas paralelas. Ação não concluída."
 
 msgid "data"
 msgstr "objetos"
@@ -388,6 +396,8 @@ msgid ""
 "Could not combine ways<br>(They could not be merged into a single string of "
 "nodes)"
 msgstr ""
+"Não foi possível combinar as linhas<br>(Antes de as combinar elas têm de "
+"estar ligadas pelo menos num nó)"
 
 msgid "Combine {0} way"
 msgid_plural "Combine {0} ways"
@@ -677,6 +687,8 @@ msgid ""
 "Some of the ways were part of relations that have been modified.<br>Please "
 "verify no errors have been introduced."
 msgstr ""
+"Algumas linhas faziam parte de relações que foram alteradas.<br>Verifique se "
+"surgiram erros nas relações."
 
 msgid "Fix tag conflicts"
 msgstr "Corrigir conflitos de etiquetas"
@@ -727,7 +739,7 @@ msgid "Move Node onto Way"
 msgstr "Transferir Nó para Via"
 
 msgid "Move the node onto the nearest way segments and include it"
-msgstr ""
+msgstr "Mover o nó para a linha mais próxima e incluí-lo nela"
 
 msgid "No Shortcut"
 msgstr "Sem Atalho"
@@ -1030,6 +1042,8 @@ msgid ""
 "Cannot open URL ''{0}''<br>The following download tasks accept the URL "
 "patterns shown:<br>{1}"
 msgstr ""
+"Não foi possível abrir o URL ''{0}''<br>As seguintes tarefas de descarregar "
+"por URL aceitam os formatos seguintes:<br>{1}"
 
 msgid ""
 "<h3>When one or more ways are selected, the shape is adjusted such, that all "
@@ -1211,7 +1225,7 @@ msgid "Report bug"
 msgstr "Reportar erro"
 
 msgid "Report a ticket to JOSM bugtracker"
-msgstr ""
+msgstr "Reportar um erro no site do JOSM (abre no navegador de internet)"
 
 msgid "Restart"
 msgstr "Reiniciar"
@@ -1269,7 +1283,7 @@ msgstr ""
 "também seleciona objetos incompletos."
 
 msgid "Non-branching way sequences"
-msgstr ""
+msgstr "Sequência de linhas"
 
 msgid "Select non-branching sequences of ways"
 msgstr ""
@@ -1442,8 +1456,8 @@ msgstr ""
 
 msgid "Split way {0} into {1} part"
 msgid_plural "Split way {0} into {1} parts"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Dividir a linha {0} em {1} parte"
+msgstr[1] "Dividir a linha {0} em {1} partes"
 
 msgid "Toggle GPX Lines"
 msgstr "Alternar as linhas GPX"
@@ -1545,18 +1559,18 @@ msgstr ""
 "objetos?"
 
 msgid "Disconnect Node from Way"
-msgstr ""
+msgstr "Desligar Nó da Linha"
 
 msgid "Disconnect nodes from a way they currently belong to"
-msgstr ""
+msgstr "Separa o nó da linha a que está ligado"
 
 msgid "Select at least one node to be disconnected."
-msgstr ""
+msgstr "Selecione pelo menos um nó a ser desconetado."
 
 msgid "Selected node cannot be disconnected from anything."
 msgid_plural "Selected nodes cannot be disconnected from anything."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "O nó selecionado não pode ser desconetado de nada."
+msgstr[1] "Os nós selecionados não podem ser desconetados de nada."
 
 msgid ""
 "The affected way would disappear after disconnecting the selected node."
@@ -1666,6 +1680,15 @@ msgstr "Não fez alterações para serem enviadas para o OpenStreetMap."
 msgid "Nothing to upload. Get some data first."
 msgstr "Nada para enviar. Obtenha primeiro alguns dados."
 
+msgid "Upload note changes to server"
+msgstr ""
+
+msgid "Upload notes"
+msgstr ""
+
+msgid "Uploading notes to server"
+msgstr ""
+
 msgid "Upload selection"
 msgstr "Enviar apenas objetos selecionados"
 
@@ -1954,10 +1977,16 @@ msgstr ""
 msgid "Click the location where you wish to create a new note"
 msgstr ""
 
-msgid "Enter a comment for a new note"
+msgid "Create new note"
 msgstr ""
 
-msgid "Create new note"
+msgid "Create note"
+msgstr ""
+
+msgid "Enter a detailed comment to create a note"
+msgstr ""
+
+msgid "You must enter a comment to create a new note"
 msgstr ""
 
 msgid "Delete Mode"
@@ -2920,6 +2949,15 @@ msgstr "... refere-se à relação"
 msgid "Cycling dependencies"
 msgstr "Dependências recíprocas"
 
+msgid "Uploading modified notes"
+msgstr ""
+
+msgid "Note {0} failed: {1}"
+msgstr ""
+
+msgid "Notes failed to upload"
+msgstr ""
+
 msgid ""
 "The following are results of automatic validation. Try fixing these, but be "
 "careful (don''t destroy valid data). When in doubt ignore them.<br>When you "
@@ -3159,6 +3197,8 @@ msgid ""
 "Layer ''{0}'' does not exist any more. Cannot remove conflict for object "
 "''{1}''."
 msgstr ""
+"A camada ''{0}'' já não existe. Não foi possível remover o conflito do "
+"objeto ''{1}''."
 
 msgid "Add conflict for ''{0}''"
 msgstr "Adicionar conflito para \"{0}\""
@@ -3191,18 +3231,18 @@ msgstr "Resolver conflitos na lista de membros da relação {0}"
 
 msgid "Resolve {0} tag conflict in node {1}"
 msgid_plural "Resolve {0} tag conflicts in node {1}"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Resolver o conflito da etiqueta {0} no nó {1}"
+msgstr[1] "Resolver o conflito das etiquetas {0} no nó {1}"
 
 msgid "Resolve {0} tag conflict in way {1}"
 msgid_plural "Resolve {0} tag conflicts in way {1}"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Resolver o conflito da etiqueta {0} na linha {1}"
+msgstr[1] "Resolver o conflito das etiquetas {0} na linha {1}"
 
 msgid "Resolve {0} tag conflict in relation {1}"
 msgid_plural "Resolve {0} tag conflicts in relation {1}"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Resolver o conflito da etiqueta {0} na relação {1}"
+msgstr[1] "Resolver o conflito das etiquetas {0} na relação {1}"
 
 msgid "Resolve version conflict for node {0}"
 msgstr "Resolver o conflito de versões para o nó {0}"
@@ -3304,7 +3344,7 @@ msgstr ""
 "Não foi possível eliminar o ficheiro da cópia de segurança antigo {0}"
 
 msgid "Your work has been saved automatically."
-msgstr ""
+msgstr "Foi feita uma cópia de segurança"
 
 msgid "Restoring files"
 msgstr "A restaurar ficheiros"
@@ -4039,7 +4079,7 @@ msgid "Unknown source:maxspeed context: {0}"
 msgstr ""
 
 msgid "Internet tags"
-msgstr ""
+msgstr "Etiquetas de páginas da internet"
 
 msgid "Checks for errors in internet-related tags."
 msgstr ""
@@ -4048,7 +4088,7 @@ msgid "''{0}'': {1}"
 msgstr ""
 
 msgid "Lane tags"
-msgstr ""
+msgstr "Etiquetas de faixas de rodagem"
 
 msgid "Test that validates ''lane:'' tags."
 msgstr ""
@@ -4069,7 +4109,7 @@ msgid "Number of lane dependent values inconsistent in backward direction"
 msgstr ""
 
 msgid "Tag checker (MapCSS based)"
-msgstr ""
+msgstr "Verificador de etiquetas (baseado em MapCSS)"
 
 msgid "This test checks for errors in tag keys and values."
 msgstr ""
@@ -4084,13 +4124,13 @@ msgid " or "
 msgstr " ou "
 
 msgid "{0}, use {1} instead"
-msgstr ""
+msgstr "{0}, use como alternativa {1}"
 
 msgid "Adding {0} to tag checker"
-msgstr ""
+msgstr "A adicionar {0}ao verificador de etiquetas"
 
 msgid "Failed to add {0} to tag checker"
-msgstr ""
+msgstr "Não foi possível adicionar {0} ao verificador de etiquetas"
 
 msgid "Multipolygon"
 msgstr "Multi-polígono"
@@ -4166,10 +4206,10 @@ msgid "A name is missing, even though name:* exists."
 msgstr "Tem etiquetas ''name:*'' mas falta a etiqueta ''name='' principal."
 
 msgid "Opening hours syntax"
-msgstr ""
+msgstr "Sintaxe do horário de abertura"
 
 msgid "This test checks the correct usage of the opening hours syntax."
-msgstr ""
+msgstr "Verifica se a sintaxe do horário de abertura está correta"
 
 msgid "opening_hours value can be prettified"
 msgstr ""
@@ -4196,7 +4236,7 @@ msgid "Unexpected token in year range:"
 msgstr ""
 
 msgid "Invalid/unsupported syntax."
-msgstr ""
+msgstr "Sintaxe inválida/não suportada."
 
 msgid "Overlapping ways"
 msgstr "Linhas sobrepostas"
@@ -4302,7 +4342,7 @@ msgstr ""
 "que podem ser enganos de digitação"
 
 msgid "Tag checker"
-msgstr ""
+msgstr "Verificador de etiquetas"
 
 msgid "Adding {0} to ignore tags"
 msgstr ""
@@ -4528,19 +4568,19 @@ msgid "area"
 msgstr "área"
 
 msgid "Unconnected highways"
-msgstr ""
+msgstr "Vias não ligadas"
 
 msgid "Unconnected railways"
-msgstr ""
+msgstr "Ferrovias não ligadas"
 
 msgid "Unconnected waterways"
-msgstr ""
+msgstr "Cursos de água não ligados"
 
 msgid "Unconnected natural lands and landuses"
-msgstr ""
+msgstr "Usos do solo e similares não ligados"
 
 msgid "Unconnected power ways"
-msgstr ""
+msgstr "Linhas de transmissão de energia não ligadas"
 
 msgid "This test checks if a way has an endpoint very near to another way."
 msgstr ""
@@ -4560,7 +4600,7 @@ msgid "Connected way end node near other way"
 msgstr "Nó de extremidade de uma linha perto de outra linha"
 
 msgid "Untagged and unconnected nodes"
-msgstr "Nós sem etiquetas e não ligados a nada"
+msgstr "Nós isolados e sem nenhuma etiqueta"
 
 msgid "This test checks for untagged nodes that are not part of any way."
 msgstr ""
@@ -4641,13 +4681,13 @@ msgstr ""
 "Linha terrestre no sentido inverso: a terra não está no lado esquerdo"
 
 msgid "Show this dialog again the next time"
-msgstr ""
+msgstr "Mostrar este aviso da próxima vez"
 
 msgid "Do not show again (this operation)"
-msgstr ""
+msgstr "Não mostrar de novo (esta operação)"
 
 msgid "Do not show again (this session)"
-msgstr ""
+msgstr "Não mostrar de novo (nesta sessão)"
 
 msgid "Do not show again (remembers choice)"
 msgstr "Não mostrar de novo este aviso"
@@ -4932,7 +4972,7 @@ msgstr ""
 "sessão?"
 
 msgid "Change proxy settings"
-msgstr ""
+msgstr "Alterar as definições de proxy"
 
 msgid "Proxy errors occurred"
 msgstr ""
@@ -5007,10 +5047,10 @@ msgid "Click to open the tagging presets tab in the preferences"
 msgstr ""
 
 msgid "Imagery preferences"
-msgstr ""
+msgstr "Preferências das imagens de fundo"
 
 msgid "Click to open the imagery tab in the preferences"
-msgstr ""
+msgstr "Mostra várias opções das imagens de fundo"
 
 msgid "Audio"
 msgstr "Áudio"
@@ -5288,34 +5328,40 @@ msgid "Conflict background: same position in opposite"
 msgstr "Conflito em segundo plano: mesma posição no oposto"
 
 msgid "Conflict background: keep one tag"
-msgstr ""
+msgstr "Conflito em segundo plano: manter uma etiqueta"
 
 msgid "Conflict foreground: keep one tag"
-msgstr ""
+msgstr "Conflito em primeiro plano: manter uma etiqueta"
 
 msgid "Conflict background: drop tag"
-msgstr ""
+msgstr "Conflito em segundo plano: eliminar uma etiqueta"
 
 msgid "Conflict foreground: drop tag"
-msgstr ""
+msgstr "Conflito em primeiro plano: eliminar uma etiqueta"
 
 msgid "Conflict background: keep all tags"
-msgstr ""
+msgstr "Conflito em segundo plano: manter todas as etiquetas"
 
 msgid "Conflict foreground: keep all tags"
-msgstr ""
+msgstr "Conflito em primeiro plano: manter todas as etiquetas"
+
+msgid "Conflict background: sum all numeric tags"
+msgstr "Conflito em segundo plano: somar todas as etiquetas numéricas"
+
+msgid "Conflict foreground: sum all numeric tags"
+msgstr "Conflito em primeiro plano: somar todas as etiquetas numéricas"
 
 msgid "Conflict background: keep member"
-msgstr ""
+msgstr "Conflito em segundo plano: manter membro"
 
 msgid "Conflict foreground: keep member"
-msgstr ""
+msgstr "Conflito em primeiro plano: manter membro"
 
 msgid "Conflict background: remove member"
-msgstr ""
+msgstr "Conflito em segundo plano: remover membro"
 
 msgid "Conflict foreground: remove member"
-msgstr ""
+msgstr "Conflito em primeiro plano: remover membro"
 
 msgid "My with Their"
 msgstr "Minha versão com a o servidor"
@@ -5716,7 +5762,17 @@ msgid_plural ""
 "are shown a dialog to decide how to adapt the relations.<br/><br/>Do you "
 "want to continue?"
 msgstr[0] ""
+"Vão ser combinados {1} objetos, alguns dos quais fazem parte de {0} "
+"relação:<br/>{2}Se combinar pode alterar erradamente a relação. Se não tiver "
+"a certeza do que está a fazer por favor cancele esta operação.<br/>Se quiser "
+"continuar, serão mostradas as opções para adaptar a relação.<br/><br/>Quer "
+"continuar?"
 msgstr[1] ""
+"Vão ser combinados {1} objetos, alguns dos quais fazem parte de {0} "
+"relações:<br/>{2}Se combinar pode alterar erradamente as relações. Se não "
+"tiver a certeza do que está a fazer por favor cancele esta operação.<br/>Se "
+"quiser continuar, serão mostradas as opções para adaptar as "
+"relações.<br/><br/>Quer continuar?"
 
 msgid "Combine confirmation"
 msgstr "Confirmação da combinação"
@@ -5738,7 +5794,17 @@ 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] ""
+"Vão ser combinados {0} objetos, mas estes têm etiquetas em "
+"conflito:<br/>{1}Se forem combinados, o objeto resultante poderá ter "
+"etiquetas erradas.<br/>Se quiser continuar, serão  mostradas as etiquetas em "
+"conflito para escolher as que quer manter ou eliminar.<br/><br/>Quer "
+"continuar?"
 msgstr[1] ""
+"Vão ser combinados {0} objetos, mas estes têm etiquetas em "
+"conflito:<br/>{1}Se forem combinados, o objeto resultante poderá ter "
+"etiquetas erradas.<br/>Se quiser continuar, serão  mostradas as etiquetas em "
+"conflito para escolher as que quer manter ou eliminar.<br/><br/>Quer "
+"continuar?"
 
 msgid "Choose a value"
 msgstr "Escolha um valor"
@@ -5749,12 +5815,19 @@ msgstr "nenhum"
 msgid "all"
 msgstr "tudo"
 
+msgid "sum"
+msgstr ""
+
 msgid "Please decide which values to keep"
 msgstr "Por favor escolha os valores a manter"
 
 msgid "Value ''{0}'' is going to be applied for key ''{1}''"
 msgstr "O valor ''{0}'' será aplicado na chave ''{1}''"
 
+msgid ""
+"All numeric values sumed as ''{0}'' are going to be applied for key ''{1}''"
+msgstr ""
+
 msgid "The key ''{0}'' and all its values are going to be removed"
 msgstr "A chave ''{0}'' e todos os seus valores serão removidos"
 
@@ -5980,8 +6053,8 @@ msgstr "Resolver conflitos."
 
 msgid "Conflict: {0} unresolved"
 msgid_plural "Conflicts: {0} unresolved"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Conflito: {0} por resolver"
+msgstr[1] "Conflitos: {0} por resolver"
 
 msgid "Rel.:{0} / Ways:{1} / Nodes:{2}"
 msgstr ""
@@ -6146,24 +6219,6 @@ msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
 "</p><p>Fechar o painel dos Filtros para ver todos os objetos.<p></html>"
 
-msgid "Display the history of all selected items."
-msgstr "Mostrar o histórico de todos os itens selecionados."
-
-msgid "Object with history"
-msgstr "Objeto com histórico"
-
-msgid "Reload"
-msgstr "Atualizar"
-
-msgid "Reload all currently selected objects and refresh the list."
-msgstr "Tornar a carregar os objetos selecionados e atualizar a lista."
-
-msgid "Show"
-msgstr "Mostrar"
-
-msgid "Display the history of the selected objects."
-msgstr "Mostrar o histórico dos objetos selecionados."
-
 msgid "Advanced object info"
 msgstr "Informações detalhadas dos objetos selecionados"
 
@@ -6516,6 +6571,9 @@ msgstr ""
 msgid "Comment"
 msgstr "Comentário"
 
+msgid "Comment on note"
+msgstr ""
+
 msgid "Add comment to note:"
 msgstr ""
 
@@ -6525,9 +6583,6 @@ msgstr ""
 msgid "Close note with message:"
 msgstr ""
 
-msgid "Close Note"
-msgstr ""
-
 msgid "Create a new note"
 msgstr ""
 
@@ -6602,6 +6657,9 @@ msgstr "Seleção Atual"
 msgid "Search for objects"
 msgstr "Procurar por objetos"
 
+msgid "Display the history of the selected objects."
+msgstr "Mostrar o histórico dos objetos selecionados."
+
 msgid "Zoom to selection"
 msgstr "Enquadrar elementos selecionados"
 
@@ -6726,6 +6784,9 @@ msgstr "Corrigindo ({0}/{1}): ''{2}''"
 msgid "Updating map ..."
 msgstr "A atualizar o mapa ..."
 
+msgid "anonymous"
+msgstr "anónimo"
+
 msgid "Display the basic properties of the changeset"
 msgstr "Mostra as propriedades básicas do conjunto de alterações"
 
@@ -6740,6 +6801,12 @@ msgstr ""
 "Mostrar os objetos criados, alterados e eliminados pelo conjunto de "
 "alterações"
 
+msgid "Discussion"
+msgstr ""
+
+msgid "Display the public discussion around this changeset"
+msgstr ""
+
 msgid "Changeset Management Dialog"
 msgstr "Janela do Gestor de Conjunto de Alterações"
 
@@ -6806,9 +6873,6 @@ msgctxt "changeset.state"
 msgid "Closed"
 msgstr "Fechado"
 
-msgid "anonymous"
-msgstr "anónimo"
-
 msgid "ID"
 msgstr "Identificador"
 
@@ -6824,6 +6888,9 @@ msgstr "Criado em"
 msgid "Closed at"
 msgstr "Fechado em"
 
+msgid "Discussions"
+msgstr ""
+
 msgid "Downloading changeset content"
 msgstr "A descarregar o conteúdo do conjunto de alterações"
 
@@ -6943,6 +7010,15 @@ msgid ""
 msgstr ""
 "Enquadrar todos os objetos deste conjunto de alterações na camada atual"
 
+msgid "Update changeset discussion"
+msgstr ""
+
+msgid "Update the changeset discussion from the OSM server"
+msgstr ""
+
+msgid "Date"
+msgstr "Data"
+
 msgid "Download changesets"
 msgstr "Descarregar conjuntos de alterações"
 
@@ -7426,8 +7502,8 @@ msgstr "Selecione um valor"
 msgid "Set number of recently added tags"
 msgstr "Definir o número de etiquetas adicionadas recentemente"
 
-msgid "Remember last used tags"
-msgstr "Memorizar últimas etiquetas utilizadas"
+msgid "Remember last used tags after a restart"
+msgstr ""
 
 msgid "Please enter the number of recently added tags to display"
 msgstr "Introduza o número de etiquetas recentes a mostrar"
@@ -7806,6 +7882,9 @@ msgstr "incluindo os filhos imediatos das relações pai"
 msgid "Load parent relations"
 msgstr "Carregar relações pai"
 
+msgid "Reload"
+msgstr "Atualizar"
+
 msgid "Loading parent relations"
 msgstr "A carregar relações pai"
 
@@ -7941,6 +8020,12 @@ msgstr ""
 "Selecionar para descarregar trilhos GPS do OpenStreetMap na área selecionada "
 "(será criada uma camada GPX)"
 
+msgid "Notes"
+msgstr "Notas"
+
+msgid "Select to download notes in the selected download area."
+msgstr ""
+
 msgid "Download as new layer"
 msgstr "Descarregar numa camada nova"
 
@@ -8294,9 +8379,6 @@ msgstr "A"
 msgid "B"
 msgstr "B"
 
-msgid "Date"
-msgstr "Data"
-
 msgid ""
 "Failed to update primitive with id {0} because current edit layer is null"
 msgstr ""
@@ -9093,7 +9175,7 @@ msgid ""
 msgstr "A ignorar exceção porque o envio foi cancelado. Exceção: {0}"
 
 msgid "Upload successful!"
-msgstr ""
+msgstr "Envio bem sucedido!"
 
 msgid ""
 "<html>Mark modified objects <strong>from the current selection</strong> to "
@@ -9284,9 +9366,6 @@ msgstr ""
 msgid "Save Layer"
 msgstr "Gravar Camada"
 
-msgid "Notes"
-msgstr "Notas"
-
 msgid "Notes layer"
 msgstr ""
 
@@ -9302,9 +9381,6 @@ msgstr "Camada de Dados {0}"
 msgid "outside downloaded area"
 msgstr "fora da área descarregada"
 
-msgid "version {0}"
-msgstr "versão {0}"
-
 msgid "Merging layers"
 msgstr "A fundir camadas"
 
@@ -9905,7 +9981,7 @@ msgid "track and waypoints"
 msgstr "trilho e pontos"
 
 msgid "Click to download"
-msgstr ""
+msgstr "Clique para descarregar"
 
 msgid "Click to cancel"
 msgstr "Clique para cancelar."
@@ -10688,7 +10764,7 @@ msgid "Preset definition file (*.xml, *.zip)"
 msgstr "Ficheiro com as definições (*.xml, *.zip)"
 
 msgid "Tag checker rule (*.validator.mapcss, *.zip)"
-msgstr ""
+msgstr "Regra do verificador de etiquetas (*.validator.mapcss, *.zip)"
 
 msgid "Edit source entry:"
 msgstr "Editar fonte:"
@@ -10845,7 +10921,7 @@ msgid "shortcut"
 msgstr "atalho"
 
 msgid "color"
-msgstr ""
+msgstr "cor"
 
 msgid "toolbar"
 msgstr "barra de ferramentas"
@@ -10873,7 +10949,7 @@ msgid "Save {0} profile"
 msgstr "Salvar {0} perfil"
 
 msgid "All the preferences of this group are default, nothing to save"
-msgstr ""
+msgstr "Todas as preferências deste grupo são as padrão, nada a gravar."
 
 msgid "Choose profile file"
 msgstr ""
@@ -11416,7 +11492,7 @@ msgstr ""
 "esquerdos"
 
 msgid "Display ISO dates"
-msgstr ""
+msgstr "Mostrar datas no formato ISO"
 
 msgid "Use native file choosers (nicer, but do not support file filters)"
 msgstr ""
@@ -11438,12 +11514,14 @@ msgstr ""
 "cursor estiver dentro do painel (necessário reiniciar)"
 
 msgid "ISO 8601"
-msgstr ""
+msgstr "ISO 8601"
 
 msgid ""
 "Format dates according to {0}. Today''s date will be displayed as {1} "
 "instead of {2}"
 msgstr ""
+"Formatar as datas conforme {0}. Por exemplo, a data de hoje será mostrada "
+"como {1} em vez de {2}"
 
 msgid ""
 "Use file choosers that behave more like native ones. They look nicer but do "
@@ -11710,10 +11788,10 @@ msgstr ""
 "pasta.)</i>"
 
 msgid "Notification at each save"
-msgstr ""
+msgstr "Mostrar mensagem ao gravar a cópia de segurança"
 
 msgid "When saving, display a small notification"
-msgstr ""
+msgstr "Mostra uma pequena mensagem ao gravar a cópia de segurança"
 
 msgid "File backup"
 msgstr "Cópias de segurança"
@@ -12211,18 +12289,21 @@ msgid ""
 "(https) on localhost.<br>These ports are not configurable because they are "
 "referenced by external applications talking to JOSM."
 msgstr ""
+"O JOSM utilizará a <b>porta {0}</b> (http) e a <b>porta {1}</b> "
+"(https).<br>Estas portas não são configuráveis porque estas são referidas "
+"por programas externos que comunicam com o JOSM."
 
 msgid "Enable remote control"
 msgstr "Ativar controlo remoto"
 
 msgid "Enable HTTPS support"
-msgstr ""
+msgstr "Ativar HTTPS"
 
 msgid "Install..."
-msgstr ""
+msgstr "Instalar..."
 
 msgid "Uninstall..."
-msgstr ""
+msgstr "Desinstalar..."
 
 msgid "Install JOSM localhost certificate to system/browser root keystores"
 msgstr ""
@@ -12232,22 +12313,22 @@ msgid ""
 msgstr ""
 
 msgid "Certificate:"
-msgstr ""
+msgstr "Certificado:"
 
 msgid "Certificate has been successfully installed."
-msgstr ""
+msgstr "O certificado foi instalado com êxito."
 
 msgid "Certificate is already installed. Nothing to do."
-msgstr ""
+msgstr "O certificado já foi instalado anteriormente. Ação não concluída."
 
 msgid "Removing certificate {0} from root keystore."
 msgstr ""
 
 msgid "Certificate has been successfully uninstalled."
-msgstr ""
+msgstr "O certificado foi desinstalado com êxito."
 
 msgid "Certificate is not installed. Nothing to do."
-msgstr ""
+msgstr "O certificado não está instalado. Ação não concluída."
 
 msgid "Permitted actions:"
 msgstr "Ações permitidas:"
@@ -12347,10 +12428,10 @@ msgid "Failed to save OSM credentials to credential manager."
 msgstr ""
 
 msgid "Periodically check for new messages"
-msgstr ""
+msgstr "Verificar se existem novas mensagens periodicamente"
 
 msgid "Check interval (minutes):"
-msgstr ""
+msgstr "A cada (minutos):"
 
 msgid "Failed to retrieve OAuth Access Token from credential manager"
 msgstr ""
@@ -12503,10 +12584,10 @@ msgstr ""
 "programas de edição."
 
 msgid "Available rules:"
-msgstr ""
+msgstr "Regras disponíveis:"
 
 msgid "Active rules:"
-msgstr ""
+msgstr "Regras ativadas:"
 
 msgid "Add a new rule by entering filename or URL"
 msgstr ""
@@ -12515,16 +12596,18 @@ msgid "New rule entry:"
 msgstr ""
 
 msgid "Remove the selected rules from the list of active rules"
-msgstr ""
+msgstr "Remover as regras selecionadas da lista de regras ativadas"
 
 msgid "Edit the filename or URL for the selected active rule"
 msgstr ""
 
 msgid "Add the selected available rules to the list of active rules"
 msgstr ""
+"Adiciona as regras selecionadas da lista de regras disponíveis à lista de "
+"regras ativadas"
 
 msgid "Reloads the list of available rules from ''{0}''"
-msgstr ""
+msgstr "Atualiza a lista de regras disponíveis de ''{0}''"
 
 msgid "Loading rule sources from ''{0}''"
 msgstr ""
@@ -12583,7 +12666,7 @@ msgid "Religion"
 msgstr "Religião"
 
 msgid "Checks for errors on religious objects"
-msgstr ""
+msgstr "Verifica erros em objetos com etiquetas sobre religião"
 
 msgid "Checks for errors on relations"
 msgstr ""
@@ -12601,10 +12684,10 @@ msgid "Checks for wrong wikipedia tags"
 msgstr ""
 
 msgid "Tag checker rules"
-msgstr ""
+msgstr "Regras do verificador de etiquetas"
 
 msgid "Choose Tag checker rules to enable"
-msgstr ""
+msgstr "Escolha as regras do verificador de etiquetas a ativar"
 
 msgid "Use ignore list."
 msgstr "Usar lista de erros que indiquei para ignorar"
@@ -12800,7 +12883,7 @@ msgid "Search presets"
 msgstr "Procurar modelo de etiquetas"
 
 msgid "Search for objects by preset"
-msgstr ""
+msgstr "Procurar por objetos pela etiqueta"
 
 msgid "Show only applicable to selection"
 msgstr "Mostrar apenas etiquetas aplicáveis aos objetos selecionados"
@@ -13354,6 +13437,15 @@ msgstr ""
 "Era suposto que o conjunto de alterações com o identificador{0} estivesse "
 "aberto mas já foi fechado."
 
+msgid "Note upload failed"
+msgstr ""
+
+msgid "Error parsing note response from server"
+msgstr ""
+
+msgid "Error encoding string: {0}"
+msgstr ""
+
 msgid "(Code={0})"
 msgstr "(Código={0})"
 
@@ -13404,15 +13496,15 @@ msgstr ""
 msgid "Parsing changeset content ..."
 msgstr "A processar o conteúdo do conjunto de alterações"
 
+msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
+msgstr "Valor booleano errado para o atributo ''{0}''. Obteve-se ''{1}''."
+
 msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
 msgstr "Valor errado para o atributo ''{0}''. Obteve-se ''{1}''."
 
 msgid "Illegal numeric value for attribute ''{0}''. Got ''{1}''."
 msgstr "Valor numérico errado para o atributo ''{0}''. Obteve-se ''{1}''."
 
-msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
-msgstr "Valor booleano errado para o atributo ''{0}''. Obteve-se ''{1}''."
-
 msgid "Missing mandatory attribute ''{0}'' of XML element {1}."
 msgstr "Falta o atributo obrigatório ''{0}'' do elemento XML {1}."
 
@@ -14179,15 +14271,21 @@ msgid ""
 "Failed to install already downloaded plugin ''{0}''. Skipping installation. "
 "JOSM is still going to load the old plugin version."
 msgstr ""
+"Não foi possível instalar o módulo descarregado ''{0}''. Instalação "
+"cancelada. O JOSM irá carregar a versão anterior existente do módulo."
 
 msgid ""
 "Failed to install plugin ''{0}'' from temporary download file ''{1}''. {2}"
 msgstr ""
+"Não foi possível instalar o módulo ''{0}'' do ficheiro temporário "
+"descarregado ''{1}''. {2}"
 
 msgid ""
 "Failed to install plugin ''{0}'' from temporary download file ''{1}''. "
 "Renaming failed."
 msgstr ""
+"Não foi possível instalar o módulo ''{0}'' do ficheiro temporário "
+"descarregado ''{1}''. Não foi possível alterar o nome."
 
 msgid "Update plugin"
 msgstr ""
@@ -14275,9 +14373,6 @@ msgstr "A processar o ficheiro ''{0}''"
 msgid "Failed to scan file ''{0}'' for plugin information. Skipping."
 msgstr ""
 
-msgid "Processing plugin site cache icon files..."
-msgstr "A processar os ficheiros de ícones na cache do site de módulos..."
-
 msgid "Processing plugin files..."
 msgstr "A processar os ficheiros de módulos..."
 
@@ -14296,12 +14391,6 @@ msgstr ""
 msgid "Details:"
 msgstr ""
 
-msgid "Plugin icons download error"
-msgstr ""
-
-msgid "JOSM failed to download plugin icons:"
-msgstr ""
-
 msgid ""
 "Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
 "plugin site ''{1}''."
@@ -14836,6 +14925,8 @@ msgid ""
 "JOSM will soon stop working with this version; we highly recommend you to "
 "update to Java {0}."
 msgstr ""
+"Brevemente o JOSM não funcionará com esta versão do Java; é recomendável "
+"atualizar para a versão do Java {0}."
 
 msgid "Would you like to update now ?"
 msgstr ""
@@ -14844,12 +14935,17 @@ msgid ""
 "A previous version of JOSM has installed a custom certificate in order to "
 "provide HTTPS support for Remote Control:"
 msgstr ""
+"Foi instalado um certificado personalizado numa versão anterior do JOSM para "
+"forcener suporte por HTTPS para o Controlo Remoto:"
 
 msgid ""
 "It appears it could be an important <b>security risk</b>.<br><br>You are now "
 "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 ""
+"Parece que é um <b>risco de segurança</b> importante.<br><br>O Windows irá "
+"perguntar-lhe se quer remover este certificado inseguro.<br>Para sua "
+"segurança, <b>clique em SIM</b> quando lhe perguntar a seguir."
 
 msgid "Removing insecure certificate from {0} keystore: {1}"
 msgstr ""
@@ -15075,11 +15171,11 @@ msgstr "fronteira"
 
 msgctxt "Relation type"
 msgid "bridge"
-msgstr ""
+msgstr "ponte"
 
 msgctxt "Relation type"
 msgid "destination_sign"
-msgstr ""
+msgstr "sinal de destino"
 
 msgctxt "Relation type"
 msgid "enforcement"
@@ -15107,7 +15203,7 @@ msgstr "rota"
 
 msgctxt "Relation type"
 msgid "route_master"
-msgstr ""
+msgstr "rota mestre"
 
 msgctxt "Relation type"
 msgid "site"
@@ -15361,10 +15457,10 @@ msgid ""
 "Creating and handling address nodes and buildings within Czech Republic."
 msgstr "Criação e manipulação de endereços e edifícios na República Checa."
 
-msgid "Allows to import various file formats into JOSM directly."
+msgid ""
+"Allows to import various file formats into JOSM directly. Currently "
+"supported: TangoGPS, Garmin Trainings Center TCX."
 msgstr ""
-"Permite importar diretamente para o JOSM os formatos de ficheiros: .log "
-"(TangoGPS) e .tcx (Garmin Trainings Center TCX)."
 
 msgid "Download your GPX tracks from openstreetmap.org"
 msgstr "Descarregue os seus trilhos GPS (GPX) do openstreetmap.org"
@@ -15414,6 +15510,9 @@ msgid ""
 "Provides parts of the GeoTools library for other JOSM plugins. Not meant to "
 "be installed directly by users, but rather as a dependency for other plugins."
 msgstr ""
+"Fornece partes da biblioteca GeoTools para outros módulos do JOSM. Não é "
+"suposto este módulo ser instalado pelos utilizadores, mas sim instalado "
+"automaticamente quando outros módulos precisam dele."
 
 msgid ""
 "Download GPS points from Globalsat dg100 data logger directly in JOSM."
@@ -15479,6 +15578,11 @@ msgid "A helper for IRS satellite adjustment."
 msgstr "Facilita o alinhamento pelo satélite IRS (Indian Remote Sensing)"
 
 msgid ""
+"Provides Java Native Access (JNA) library. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
+msgid ""
 "Provides Java Topology Suite (JTS) library and related utilities. Not meant "
 "to be installed directly by users, but rather as a dependency for other "
 "plugins."
@@ -15509,6 +15613,9 @@ msgid ""
 "Provides the Log4j library for other JOSM plugins. Not meant to be installed "
 "directly by users, but rather as a dependency for other plugins."
 msgstr ""
+"Fornece a biblioteca Log4j para outros módulos do JOSM. Não é suposto este "
+"módulo ser instalado pelos utilizadores, mas sim instalado automaticamente "
+"quando outros módulos precisam dele."
 
 msgid ""
 "The MapDust Plug-In shows the MapDust bug reports on the map. You can "
@@ -15876,7 +15983,7 @@ msgid "ground"
 msgstr "terra"
 
 msgid "sett"
-msgstr ""
+msgstr "paralelos"
 
 msgctxt "riding"
 msgid "pitch"
@@ -15948,6 +16055,25 @@ msgstr "Com iluminação"
 msgid "Width (meters)"
 msgstr "Largura (metros)"
 
+msgid "Sidewalk"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "both"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "left"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "right"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "no"
+msgstr ""
+
 msgid "Service type"
 msgstr ""
 
@@ -16132,7 +16258,7 @@ msgid "stadium"
 msgstr "estádio"
 
 msgid "Select sport:"
-msgstr ""
+msgstr "Selecione o desporto:"
 
 msgid "Sport"
 msgstr "Desporto"
@@ -16312,17 +16438,21 @@ msgstr ""
 msgid "May-Sep 09:30-12:30,14:15-19:30"
 msgstr ""
 
+msgctxt "parking"
 msgid "multi-storey"
-msgstr "vários pisos"
+msgstr ""
 
+msgctxt "parking"
 msgid "surface"
-msgstr "à superfície"
+msgstr ""
 
+msgctxt "parking"
 msgid "underground"
-msgstr "subterrâneo"
+msgstr ""
 
+msgctxt "parking"
 msgid "rooftop"
-msgstr "telhado"
+msgstr ""
 
 msgid "Reference number"
 msgstr "Número de referência"
@@ -16683,7 +16813,7 @@ msgid "Service"
 msgstr "Estrada de Serviço (residência/loja/indústria)"
 
 msgid "Service way type"
-msgstr ""
+msgstr "Tipo de estrada de serviço"
 
 msgid "alley"
 msgstr "rua de traseiras"
@@ -16764,7 +16894,7 @@ msgid "Public Service Vehicles (psv)"
 msgstr "Transporte Público de Passageiros"
 
 msgid "Tourist buses"
-msgstr ""
+msgstr "Autocarros de turismo"
 
 msgid "Min. speed (km/h)"
 msgstr "Velocidade mínima (km/h)"
@@ -16778,14 +16908,25 @@ msgstr "Comprimento máximo (metros)"
 msgid "Overtaking"
 msgstr "Ultrapassagem"
 
+msgctxt "overtaking"
+msgid "yes"
+msgstr ""
+
+msgctxt "overtaking"
 msgid "both"
-msgstr "ambas as faixas"
+msgstr ""
 
+msgctxt "overtaking"
 msgid "forward"
-msgstr "faixa no sentido da linha"
+msgstr ""
 
+msgctxt "overtaking"
 msgid "backward"
-msgstr "faixa contrária ao sentido da linha"
+msgstr ""
+
+msgctxt "overtaking"
+msgid "no"
+msgstr ""
 
 msgid "Roundabout"
 msgstr "Rotunda"
@@ -17088,6 +17229,12 @@ msgstr "pegasus (não usada em Portugal)"
 msgid "tiger"
 msgstr "tiger (não usada em Portugal)"
 
+msgid "Button operated"
+msgstr ""
+
+msgid "Sound signals"
+msgstr "Sinal sonoro"
+
 msgid "Crossing attendant"
 msgstr "Com sinaleiro de passagem de peões (raro)"
 
@@ -17609,9 +17756,6 @@ msgstr "Passagem de Nível Ferroviária"
 msgid "Traffic lights"
 msgstr "Semáforo"
 
-msgid "Sound signals"
-msgstr "Sinal sonoro"
-
 msgid "Barrier"
 msgstr "Barreira"
 
@@ -17916,7 +18060,7 @@ msgid "Parts"
 msgstr "Peças"
 
 msgid "Tires"
-msgstr ""
+msgstr "Pneus"
 
 msgid "Rental"
 msgstr "Aluguer"
@@ -18021,7 +18165,7 @@ msgid "Public Transport"
 msgstr "Transporte Público"
 
 msgid "Public Transport Route"
-msgstr ""
+msgstr "Rota de Transportes Públicos"
 
 msgid "Route type"
 msgstr "Tipo de rota"
@@ -18110,7 +18254,7 @@ msgid "platform (entry only)"
 msgstr "plataforma (apenas entrada)"
 
 msgid "Route Master"
-msgstr ""
+msgstr "Rota Mestre"
 
 msgid "route variant/direction (at least 2)"
 msgstr "variante da rota / direção (pelo menos 2)"
@@ -18439,10 +18583,12 @@ msgid "Look-Out Tower"
 msgstr "Torre de Vigia"
 
 msgid "Information Office"
-msgstr "Posto de Informações"
+msgstr "Posto de Turismo"
 
 msgid "An office where you can get information about a town or region."
 msgstr ""
+"Num local onde se pode obter informação turística sobre uma localidade ou "
+"região"
 
 msgid "Map"
 msgstr "Mapa"
@@ -18533,7 +18679,7 @@ msgstr "Poste com Direções"
 
 msgid ""
 "A Signpost/Guidepost to indicate the directions to different destinations."
-msgstr ""
+msgstr "Um Sinal/Quadro informativo que indica uma ou várias direções."
 
 msgid "Information Terminal"
 msgstr "Terminal de Informação Eletrónico"
@@ -18563,7 +18709,7 @@ msgid "Leisure"
 msgstr "Lazer"
 
 msgid "Movie Theater/Cinema"
-msgstr ""
+msgstr "Cinema"
 
 msgid "Zoo"
 msgstr "Jardim Zoológico"
@@ -18578,7 +18724,7 @@ msgid "wall"
 msgstr "muro"
 
 msgid "Amusement/Theme Park"
-msgstr ""
+msgstr "Parque de Diversões"
 
 msgid "Water Park"
 msgstr "Parque Aquático"
@@ -18760,70 +18906,70 @@ msgid "seventh_day_adventist"
 msgstr ""
 
 msgid "Mosque"
-msgstr ""
+msgstr "mesquita"
 
 msgid "mosque"
-msgstr ""
+msgstr "mesquita"
 
 msgid "ibadi"
-msgstr ""
+msgstr "ibadita"
 
 msgid "Synagogue"
-msgstr ""
+msgstr "Sinagoga"
 
 msgid "synagogue"
-msgstr ""
+msgstr "sinagoga"
 
 msgctxt "jewish"
 msgid "orthodox"
-msgstr ""
+msgstr "ortodoxa"
 
 msgctxt "jewish"
 msgid "conservative"
-msgstr ""
+msgstr "conservadora"
 
 msgctxt "jewish"
 msgid "reform"
-msgstr ""
+msgstr "reformista"
 
 msgid "Buddhist Temple"
-msgstr ""
+msgstr "Templo Budista"
 
 msgid "theravada"
-msgstr ""
+msgstr "teravada"
 
 msgid "mahayana"
-msgstr ""
+msgstr "maaiana"
 
 msgid "vajrayana"
 msgstr ""
 
 msgid "Hindu Temple"
-msgstr ""
+msgstr "Templo Hindu"
 
 msgid "vaishnavism"
 msgstr ""
 
 msgid "shaivism"
-msgstr ""
+msgstr "xivaísmo"
 
 msgid "shaktism"
-msgstr ""
+msgstr "shaktismo"
 
 msgid "smartism"
-msgstr ""
+msgstr "smarta"
 
 msgid "Shinto Shrine"
-msgstr ""
+msgstr "Templo Xintoísta"
 
 msgid "Other Place of Worship"
-msgstr ""
+msgstr "Outro Templo de Oração"
 
 msgid "Public Building"
 msgstr "Edifício Público"
 
 msgid "Town Hall"
-msgstr ""
+msgstr "Câmara Municipal / Junta de Freguesia"
 
 msgid "Community Centre"
 msgstr "Centro Comunitário"
@@ -18883,7 +19029,7 @@ msgid "Clinic"
 msgstr "Clínica"
 
 msgid "Doctor''s Office"
-msgstr ""
+msgstr "Médico Privado"
 
 msgid "Dentist"
 msgstr "Dentista"
@@ -18961,7 +19107,7 @@ msgid "urinal"
 msgstr ""
 
 msgid "Shower"
-msgstr ""
+msgstr "Chuveiros Públicos"
 
 msgid "Post Box"
 msgstr "Marco / caixa de correio"
@@ -18991,7 +19137,7 @@ msgid "Emergency Phone"
 msgstr "Telefone de Emergência"
 
 msgid "Internet Access"
-msgstr ""
+msgstr "Acesso à Internet"
 
 msgid "Automated Defibrillator"
 msgstr ""
@@ -19542,7 +19688,7 @@ msgstr ""
 
 msgctxt "building"
 msgid "farm"
-msgstr ""
+msgstr "quinta"
 
 msgctxt "building"
 msgid "transportation"
@@ -19554,7 +19700,7 @@ msgstr ""
 
 msgctxt "building"
 msgid "office"
-msgstr ""
+msgstr "escritório"
 
 msgctxt "building"
 msgid "university"
@@ -19582,7 +19728,7 @@ msgstr ""
 
 msgctxt "building"
 msgid "construction"
-msgstr ""
+msgstr "em construção"
 
 msgid "Residential Building"
 msgstr "Edifício Residencial"
@@ -19671,6 +19817,9 @@ msgstr "Moinho de Vento"
 msgid "Gasometer"
 msgstr "Gasómetro (depósito)"
 
+msgid "Bunker Silo"
+msgstr ""
+
 msgid "Pipeline"
 msgstr "Pipeline / Tubo (água, petróleo, esgotos...)"
 
@@ -19788,7 +19937,7 @@ msgid "Water Works"
 msgstr "Estação de captação e tratamento de água"
 
 msgid "Wastewater Treatment Plant"
-msgstr ""
+msgstr "ETAR Estação de Tratamento de Águas Residuais"
 
 msgid "Watermill"
 msgstr "Moinho de Água"
@@ -19812,70 +19961,73 @@ msgid "Mo-Fr 22:00-05:00"
 msgstr "Segunda a Sexta 22:00 às 05:00"
 
 msgid "Monitoring Station"
-msgstr ""
+msgstr "Estação de Monitorização (tempo/nível da água/ar/sísmica...)"
 
 msgid "Monitoring:"
-msgstr ""
-
-msgid "Weather"
-msgstr ""
+msgstr "Monitorização:"
 
 msgid "Water level"
-msgstr ""
+msgstr "Nível da água"
 
 msgid "Tide Level"
+msgstr "Nível das ondas"
+
+msgid "Groundwater"
 msgstr ""
 
 msgid "Traffic"
-msgstr ""
+msgstr "Tráfego"
 
 msgid "Air Quality"
-msgstr ""
+msgstr "Qualidade do ar"
 
 msgid "Noise"
-msgstr ""
+msgstr "Ruído"
 
 msgid "GPS Signals"
-msgstr ""
+msgstr "Sinais de satélites GPS"
 
 msgid "GLONASS Signals"
-msgstr ""
+msgstr "Sinais de satélites GLONASS"
 
 msgid "Galileo Signals"
-msgstr ""
+msgstr "Sinais de satélites Galileo"
+
+msgid "Weather"
+msgstr "Clima"
 
 msgid "Radiation"
-msgstr ""
+msgstr "Radiação"
 
 msgid "Seismic Activity"
-msgstr ""
+msgstr "Atividade sísmica"
 
 msgid "Recording:"
-msgstr ""
+msgstr "Gravação:"
 
 msgid "Automated"
-msgstr ""
+msgstr "Automática"
 
 msgid "Manually"
-msgstr ""
+msgstr "Manual"
 
 msgid "Remote"
-msgstr ""
+msgstr "Remota"
 
 msgid "Display:"
-msgstr ""
+msgstr "Mostrador:"
 
 msgid "Analog"
-msgstr ""
+msgstr "Analógico"
 
 msgid "Digital"
-msgstr ""
+msgstr "Digital"
 
 msgid "Survey Point"
 msgstr "Vértice Geodésico"
 
 msgid "Surveillance Camera"
-msgstr ""
+msgstr "Câmara de Vigilância"
 
 msgid "indoor"
 msgstr "interior de edifícios privados/empresas"
@@ -19884,61 +20036,61 @@ msgid "outdoor"
 msgstr "exterior de edifícios privados/empresas"
 
 msgid "Zone"
-msgstr ""
+msgstr "Zona"
 
 msgid "parking"
-msgstr ""
+msgstr "parque de estacionamento"
 
 msgid "traffic"
-msgstr ""
+msgstr "tráfego"
 
 msgid "shop"
 msgstr "lojas"
 
 msgid "bank"
-msgstr ""
+msgstr "banco"
 
 msgid "Camera"
-msgstr ""
+msgstr "Câmara"
 
 msgctxt "camera:type"
 msgid "fixed"
-msgstr ""
+msgstr "fixa"
 
 msgctxt "camera:type"
 msgid "panning"
-msgstr ""
+msgstr "panrâmica"
 
 msgctxt "camera:type"
 msgid "dome"
-msgstr ""
+msgstr "Cúpula / domo"
 
 msgid "Mounted on"
-msgstr ""
+msgstr "Montada em"
 
 msgctxt "camera:mount"
 msgid "wall"
-msgstr ""
+msgstr "na parede"
 
 msgctxt "camera:mount"
 msgid "pole"
-msgstr ""
+msgstr "num poste"
 
 msgctxt "camera:mount"
 msgid "ceiling"
-msgstr ""
+msgstr "no teto"
 
 msgid "Direction in degrees"
-msgstr ""
+msgstr "Direção em graus"
 
 msgid "Inclination in degrees"
-msgstr ""
+msgstr "Inclinação em graus"
 
 msgid "Height in meter (m)"
-msgstr ""
+msgstr "Altura em metros"
 
 msgid "Bridges"
-msgstr ""
+msgstr "Pontes"
 
 msgid "aqueduct"
 msgstr "aqueduto"
@@ -19950,7 +20102,7 @@ msgid "cantilever"
 msgstr ""
 
 msgid "covered"
-msgstr ""
+msgstr "coberta"
 
 msgid "low_water_crossing"
 msgstr ""
@@ -19962,10 +20114,10 @@ msgid "viaduct"
 msgstr "viaduto"
 
 msgid "Structure"
-msgstr ""
+msgstr "Estrutura"
 
 msgid "arch"
-msgstr ""
+msgstr "arco"
 
 msgid "beam"
 msgstr ""
@@ -19974,10 +20126,10 @@ msgid "truss"
 msgstr ""
 
 msgid "floating"
-msgstr ""
+msgstr "flutuante"
 
 msgid "suspension"
-msgstr ""
+msgstr "suspensa"
 
 msgid "cable-stayed"
 msgstr ""
@@ -19989,7 +20141,7 @@ msgid "humpback"
 msgstr ""
 
 msgid "Movable Bridge"
-msgstr ""
+msgstr "Ponte Móvel"
 
 msgid "bascule"
 msgstr ""
@@ -19998,10 +20150,10 @@ msgid "drawbridge"
 msgstr ""
 
 msgid "lift"
-msgstr ""
+msgstr "elevatória"
 
 msgid "submersible"
-msgstr ""
+msgstr "submersível"
 
 msgid "swing"
 msgstr "giratória"
@@ -20010,7 +20162,7 @@ msgid "transporter"
 msgstr ""
 
 msgid "Bridge Support"
-msgstr ""
+msgstr "Suporte da Ponte"
 
 msgid "pier"
 msgstr ""
@@ -20024,6 +20176,9 @@ msgstr ""
 msgid "pivot_pier"
 msgstr ""
 
+msgid "Bridge outline"
+msgstr ""
+
 msgid "Power Plant"
 msgstr ""
 
@@ -20462,7 +20617,7 @@ msgid "Power Tower"
 msgstr "Torre de Alta Tensão"
 
 msgid "Type of construction"
-msgstr ""
+msgstr "Tipo de construção"
 
 msgid "lattice"
 msgstr ""
@@ -20631,6 +20786,15 @@ msgstr ""
 msgid "Pole"
 msgstr "Poste"
 
+msgid "Pole with Transformer"
+msgstr ""
+
+msgid "Pole Attributes:"
+msgstr ""
+
+msgid "Transformer Attributes:"
+msgstr ""
+
 msgid "Power Line"
 msgstr "Linha de Transmissão"
 
@@ -20680,9 +20844,15 @@ msgstr ""
 msgid "Power Cable"
 msgstr ""
 
+msgctxt "power cable"
+msgid "underground"
+msgstr ""
+
+msgctxt "power cable"
 msgid "underwater"
 msgstr ""
 
+msgctxt "power cable"
 msgid "overground"
 msgstr ""
 
@@ -20710,6 +20880,33 @@ msgstr "Monumento"
 msgid "Memorial"
 msgstr "Memorial"
 
+msgctxt "memorial"
+msgid "statue"
+msgstr ""
+
+msgctxt "memorial"
+msgid "bust"
+msgstr ""
+
+msgctxt "memorial"
+msgid "plaque"
+msgstr ""
+
+msgctxt "memorial"
+msgid "stele"
+msgstr ""
+
+msgctxt "memorial"
+msgid "stone"
+msgstr ""
+
+msgctxt "memorial"
+msgid "war_memorial"
+msgstr ""
+
+msgid "Inscription"
+msgstr ""
+
 msgid "Wayside Cross"
 msgstr "Cruzeiro / Cruz ao ar livre"
 
@@ -20735,7 +20932,7 @@ msgid "Kiosk"
 msgstr "Quiosque"
 
 msgid "Bakery"
-msgstr ""
+msgstr "Padaria"
 
 msgid "Butcher"
 msgstr "Talho"
@@ -20747,16 +20944,16 @@ msgid "Deli (Fine Food)"
 msgstr "Loja de Gourmet"
 
 msgid "Candy Store"
-msgstr ""
+msgstr "Loja de Guloseimas"
 
 msgid "Tea"
-msgstr ""
+msgstr "Chá"
 
 msgid "Coffee"
-msgstr ""
+msgstr "Café em grão/moído"
 
 msgid "Public Market"
-msgstr ""
+msgstr "Mercado / Feira"
 
 msgid "Organic"
 msgstr "Orgânica / Biológica"
@@ -20779,6 +20976,9 @@ msgstr "Bebidas Alcoólicas"
 msgid "Beverages"
 msgstr "Bebidas"
 
+msgid "Wine"
+msgstr ""
+
 msgid "Boutique"
 msgstr "Boutique"
 
@@ -20822,6 +21022,9 @@ msgid "Video"
 msgstr "Vídeo"
 
 msgid "Video Games"
+msgstr "Jogos Eletrónicos"
+
+msgid "Music"
 msgstr ""
 
 msgid "Cash"
@@ -20837,10 +21040,10 @@ msgid "Money Exchange"
 msgstr "Angência de Câmbio"
 
 msgid "Pawnbroker"
-msgstr ""
+msgstr "Casa de Penhoras"
 
 msgid "Home decoration"
-msgstr ""
+msgstr "Decoração"
 
 msgid "Furniture"
 msgstr "Mobiliário"
@@ -20851,35 +21054,38 @@ msgstr "Loja de Cozinhas"
 msgid "Curtain"
 msgstr "Loja de Cortinados"
 
+msgid "Art"
+msgstr ""
+
 msgid "Frame"
 msgstr "Molduras"
 
 msgid "Bed"
-msgstr ""
+msgstr "Camas"
 
 msgid "Interior Decoration"
-msgstr ""
+msgstr "Decoração de Interiores"
 
 msgid "Antiques"
-msgstr ""
+msgstr "Antiguidades"
 
 msgid "Printed Material"
-msgstr ""
+msgstr "Material Impresso"
 
 msgid "Stationery"
 msgstr "Papelaria"
 
 msgid "Copy Shop"
-msgstr ""
+msgstr "Loja de Cópias"
 
 msgid "Book Store"
 msgstr "Livraria"
 
 msgid "Newspaper Stand"
-msgstr ""
+msgstr "Jornais / Revistas"
 
 msgid "Ticket"
-msgstr ""
+msgstr "Bilheteira"
 
 msgid "Department Store"
 msgstr "Grande Armazém"
@@ -20891,19 +21097,22 @@ msgid "Chemist"
 msgstr "Drogaria"
 
 msgid "Hairdresser/Barber"
-msgstr ""
+msgstr "Cabeleireiro/Barbeiro"
 
 msgid "Beauty"
-msgstr ""
+msgstr "Serviços de Beleza"
+
+msgid "Tattoo"
+msgstr "Tatuagens"
 
 msgid "Optician"
 msgstr "Ótica"
 
 msgid "Jewellery"
-msgstr ""
+msgstr "Joalharia"
 
 msgid "Gift/Souvenir"
-msgstr ""
+msgstr "Lembranças"
 
 msgid "Erotic"
 msgstr "Sex Shop"
@@ -20915,7 +21124,7 @@ msgid "Garden Centre"
 msgstr "Loja de Jardinagem"
 
 msgid "Do-It-Yourself Store"
-msgstr ""
+msgstr "Loja de Bricolagem"
 
 msgid "Hardware"
 msgstr "Loja de Ferragens"
@@ -20936,19 +21145,22 @@ msgid "Variety Store"
 msgstr "Loja de Descontos (Lojas 1,99; preço único)"
 
 msgid "Bookmaker"
-msgstr ""
+msgstr "Casa de Apostas"
 
 msgid "Lottery"
-msgstr ""
+msgstr "Lotaria"
 
 msgid "Bag"
-msgstr ""
+msgstr "Carteiras / Malas"
 
 msgid "Pet"
+msgstr "Loja de animais/artigos para animais"
+
+msgid "Funeral Directors"
 msgstr ""
 
 msgid "Vending Machine"
-msgstr ""
+msgstr "Máquida de Venda Automática"
 
 msgid "Vending products"
 msgstr "Produtos à venda"
@@ -21044,6 +21256,15 @@ msgid "Postal Code"
 msgstr ""
 
 msgid "National Park"
+msgstr "Parque Nacional"
+
+msgid "Protected Area"
+msgstr ""
+
+msgid "Protected Class"
+msgstr ""
+
+msgid "Title or type of protection"
 msgstr ""
 
 msgid "Places"
@@ -21080,13 +21301,14 @@ msgid "Hamlet"
 msgstr "Aldeia / Lugar"
 
 msgid "Farm"
-msgstr ""
+msgstr "Quinta"
 
 msgid "A farm within a bigger settlement"
-msgstr ""
+msgstr "Uma quinta numa dada localidade"
 
 msgid "(please use isolated_dwelling for an isolated farm)"
 msgstr ""
+"(por favor use isolated_dwelling/habitação isolada para uma quinta isolada)"
 
 msgid "Isolated Dwelling"
 msgstr "Habitação Isolada"
@@ -21154,10 +21376,10 @@ msgid "Islet"
 msgstr "Ilhéu"
 
 msgid "Ridge"
-msgstr ""
+msgstr "Cumeeira"
 
 msgid "A mountain or hill ridge."
-msgstr ""
+msgstr "Cumeeiras de uma montanha"
 
 msgid "Nature"
 msgstr "Natureza"
@@ -21172,7 +21394,7 @@ msgid "Botanical Name"
 msgstr "Nome Botânico"
 
 msgid "Tree Row"
-msgstr ""
+msgstr "Linha de Árvores"
 
 msgid "A line of trees."
 msgstr ""
@@ -21313,7 +21535,7 @@ msgid "Recreation Ground"
 msgstr "Parque Recreativo (para atividades desportivas)"
 
 msgid "Residential Area"
-msgstr ""
+msgstr "Área Residencial"
 
 msgid "Graveyard"
 msgstr "Sepulturas (uso raro e fora de cemitérios)"
@@ -21322,7 +21544,7 @@ msgid "Cemetery"
 msgstr "Cemitério"
 
 msgid "Religious"
-msgstr ""
+msgstr "Área Religiosa"
 
 msgid "Retail"
 msgstr "Área de Retalho (várias lojas)"
@@ -21337,13 +21559,13 @@ msgid "Garages"
 msgstr "Área de Garagens"
 
 msgid "Railway Land"
-msgstr ""
+msgstr "Área Ferroviária"
 
 msgid "Military"
 msgstr "Área Militar"
 
 msgid "Construction Area"
-msgstr ""
+msgstr "Área em construção"
 
 msgid "Brownfield"
 msgstr "Edifícios industriais em ruínas e contaminados"
@@ -21373,10 +21595,10 @@ msgid "Regional name"
 msgstr ""
 
 msgid "National name"
-msgstr ""
+msgstr "Nome nacional"
 
 msgid "International name"
-msgstr ""
+msgstr "Nome internacional"
 
 msgid "Official name"
 msgstr ""
@@ -21667,7 +21889,7 @@ msgid "members of site"
 msgstr "membros do sítio"
 
 msgid "Turn Restriction"
-msgstr ""
+msgstr "Restrição de Viragem"
 
 msgid "Restriction"
 msgstr "Restrição"
@@ -21745,10 +21967,10 @@ msgid "traffic light or barrier that stops you"
 msgstr "semáforo ou barreira que obriga a parar"
 
 msgid "Routes"
-msgstr ""
+msgstr "Rotas"
 
 msgid "Bicycle Route"
-msgstr ""
+msgstr "Rota de Ciclismo"
 
 msgid "icn"
 msgstr ""
@@ -21763,10 +21985,10 @@ msgid "lcn"
 msgstr ""
 
 msgid "Mountain Biking Route"
-msgstr ""
+msgstr "Rota de Ciclismo de Montanha"
 
 msgid "Hiking Route"
-msgstr ""
+msgstr "Rota de Caminhadas"
 
 msgid "iwn"
 msgstr ""
@@ -21802,13 +22024,13 @@ msgid "entry points"
 msgstr ""
 
 msgid "Ski Route"
-msgstr ""
+msgstr "Rota de Esqui"
 
 msgid "alpine"
 msgstr ""
 
 msgid "Detour Route"
-msgstr ""
+msgstr "Rota de Desvio"
 
 msgid "Destination"
 msgstr ""
@@ -21820,22 +22042,22 @@ msgid "fork node for alternative routes"
 msgstr ""
 
 msgid "Power Route"
-msgstr ""
+msgstr "Rota de Rede de Transmissão de Energia"
 
 msgid "Railway Route"
-msgstr ""
+msgstr "Rota de Ferrovia"
 
 msgid "Road Route"
-msgstr ""
+msgstr "Rota de Estradas"
 
 msgid "Route Network"
-msgstr ""
+msgstr "Rede de Rotas"
 
 msgid "member"
 msgstr "membro"
 
 msgid "Associated Street"
-msgstr ""
+msgstr "Rua Associada"
 
 msgid "house"
 msgstr "casa"
@@ -21856,7 +22078,7 @@ msgid "anything related to the street"
 msgstr "outras coisas que pertencem à rua"
 
 msgid "Destination Sign"
-msgstr ""
+msgstr "Sinal de Destino/Direções"
 
 msgid "Destination written on sign (w/o distance)"
 msgstr "Destino indicado no sinal (apenas nome, sem distância)"
@@ -21982,7 +22204,7 @@ msgid "Bing Sat"
 msgstr ""
 
 msgid "HDM (Humanitarian OpenStreetMap Team)"
-msgstr ""
+msgstr "HDM (Equipa Humanitária do OpenStreetMap)"
 
 msgid "MapBox Satellite"
 msgstr ""
@@ -22122,7 +22344,13 @@ msgstr ""
 msgid "Estonia Ortho (Maaamet)"
 msgstr ""
 
-msgid "Estonia Multi (Maaamet)"
+msgid "Estonia Hillshade (Maaamet)"
+msgstr ""
+
+msgid "Estonia Cadastre (Maaamet)"
+msgstr ""
+
+msgid "Estonia Forestry (Maaamet)"
 msgstr ""
 
 msgid "Bordeaux - 2012"
@@ -22146,7 +22374,7 @@ msgstr ""
 msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
 msgstr ""
 
-msgid "CUGN Nancy - Orthophoto 2012"
+msgid "GrandNancy Orthophotographie 2012"
 msgstr ""
 
 msgid "Géobretagne - Brest 2010 - 10 cm"
@@ -22193,9 +22421,6 @@ msgid ""
 "- 1 m"
 msgstr ""
 
-msgid "Streets NRW Geofabrik.de"
-msgstr ""
-
 msgid "Hike & Bike"
 msgstr ""
 
@@ -22255,6 +22480,9 @@ msgstr ""
 msgid "NRW-Atlas: Topographische Karte 1:10000"
 msgstr ""
 
+msgid "Metropole Ruhr: Luftbilder (10 cm)"
+msgstr ""
+
 msgid "Drone Imagery (Haiti)"
 msgstr ""
 
@@ -22456,6 +22684,9 @@ msgstr ""
 msgid "Stadt Zürich Übersichtsplan (Strassen, Gebäude, Hausnummer)"
 msgstr ""
 
+msgid "Stadt Zürich Luftbild 2011"
+msgstr ""
+
 msgid "Orthofoto Kanton Solothurn RGB (SOGIS 2011/2012/2013)"
 msgstr ""
 
@@ -22474,7 +22705,7 @@ msgstr ""
 msgid "Canton de Fribourg 50cm (2005)"
 msgstr ""
 
-msgid "Stadt Bern 10cm/25cm (2008)"
+msgid "Stadt Bern 10cm/25cm (2012)"
 msgstr ""
 
 msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
@@ -22513,7 +22744,7 @@ msgstr ""
 msgid "OSM US TIGER 2012 Roads Overlay"
 msgstr ""
 
-msgid "New & Misaligned TIGER Roads (TIGER 2013)"
+msgid "New & Misaligned TIGER Roads (TIGER 2014)"
 msgstr ""
 
 msgid "MassGIS L3 Parcels"
@@ -22561,9 +22792,234 @@ msgstr ""
 msgid "NLS - Bartholomew Half Inch, 1897-1907"
 msgstr ""
 
+msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Annan 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgstr ""
+
 msgid "OS Town Plans, Cupar 1854 (NLS)"
 msgstr ""
 
+msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Elgin 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Forres 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Galashiels 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Girvan 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Greenock 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Haddington 1853 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Haddington 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Hamilton 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Irvine 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Jedburgh 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kelso 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Lanark 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Linlithgow 1856 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Musselburgh 1853 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Musselburgh 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Oban 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Peebles 1856 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Perth 1860 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Peterhead 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Selkirk 1865 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, St Andrews 1854 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, St Andrews 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stirling 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stonehaven 1864 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1847 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Strathaven 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wick 1872 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wigtown 1848 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wigtown 1894 (NLS)"
+msgstr ""
+
 msgid "Decreasing house numbers in addresses interpolation"
 msgstr ""
 
@@ -22617,17 +23073,37 @@ msgid "{0}={1} is deprecated. Please use instead a multipolygon."
 msgstr ""
 
 msgid ""
-"{0} is deprecated. Please specify ìnterval by using opening_hours syntax"
+"{0} is deprecated. Please specify interval by using opening_hours syntax"
 msgstr ""
 
 msgid ""
 "{0} is deprecated. Please delete this object and use a private layer instead"
 msgstr ""
 
-msgid "{0} on a node"
+msgid "{0}={1} is unspecific. Please replace ''{1}'' by a specific value."
 msgstr ""
 
-msgid "{0} on a node. Should be drawn as an area"
+msgid "{0} should be replaced with {1}"
+msgstr ""
+
+msgid ""
+"{0}={1} is unspecific. Please replace ''{1}'' by ''left'', ''right'' or "
+"''both''."
+msgstr ""
+
+msgid "{0} on a node. Should be used on a way."
+msgstr ""
+
+msgid "{0} on a node. Should be drawn as an area."
+msgstr ""
+
+msgid "{0}=* on a node. Should be used in a relation"
+msgstr ""
+
+msgid "{0} on a way. Should be used in a relation"
+msgstr ""
+
+msgid "{0} on a node"
 msgstr ""
 
 msgid "Building inside building"
@@ -22649,7 +23125,7 @@ msgid "Overlapping Identical Landuses"
 msgstr ""
 
 msgid "abbreviated street name"
-msgstr ""
+msgstr "nome abreviado da rua"
 
 msgid "wrong highway tag on a node"
 msgstr "etiqueta errada de estrada num nó"
@@ -24030,7 +24506,7 @@ msgid "Tolerance Angle"
 msgstr ""
 
 msgid "Plugin Settings"
-msgstr ""
+msgstr "Configuração do Módulo"
 
 msgid "Show Address Dialog after mapping an area"
 msgstr ""
@@ -25560,7 +26036,7 @@ msgid "Are you sure this imagery offset is wrong?"
 msgstr ""
 
 msgid "Are you sure this calibration geometry is aligned badly?"
-msgstr ""
+msgstr "Tem certeza que esta calibragem geométrica está errada?"
 
 msgid "Warning: deprecation is basically irreversible!"
 msgstr ""
@@ -27675,6 +28151,9 @@ msgstr "Sugerir Paragens"
 msgid "Find"
 msgstr "Procurar"
 
+msgid "Show"
+msgstr "Mostrar"
+
 msgid "Mark"
 msgstr "Marcar"
 
@@ -30262,6 +30741,9 @@ msgid ""
 "correctly installed on your system. Its architecture (32/64 bits) must also "
 "be the same as the JRE that runs JOSM."
 msgstr ""
+"A biblioteca do VLC não foi corretamente inicializada. Verifique se o VLC "
+"{0} está corretamente instalado. A arquitetura 32 ou 64 bits do VLC deve ser "
+"a mesma do JOSM."
 
 msgid "Jump to"
 msgstr "Saltar para"
diff --git a/i18n/po/pt_BR.po b/i18n/po/pt_BR.po
index f3c1f80..dbf5e4f 100644
--- a/i18n/po/pt_BR.po
+++ b/i18n/po/pt_BR.po
@@ -1,17 +1,23 @@
+# Brazilian Portuguese translation for josm
+# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
+# This file is distributed under the same license as the josm package.
+# FIRST AUTHOR <EMAIL at ADDRESS>, 2009.
+# Djavan Fagundes <djavan at comum.org>, 2010, 2011.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-21 03:38+0200\n"
-"PO-Revision-Date: 2014-10-20 03:12+0000\n"
-"Last-Translator: Nelson A. de Oliveira <naoliv at debian.org>\n"
+"POT-Creation-Date: 2014-12-10 03:42+0100\n"
+"PO-Revision-Date: 2014-11-27 17:23+0000\n"
+"Last-Translator: brunomelniic <Unknown>\n"
 "Language-Team: Português Brasileiro <gnome-pt_br-list at gnome.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2014-10-21 05:32+0000\n"
-"X-Generator: Launchpad (build 17203)\n"
+"X-Launchpad-Export-Date: 2014-12-10 05:18+0000\n"
+"X-Generator: Launchpad (build 17283)\n"
 "Language: pt_BR\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -147,6 +153,7 @@ msgstr "Java versão {0}"
 msgid "Homepage"
 msgstr "Página inicial"
 
+# Apesar do inglês querer dizer "relatórios de erros", o correto é "relatar erro", já que é utilizado em um link para abrir um novo ticket
 msgid "Bug Reports"
 msgstr "Relatar erro"
 
@@ -172,22 +179,6 @@ msgid "About JOSM..."
 msgstr "Sobre o JOSM..."
 
 msgid ""
-"Unexpected format of API base URL. Redirection to info or history page for "
-"OSM object will probably fail. API base URL is: ''{0}''"
-msgstr ""
-"Formato não esperado da URL base de API. Redirecionamento para informação ou "
-"página de histórico para o objeto OSM provavelmente falhará. A URL base da "
-"API é: ''{0}''"
-
-msgid ""
-"Unexpected format of API base URL. Redirection to user page for OSM user "
-"will probably fail. API base URL is: ''{0}''"
-msgstr ""
-"Formato inesperado para API da URL base. O redirecionamento para a página de "
-"usuário para o usuário OSM provavelmente irá falhar. A API da URL base é:'' "
-"{0}''"
-
-msgid ""
 "You are about to launch {0} browser window.<br>This may both clutter your "
 "screen with browser windows<br>and take some time to finish."
 msgid_plural ""
@@ -1670,6 +1661,15 @@ msgstr "Não há modificações a enviar."
 msgid "Nothing to upload. Get some data first."
 msgstr "Não há nada a enviar. Baixe dados primeiro."
 
+msgid "Upload note changes to server"
+msgstr "Enviar notas de alterações para o servidor"
+
+msgid "Upload notes"
+msgstr "Enviar notas"
+
+msgid "Uploading notes to server"
+msgstr "Enviar notas para o servidor"
+
 msgid "Upload selection"
 msgstr "Enviar seleção"
 
@@ -1958,12 +1958,18 @@ msgstr "Modo de adição de notas"
 msgid "Click the location where you wish to create a new note"
 msgstr "Clique no lugar que você deseja criar uma Nota nova"
 
-msgid "Enter a comment for a new note"
-msgstr "Digite um comentário para a Nota criada"
-
 msgid "Create new note"
 msgstr "Criar Nota nova"
 
+msgid "Create note"
+msgstr "Criar nota"
+
+msgid "Enter a detailed comment to create a note"
+msgstr "Insira um comentário detalhado para criar uma nota"
+
+msgid "You must enter a comment to create a new note"
+msgstr "Você precisa inserir um comentário para criar uma nota"
+
 msgid "Delete Mode"
 msgstr "Apagar Modo"
 
@@ -2932,6 +2938,15 @@ msgstr "... refere-se a uma relação"
 msgid "Cycling dependencies"
 msgstr "Dependências cíclicas"
 
+msgid "Uploading modified notes"
+msgstr "Enviando notas modificadas"
+
+msgid "Note {0} failed: {1}"
+msgstr "Nota {0} falhou: {1}"
+
+msgid "Notes failed to upload"
+msgstr "Falha ao enviar notas"
+
 msgid ""
 "The following are results of automatic validation. Try fixing these, but be "
 "careful (don''t destroy valid data). When in doubt ignore them.<br>When you "
@@ -5331,6 +5346,12 @@ msgstr "Conflito de fundo: manter todas as tags"
 msgid "Conflict foreground: keep all tags"
 msgstr "Conflito de primeiro plano: manter todas as tags"
 
+msgid "Conflict background: sum all numeric tags"
+msgstr ""
+
+msgid "Conflict foreground: sum all numeric tags"
+msgstr ""
+
 msgid "Conflict background: keep member"
 msgstr "Conflito de fundo: mantar membro"
 
@@ -5801,12 +5822,21 @@ msgstr "nenhum"
 msgid "all"
 msgstr "todos"
 
+msgid "sum"
+msgstr "soma"
+
 msgid "Please decide which values to keep"
 msgstr "Por favor, escolher quais valores manter"
 
 msgid "Value ''{0}'' is going to be applied for key ''{1}''"
 msgstr "O valor ''{0}'' será aplicado para a chave ''{1}''"
 
+msgid ""
+"All numeric values sumed as ''{0}'' are going to be applied for key ''{1}''"
+msgstr ""
+"Todos os valores numéricos somados como ''{0}'' serão substituídos pela "
+"chave ''{1}''"
+
 msgid "The key ''{0}'' and all its values are going to be removed"
 msgstr "A chave ''{0}'' e todos os seus valores serão removidos"
 
@@ -6211,24 +6241,6 @@ msgstr[1] "<b>{0}</b> objetos desabilitados"
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr "</p><p>Feche a janela de filtros para ver todos objetos.<p></html>"
 
-msgid "Display the history of all selected items."
-msgstr "Mostrar histórico de todos itens selecionados."
-
-msgid "Object with history"
-msgstr "Objeto com histórico"
-
-msgid "Reload"
-msgstr "Recarregar"
-
-msgid "Reload all currently selected objects and refresh the list."
-msgstr "Recarregar todos objetos selecionados e atualizar a lista."
-
-msgid "Show"
-msgstr "Mostrar"
-
-msgid "Display the history of the selected objects."
-msgstr "Mostrar histórico dos objetos selecionados."
-
 msgid "Advanced object info"
 msgstr "Informação avançada de objeto"
 
@@ -6591,6 +6603,9 @@ msgstr "Adicionar comentário"
 msgid "Comment"
 msgstr "Comentário"
 
+msgid "Comment on note"
+msgstr "Comentar sobre a nota"
+
 msgid "Add comment to note:"
 msgstr "Adicionar comentário na Nota"
 
@@ -6600,9 +6615,6 @@ msgstr "Fechar Nota"
 msgid "Close note with message:"
 msgstr "Fechar nota com mensagem:"
 
-msgid "Close Note"
-msgstr "Fechar Nota"
-
 msgid "Create a new note"
 msgstr "Criar uma nova nota"
 
@@ -6680,6 +6692,9 @@ msgstr "Seleção Atual"
 msgid "Search for objects"
 msgstr "Procure por objetos"
 
+msgid "Display the history of the selected objects."
+msgstr "Mostrar histórico dos objetos selecionados."
+
 msgid "Zoom to selection"
 msgstr "Zoom para seleção"
 
@@ -6804,6 +6819,9 @@ msgstr "Consertando ({0}/{1}): ''{2}''"
 msgid "Updating map ..."
 msgstr "Atualizando mapa ..."
 
+msgid "anonymous"
+msgstr "anônimo"
+
 msgid "Display the basic properties of the changeset"
 msgstr "Exibir propriedades básicas do changeset"
 
@@ -6817,6 +6835,12 @@ msgid "Display the objects created, updated, and deleted by the changeset"
 msgstr ""
 "Mostra os objetos criados, atualizados, e removidos por este changeset"
 
+msgid "Discussion"
+msgstr "Discussão"
+
+msgid "Display the public discussion around this changeset"
+msgstr "Mostrar a discussão pública deste changeset"
+
 msgid "Changeset Management Dialog"
 msgstr "Janela de gerenciamento de conjunto de alterações"
 
@@ -6882,9 +6906,6 @@ msgctxt "changeset.state"
 msgid "Closed"
 msgstr "Fechado"
 
-msgid "anonymous"
-msgstr "anônimo"
-
 msgid "ID"
 msgstr "ID"
 
@@ -6900,6 +6921,9 @@ msgstr "Criado em"
 msgid "Closed at"
 msgstr "Fechado em"
 
+msgid "Discussions"
+msgstr "Discussões"
+
 msgid "Downloading changeset content"
 msgstr "Baixando conteúdo do changeset"
 
@@ -7021,6 +7045,15 @@ msgid ""
 msgstr ""
 "Zoom até os objetos contidos neste changeste na camada de dados atual"
 
+msgid "Update changeset discussion"
+msgstr "Atualizar discussão do changeset"
+
+msgid "Update the changeset discussion from the OSM server"
+msgstr "Atualizar discussão do changeset do servidor OSM"
+
+msgid "Date"
+msgstr "Data"
+
 msgid "Download changesets"
 msgstr "Baixar conjuntos de alterações"
 
@@ -7498,8 +7531,8 @@ msgstr "Por favor, selecione um valor"
 msgid "Set number of recently added tags"
 msgstr "Defina o número de tags adicionadas recentemente"
 
-msgid "Remember last used tags"
-msgstr "Lembrar tags usadas recentemente"
+msgid "Remember last used tags after a restart"
+msgstr "Lembrar das últimas tags usadas antes do restar"
 
 msgid "Please enter the number of recently added tags to display"
 msgstr ""
@@ -7881,6 +7914,9 @@ msgstr "incluir relações de parentesco diretas"
 msgid "Load parent relations"
 msgstr "Carregar relações de parentesco"
 
+msgid "Reload"
+msgstr "Recarregar"
+
 msgid "Loading parent relations"
 msgstr "Carregar relações-pai"
 
@@ -8012,6 +8048,12 @@ msgid "Select to download GPS traces in the selected download area."
 msgstr ""
 "Selecione para baixar trilhas GPS do OSM para a área de download selecionada."
 
+msgid "Notes"
+msgstr "Notas"
+
+msgid "Select to download notes in the selected download area."
+msgstr "Selecione para baixar notas na área de download selecionada."
+
 msgid "Download as new layer"
 msgstr "Baixar como nova camada"
 
@@ -8354,9 +8396,6 @@ msgstr "A"
 msgid "B"
 msgstr "B"
 
-msgid "Date"
-msgstr "Data"
-
 msgid ""
 "Failed to update primitive with id {0} because current edit layer is null"
 msgstr ""
@@ -9357,9 +9396,6 @@ msgstr ""
 msgid "Save Layer"
 msgstr "Salvar Camada"
 
-msgid "Notes"
-msgstr "Notas"
-
 msgid "Notes layer"
 msgstr "Ccamada de notas"
 
@@ -9375,9 +9411,6 @@ msgstr "Camada de dados {0}"
 msgid "outside downloaded area"
 msgstr "fora da área baixada"
 
-msgid "version {0}"
-msgstr "versão {0}"
-
 msgid "Merging layers"
 msgstr "Unir camadas"
 
@@ -13418,6 +13451,15 @@ msgstr "ID do changeset atual > requerido 0. ID atual é {0}."
 msgid "Open changeset expected. Got closed changeset with id {0}."
 msgstr "Abrertura do changeset esperado. Fechando changeset com id {0}."
 
+msgid "Note upload failed"
+msgstr "Upload de notas falhou"
+
+msgid "Error parsing note response from server"
+msgstr "Erro ao analisar resposta do servidor"
+
+msgid "Error encoding string: {0}"
+msgstr "Erro na codificação da string:{0}"
+
 msgid "(Code={0})"
 msgstr "(Código={0})"
 
@@ -13475,15 +13517,15 @@ msgstr ""
 msgid "Parsing changeset content ..."
 msgstr "Analisando o conteúdo do changeset..."
 
+msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
+msgstr "Valor booleano ilegal para o atributo ''{0}''. Retornado ''{1}''."
+
 msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
 msgstr "Valor ilegal para o atributo ''{0}''. Got ''{1}''."
 
 msgid "Illegal numeric value for attribute ''{0}''. Got ''{1}''."
 msgstr "Valor numérico ilegal para o atributo ''{0}''. Recuperado ''{1}''."
 
-msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
-msgstr "Valor booleano ilegal para o atributo ''{0}''. Retornado ''{1}''."
-
 msgid "Missing mandatory attribute ''{0}'' of XML element {1}."
 msgstr "Faltando atributo obrigatório ''{0}'' do elemento XML {1}."
 
@@ -13879,10 +13921,10 @@ msgid "The minima must be less than the maxima"
 msgstr "Os mínimos devem ser menor do que a máxima"
 
 msgid "Remote Control has been asked to load the following data:"
-msgstr ""
+msgstr "Foi solicitado ao Controle Remoto carregar os seguintes dados:"
 
 msgid "Loading data"
-msgstr ""
+msgstr "Carregando dados"
 
 msgid ""
 "Remote Control has been asked to load objects (specified by their id) from "
@@ -14369,9 +14411,6 @@ msgid "Failed to scan file ''{0}'' for plugin information. Skipping."
 msgstr ""
 "Falha ao digitalizar o arquivo ''{0}'' para informações do plugin. Ignorando."
 
-msgid "Processing plugin site cache icon files..."
-msgstr "Processando módulo do cache dos arquivos de icones locais..."
-
 msgid "Processing plugin files..."
 msgstr "Processando arquivos de plugin..."
 
@@ -14390,12 +14429,6 @@ msgstr "O JOSM falhou ao baixar a lista de plugins:"
 msgid "Details:"
 msgstr "Detalhes:"
 
-msgid "Plugin icons download error"
-msgstr "Erro no download dos icones do plugin"
-
-msgid "JOSM failed to download plugin icons:"
-msgstr "O JOSM falhou ao baixar os ícones dos plugins:"
-
 msgid ""
 "Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
 "plugin site ''{1}''."
@@ -15492,8 +15525,12 @@ msgid ""
 msgstr ""
 "Criação e manipulação de endereço de nós e edifícios na República Checa."
 
-msgid "Allows to import various file formats into JOSM directly."
-msgstr "Permite importar vários formatos de arquivos diretamente no JOSM."
+msgid ""
+"Allows to import various file formats into JOSM directly. Currently "
+"supported: TangoGPS, Garmin Trainings Center TCX."
+msgstr ""
+"Permite importar vários formatos da arquivos diretamente no JOSM. Suportado "
+"atualmente: TangoGPS, Garmin Trainings Center TCX."
 
 msgid "Download your GPX tracks from openstreetmap.org"
 msgstr "Baixe suas trilhas GPX do openstreetmap.org"
@@ -15610,6 +15647,11 @@ msgid "A helper for IRS satellite adjustment."
 msgstr "Um auxiliar de ajuste de satélite IRS."
 
 msgid ""
+"Provides Java Native Access (JNA) library. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
+msgid ""
 "Provides Java Topology Suite (JTS) library and related utilities. Not meant "
 "to be installed directly by users, but rather as a dependency for other "
 "plugins."
@@ -15855,7 +15897,7 @@ msgid "Plugin to digital sign OSM-Data"
 msgstr "Plugin para sinal digital do OSM-Data"
 
 msgid "${plugin.description}"
-msgstr ""
+msgstr "${plugin.description}"
 
 msgid ""
 "Provides a straightforward GUI for adding, editing and deleting turn lanes."
@@ -16032,6 +16074,25 @@ msgstr "Iluminado"
 msgid "Width (meters)"
 msgstr "Largura (metros)"
 
+msgid "Sidewalk"
+msgstr "Calçada"
+
+msgctxt "sidewalk"
+msgid "both"
+msgstr "ambos"
+
+msgctxt "sidewalk"
+msgid "left"
+msgstr "esquerda"
+
+msgctxt "sidewalk"
+msgid "right"
+msgstr "direita"
+
+msgctxt "sidewalk"
+msgid "no"
+msgstr "não"
+
 msgid "Service type"
 msgstr "Tipo de serviço"
 
@@ -16398,17 +16459,21 @@ msgstr "Mo-Fr 09:00-18:00,Sa 08:00-14:00"
 msgid "May-Sep 09:30-12:30,14:15-19:30"
 msgstr "May-Sep 09:30-12:30,14:15-19:30"
 
+msgctxt "parking"
 msgid "multi-storey"
-msgstr "com vários andares"
+msgstr "vários andares"
 
+msgctxt "parking"
 msgid "surface"
 msgstr "superfície"
 
+msgctxt "parking"
 msgid "underground"
 msgstr "subterrâneo"
 
+msgctxt "parking"
 msgid "rooftop"
-msgstr "terraço"
+msgstr "na cobertura"
 
 msgid "Reference number"
 msgstr "Número de Referência"
@@ -16864,14 +16929,25 @@ msgstr "Max. length (metros)"
 msgid "Overtaking"
 msgstr "Ultrapassagem"
 
+msgctxt "overtaking"
+msgid "yes"
+msgstr "sim"
+
+msgctxt "overtaking"
 msgid "both"
-msgstr "tanto"
+msgstr "ambos"
 
+msgctxt "overtaking"
 msgid "forward"
-msgstr "avançar"
+msgstr "adiante"
 
+msgctxt "overtaking"
 msgid "backward"
-msgstr "para trás"
+msgstr "atrás"
+
+msgctxt "overtaking"
+msgid "no"
+msgstr "não"
 
 msgid "Roundabout"
 msgstr "Rotatória"
@@ -17179,6 +17255,12 @@ msgstr "pégasus"
 msgid "tiger"
 msgstr "tigre"
 
+msgid "Button operated"
+msgstr ""
+
+msgid "Sound signals"
+msgstr "Sinais sonoros"
+
 msgid "Crossing attendant"
 msgstr "Guarda de trânsito"
 
@@ -17706,9 +17788,6 @@ msgstr "Passagem de nível"
 msgid "Traffic lights"
 msgstr "Semáforos"
 
-msgid "Sound signals"
-msgstr "Sinais sonoros"
-
 msgid "Barrier"
 msgstr "Barreira"
 
@@ -19680,7 +19759,7 @@ msgstr "cabana"
 
 msgctxt "building"
 msgid "cowshed"
-msgstr ""
+msgstr "estábulo"
 
 msgctxt "building"
 msgid "construction"
@@ -19773,6 +19852,9 @@ msgstr "Moinho de Vento"
 msgid "Gasometer"
 msgstr "Gasômetro"
 
+msgid "Bunker Silo"
+msgstr "Bunker Silo"
+
 msgid "Pipeline"
 msgstr "Duto"
 
@@ -19919,15 +20001,15 @@ msgstr "Estação de Monitoramento"
 msgid "Monitoring:"
 msgstr "Monitorando:"
 
-msgid "Weather"
-msgstr "Tempo"
-
 msgid "Water level"
 msgstr "Nível de água"
 
 msgid "Tide Level"
 msgstr "Nível da maré"
 
+msgid "Groundwater"
+msgstr ""
+
 msgid "Traffic"
 msgstr "Tráfego"
 
@@ -19946,6 +20028,9 @@ msgstr "GLONASS Signals"
 msgid "Galileo Signals"
 msgstr "Galileo Signals"
 
+msgid "Weather"
+msgstr "Tempo"
+
 msgid "Radiation"
 msgstr "Radiação"
 
@@ -20126,6 +20211,9 @@ msgstr "lift_pier"
 msgid "pivot_pier"
 msgstr "pivot_pier"
 
+msgid "Bridge outline"
+msgstr "Bridge outline"
+
 msgid "Power Plant"
 msgstr "Usina"
 
@@ -20735,6 +20823,15 @@ msgstr "torre incompleta"
 msgid "Pole"
 msgstr "Pólo"
 
+msgid "Pole with Transformer"
+msgstr "Poste com transformador"
+
+msgid "Pole Attributes:"
+msgstr "Atributos do poste:"
+
+msgid "Transformer Attributes:"
+msgstr "Atributos do transformador:"
+
 msgid "Power Line"
 msgstr "Linha de transmissão"
 
@@ -20784,9 +20881,15 @@ msgstr "Usado para comunicação de dados"
 msgid "Power Cable"
 msgstr "Cabo de força"
 
+msgctxt "power cable"
+msgid "underground"
+msgstr "subterrâneo"
+
+msgctxt "power cable"
 msgid "underwater"
 msgstr "subaquático"
 
+msgctxt "power cable"
 msgid "overground"
 msgstr "aéreo"
 
@@ -20814,6 +20917,33 @@ msgstr "Monumento"
 msgid "Memorial"
 msgstr "Memorial"
 
+msgctxt "memorial"
+msgid "statue"
+msgstr "estatua"
+
+msgctxt "memorial"
+msgid "bust"
+msgstr "busto"
+
+msgctxt "memorial"
+msgid "plaque"
+msgstr "placa"
+
+msgctxt "memorial"
+msgid "stele"
+msgstr "estrela"
+
+msgctxt "memorial"
+msgid "stone"
+msgstr "pedra"
+
+msgctxt "memorial"
+msgid "war_memorial"
+msgstr "war_memorial"
+
+msgid "Inscription"
+msgstr "Inscrição"
+
 msgid "Wayside Cross"
 msgstr "Cruz de beira de estrada"
 
@@ -20883,6 +21013,9 @@ msgstr "Álcool"
 msgid "Beverages"
 msgstr "Bebidas"
 
+msgid "Wine"
+msgstr "Vinho"
+
 msgid "Boutique"
 msgstr "Boutique"
 
@@ -20928,6 +21061,9 @@ msgstr "Vídeo"
 msgid "Video Games"
 msgstr "Video Games"
 
+msgid "Music"
+msgstr "Música"
+
 msgid "Cash"
 msgstr "Dinheiro"
 
@@ -20955,6 +21091,9 @@ msgstr "Kitchen"
 msgid "Curtain"
 msgstr "Cortina"
 
+msgid "Art"
+msgstr "Arte"
+
 msgid "Frame"
 msgstr "Frame"
 
@@ -20965,7 +21104,7 @@ msgid "Interior Decoration"
 msgstr "Decoração de interiores"
 
 msgid "Antiques"
-msgstr ""
+msgstr "Atiguidades"
 
 msgid "Printed Material"
 msgstr "Material impresso"
@@ -21000,6 +21139,9 @@ msgstr "Cabeleireiro/Barbeiro"
 msgid "Beauty"
 msgstr "Beleza"
 
+msgid "Tattoo"
+msgstr "Tatuagem"
+
 msgid "Optician"
 msgstr "Oculista"
 
@@ -21051,6 +21193,9 @@ msgstr "Saco"
 msgid "Pet"
 msgstr "Animal de estimação"
 
+msgid "Funeral Directors"
+msgstr "Diretores Funerários"
+
 msgid "Vending Machine"
 msgstr "Máquina de vendas"
 
@@ -21150,6 +21295,15 @@ msgstr "Código postal"
 msgid "National Park"
 msgstr "Parque nacional"
 
+msgid "Protected Area"
+msgstr "Área protegida"
+
+msgid "Protected Class"
+msgstr "Classe protegida"
+
+msgid "Title or type of protection"
+msgstr "Título ou tipo de proteção"
+
 msgid "Places"
 msgstr "Lugares"
 
@@ -22240,8 +22394,14 @@ msgstr "Estónia Basemap (Maaamet)"
 msgid "Estonia Ortho (Maaamet)"
 msgstr "Estónia Ortho (Maaamet)"
 
-msgid "Estonia Multi (Maaamet)"
-msgstr "Estónia multi (Maaamet)"
+msgid "Estonia Hillshade (Maaamet)"
+msgstr ""
+
+msgid "Estonia Cadastre (Maaamet)"
+msgstr ""
+
+msgid "Estonia Forestry (Maaamet)"
+msgstr ""
 
 msgid "Bordeaux - 2012"
 msgstr "Bordeaux - 2012"
@@ -22264,8 +22424,8 @@ msgstr "CRAIG - Le Puy 2010 - 15 cm"
 msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
 msgstr "CRIGE PACA Alpes Marítimos 2009-40 cm"
 
-msgid "CUGN Nancy - Orthophoto 2012"
-msgstr "CUGN Nancy - Orthophoto 2012"
+msgid "GrandNancy Orthophotographie 2012"
+msgstr "GrandNancy Orthophotographie 2012"
 
 msgid "Géobretagne - Brest 2010 - 10 cm"
 msgstr "Géobretagne - Brest 2010 - 10 cm"
@@ -22313,9 +22473,6 @@ msgstr ""
 "Vercors - Réserve naturelle des Hauts-Plateaux du Vercors - Orthophotos 1999 "
 "- 1 m"
 
-msgid "Streets NRW Geofabrik.de"
-msgstr "Streets NRW Geofabrik.de"
-
 msgid "Hike & Bike"
 msgstr "Hike & Bike"
 
@@ -22378,6 +22535,9 @@ msgstr "NRW-Atlas: Luftbilder"
 msgid "NRW-Atlas: Topographische Karte 1:10000"
 msgstr "NRW-Atlas: Topographische Karte 1:10000"
 
+msgid "Metropole Ruhr: Luftbilder (10 cm)"
+msgstr ""
+
 msgid "Drone Imagery (Haiti)"
 msgstr "Drone Imagery (Haiti)"
 
@@ -22430,16 +22590,16 @@ msgid "ORT10LT (Lithuania)"
 msgstr "ORT10LT (Lituânia)"
 
 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 "Niger Delta Oct 2012 Landsat"
@@ -22579,6 +22739,9 @@ msgstr "Stadtplan Zürich"
 msgid "Stadt Zürich Übersichtsplan (Strassen, Gebäude, Hausnummer)"
 msgstr "Stadt Zürich Übersichtsplan (Strassen, Gebäude, Hausnummer)"
 
+msgid "Stadt Zürich Luftbild 2011"
+msgstr "Stadt Zürich Luftbild 2011"
+
 msgid "Orthofoto Kanton Solothurn RGB (SOGIS 2011/2012/2013)"
 msgstr "Orthofoto Kanton Solothurn RGB (SOGIS 2011/2012/2013)"
 
@@ -22597,8 +22760,8 @@ msgstr "Canton du Jura 50cm (RCJU 1998)"
 msgid "Canton de Fribourg 50cm (2005)"
 msgstr "Canton de Fribourg 50cm (2005)"
 
-msgid "Stadt Bern 10cm/25cm (2008)"
-msgstr "Stadt Bern 10cm/25cm (2008)"
+msgid "Stadt Bern 10cm/25cm (2012)"
+msgstr "Stadt Bern 10cm/25cm (2012)"
 
 msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
 msgstr "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
@@ -22636,8 +22799,8 @@ msgstr "USGS Large Scale Imagery"
 msgid "OSM US TIGER 2012 Roads Overlay"
 msgstr "OSM US TIGER 2012 Roads Overlay"
 
-msgid "New & Misaligned TIGER Roads (TIGER 2013)"
-msgstr "New & Misaligned TIGER Roads (TIGER 2013)"
+msgid "New & Misaligned TIGER Roads (TIGER 2014)"
+msgstr ""
 
 msgid "MassGIS L3 Parcels"
 msgstr "MassGIS L3 Parcels"
@@ -22684,9 +22847,234 @@ msgstr "OS Scottish Popular historic"
 msgid "NLS - Bartholomew Half Inch, 1897-1907"
 msgstr "NLS - Bartholomew Half Inch, 1897-1907"
 
+msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgstr "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+
+msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgstr "OS Town Plans, Airdrie 1858 (NLS)"
+
+msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgstr "OS Town Plans, Alexandria 1859 (NLS)"
+
+msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgstr "OS Town Plans, Alloa 1861-1862 (NLS)"
+
+msgid "OS Town Plans, Annan 1859 (NLS)"
+msgstr "OS Town Plans, Annan 1859 (NLS)"
+
+msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgstr "OS Town Plans, Arbroath 1858 (NLS)"
+
+msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgstr "OS Town Plans, Ayr 1855 (NLS)"
+
+msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgstr "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+
+msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgstr "OS Town Plans, Brechin 1862 (NLS)"
+
+msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgstr "OS Town Plans, Burntisland 1894 (NLS)"
+
+msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgstr "OS Town Plans, Campbelton 1865 (NLS)"
+
+msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgstr "OS Town Plans, Coatbridge 1858 (NLS)"
+
 msgid "OS Town Plans, Cupar 1854 (NLS)"
 msgstr "OS Town Plans, Cupar 1854 (NLS)"
 
+msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgstr "OS Town Plans, Cupar 1893-1894 (NLS)"
+
+msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgstr "OS Town Plans, Dalkeith 1852 (NLS)"
+
+msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgstr "OS Town Plans, Dalkeith 1893 (NLS)"
+
+msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgstr "OS Town Plans, Dumbarton 1859 (NLS)"
+
+msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgstr "OS Town Plans, Dumfries 1850 (NLS)"
+
+msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgstr "OS Town Plans, Dumfries 1893 (NLS)"
+
+msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgstr "OS Town Plans, Dundee 1857-1858 (NLS)"
+
+msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgstr "OS Town Plans, Dundee 1870-1872 (NLS)"
+
+msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgstr "OS Town Plans, Dunfermline 1854 (NLS)"
+
+msgid "OS Town Plans, Dunfermline 1894 (NLS)"
+msgstr "OS Town Plans, Dunfermline 1894 (NLS)"
+
+msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
+msgstr "OS Town Plans, Edinburgh 1849-1851 (NLS)"
+
+msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
+msgstr "OS Town Plans, Edinburgh 1876-1877 (NLS)"
+
+msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
+msgstr "OS Town Plans, Edinburgh 1893-1894 (NLS)"
+
+msgid "OS Town Plans, Elgin 1868 (NLS)"
+msgstr "OS Town Plans, Elgin 1868 (NLS)"
+
+msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
+msgstr "OS Town Plans, Falkirk 1858-1859 (NLS)"
+
+msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
+msgstr "OS Town Plans, Forfar 1860-1861 (NLS)"
+
+msgid "OS Town Plans, Forres 1868 (NLS)"
+msgstr "OS Town Plans, Forres 1868 (NLS)"
+
+msgid "OS Town Plans, Galashiels 1858 (NLS)"
+msgstr "OS Town Plans, Galashiels 1858 (NLS)"
+
+msgid "OS Town Plans, Girvan 1857 (NLS)"
+msgstr "OS Town Plans, Girvan 1857 (NLS)"
+
+msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
+msgstr "OS Town Plans, Glasgow 1857-1858 (NLS)"
+
+msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
+msgstr "OS Town Plans, Glasgow 1892-1894 (NLS)"
+
+msgid "OS Town Plans, Greenock 1857 (NLS)"
+msgstr "OS Town Plans, Greenock 1857 (NLS)"
+
+msgid "OS Town Plans, Haddington 1853 (NLS)"
+msgstr "OS Town Plans, Haddington 1853 (NLS)"
+
+msgid "OS Town Plans, Haddington 1893 (NLS)"
+msgstr "OS Town Plans, Haddington 1893 (NLS)"
+
+msgid "OS Town Plans, Hamilton 1858 (NLS)"
+msgstr "OS Town Plans, Hamilton 1858 (NLS)"
+
+msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
+msgstr "OS Town Plans, Hawick 1857-1858 (NLS)"
+
+msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
+msgstr "OS Town Plans, Inverness 1867-1868 (NLS)"
+
+msgid "OS Town Plans, Irvine 1859 (NLS)"
+msgstr "OS Town Plans, Irvine 1859 (NLS)"
+
+msgid "OS Town Plans, Jedburgh 1858 (NLS)"
+msgstr "OS Town Plans, Jedburgh 1858 (NLS)"
+
+msgid "OS Town Plans, Kelso 1857 (NLS)"
+msgstr "OS Town Plans, Kelso 1857 (NLS)"
+
+msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
+msgstr "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
+
+msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
+msgstr "OS Town Plans, Kirkcaldy 1855 (NLS)"
+
+msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
+msgstr "OS Town Plans, Kirkcaldy 1894 (NLS)"
+
+msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
+msgstr "OS Town Plans, Kirkcudbright 1850 (NLS)"
+
+msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
+msgstr "OS Town Plans, Kirkcudbright 1893 (NLS)"
+
+msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
+msgstr "OS Town Plans, Kirkintilloch 1859 (NLS)"
+
+msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
+msgstr "OS Town Plans, Kirriemuir 1861 (NLS)"
+
+msgid "OS Town Plans, Lanark 1858 (NLS)"
+msgstr "OS Town Plans, Lanark 1858 (NLS)"
+
+msgid "OS Town Plans, Linlithgow 1856 (NLS)"
+msgstr "OS Town Plans, Linlithgow 1856 (NLS)"
+
+msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
+msgstr "OS Town Plans, Mayole 1856-1857 (NLS)"
+
+msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
+msgstr "OS Town Plans, Montrose 1861-1862 (NLS)"
+
+msgid "OS Town Plans, Musselburgh 1853 (NLS)"
+msgstr "OS Town Plans, Musselburgh 1853 (NLS)"
+
+msgid "OS Town Plans, Musselburgh 1893 (NLS)"
+msgstr "OS Town Plans, Musselburgh 1893 (NLS)"
+
+msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
+msgstr "OS Town Plans, Nairn 1867-1868 (NLS)"
+
+msgid "OS Town Plans, Oban 1867-1868 (NLS)"
+msgstr "OS Town Plans, Oban 1867-1868 (NLS)"
+
+msgid "OS Town Plans, Peebles 1856 (NLS)"
+msgstr "OS Town Plans, Peebles 1856 (NLS)"
+
+msgid "OS Town Plans, Perth 1860 (NLS)"
+msgstr "OS Town Plans, Perth 1860 (NLS)"
+
+msgid "OS Town Plans, Peterhead 1868 (NLS)"
+msgstr "OS Town Plans, Peterhead 1868 (NLS)"
+
+msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
+msgstr "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
+
+msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
+msgstr "OS Town Plans, Portobello 1893-1894 (NLS)"
+
+msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
+msgstr "OS Town Plans, Rothesay 1862-1863 (NLS)"
+
+msgid "OS Town Plans, Selkirk 1865 (NLS)"
+msgstr "OS Town Plans, Selkirk 1865 (NLS)"
+
+msgid "OS Town Plans, St Andrews 1854 (NLS)"
+msgstr "OS Town Plans, St Andrews 1854 (NLS)"
+
+msgid "OS Town Plans, St Andrews 1893 (NLS)"
+msgstr "OS Town Plans, St Andrews 1893 (NLS)"
+
+msgid "OS Town Plans, Stirling 1858 (NLS)"
+msgstr "OS Town Plans, Stirling 1858 (NLS)"
+
+msgid "OS Town Plans, Stonehaven 1864 (NLS)"
+msgstr "OS Town Plans, Stonehaven 1864 (NLS)"
+
+msgid "OS Town Plans, Stranraer 1847 (NLS)"
+msgstr "OS Town Plans, Stranraer 1847 (NLS)"
+
+msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
+msgstr "OS Town Plans, Stranraer 1863-1877 (NLS)"
+
+msgid "OS Town Plans, Stranraer 1893 (NLS)"
+msgstr "OS Town Plans, Stranraer 1893 (NLS)"
+
+msgid "OS Town Plans, Strathaven 1858 (NLS)"
+msgstr "OS Town Plans, Strathaven 1858 (NLS)"
+
+msgid "OS Town Plans, Wick 1872 (NLS)"
+msgstr "OS Town Plans, Wick 1872 (NLS)"
+
+msgid "OS Town Plans, Wigtown 1848 (NLS)"
+msgstr "OS Town Plans, Wigtown 1848 (NLS)"
+
+msgid "OS Town Plans, Wigtown 1894 (NLS)"
+msgstr "OS Town Plans, Wigtown 1894 (NLS)"
+
 msgid "Decreasing house numbers in addresses interpolation"
 msgstr "Diminuição do número de casas em interpolação de endereços"
 
@@ -22744,9 +23132,9 @@ msgid "{0}={1} is deprecated. Please use instead a multipolygon."
 msgstr "{0}={1} está obsoleto. Por favor, utilize ao invés um multipolígono."
 
 msgid ""
-"{0} is deprecated. Please specify ìnterval by using opening_hours syntax"
+"{0} is deprecated. Please specify interval by using opening_hours syntax"
 msgstr ""
-"{0} é obsoleto. Por favor especifique o intervalo usando a sintaxe da chave "
+"{0} é obsoleto. Por favor, especifique o intervalo usando a sintaxe "
 "opening_hours"
 
 msgid ""
@@ -22754,12 +23142,35 @@ msgid ""
 msgstr ""
 "{0} é obsoleto. Por favor, apague este objeto e use uma camada privada em vez"
 
+msgid "{0}={1} is unspecific. Please replace ''{1}'' by a specific value."
+msgstr ""
+"{0}={1} é inespecífico. Por favor, substitua ''{1}'' por um valor específico."
+
+msgid "{0} should be replaced with {1}"
+msgstr "{0} deve ser substituido por {1}"
+
+msgid ""
+"{0}={1} is unspecific. Please replace ''{1}'' by ''left'', ''right'' or "
+"''both''."
+msgstr ""
+"{0}={1} é inespecífico. Por favor, substitua ''{1}'' por ''esquerda'', "
+"''direita'' ou ''ambos''."
+
+msgid "{0} on a node. Should be used on a way."
+msgstr "{0} em um nó. Deveria ser usado em uma via."
+
+msgid "{0} on a node. Should be drawn as an area."
+msgstr "{0} em um nó. Deveria ser desenhado como uma área."
+
+msgid "{0}=* on a node. Should be used in a relation"
+msgstr "{0}=* em um nó. Deveria ser utilizado em uma relação"
+
+msgid "{0} on a way. Should be used in a relation"
+msgstr "{0} em uma via. Deveria ser utilizado em uma relação"
+
 msgid "{0} on a node"
 msgstr "{0} em um nó"
 
-msgid "{0} on a node. Should be drawn as an area"
-msgstr "{0} em um nó. Deve ser elaborado como uma área"
-
 msgid "Building inside building"
 msgstr "Edifício dentro do edifício"
 
@@ -27831,6 +28242,9 @@ msgstr "Paradas sugeridas"
 msgid "Find"
 msgstr "Encontrar"
 
+msgid "Show"
+msgstr "Mostrar"
+
 msgid "Mark"
 msgstr "Marca"
 
diff --git a/i18n/po/rm.po b/i18n/po/rm.po
index a96a3dc..e641a34 100644
--- a/i18n/po/rm.po
+++ b/i18n/po/rm.po
@@ -1,8 +1,13 @@
+# Raeto-Romance translation for josm
+# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
+# This file is distributed under the same license as the josm package.
+# FIRST AUTHOR <EMAIL at ADDRESS>, 2009.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-21 03:38+0200\n"
+"POT-Creation-Date: 2014-12-10 03:42+0100\n"
 "PO-Revision-Date: 2009-06-21 19:14+0000\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: Raeto-Romance <rm at li.org>\n"
@@ -10,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-10-21 05:17+0000\n"
-"X-Generator: Launchpad (build 17203)\n"
+"X-Launchpad-Export-Date: 2014-12-10 05:07+0000\n"
+"X-Generator: Launchpad (build 17283)\n"
 "Language: \n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -168,16 +173,6 @@ msgid "About JOSM..."
 msgstr ""
 
 msgid ""
-"Unexpected format of API base URL. Redirection to info or history page for "
-"OSM object will probably fail. API base URL is: ''{0}''"
-msgstr ""
-
-msgid ""
-"Unexpected format of API base URL. Redirection to user page for OSM user "
-"will probably fail. API base URL is: ''{0}''"
-msgstr ""
-
-msgid ""
 "You are about to launch {0} browser window.<br>This may both clutter your "
 "screen with browser windows<br>and take some time to finish."
 msgid_plural ""
@@ -1519,6 +1514,15 @@ msgstr ""
 msgid "Nothing to upload. Get some data first."
 msgstr ""
 
+msgid "Upload note changes to server"
+msgstr ""
+
+msgid "Upload notes"
+msgstr ""
+
+msgid "Uploading notes to server"
+msgstr ""
+
 msgid "Upload selection"
 msgstr ""
 
@@ -1791,10 +1795,16 @@ msgstr ""
 msgid "Click the location where you wish to create a new note"
 msgstr ""
 
-msgid "Enter a comment for a new note"
+msgid "Create new note"
 msgstr ""
 
-msgid "Create new note"
+msgid "Create note"
+msgstr ""
+
+msgid "Enter a detailed comment to create a note"
+msgstr ""
+
+msgid "You must enter a comment to create a new note"
 msgstr ""
 
 msgid "Delete Mode"
@@ -2665,6 +2675,15 @@ msgstr ""
 msgid "Cycling dependencies"
 msgstr ""
 
+msgid "Uploading modified notes"
+msgstr ""
+
+msgid "Note {0} failed: {1}"
+msgstr ""
+
+msgid "Notes failed to upload"
+msgstr ""
+
 msgid ""
 "The following are results of automatic validation. Try fixing these, but be "
 "careful (don''t destroy valid data). When in doubt ignore them.<br>When you "
@@ -4894,6 +4913,12 @@ msgstr ""
 msgid "Conflict foreground: keep all tags"
 msgstr ""
 
+msgid "Conflict background: sum all numeric tags"
+msgstr ""
+
+msgid "Conflict foreground: sum all numeric tags"
+msgstr ""
+
 msgid "Conflict background: keep member"
 msgstr ""
 
@@ -5312,12 +5337,19 @@ msgstr ""
 msgid "all"
 msgstr ""
 
+msgid "sum"
+msgstr ""
+
 msgid "Please decide which values to keep"
 msgstr ""
 
 msgid "Value ''{0}'' is going to be applied for key ''{1}''"
 msgstr ""
 
+msgid ""
+"All numeric values sumed as ''{0}'' are going to be applied for key ''{1}''"
+msgstr ""
+
 msgid "The key ''{0}'' and all its values are going to be removed"
 msgstr ""
 
@@ -5680,24 +5712,6 @@ msgstr[1] ""
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
 
-msgid "Display the history of all selected items."
-msgstr ""
-
-msgid "Object with history"
-msgstr ""
-
-msgid "Reload"
-msgstr ""
-
-msgid "Reload all currently selected objects and refresh the list."
-msgstr ""
-
-msgid "Show"
-msgstr ""
-
-msgid "Display the history of the selected objects."
-msgstr ""
-
 msgid "Advanced object info"
 msgstr ""
 
@@ -6035,6 +6049,9 @@ msgstr ""
 msgid "Comment"
 msgstr ""
 
+msgid "Comment on note"
+msgstr ""
+
 msgid "Add comment to note:"
 msgstr ""
 
@@ -6044,9 +6061,6 @@ msgstr ""
 msgid "Close note with message:"
 msgstr ""
 
-msgid "Close Note"
-msgstr ""
-
 msgid "Create a new note"
 msgstr ""
 
@@ -6119,6 +6133,9 @@ msgstr ""
 msgid "Search for objects"
 msgstr ""
 
+msgid "Display the history of the selected objects."
+msgstr ""
+
 msgid "Zoom to selection"
 msgstr ""
 
@@ -6238,6 +6255,9 @@ msgstr ""
 msgid "Updating map ..."
 msgstr ""
 
+msgid "anonymous"
+msgstr ""
+
 msgid "Display the basic properties of the changeset"
 msgstr ""
 
@@ -6250,6 +6270,12 @@ msgstr ""
 msgid "Display the objects created, updated, and deleted by the changeset"
 msgstr ""
 
+msgid "Discussion"
+msgstr ""
+
+msgid "Display the public discussion around this changeset"
+msgstr ""
+
 msgid "Changeset Management Dialog"
 msgstr ""
 
@@ -6307,9 +6333,6 @@ msgctxt "changeset.state"
 msgid "Closed"
 msgstr ""
 
-msgid "anonymous"
-msgstr ""
-
 msgid "ID"
 msgstr ""
 
@@ -6325,6 +6348,9 @@ msgstr ""
 msgid "Closed at"
 msgstr ""
 
+msgid "Discussions"
+msgstr ""
+
 msgid "Downloading changeset content"
 msgstr ""
 
@@ -6436,6 +6462,15 @@ msgid ""
 "layer"
 msgstr ""
 
+msgid "Update changeset discussion"
+msgstr ""
+
+msgid "Update the changeset discussion from the OSM server"
+msgstr ""
+
+msgid "Date"
+msgstr ""
+
 msgid "Download changesets"
 msgstr ""
 
@@ -6853,7 +6888,7 @@ msgstr ""
 msgid "Set number of recently added tags"
 msgstr ""
 
-msgid "Remember last used tags"
+msgid "Remember last used tags after a restart"
 msgstr ""
 
 msgid "Please enter the number of recently added tags to display"
@@ -7199,6 +7234,9 @@ msgstr ""
 msgid "Load parent relations"
 msgstr ""
 
+msgid "Reload"
+msgstr ""
+
 msgid "Loading parent relations"
 msgstr ""
 
@@ -7321,6 +7359,12 @@ msgstr ""
 msgid "Select to download GPS traces in the selected download area."
 msgstr ""
 
+msgid "Notes"
+msgstr ""
+
+msgid "Select to download notes in the selected download area."
+msgstr ""
+
 msgid "Download as new layer"
 msgstr ""
 
@@ -7626,9 +7670,6 @@ msgstr ""
 msgid "B"
 msgstr ""
 
-msgid "Date"
-msgstr ""
-
 msgid ""
 "Failed to update primitive with id {0} because current edit layer is null"
 msgstr ""
@@ -8483,9 +8524,6 @@ msgstr ""
 msgid "Save Layer"
 msgstr ""
 
-msgid "Notes"
-msgstr ""
-
 msgid "Notes layer"
 msgstr ""
 
@@ -8501,9 +8539,6 @@ msgstr ""
 msgid "outside downloaded area"
 msgstr ""
 
-msgid "version {0}"
-msgstr ""
-
 msgid "Merging layers"
 msgstr ""
 
@@ -12129,6 +12164,15 @@ msgstr ""
 msgid "Open changeset expected. Got closed changeset with id {0}."
 msgstr ""
 
+msgid "Note upload failed"
+msgstr ""
+
+msgid "Error parsing note response from server"
+msgstr ""
+
+msgid "Error encoding string: {0}"
+msgstr ""
+
 msgid "(Code={0})"
 msgstr ""
 
@@ -12177,13 +12221,13 @@ msgstr ""
 msgid "Parsing changeset content ..."
 msgstr ""
 
-msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
-msgid "Illegal numeric value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
-msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal numeric value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
 msgid "Missing mandatory attribute ''{0}'' of XML element {1}."
@@ -12975,9 +13019,6 @@ msgstr ""
 msgid "Failed to scan file ''{0}'' for plugin information. Skipping."
 msgstr ""
 
-msgid "Processing plugin site cache icon files..."
-msgstr ""
-
 msgid "Processing plugin files..."
 msgstr ""
 
@@ -12996,12 +13037,6 @@ msgstr ""
 msgid "Details:"
 msgstr ""
 
-msgid "Plugin icons download error"
-msgstr ""
-
-msgid "JOSM failed to download plugin icons:"
-msgstr ""
-
 msgid ""
 "Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
 "plugin site ''{1}''."
@@ -13887,7 +13922,9 @@ msgid ""
 "Creating and handling address nodes and buildings within Czech Republic."
 msgstr ""
 
-msgid "Allows to import various file formats into JOSM directly."
+msgid ""
+"Allows to import various file formats into JOSM directly. Currently "
+"supported: TangoGPS, Garmin Trainings Center TCX."
 msgstr ""
 
 msgid "Download your GPX tracks from openstreetmap.org"
@@ -13984,6 +14021,11 @@ msgid "A helper for IRS satellite adjustment."
 msgstr ""
 
 msgid ""
+"Provides Java Native Access (JNA) library. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
+msgid ""
 "Provides Java Topology Suite (JTS) library and related utilities. Not meant "
 "to be installed directly by users, but rather as a dependency for other "
 "plugins."
@@ -14339,6 +14381,25 @@ msgstr ""
 msgid "Width (meters)"
 msgstr ""
 
+msgid "Sidewalk"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "both"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "left"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "right"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "no"
+msgstr ""
+
 msgid "Service type"
 msgstr ""
 
@@ -14703,15 +14764,19 @@ msgstr ""
 msgid "May-Sep 09:30-12:30,14:15-19:30"
 msgstr ""
 
+msgctxt "parking"
 msgid "multi-storey"
 msgstr ""
 
+msgctxt "parking"
 msgid "surface"
 msgstr ""
 
+msgctxt "parking"
 msgid "underground"
 msgstr ""
 
+msgctxt "parking"
 msgid "rooftop"
 msgstr ""
 
@@ -15169,15 +15234,26 @@ msgstr ""
 msgid "Overtaking"
 msgstr ""
 
+msgctxt "overtaking"
+msgid "yes"
+msgstr ""
+
+msgctxt "overtaking"
 msgid "both"
 msgstr ""
 
+msgctxt "overtaking"
 msgid "forward"
 msgstr ""
 
+msgctxt "overtaking"
 msgid "backward"
 msgstr ""
 
+msgctxt "overtaking"
+msgid "no"
+msgstr ""
+
 msgid "Roundabout"
 msgstr ""
 
@@ -15471,6 +15547,12 @@ msgstr ""
 msgid "tiger"
 msgstr ""
 
+msgid "Button operated"
+msgstr ""
+
+msgid "Sound signals"
+msgstr ""
+
 msgid "Crossing attendant"
 msgstr ""
 
@@ -15992,9 +16074,6 @@ msgstr ""
 msgid "Traffic lights"
 msgstr ""
 
-msgid "Sound signals"
-msgstr ""
-
 msgid "Barrier"
 msgstr ""
 
@@ -18054,6 +18133,9 @@ msgstr ""
 msgid "Gasometer"
 msgstr ""
 
+msgid "Bunker Silo"
+msgstr ""
+
 msgid "Pipeline"
 msgstr ""
 
@@ -18200,15 +18282,15 @@ msgstr ""
 msgid "Monitoring:"
 msgstr ""
 
-msgid "Weather"
-msgstr ""
-
 msgid "Water level"
 msgstr ""
 
 msgid "Tide Level"
 msgstr ""
 
+msgid "Groundwater"
+msgstr ""
+
 msgid "Traffic"
 msgstr ""
 
@@ -18227,6 +18309,9 @@ msgstr ""
 msgid "Galileo Signals"
 msgstr ""
 
+msgid "Weather"
+msgstr ""
+
 msgid "Radiation"
 msgstr ""
 
@@ -18407,6 +18492,9 @@ msgstr ""
 msgid "pivot_pier"
 msgstr ""
 
+msgid "Bridge outline"
+msgstr ""
+
 msgid "Power Plant"
 msgstr ""
 
@@ -19014,6 +19102,15 @@ msgstr ""
 msgid "Pole"
 msgstr ""
 
+msgid "Pole with Transformer"
+msgstr ""
+
+msgid "Pole Attributes:"
+msgstr ""
+
+msgid "Transformer Attributes:"
+msgstr ""
+
 msgid "Power Line"
 msgstr ""
 
@@ -19063,9 +19160,15 @@ msgstr ""
 msgid "Power Cable"
 msgstr ""
 
+msgctxt "power cable"
+msgid "underground"
+msgstr ""
+
+msgctxt "power cable"
 msgid "underwater"
 msgstr ""
 
+msgctxt "power cable"
 msgid "overground"
 msgstr ""
 
@@ -19093,6 +19196,33 @@ msgstr ""
 msgid "Memorial"
 msgstr ""
 
+msgctxt "memorial"
+msgid "statue"
+msgstr ""
+
+msgctxt "memorial"
+msgid "bust"
+msgstr ""
+
+msgctxt "memorial"
+msgid "plaque"
+msgstr ""
+
+msgctxt "memorial"
+msgid "stele"
+msgstr ""
+
+msgctxt "memorial"
+msgid "stone"
+msgstr ""
+
+msgctxt "memorial"
+msgid "war_memorial"
+msgstr ""
+
+msgid "Inscription"
+msgstr ""
+
 msgid "Wayside Cross"
 msgstr ""
 
@@ -19162,6 +19292,9 @@ msgstr ""
 msgid "Beverages"
 msgstr ""
 
+msgid "Wine"
+msgstr ""
+
 msgid "Boutique"
 msgstr ""
 
@@ -19207,6 +19340,9 @@ msgstr ""
 msgid "Video Games"
 msgstr ""
 
+msgid "Music"
+msgstr ""
+
 msgid "Cash"
 msgstr ""
 
@@ -19234,6 +19370,9 @@ msgstr ""
 msgid "Curtain"
 msgstr ""
 
+msgid "Art"
+msgstr ""
+
 msgid "Frame"
 msgstr ""
 
@@ -19279,6 +19418,9 @@ msgstr ""
 msgid "Beauty"
 msgstr ""
 
+msgid "Tattoo"
+msgstr ""
+
 msgid "Optician"
 msgstr ""
 
@@ -19330,6 +19472,9 @@ msgstr ""
 msgid "Pet"
 msgstr ""
 
+msgid "Funeral Directors"
+msgstr ""
+
 msgid "Vending Machine"
 msgstr ""
 
@@ -19429,6 +19574,15 @@ msgstr ""
 msgid "National Park"
 msgstr ""
 
+msgid "Protected Area"
+msgstr ""
+
+msgid "Protected Class"
+msgstr ""
+
+msgid "Title or type of protection"
+msgstr ""
+
 msgid "Places"
 msgstr ""
 
@@ -20505,7 +20659,13 @@ msgstr ""
 msgid "Estonia Ortho (Maaamet)"
 msgstr ""
 
-msgid "Estonia Multi (Maaamet)"
+msgid "Estonia Hillshade (Maaamet)"
+msgstr ""
+
+msgid "Estonia Cadastre (Maaamet)"
+msgstr ""
+
+msgid "Estonia Forestry (Maaamet)"
 msgstr ""
 
 msgid "Bordeaux - 2012"
@@ -20529,7 +20689,7 @@ msgstr ""
 msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
 msgstr ""
 
-msgid "CUGN Nancy - Orthophoto 2012"
+msgid "GrandNancy Orthophotographie 2012"
 msgstr ""
 
 msgid "Géobretagne - Brest 2010 - 10 cm"
@@ -20576,9 +20736,6 @@ msgid ""
 "- 1 m"
 msgstr ""
 
-msgid "Streets NRW Geofabrik.de"
-msgstr ""
-
 msgid "Hike & Bike"
 msgstr ""
 
@@ -20638,6 +20795,9 @@ msgstr ""
 msgid "NRW-Atlas: Topographische Karte 1:10000"
 msgstr ""
 
+msgid "Metropole Ruhr: Luftbilder (10 cm)"
+msgstr ""
+
 msgid "Drone Imagery (Haiti)"
 msgstr ""
 
@@ -20839,6 +20999,9 @@ msgstr ""
 msgid "Stadt Zürich Übersichtsplan (Strassen, Gebäude, Hausnummer)"
 msgstr ""
 
+msgid "Stadt Zürich Luftbild 2011"
+msgstr ""
+
 msgid "Orthofoto Kanton Solothurn RGB (SOGIS 2011/2012/2013)"
 msgstr ""
 
@@ -20857,7 +21020,7 @@ msgstr ""
 msgid "Canton de Fribourg 50cm (2005)"
 msgstr ""
 
-msgid "Stadt Bern 10cm/25cm (2008)"
+msgid "Stadt Bern 10cm/25cm (2012)"
 msgstr ""
 
 msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
@@ -20896,7 +21059,7 @@ msgstr ""
 msgid "OSM US TIGER 2012 Roads Overlay"
 msgstr ""
 
-msgid "New & Misaligned TIGER Roads (TIGER 2013)"
+msgid "New & Misaligned TIGER Roads (TIGER 2014)"
 msgstr ""
 
 msgid "MassGIS L3 Parcels"
@@ -20944,9 +21107,234 @@ msgstr ""
 msgid "NLS - Bartholomew Half Inch, 1897-1907"
 msgstr ""
 
+msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Annan 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgstr ""
+
 msgid "OS Town Plans, Cupar 1854 (NLS)"
 msgstr ""
 
+msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Elgin 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Forres 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Galashiels 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Girvan 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Greenock 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Haddington 1853 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Haddington 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Hamilton 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Irvine 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Jedburgh 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kelso 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Lanark 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Linlithgow 1856 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Musselburgh 1853 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Musselburgh 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Oban 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Peebles 1856 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Perth 1860 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Peterhead 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Selkirk 1865 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, St Andrews 1854 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, St Andrews 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stirling 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stonehaven 1864 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1847 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Strathaven 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wick 1872 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wigtown 1848 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wigtown 1894 (NLS)"
+msgstr ""
+
 msgid "Decreasing house numbers in addresses interpolation"
 msgstr ""
 
@@ -21000,17 +21388,37 @@ msgid "{0}={1} is deprecated. Please use instead a multipolygon."
 msgstr ""
 
 msgid ""
-"{0} is deprecated. Please specify ìnterval by using opening_hours syntax"
+"{0} is deprecated. Please specify interval by using opening_hours syntax"
 msgstr ""
 
 msgid ""
 "{0} is deprecated. Please delete this object and use a private layer instead"
 msgstr ""
 
-msgid "{0} on a node"
+msgid "{0}={1} is unspecific. Please replace ''{1}'' by a specific value."
 msgstr ""
 
-msgid "{0} on a node. Should be drawn as an area"
+msgid "{0} should be replaced with {1}"
+msgstr ""
+
+msgid ""
+"{0}={1} is unspecific. Please replace ''{1}'' by ''left'', ''right'' or "
+"''both''."
+msgstr ""
+
+msgid "{0} on a node. Should be used on a way."
+msgstr ""
+
+msgid "{0} on a node. Should be drawn as an area."
+msgstr ""
+
+msgid "{0}=* on a node. Should be used in a relation"
+msgstr ""
+
+msgid "{0} on a way. Should be used in a relation"
+msgstr ""
+
+msgid "{0} on a node"
 msgstr ""
 
 msgid "Building inside building"
@@ -25680,6 +26088,9 @@ msgstr ""
 msgid "Find"
 msgstr ""
 
+msgid "Show"
+msgstr ""
+
 msgid "Mark"
 msgstr ""
 
diff --git a/i18n/po/ro.po b/i18n/po/ro.po
index e4c5b65..6ddc667 100644
--- a/i18n/po/ro.po
+++ b/i18n/po/ro.po
@@ -1,8 +1,13 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: JOSM\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-21 03:38+0200\n"
+"POT-Creation-Date: 2014-12-10 03:42+0100\n"
 "PO-Revision-Date: 2012-10-03 22:38+0000\n"
 "Last-Translator: Ciprian <c1pr1an_43v3r at yahoo.com>\n"
 "Language-Team: Romanian <gnomero-list at lists.sourceforge.net>\n"
@@ -11,8 +16,8 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n == 1 ? 0: (((n % 100 > 19) || ((n % 100 "
 "== 0) && (n != 0))) ? 2: 1));\n"
-"X-Launchpad-Export-Date: 2014-10-21 05:18+0000\n"
-"X-Generator: Launchpad (build 17203)\n"
+"X-Launchpad-Export-Date: 2014-12-10 05:08+0000\n"
+"X-Generator: Launchpad (build 17283)\n"
 "X-Poedit-Country: ROMANIA\n"
 "Language: ro\n"
 "X-Poedit-Language: Romanian\n"
@@ -172,16 +177,6 @@ msgid "About JOSM..."
 msgstr "Despre JOSM..."
 
 msgid ""
-"Unexpected format of API base URL. Redirection to info or history page for "
-"OSM object will probably fail. API base URL is: ''{0}''"
-msgstr ""
-
-msgid ""
-"Unexpected format of API base URL. Redirection to user page for OSM user "
-"will probably fail. API base URL is: ''{0}''"
-msgstr ""
-
-msgid ""
 "You are about to launch {0} browser window.<br>This may both clutter your "
 "screen with browser windows<br>and take some time to finish."
 msgid_plural ""
@@ -1532,6 +1527,15 @@ msgstr "Nu sunt schimbări de transmis."
 msgid "Nothing to upload. Get some data first."
 msgstr "Nimic de transmis. Mai întâi obţineţi nişte date."
 
+msgid "Upload note changes to server"
+msgstr ""
+
+msgid "Upload notes"
+msgstr ""
+
+msgid "Uploading notes to server"
+msgstr ""
+
 msgid "Upload selection"
 msgstr "Încarcă selecție"
 
@@ -1804,10 +1808,16 @@ msgstr ""
 msgid "Click the location where you wish to create a new note"
 msgstr ""
 
-msgid "Enter a comment for a new note"
+msgid "Create new note"
 msgstr ""
 
-msgid "Create new note"
+msgid "Create note"
+msgstr ""
+
+msgid "Enter a detailed comment to create a note"
+msgstr ""
+
+msgid "You must enter a comment to create a new note"
 msgstr ""
 
 msgid "Delete Mode"
@@ -2678,6 +2688,15 @@ msgstr ""
 msgid "Cycling dependencies"
 msgstr ""
 
+msgid "Uploading modified notes"
+msgstr ""
+
+msgid "Note {0} failed: {1}"
+msgstr ""
+
+msgid "Notes failed to upload"
+msgstr ""
+
 msgid ""
 "The following are results of automatic validation. Try fixing these, but be "
 "careful (don''t destroy valid data). When in doubt ignore them.<br>When you "
@@ -4911,6 +4930,12 @@ msgstr ""
 msgid "Conflict foreground: keep all tags"
 msgstr ""
 
+msgid "Conflict background: sum all numeric tags"
+msgstr ""
+
+msgid "Conflict foreground: sum all numeric tags"
+msgstr ""
+
 msgid "Conflict background: keep member"
 msgstr ""
 
@@ -5329,12 +5354,19 @@ msgstr "nici unul"
 msgid "all"
 msgstr ""
 
+msgid "sum"
+msgstr ""
+
 msgid "Please decide which values to keep"
 msgstr ""
 
 msgid "Value ''{0}'' is going to be applied for key ''{1}''"
 msgstr ""
 
+msgid ""
+"All numeric values sumed as ''{0}'' are going to be applied for key ''{1}''"
+msgstr ""
+
 msgid "The key ''{0}'' and all its values are going to be removed"
 msgstr ""
 
@@ -5701,24 +5733,6 @@ msgstr[1] ""
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
 
-msgid "Display the history of all selected items."
-msgstr "Afişează istoricul tuturor elementelor selectate."
-
-msgid "Object with history"
-msgstr ""
-
-msgid "Reload"
-msgstr "Reîncarcă"
-
-msgid "Reload all currently selected objects and refresh the list."
-msgstr "Reîncarcă toate obiectele selectate curent şi împrospătează lista."
-
-msgid "Show"
-msgstr ""
-
-msgid "Display the history of the selected objects."
-msgstr ""
-
 msgid "Advanced object info"
 msgstr ""
 
@@ -6056,6 +6070,9 @@ msgstr ""
 msgid "Comment"
 msgstr ""
 
+msgid "Comment on note"
+msgstr ""
+
 msgid "Add comment to note:"
 msgstr ""
 
@@ -6065,9 +6082,6 @@ msgstr ""
 msgid "Close note with message:"
 msgstr ""
 
-msgid "Close Note"
-msgstr ""
-
 msgid "Create a new note"
 msgstr ""
 
@@ -6140,6 +6154,9 @@ msgstr "Selecţia curentă"
 msgid "Search for objects"
 msgstr ""
 
+msgid "Display the history of the selected objects."
+msgstr ""
+
 msgid "Zoom to selection"
 msgstr ""
 
@@ -6259,6 +6276,9 @@ msgstr ""
 msgid "Updating map ..."
 msgstr ""
 
+msgid "anonymous"
+msgstr ""
+
 msgid "Display the basic properties of the changeset"
 msgstr ""
 
@@ -6271,6 +6291,12 @@ msgstr ""
 msgid "Display the objects created, updated, and deleted by the changeset"
 msgstr ""
 
+msgid "Discussion"
+msgstr ""
+
+msgid "Display the public discussion around this changeset"
+msgstr ""
+
 msgid "Changeset Management Dialog"
 msgstr ""
 
@@ -6328,9 +6354,6 @@ msgctxt "changeset.state"
 msgid "Closed"
 msgstr ""
 
-msgid "anonymous"
-msgstr ""
-
 msgid "ID"
 msgstr ""
 
@@ -6346,6 +6369,9 @@ msgstr ""
 msgid "Closed at"
 msgstr ""
 
+msgid "Discussions"
+msgstr ""
+
 msgid "Downloading changeset content"
 msgstr ""
 
@@ -6457,6 +6483,15 @@ msgid ""
 "layer"
 msgstr ""
 
+msgid "Update changeset discussion"
+msgstr ""
+
+msgid "Update the changeset discussion from the OSM server"
+msgstr ""
+
+msgid "Date"
+msgstr "Dată"
+
 msgid "Download changesets"
 msgstr ""
 
@@ -6874,7 +6909,7 @@ msgstr "Vă rog selectaţi o valoare"
 msgid "Set number of recently added tags"
 msgstr ""
 
-msgid "Remember last used tags"
+msgid "Remember last used tags after a restart"
 msgstr ""
 
 msgid "Please enter the number of recently added tags to display"
@@ -7220,6 +7255,9 @@ msgstr ""
 msgid "Load parent relations"
 msgstr ""
 
+msgid "Reload"
+msgstr "Reîncarcă"
+
 msgid "Loading parent relations"
 msgstr ""
 
@@ -7342,6 +7380,12 @@ msgstr "Date GPS neprelucrate"
 msgid "Select to download GPS traces in the selected download area."
 msgstr ""
 
+msgid "Notes"
+msgstr ""
+
+msgid "Select to download notes in the selected download area."
+msgstr ""
+
 msgid "Download as new layer"
 msgstr ""
 
@@ -7647,9 +7691,6 @@ msgstr ""
 msgid "B"
 msgstr ""
 
-msgid "Date"
-msgstr "Dată"
-
 msgid ""
 "Failed to update primitive with id {0} because current edit layer is null"
 msgstr ""
@@ -8504,9 +8545,6 @@ msgstr ""
 msgid "Save Layer"
 msgstr "Salvează Strat"
 
-msgid "Notes"
-msgstr ""
-
 msgid "Notes layer"
 msgstr ""
 
@@ -8522,9 +8560,6 @@ msgstr ""
 msgid "outside downloaded area"
 msgstr ""
 
-msgid "version {0}"
-msgstr ""
-
 msgid "Merging layers"
 msgstr ""
 
@@ -12157,6 +12192,15 @@ msgstr ""
 msgid "Open changeset expected. Got closed changeset with id {0}."
 msgstr ""
 
+msgid "Note upload failed"
+msgstr ""
+
+msgid "Error parsing note response from server"
+msgstr ""
+
+msgid "Error encoding string: {0}"
+msgstr ""
+
 msgid "(Code={0})"
 msgstr ""
 
@@ -12205,13 +12249,13 @@ msgstr ""
 msgid "Parsing changeset content ..."
 msgstr ""
 
-msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
-msgid "Illegal numeric value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
-msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal numeric value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
 msgid "Missing mandatory attribute ''{0}'' of XML element {1}."
@@ -13003,9 +13047,6 @@ msgstr ""
 msgid "Failed to scan file ''{0}'' for plugin information. Skipping."
 msgstr ""
 
-msgid "Processing plugin site cache icon files..."
-msgstr ""
-
 msgid "Processing plugin files..."
 msgstr ""
 
@@ -13024,12 +13065,6 @@ msgstr ""
 msgid "Details:"
 msgstr ""
 
-msgid "Plugin icons download error"
-msgstr ""
-
-msgid "JOSM failed to download plugin icons:"
-msgstr ""
-
 msgid ""
 "Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
 "plugin site ''{1}''."
@@ -13915,7 +13950,9 @@ msgid ""
 "Creating and handling address nodes and buildings within Czech Republic."
 msgstr ""
 
-msgid "Allows to import various file formats into JOSM directly."
+msgid ""
+"Allows to import various file formats into JOSM directly. Currently "
+"supported: TangoGPS, Garmin Trainings Center TCX."
 msgstr ""
 
 msgid "Download your GPX tracks from openstreetmap.org"
@@ -14012,6 +14049,11 @@ msgid "A helper for IRS satellite adjustment."
 msgstr ""
 
 msgid ""
+"Provides Java Native Access (JNA) library. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
+msgid ""
 "Provides Java Topology Suite (JTS) library and related utilities. Not meant "
 "to be installed directly by users, but rather as a dependency for other "
 "plugins."
@@ -14367,6 +14409,25 @@ msgstr ""
 msgid "Width (meters)"
 msgstr ""
 
+msgid "Sidewalk"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "both"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "left"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "right"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "no"
+msgstr ""
+
 msgid "Service type"
 msgstr ""
 
@@ -14731,15 +14792,19 @@ msgstr ""
 msgid "May-Sep 09:30-12:30,14:15-19:30"
 msgstr ""
 
+msgctxt "parking"
 msgid "multi-storey"
 msgstr ""
 
+msgctxt "parking"
 msgid "surface"
 msgstr ""
 
+msgctxt "parking"
 msgid "underground"
 msgstr ""
 
+msgctxt "parking"
 msgid "rooftop"
 msgstr ""
 
@@ -15197,15 +15262,26 @@ msgstr ""
 msgid "Overtaking"
 msgstr ""
 
+msgctxt "overtaking"
+msgid "yes"
+msgstr ""
+
+msgctxt "overtaking"
 msgid "both"
 msgstr ""
 
+msgctxt "overtaking"
 msgid "forward"
 msgstr ""
 
+msgctxt "overtaking"
 msgid "backward"
 msgstr ""
 
+msgctxt "overtaking"
+msgid "no"
+msgstr ""
+
 msgid "Roundabout"
 msgstr ""
 
@@ -15499,6 +15575,12 @@ msgstr ""
 msgid "tiger"
 msgstr ""
 
+msgid "Button operated"
+msgstr ""
+
+msgid "Sound signals"
+msgstr ""
+
 msgid "Crossing attendant"
 msgstr ""
 
@@ -16020,9 +16102,6 @@ msgstr ""
 msgid "Traffic lights"
 msgstr ""
 
-msgid "Sound signals"
-msgstr ""
-
 msgid "Barrier"
 msgstr ""
 
@@ -18082,6 +18161,9 @@ msgstr ""
 msgid "Gasometer"
 msgstr ""
 
+msgid "Bunker Silo"
+msgstr ""
+
 msgid "Pipeline"
 msgstr ""
 
@@ -18228,15 +18310,15 @@ msgstr ""
 msgid "Monitoring:"
 msgstr ""
 
-msgid "Weather"
-msgstr ""
-
 msgid "Water level"
 msgstr ""
 
 msgid "Tide Level"
 msgstr ""
 
+msgid "Groundwater"
+msgstr ""
+
 msgid "Traffic"
 msgstr ""
 
@@ -18255,6 +18337,9 @@ msgstr ""
 msgid "Galileo Signals"
 msgstr ""
 
+msgid "Weather"
+msgstr ""
+
 msgid "Radiation"
 msgstr ""
 
@@ -18435,6 +18520,9 @@ msgstr ""
 msgid "pivot_pier"
 msgstr ""
 
+msgid "Bridge outline"
+msgstr ""
+
 msgid "Power Plant"
 msgstr ""
 
@@ -19042,6 +19130,15 @@ msgstr ""
 msgid "Pole"
 msgstr ""
 
+msgid "Pole with Transformer"
+msgstr ""
+
+msgid "Pole Attributes:"
+msgstr ""
+
+msgid "Transformer Attributes:"
+msgstr ""
+
 msgid "Power Line"
 msgstr ""
 
@@ -19091,9 +19188,15 @@ msgstr ""
 msgid "Power Cable"
 msgstr ""
 
+msgctxt "power cable"
+msgid "underground"
+msgstr ""
+
+msgctxt "power cable"
 msgid "underwater"
 msgstr ""
 
+msgctxt "power cable"
 msgid "overground"
 msgstr ""
 
@@ -19121,6 +19224,33 @@ msgstr ""
 msgid "Memorial"
 msgstr ""
 
+msgctxt "memorial"
+msgid "statue"
+msgstr ""
+
+msgctxt "memorial"
+msgid "bust"
+msgstr ""
+
+msgctxt "memorial"
+msgid "plaque"
+msgstr ""
+
+msgctxt "memorial"
+msgid "stele"
+msgstr ""
+
+msgctxt "memorial"
+msgid "stone"
+msgstr ""
+
+msgctxt "memorial"
+msgid "war_memorial"
+msgstr ""
+
+msgid "Inscription"
+msgstr ""
+
 msgid "Wayside Cross"
 msgstr ""
 
@@ -19190,6 +19320,9 @@ msgstr ""
 msgid "Beverages"
 msgstr ""
 
+msgid "Wine"
+msgstr ""
+
 msgid "Boutique"
 msgstr ""
 
@@ -19235,6 +19368,9 @@ msgstr ""
 msgid "Video Games"
 msgstr ""
 
+msgid "Music"
+msgstr ""
+
 msgid "Cash"
 msgstr ""
 
@@ -19262,6 +19398,9 @@ msgstr ""
 msgid "Curtain"
 msgstr ""
 
+msgid "Art"
+msgstr ""
+
 msgid "Frame"
 msgstr ""
 
@@ -19307,6 +19446,9 @@ msgstr ""
 msgid "Beauty"
 msgstr ""
 
+msgid "Tattoo"
+msgstr ""
+
 msgid "Optician"
 msgstr ""
 
@@ -19358,6 +19500,9 @@ msgstr ""
 msgid "Pet"
 msgstr ""
 
+msgid "Funeral Directors"
+msgstr ""
+
 msgid "Vending Machine"
 msgstr ""
 
@@ -19457,6 +19602,15 @@ msgstr ""
 msgid "National Park"
 msgstr ""
 
+msgid "Protected Area"
+msgstr ""
+
+msgid "Protected Class"
+msgstr ""
+
+msgid "Title or type of protection"
+msgstr ""
+
 msgid "Places"
 msgstr ""
 
@@ -20533,7 +20687,13 @@ msgstr ""
 msgid "Estonia Ortho (Maaamet)"
 msgstr ""
 
-msgid "Estonia Multi (Maaamet)"
+msgid "Estonia Hillshade (Maaamet)"
+msgstr ""
+
+msgid "Estonia Cadastre (Maaamet)"
+msgstr ""
+
+msgid "Estonia Forestry (Maaamet)"
 msgstr ""
 
 msgid "Bordeaux - 2012"
@@ -20557,7 +20717,7 @@ msgstr ""
 msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
 msgstr ""
 
-msgid "CUGN Nancy - Orthophoto 2012"
+msgid "GrandNancy Orthophotographie 2012"
 msgstr ""
 
 msgid "Géobretagne - Brest 2010 - 10 cm"
@@ -20604,9 +20764,6 @@ msgid ""
 "- 1 m"
 msgstr ""
 
-msgid "Streets NRW Geofabrik.de"
-msgstr ""
-
 msgid "Hike & Bike"
 msgstr ""
 
@@ -20666,6 +20823,9 @@ msgstr ""
 msgid "NRW-Atlas: Topographische Karte 1:10000"
 msgstr ""
 
+msgid "Metropole Ruhr: Luftbilder (10 cm)"
+msgstr ""
+
 msgid "Drone Imagery (Haiti)"
 msgstr ""
 
@@ -20867,6 +21027,9 @@ msgstr ""
 msgid "Stadt Zürich Übersichtsplan (Strassen, Gebäude, Hausnummer)"
 msgstr ""
 
+msgid "Stadt Zürich Luftbild 2011"
+msgstr ""
+
 msgid "Orthofoto Kanton Solothurn RGB (SOGIS 2011/2012/2013)"
 msgstr ""
 
@@ -20885,7 +21048,7 @@ msgstr ""
 msgid "Canton de Fribourg 50cm (2005)"
 msgstr ""
 
-msgid "Stadt Bern 10cm/25cm (2008)"
+msgid "Stadt Bern 10cm/25cm (2012)"
 msgstr ""
 
 msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
@@ -20924,7 +21087,7 @@ msgstr ""
 msgid "OSM US TIGER 2012 Roads Overlay"
 msgstr ""
 
-msgid "New & Misaligned TIGER Roads (TIGER 2013)"
+msgid "New & Misaligned TIGER Roads (TIGER 2014)"
 msgstr ""
 
 msgid "MassGIS L3 Parcels"
@@ -20972,9 +21135,234 @@ msgstr ""
 msgid "NLS - Bartholomew Half Inch, 1897-1907"
 msgstr ""
 
+msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Annan 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgstr ""
+
 msgid "OS Town Plans, Cupar 1854 (NLS)"
 msgstr ""
 
+msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Elgin 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Forres 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Galashiels 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Girvan 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Greenock 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Haddington 1853 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Haddington 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Hamilton 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Irvine 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Jedburgh 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kelso 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Lanark 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Linlithgow 1856 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Musselburgh 1853 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Musselburgh 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Oban 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Peebles 1856 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Perth 1860 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Peterhead 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Selkirk 1865 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, St Andrews 1854 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, St Andrews 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stirling 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stonehaven 1864 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1847 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Strathaven 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wick 1872 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wigtown 1848 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wigtown 1894 (NLS)"
+msgstr ""
+
 msgid "Decreasing house numbers in addresses interpolation"
 msgstr ""
 
@@ -21028,17 +21416,37 @@ msgid "{0}={1} is deprecated. Please use instead a multipolygon."
 msgstr ""
 
 msgid ""
-"{0} is deprecated. Please specify ìnterval by using opening_hours syntax"
+"{0} is deprecated. Please specify interval by using opening_hours syntax"
 msgstr ""
 
 msgid ""
 "{0} is deprecated. Please delete this object and use a private layer instead"
 msgstr ""
 
-msgid "{0} on a node"
+msgid "{0}={1} is unspecific. Please replace ''{1}'' by a specific value."
 msgstr ""
 
-msgid "{0} on a node. Should be drawn as an area"
+msgid "{0} should be replaced with {1}"
+msgstr ""
+
+msgid ""
+"{0}={1} is unspecific. Please replace ''{1}'' by ''left'', ''right'' or "
+"''both''."
+msgstr ""
+
+msgid "{0} on a node. Should be used on a way."
+msgstr ""
+
+msgid "{0} on a node. Should be drawn as an area."
+msgstr ""
+
+msgid "{0}=* on a node. Should be used in a relation"
+msgstr ""
+
+msgid "{0} on a way. Should be used in a relation"
+msgstr ""
+
+msgid "{0} on a node"
 msgstr ""
 
 msgid "Building inside building"
@@ -25708,6 +26116,9 @@ msgstr ""
 msgid "Find"
 msgstr ""
 
+msgid "Show"
+msgstr ""
+
 msgid "Mark"
 msgstr ""
 
diff --git a/i18n/po/ru.po b/i18n/po/ru.po
index a7eb225..98814d6 100644
--- a/i18n/po/ru.po
+++ b/i18n/po/ru.po
@@ -1,9 +1,14 @@
+# Russian translation for josm
+# Copyright (c) 2007 Rosetta Contributors and Canonical Ltd 2007
+# This file is distributed under the same license as the josm package.
+# FIRST AUTHOR <EMAIL at ADDRESS>, 2007.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-21 03:38+0200\n"
-"PO-Revision-Date: 2014-10-20 06:06+0000\n"
+"POT-Creation-Date: 2014-12-10 03:42+0100\n"
+"PO-Revision-Date: 2014-12-08 17:07+0000\n"
 "Last-Translator: Nkolay Parukhin <parukhin at gmail.com>\n"
 "Language-Team: Koptev Oleg <koptev.oleg at gmail.com>\n"
 "MIME-Version: 1.0\n"
@@ -11,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-10-21 05:19+0000\n"
-"X-Generator: Launchpad (build 17203)\n"
+"X-Launchpad-Export-Date: 2014-12-10 05:08+0000\n"
+"X-Generator: Launchpad (build 17283)\n"
 "Language: ru_RU\n"
 
 msgid "Use Basic Authentication"
@@ -185,21 +190,6 @@ msgid "About JOSM..."
 msgstr "О программе JOSM..."
 
 msgid ""
-"Unexpected format of API base URL. Redirection to info or history page for "
-"OSM object will probably fail. API base URL is: ''{0}''"
-msgstr ""
-"Непредвиденный формат базового URL API. Перенаправление на страницу "
-"информации или истории для объекта OSM, вероятно, завершится ошибкой. "
-"Базовый URL API: ''{0}''"
-
-msgid ""
-"Unexpected format of API base URL. Redirection to user page for OSM user "
-"will probably fail. API base URL is: ''{0}''"
-msgstr ""
-"Непредвиденный формат базового URL API. Перенаправление на страницу "
-"пользователя OSM, вероятно, завершится ошибкой. Базовый URL API: ''{0}''"
-
-msgid ""
 "You are about to launch {0} browser window.<br>This may both clutter your "
 "screen with browser windows<br>and take some time to finish."
 msgid_plural ""
@@ -1697,6 +1687,15 @@ msgstr "Нет изменений для передачи на сервер."
 msgid "Nothing to upload. Get some data first."
 msgstr "Нечего передавать. Сначала создайте данные."
 
+msgid "Upload note changes to server"
+msgstr "Передать изменения в заметках на сервер"
+
+msgid "Upload notes"
+msgstr "Передать заметки"
+
+msgid "Uploading notes to server"
+msgstr "Передать заметки на сервер"
+
 msgid "Upload selection"
 msgstr "Передать выделенное на сервер..."
 
@@ -1989,12 +1988,18 @@ msgstr "Режим создания заметок"
 msgid "Click the location where you wish to create a new note"
 msgstr "Щёлкните там, где хотите создать заметку"
 
-msgid "Enter a comment for a new note"
-msgstr "Введите комментарий для заметки"
-
 msgid "Create new note"
 msgstr "Создать заметку"
 
+msgid "Create note"
+msgstr "Создать заметку"
+
+msgid "Enter a detailed comment to create a note"
+msgstr "Введите подробный комментарий для создания заметки"
+
+msgid "You must enter a comment to create a new note"
+msgstr "Необходимо ввести комментарий для создания заметки"
+
 msgid "Delete Mode"
 msgstr "Режим удаления"
 
@@ -2971,6 +2976,15 @@ msgstr "... обращается к отношению"
 msgid "Cycling dependencies"
 msgstr "Циклические зависимости"
 
+msgid "Uploading modified notes"
+msgstr "Передать изменённые заметки"
+
+msgid "Note {0} failed: {1}"
+msgstr "Сбой при передаче заметки {0}: {1}"
+
+msgid "Notes failed to upload"
+msgstr "Не удалось передать заметки"
+
 msgid ""
 "The following are results of automatic validation. Try fixing these, but be "
 "careful (don''t destroy valid data). When in doubt ignore them.<br>When you "
@@ -5382,6 +5396,12 @@ msgstr "Фон конфликта: оставить все теги"
 msgid "Conflict foreground: keep all tags"
 msgstr "Передний план конфликта: оставить все теги"
 
+msgid "Conflict background: sum all numeric tags"
+msgstr "Фон конфликта: сумма всех числовых тегов"
+
+msgid "Conflict foreground: sum all numeric tags"
+msgstr "Передний план конфликта: сумма всех числовых тегов"
+
 msgid "Conflict background: keep member"
 msgstr "Фон конфликта: оставить участника"
 
@@ -5865,12 +5885,20 @@ msgstr "ничего"
 msgid "all"
 msgstr "все"
 
+msgid "sum"
+msgstr "сумма"
+
 msgid "Please decide which values to keep"
 msgstr "Пожалуйста, решите, какие значения сохранить"
 
 msgid "Value ''{0}'' is going to be applied for key ''{1}''"
 msgstr "Значение ''{0}'' будет присвоено ключу ''{1}''"
 
+msgid ""
+"All numeric values sumed as ''{0}'' are going to be applied for key ''{1}''"
+msgstr ""
+"Сумма всех числовых значений, равная ''{0}'', будет присвоена ключу ''{1}''"
+
 msgid "The key ''{0}'' and all its values are going to be removed"
 msgstr "Ключ ''{0}'' и все его значения будут удалены"
 
@@ -6272,24 +6300,6 @@ msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
 "</p><p>Закройте диалог фильтра, если хотите увидеть все объекты.<p></html>"
 
-msgid "Display the history of all selected items."
-msgstr "Отобразить журнал по всем выделенным объектам."
-
-msgid "Object with history"
-msgstr "Объект с историей"
-
-msgid "Reload"
-msgstr "Обновить"
-
-msgid "Reload all currently selected objects and refresh the list."
-msgstr "Скачать заново все выделенные объекты, и обновить список."
-
-msgid "Show"
-msgstr "Показать"
-
-msgid "Display the history of the selected objects."
-msgstr "Показать историю выделенных объектов."
-
 msgid "Advanced object info"
 msgstr "Подробная информация"
 
@@ -6653,6 +6663,9 @@ msgstr "Добавить комментарий"
 msgid "Comment"
 msgstr "Комментарий"
 
+msgid "Comment on note"
+msgstr "Комментарий к заметке"
+
 msgid "Add comment to note:"
 msgstr "Добавить комментарий к заметке:"
 
@@ -6662,9 +6675,6 @@ msgstr "Закрыть заметку"
 msgid "Close note with message:"
 msgstr "Закрыть заметку с сообщением:"
 
-msgid "Close Note"
-msgstr "Закрыть заметку"
-
 msgid "Create a new note"
 msgstr "Создать заметку"
 
@@ -6742,6 +6752,9 @@ msgstr "Текущее выделение"
 msgid "Search for objects"
 msgstr "Поиск объектов"
 
+msgid "Display the history of the selected objects."
+msgstr "Показать историю выделенных объектов."
+
 msgid "Zoom to selection"
 msgstr "Приблизиться к выделенному"
 
@@ -6868,6 +6881,9 @@ msgstr "Исправление ({0}/{1}): ''{2}''"
 msgid "Updating map ..."
 msgstr "Обновление карты ..."
 
+msgid "anonymous"
+msgstr "анонимный"
+
 msgid "Display the basic properties of the changeset"
 msgstr "Отобразить основные параметры пакета правок"
 
@@ -6881,6 +6897,12 @@ msgid "Display the objects created, updated, and deleted by the changeset"
 msgstr ""
 "Показать объекты, созданные, измененные или удалённые в пакете правок"
 
+msgid "Discussion"
+msgstr "Обсуждение"
+
+msgid "Display the public discussion around this changeset"
+msgstr "Показать публичное обсуждение этого пакета правок"
+
 msgid "Changeset Management Dialog"
 msgstr "Диалог управления пакетами правок"
 
@@ -6941,9 +6963,6 @@ msgctxt "changeset.state"
 msgid "Closed"
 msgstr "Закрыт"
 
-msgid "anonymous"
-msgstr "анонимный"
-
 msgid "ID"
 msgstr "ID"
 
@@ -6959,6 +6978,9 @@ msgstr "Создан"
 msgid "Closed at"
 msgstr "Закрыт"
 
+msgid "Discussions"
+msgstr "Обсуждения"
+
 msgid "Downloading changeset content"
 msgstr "Скачивание с сервера содержимого пакета правок"
 
@@ -7083,6 +7105,15 @@ msgstr ""
 "Приблизиться к объектам, содержащимся в этом пакете правок в текущем слое "
 "данных"
 
+msgid "Update changeset discussion"
+msgstr "Обновить обсуждение пакета правок"
+
+msgid "Update the changeset discussion from the OSM server"
+msgstr "Обновить обсуждение пакета правок с сервера OSM"
+
+msgid "Date"
+msgstr "Дата"
+
 msgid "Download changesets"
 msgstr "Скачать с сервера пакеты правок"
 
@@ -7548,8 +7579,8 @@ msgstr "Выберите значение"
 msgid "Set number of recently added tags"
 msgstr "Задать количество недавно добавленных тегов"
 
-msgid "Remember last used tags"
-msgstr "Помнить последние введённые теги"
+msgid "Remember last used tags after a restart"
+msgstr "Помнить недавно добавленные теги после перезапуска"
 
 msgid "Please enter the number of recently added tags to display"
 msgstr ""
@@ -7941,6 +7972,9 @@ msgstr "включая непосредственные дочерние эле
 msgid "Load parent relations"
 msgstr "Скачать родителей отношения"
 
+msgid "Reload"
+msgstr "Обновить"
+
 msgid "Loading parent relations"
 msgstr "Скачивание родителей отношения"
 
@@ -8072,6 +8106,12 @@ msgstr "Данные GPS"
 msgid "Select to download GPS traces in the selected download area."
 msgstr "Пометьте, чтобы скачать с сервера ТРЕКИ GPS для выбранной области."
 
+msgid "Notes"
+msgstr "Банкноты"
+
+msgid "Select to download notes in the selected download area."
+msgstr "Выберите для скачивания заметок в выделенной области скачивания"
+
 msgid "Download as new layer"
 msgstr "Скачать как новый слой"
 
@@ -8418,9 +8458,6 @@ msgstr "A"
 msgid "B"
 msgstr "B"
 
-msgid "Date"
-msgstr "Дата"
-
 msgid ""
 "Failed to update primitive with id {0} because current edit layer is null"
 msgstr ""
@@ -9470,9 +9507,6 @@ msgstr ""
 msgid "Save Layer"
 msgstr "Сохранить слой"
 
-msgid "Notes"
-msgstr "Банкноты"
-
 msgid "Notes layer"
 msgstr "Слой заметок"
 
@@ -9488,9 +9522,6 @@ msgstr "Слой данных {0}"
 msgid "outside downloaded area"
 msgstr "вне области для скачивания"
 
-msgid "version {0}"
-msgstr "версия {0}"
-
 msgid "Merging layers"
 msgstr "Объединение слоёв"
 
@@ -13515,6 +13546,15 @@ msgstr ""
 "Требуется открытый пакет правок. Получен закрытый пакет правок с "
 "идентификатором {0}"
 
+msgid "Note upload failed"
+msgstr "Не удалось отправить заметку"
+
+msgid "Error parsing note response from server"
+msgstr "Ошибка при разборе ответа сервера на отправку заметки"
+
+msgid "Error encoding string: {0}"
+msgstr "Ошибка в кодировке строки: {0}"
+
 msgid "(Code={0})"
 msgstr "(Код={0})"
 
@@ -13572,15 +13612,15 @@ msgstr ""
 msgid "Parsing changeset content ..."
 msgstr "Разбор содержимого пакета правок ..."
 
+msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
+msgstr "Неверное целое значение атрибута ''{0}''. Получено ''{1}''."
+
 msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
 msgstr "Неверное значение для атрибута ''{0}''. Получено''{1}''."
 
 msgid "Illegal numeric value for attribute ''{0}''. Got ''{1}''."
 msgstr "Неверное числовое значение для атрибута ''{0}''. Получено ''{1}''."
 
-msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
-msgstr "Неверное целое значение атрибута ''{0}''. Получено ''{1}''."
-
 msgid "Missing mandatory attribute ''{0}'' of XML element {1}."
 msgstr "Отсутствует обязательный атрибут ''{0}'' для элемента XML {1}."
 
@@ -14469,9 +14509,6 @@ msgid "Failed to scan file ''{0}'' for plugin information. Skipping."
 msgstr ""
 "Не удалось просканировать файл ''{0}'' на информацию о модулях. Пропуск."
 
-msgid "Processing plugin site cache icon files..."
-msgstr "Обработка файлов пиктограмм из кэша сайта модулей..."
-
 msgid "Processing plugin files..."
 msgstr "Обработка файлов модулей..."
 
@@ -14490,12 +14527,6 @@ msgstr "JOSM не удалось загрузить список модулей:
 msgid "Details:"
 msgstr "Подробности:"
 
-msgid "Plugin icons download error"
-msgstr "Ошибка загрузки значков модулей"
-
-msgid "JOSM failed to download plugin icons:"
-msgstr "JOSM не удалось загрузить значки модулей:"
-
 msgid ""
 "Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
 "plugin site ''{1}''."
@@ -15617,9 +15648,12 @@ msgid ""
 msgstr ""
 "Создание и управление адресными точками и зданиями в Чешской Республике"
 
-msgid "Allows to import various file formats into JOSM directly."
+msgid ""
+"Allows to import various file formats into JOSM directly. Currently "
+"supported: TangoGPS, Garmin Trainings Center TCX."
 msgstr ""
-"Позволяет импортировать файлы различных форматов непосредственно в JOSM"
+"Позволяет импортировать в JOSM различные форматы файлов. В настоящее время "
+"поддерживаются: TangoGPS, Garmin Trainings Center TCX."
 
 msgid "Download your GPX tracks from openstreetmap.org"
 msgstr "Загрузить ваши GPX треки с openstreetmap.org"
@@ -15736,6 +15770,14 @@ msgid "A helper for IRS satellite adjustment."
 msgstr "Помощник корректировки спутника IRS."
 
 msgid ""
+"Provides Java Native Access (JNA) library. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+"Предоставляет библиотеку Java Native Access (JNA). Предназначен не для "
+"непосредственной установки пользователями, а как зависимость для других "
+"модулей."
+
+msgid ""
 "Provides Java Topology Suite (JTS) library and related utilities. Not meant "
 "to be installed directly by users, but rather as a dependency for other "
 "plugins."
@@ -15978,7 +16020,7 @@ msgid "Plugin to digital sign OSM-Data"
 msgstr "Модуль для цифровой подписи данных OSM"
 
 msgid "${plugin.description}"
-msgstr ""
+msgstr "${plugin.description}"
 
 msgid ""
 "Provides a straightforward GUI for adding, editing and deleting turn lanes."
@@ -16156,6 +16198,25 @@ msgstr "Освещённая"
 msgid "Width (meters)"
 msgstr "Ширина (метры)"
 
+msgid "Sidewalk"
+msgstr "Тротуар"
+
+msgctxt "sidewalk"
+msgid "both"
+msgstr "в обоих направлениях"
+
+msgctxt "sidewalk"
+msgid "left"
+msgstr "слева"
+
+msgctxt "sidewalk"
+msgid "right"
+msgstr "справа"
+
+msgctxt "sidewalk"
+msgid "no"
+msgstr "нет"
+
 msgid "Service type"
 msgstr "Тип служебного пути"
 
@@ -16522,17 +16583,21 @@ msgstr "Mo-Fr 09:00-18:00,Sa 08:00-14:00"
 msgid "May-Sep 09:30-12:30,14:15-19:30"
 msgstr "May-Sep 09:30-12:30,14:15-19:30"
 
+msgctxt "parking"
 msgid "multi-storey"
 msgstr "многоуровневая"
 
+msgctxt "parking"
 msgid "surface"
-msgstr "наземная"
+msgstr "открытая наземная"
 
+msgctxt "parking"
 msgid "underground"
 msgstr "подземная"
 
+msgctxt "parking"
 msgid "rooftop"
-msgstr "крыша"
+msgstr "на крыше"
 
 msgid "Reference number"
 msgstr "Справочный номер"
@@ -16988,15 +17053,26 @@ msgstr "Макс. длина (в метрах)"
 msgid "Overtaking"
 msgstr "Обгон разрешён"
 
+msgctxt "overtaking"
+msgid "yes"
+msgstr "да"
+
+msgctxt "overtaking"
 msgid "both"
 msgstr "в обоих направлениях"
 
+msgctxt "overtaking"
 msgid "forward"
 msgstr "по направлению линии"
 
+msgctxt "overtaking"
 msgid "backward"
 msgstr "против направления линии"
 
+msgctxt "overtaking"
+msgid "no"
+msgstr "нет"
+
 msgid "Roundabout"
 msgstr "Круг"
 
@@ -17303,6 +17379,12 @@ msgstr "pegasus (для верховой езды)"
 msgid "tiger"
 msgstr "tiger (нерегулируемый вело-пешеходный)"
 
+msgid "Button operated"
+msgstr "Управляемый кнопкой"
+
+msgid "Sound signals"
+msgstr "Звуковые сигналы"
+
 msgid "Crossing attendant"
 msgstr "Под наблюдением постового"
 
@@ -17829,9 +17911,6 @@ msgstr "Железнодорожный переезд"
 msgid "Traffic lights"
 msgstr "Светофор"
 
-msgid "Sound signals"
-msgstr "Звуковые сигналы"
-
 msgid "Barrier"
 msgstr "Ограждение"
 
@@ -18079,13 +18158,13 @@ msgid "Diesel for Heavy Good Vehicles"
 msgstr "дизельное для тяжёлого транспорта"
 
 msgid "Octane 80"
-msgstr "80-й бензин"
+msgstr "бензин АИ-80"
 
 msgid "Octane 91"
 msgstr "бензин АИ-91"
 
 msgid "Octane 92"
-msgstr "92-й бензин"
+msgstr "бензин АИ-92"
 
 msgid "Octane 95"
 msgstr "бензин АИ-95"
@@ -19417,7 +19496,7 @@ msgstr "тротуар"
 
 msgctxt "hydrant position"
 msgid "green"
-msgstr "Газон"
+msgstr "газон"
 
 msgid "Pressure (in bar)"
 msgstr "Давление (в барах)"
@@ -19893,6 +19972,9 @@ msgstr "Ветряная мельница"
 msgid "Gasometer"
 msgstr "Газгольдер"
 
+msgid "Bunker Silo"
+msgstr "Силосная яма"
+
 msgid "Pipeline"
 msgstr "Трубопровод"
 
@@ -20039,15 +20121,15 @@ msgstr "Станция наблюдения"
 msgid "Monitoring:"
 msgstr "Наблюдение за:"
 
-msgid "Weather"
-msgstr "Погодой"
-
 msgid "Water level"
 msgstr "Уровнем воды"
 
 msgid "Tide Level"
 msgstr "Уровнем прилива"
 
+msgid "Groundwater"
+msgstr ""
+
 msgid "Traffic"
 msgstr "Дорожным движением"
 
@@ -20066,6 +20148,9 @@ msgstr "Сигналами GLONASS"
 msgid "Galileo Signals"
 msgstr "Сигналами Galileo"
 
+msgid "Weather"
+msgstr "Погодой"
+
 msgid "Radiation"
 msgstr "Радиацией"
 
@@ -20246,6 +20331,9 @@ msgstr "опора подъёмного пролёта"
 msgid "pivot_pier"
 msgstr "опора разводного пролёта"
 
+msgid "Bridge outline"
+msgstr "Контур моста"
+
 msgid "Power Plant"
 msgstr "Электростанция"
 
@@ -20855,6 +20943,15 @@ msgstr "Неполная опора"
 msgid "Pole"
 msgstr "Столб"
 
+msgid "Pole with Transformer"
+msgstr "Столб с трансформатором"
+
+msgid "Pole Attributes:"
+msgstr "Свойства столба:"
+
+msgid "Transformer Attributes:"
+msgstr "Свойства трансформатора:"
+
 msgid "Power Line"
 msgstr "Линия электропередач"
 
@@ -20904,9 +21001,15 @@ msgstr "Используется для передачи данных"
 msgid "Power Cable"
 msgstr "Электрический кабель"
 
+msgctxt "power cable"
+msgid "underground"
+msgstr "подземный"
+
+msgctxt "power cable"
 msgid "underwater"
 msgstr "подводный"
 
+msgctxt "power cable"
 msgid "overground"
 msgstr "надземный"
 
@@ -20934,6 +21037,33 @@ msgstr "Монумент"
 msgid "Memorial"
 msgstr "Памятник"
 
+msgctxt "memorial"
+msgid "statue"
+msgstr "статуя"
+
+msgctxt "memorial"
+msgid "bust"
+msgstr "бюст"
+
+msgctxt "memorial"
+msgid "plaque"
+msgstr "мемориальная доска"
+
+msgctxt "memorial"
+msgid "stele"
+msgstr "стела"
+
+msgctxt "memorial"
+msgid "stone"
+msgstr "камень"
+
+msgctxt "memorial"
+msgid "war_memorial"
+msgstr "военный мемориал"
+
+msgid "Inscription"
+msgstr "Надпись"
+
 msgid "Wayside Cross"
 msgstr "Придорожный крест"
 
@@ -21003,6 +21133,9 @@ msgstr "Алкогольная продукция"
 msgid "Beverages"
 msgstr "Напитки"
 
+msgid "Wine"
+msgstr "Вино"
+
 msgid "Boutique"
 msgstr "Бутик"
 
@@ -21048,6 +21181,9 @@ msgstr "Видео"
 msgid "Video Games"
 msgstr "Видеоигры"
 
+msgid "Music"
+msgstr "Музыка"
+
 msgid "Cash"
 msgstr "Финансы"
 
@@ -21075,6 +21211,9 @@ msgstr "Кухня"
 msgid "Curtain"
 msgstr "Шторы"
 
+msgid "Art"
+msgstr "Произведения искусства"
+
 msgid "Frame"
 msgstr "Рамки"
 
@@ -21120,6 +21259,9 @@ msgstr "Парикмахерская"
 msgid "Beauty"
 msgstr "Салон красоты"
 
+msgid "Tattoo"
+msgstr "Татуировка"
+
 msgid "Optician"
 msgstr "Оптика"
 
@@ -21171,6 +21313,9 @@ msgstr "Сумки и чемоданы"
 msgid "Pet"
 msgstr "Зоомагазин"
 
+msgid "Funeral Directors"
+msgstr "Ритуальные услуги"
+
 msgid "Vending Machine"
 msgstr "Торговый автомат"
 
@@ -21270,6 +21415,15 @@ msgstr "Почтовый индекс"
 msgid "National Park"
 msgstr "Национальный парк"
 
+msgid "Protected Area"
+msgstr "Особо охраняемая природная территория"
+
+msgid "Protected Class"
+msgstr "Класс охраны"
+
+msgid "Title or type of protection"
+msgstr "Тип ООПТ"
+
 msgid "Places"
 msgstr "Места"
 
@@ -22359,8 +22513,14 @@ msgstr "Эстония: базовая карта (Maaamet)"
 msgid "Estonia Ortho (Maaamet)"
 msgstr "Эстония: ортофото (Maaamet)"
 
-msgid "Estonia Multi (Maaamet)"
-msgstr "Эстония Multi (Maaamet)"
+msgid "Estonia Hillshade (Maaamet)"
+msgstr ""
+
+msgid "Estonia Cadastre (Maaamet)"
+msgstr ""
+
+msgid "Estonia Forestry (Maaamet)"
+msgstr ""
 
 msgid "Bordeaux - 2012"
 msgstr "Бордо - 2012"
@@ -22383,8 +22543,8 @@ msgstr "CRAIG - Ле-Пюи 2010 - 15 см"
 msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
 msgstr "CRIGE PACA Приморские Альпы 2009 - 40 см"
 
-msgid "CUGN Nancy - Orthophoto 2012"
-msgstr "Городское сообщество Большого Нанси - ортофото 2012"
+msgid "GrandNancy Orthophotographie 2012"
+msgstr "Большой Нанси: ортофото 2012"
 
 msgid "Géobretagne - Brest 2010 - 10 cm"
 msgstr "Géobretagne - Брест 2010 - 10 см"
@@ -22430,9 +22590,6 @@ msgid ""
 "- 1 m"
 msgstr "Веркор - заповедник горного массива Веркор - ортофото 1999 - 1 м"
 
-msgid "Streets NRW Geofabrik.de"
-msgstr "Streets NRW Geofabrik.de"
-
 msgid "Hike & Bike"
 msgstr "Hike & Bike"
 
@@ -22493,6 +22650,9 @@ msgstr "NRW-Atlas: аэрофотосъёмка"
 msgid "NRW-Atlas: Topographische Karte 1:10000"
 msgstr "NRW-Atlas: топографическая карта 1:10000"
 
+msgid "Metropole Ruhr: Luftbilder (10 cm)"
+msgstr "Городская агломерация Рур: аэрофотосъёмка (10 см)"
+
 msgid "Drone Imagery (Haiti)"
 msgstr "Снимки с дрона (Гаити)"
 
@@ -22694,6 +22854,9 @@ msgstr "Цюрих - план города"
 msgid "Stadt Zürich Übersichtsplan (Strassen, Gebäude, Hausnummer)"
 msgstr "Цюрих: обзорный план города (улицы, здания, номера домов)"
 
+msgid "Stadt Zürich Luftbild 2011"
+msgstr "Город Цюрих: аэрофотосъёмка 2011"
+
 msgid "Orthofoto Kanton Solothurn RGB (SOGIS 2011/2012/2013)"
 msgstr "Кантон Золотурн: ортофото RGB (SOGIS 2011/2012/2013)"
 
@@ -22712,8 +22875,8 @@ msgstr "Кантон Юра 50см (RCJU 1998)"
 msgid "Canton de Fribourg 50cm (2005)"
 msgstr "Кантон Фрибур 50см (2005)"
 
-msgid "Stadt Bern 10cm/25cm (2008)"
-msgstr "Город Берн 10см/25см (2008)"
+msgid "Stadt Bern 10cm/25cm (2012)"
+msgstr "Город Берн 10см/25см (2012)"
 
 msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
 msgstr "HEIG-VD / ортофото Ивердон-Ле-Бен 25см (2007)"
@@ -22751,8 +22914,8 @@ msgstr "USGS: крупномасштабные снимки"
 msgid "OSM US TIGER 2012 Roads Overlay"
 msgstr "OSM US TIGER 2012: оверлей дорог"
 
-msgid "New & Misaligned TIGER Roads (TIGER 2013)"
-msgstr "Новые и смещённые дороги TIGER (TIGER 2013)"
+msgid "New & Misaligned TIGER Roads (TIGER 2014)"
+msgstr ""
 
 msgid "MassGIS L3 Parcels"
 msgstr "MassGIS L3 Parcels"
@@ -22799,9 +22962,234 @@ msgstr "OS Scottish Popular историческая"
 msgid "NLS - Bartholomew Half Inch, 1897-1907"
 msgstr "NLS - изд. Bartholomew, полудюймовая, 1897-1907"
 
+msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgstr "OS Town Plans, Абердин 1866-1867 (NLS)"
+
+msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgstr "OS Town Plans, Эйрдри 1858 (NLS)"
+
+msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgstr "OS Town Plans, Александрия 1859 (NLS)"
+
+msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgstr "OS Town Plans, Аллоа 1861-1862 (NLS)"
+
+msgid "OS Town Plans, Annan 1859 (NLS)"
+msgstr "OS Town Plans, Аннан 1859 (NLS)"
+
+msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgstr "OS Town Plans, Арброт 1858 (NLS)"
+
+msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgstr "OS Town Plans, Эр 1855 (NLS)"
+
+msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgstr "OS Town Plans, Берик-апон-Туид 1852 (NLS)"
+
+msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgstr "OS Town Plans, Брихин 1862 (NLS)"
+
+msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgstr "OS Town Plans, Бернтайленд 1894 (NLS)"
+
+msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgstr "OS Town Plans, Кэмпбелтаун 1865 (NLS)"
+
+msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgstr "OS Town Plans, Котбридж 1858 (NLS)"
+
 msgid "OS Town Plans, Cupar 1854 (NLS)"
 msgstr "OS: планы городов, Купар 1854 (NLS)"
 
+msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgstr "OS Town Plans, Купар 1893-1894 (NLS)"
+
+msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgstr "OS Town Plans, Далкит 1852 (NLS)"
+
+msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgstr "OS Town Plans, Далкит 1893 (NLS)"
+
+msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgstr "OS Town Plans, Дамбартон 1859 (NLS)"
+
+msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgstr "OS Town Plans, Дамфрис 1850 (NLS)"
+
+msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgstr "OS Town Plans, Дамфрис 1893 (NLS)"
+
+msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgstr "OS Town Plans, Данди 1857-1858 (NLS)"
+
+msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgstr "OS Town Plans, Данди 1870-1872 (NLS)"
+
+msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgstr "OS Town Plans, Данфермлин 1854 (NLS)"
+
+msgid "OS Town Plans, Dunfermline 1894 (NLS)"
+msgstr "OS Town Plans, Данфермлин 1894 (NLS)"
+
+msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
+msgstr "OS Town Plans, Эдинбург 1849-1851 (NLS)"
+
+msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
+msgstr "OS Town Plans, Эдинбург 1876-1877 (NLS)"
+
+msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
+msgstr "OS Town Plans, Эдинбург 1893-1894 (NLS)"
+
+msgid "OS Town Plans, Elgin 1868 (NLS)"
+msgstr "OS Town Plans, Элгин 1868 (NLS)"
+
+msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
+msgstr "OS Town Plans, Фолкерк 1858-1859 (NLS)"
+
+msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
+msgstr "OS Town Plans, Форфар 1860-1861 (NLS)"
+
+msgid "OS Town Plans, Forres 1868 (NLS)"
+msgstr "OS Town Plans, Форрес 1868 (NLS)"
+
+msgid "OS Town Plans, Galashiels 1858 (NLS)"
+msgstr "OS Town Plans, Галашилс 1858 (NLS)"
+
+msgid "OS Town Plans, Girvan 1857 (NLS)"
+msgstr "OS Town Plans, Герван 1857 (NLS)"
+
+msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
+msgstr "OS Town Plans, Глазго 1857-1858 (NLS)"
+
+msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
+msgstr "OS Town Plans, Глазго 1892-1894 (NLS)"
+
+msgid "OS Town Plans, Greenock 1857 (NLS)"
+msgstr "OS Town Plans, Гринок 1857 (NLS)"
+
+msgid "OS Town Plans, Haddington 1853 (NLS)"
+msgstr "OS Town Plans, Хаддингтон 1853 (NLS)"
+
+msgid "OS Town Plans, Haddington 1893 (NLS)"
+msgstr "OS Town Plans, Хаддингтон 1893 (NLS)"
+
+msgid "OS Town Plans, Hamilton 1858 (NLS)"
+msgstr "OS Town Plans, Гамильтон 1858 (NLS)"
+
+msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
+msgstr "OS Town Plans, Хоик 1857-1858 (NLS)"
+
+msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
+msgstr "OS Town Plans, Инвернесс 1867-1868 (NLS)"
+
+msgid "OS Town Plans, Irvine 1859 (NLS)"
+msgstr "OS Town Plans, Эрвин 1859 (NLS)"
+
+msgid "OS Town Plans, Jedburgh 1858 (NLS)"
+msgstr "OS Town Plans, Джедборо 1858 (NLS)"
+
+msgid "OS Town Plans, Kelso 1857 (NLS)"
+msgstr "OS Town Plans, Келсо 1857 (NLS)"
+
+msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
+msgstr "OS Town Plans, Килмарнок 1857-1859 (NLS)"
+
+msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
+msgstr "OS Town Plans, Керколди 1855 (NLS)"
+
+msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
+msgstr "OS Town Plans, Керколди 1894 (NLS)"
+
+msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
+msgstr "OS Town Plans, Керкубри 1850 (NLS)"
+
+msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
+msgstr "OS Town Plans, Керкубри 1893 (NLS)"
+
+msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
+msgstr "OS Town Plans, Керкинтиллох 1859 (NLS)"
+
+msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
+msgstr "OS Town Plans, Кирримьюир 1861 (NLS)"
+
+msgid "OS Town Plans, Lanark 1858 (NLS)"
+msgstr "OS Town Plans, Ланарк 1858 (NLS)"
+
+msgid "OS Town Plans, Linlithgow 1856 (NLS)"
+msgstr "OS Town Plans, Линлитгоу 1856 (NLS)"
+
+msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
+msgstr "OS Town Plans, Мейбол 1856-1857 (NLS)"
+
+msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
+msgstr "OS Town Plans, Монтроз 1861-1862 (NLS)"
+
+msgid "OS Town Plans, Musselburgh 1853 (NLS)"
+msgstr "OS Town Plans, Масселборо 1853 (NLS)"
+
+msgid "OS Town Plans, Musselburgh 1893 (NLS)"
+msgstr "OS Town Plans, Масселборо 1893 (NLS)"
+
+msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
+msgstr "OS Town Plans, Нэрн 1867-1868 (NLS)"
+
+msgid "OS Town Plans, Oban 1867-1868 (NLS)"
+msgstr "OS Town Plans, Обан 1867-1868 (NLS)"
+
+msgid "OS Town Plans, Peebles 1856 (NLS)"
+msgstr "OS Town Plans, Пибл 1856 (NLS)"
+
+msgid "OS Town Plans, Perth 1860 (NLS)"
+msgstr "OS Town Plans, Перт 1860 (NLS)"
+
+msgid "OS Town Plans, Peterhead 1868 (NLS)"
+msgstr "OS Town Plans, Питерхед 1868 (NLS)"
+
+msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
+msgstr "OS Town Plans, Порт Глазго 1856-1857 (NLS)"
+
+msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
+msgstr "OS Town Plans, Портобелло 1893-1894 (NLS)"
+
+msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
+msgstr "OS Town Plans, Ротсей 1862-1863 (NLS)"
+
+msgid "OS Town Plans, Selkirk 1865 (NLS)"
+msgstr "OS Town Plans, Селкерк 1865 (NLS)"
+
+msgid "OS Town Plans, St Andrews 1854 (NLS)"
+msgstr "OS Town Plans, Сент-Эндрюс 1854 (NLS)"
+
+msgid "OS Town Plans, St Andrews 1893 (NLS)"
+msgstr "OS Town Plans, Сент-Эндрюс 1893 (NLS)"
+
+msgid "OS Town Plans, Stirling 1858 (NLS)"
+msgstr "OS Town Plans, Стерлинг 1858 (NLS)"
+
+msgid "OS Town Plans, Stonehaven 1864 (NLS)"
+msgstr "OS Town Plans, Стоунхейвен 1864 (NLS)"
+
+msgid "OS Town Plans, Stranraer 1847 (NLS)"
+msgstr "OS Town Plans, Странрар 1847 (NLS)"
+
+msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
+msgstr "OS Town Plans, Странрар 1863-1877 (NLS)"
+
+msgid "OS Town Plans, Stranraer 1893 (NLS)"
+msgstr "OS Town Plans, Странрар 1893 (NLS)"
+
+msgid "OS Town Plans, Strathaven 1858 (NLS)"
+msgstr "OS Town Plans, Стратхейвен 1858 (NLS)"
+
+msgid "OS Town Plans, Wick 1872 (NLS)"
+msgstr "OS Town Plans, Уик 1872 (NLS)"
+
+msgid "OS Town Plans, Wigtown 1848 (NLS)"
+msgstr "OS Town Plans, Уигтаун 1848 (NLS)"
+
+msgid "OS Town Plans, Wigtown 1894 (NLS)"
+msgstr "OS Town Plans, Уигтаун 1894 (NLS)"
+
 msgid "Decreasing house numbers in addresses interpolation"
 msgstr "Номера домов по убыванию в интерполяции адресов"
 
@@ -22861,9 +23249,9 @@ msgstr ""
 "Применять {0}={1} не рекомендуется. Используйте взамен мультиполигон."
 
 msgid ""
-"{0} is deprecated. Please specify ìnterval by using opening_hours syntax"
+"{0} is deprecated. Please specify interval by using opening_hours syntax"
 msgstr ""
-"{0} использовать не рекомендуется. Укажите интервал, используя синтаксис "
+"Применять {0} не рекомендуется. Укажите интервал, используя синтаксис "
 "opening_hours"
 
 msgid ""
@@ -22872,12 +23260,35 @@ msgstr ""
 "{0} использовать не рекомендуется. Удалите этот объект и используйте вместо "
 "этого личный слой"
 
+msgid "{0}={1} is unspecific. Please replace ''{1}'' by a specific value."
+msgstr ""
+"{0}={1} — обобщённое значение. Замените ''{1}'' более конкретным значением."
+
+msgid "{0} should be replaced with {1}"
+msgstr "{0} следует заменить на {1}"
+
+msgid ""
+"{0}={1} is unspecific. Please replace ''{1}'' by ''left'', ''right'' or "
+"''both''."
+msgstr ""
+"{0}={1} — обобщённое значение. Замените ''{1}'' на ''left'', ''right'' или "
+"''both''."
+
+msgid "{0} on a node. Should be used on a way."
+msgstr "{0} на точке. Должен использоваться на линии."
+
+msgid "{0} on a node. Should be drawn as an area."
+msgstr "{0} на точке. Должен быть нарисован как область."
+
+msgid "{0}=* on a node. Should be used in a relation"
+msgstr "{0}=* на точке. Следует использовать в отношении"
+
+msgid "{0} on a way. Should be used in a relation"
+msgstr "{0} на линии. Должен использоваться в отношении"
+
 msgid "{0} on a node"
 msgstr "{0} на точке"
 
-msgid "{0} on a node. Should be drawn as an area"
-msgstr "{0} на точке. Должен быть изображён как область"
-
 msgid "Building inside building"
 msgstr "Здание внутри другого здания"
 
@@ -27931,6 +28342,9 @@ msgstr "Предлагать остановки"
 msgid "Find"
 msgstr "Найти"
 
+msgid "Show"
+msgstr "Показать"
+
 msgid "Mark"
 msgstr "Пометить"
 
diff --git a/i18n/po/sk.po b/i18n/po/sk.po
index 8499ac3..ef4b0dc 100644
--- a/i18n/po/sk.po
+++ b/i18n/po/sk.po
@@ -1,17 +1,24 @@
+# Slovak translation for josm
+# Copyright (c) 2008 Rosetta Contributors and Canonical Ltd 2008
+# This file is distributed under the same license as the josm package.
+#
+# FIRST AUTHOR <EMAIL at ADDRESS>, 2008.
+# zis <michal.bellovic at ruvzpd.sk>, 2011.
+# kayle.sk <webmaster at kayle.sk>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-21 03:38+0200\n"
-"PO-Revision-Date: 2014-10-11 21:46+0000\n"
+"POT-Creation-Date: 2014-12-10 03:42+0100\n"
+"PO-Revision-Date: 2014-12-06 22:15+0000\n"
 "Last-Translator: aceman444 <Unknown>\n"
 "Language-Team: Slovak <>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n"
-"X-Launchpad-Export-Date: 2014-10-21 05:21+0000\n"
-"X-Generator: Launchpad (build 17203)\n"
+"X-Launchpad-Export-Date: 2014-12-10 05:10+0000\n"
+"X-Generator: Launchpad (build 17283)\n"
 "Language: sk\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -173,21 +180,6 @@ msgid "About JOSM..."
 msgstr "O programe JOSM..."
 
 msgid ""
-"Unexpected format of API base URL. Redirection to info or history page for "
-"OSM object will probably fail. API base URL is: ''{0}''"
-msgstr ""
-"Neočakávaný formát základného URL pre API. Presmerovanie na info alebo "
-"históriu stránky pre objekt OSM pravdepodobne zlyhá. Základné URL pre API "
-"je: \"{0}"
-
-msgid ""
-"Unexpected format of API base URL. Redirection to user page for OSM user "
-"will probably fail. API base URL is: ''{0}''"
-msgstr ""
-"Neočakávaný formát základného URL pre API. Presmerovanie na stránku "
-"používateľa OSM pravdepodobne zlyhá. Základné URL pre API je: \"{0}\""
-
-msgid ""
 "You are about to launch {0} browser window.<br>This may both clutter your "
 "screen with browser windows<br>and take some time to finish."
 msgid_plural ""
@@ -1219,7 +1211,7 @@ msgid "Report bug"
 msgstr "Nahlásiť chybu"
 
 msgid "Report a ticket to JOSM bugtracker"
-msgstr ""
+msgstr "Zadať hlásenie do evidence chýb pre JOSM"
 
 msgid "Restart"
 msgstr "Reštartovať"
@@ -1670,6 +1662,15 @@ msgstr "Žiadne zmeny na uloženie."
 msgid "Nothing to upload. Get some data first."
 msgstr "Nie je nič k nahratiu. Najskôr musíte mať nejaké dáta."
 
+msgid "Upload note changes to server"
+msgstr "Odoslať zmeny v poznámkach na server"
+
+msgid "Upload notes"
+msgstr "Odoslať poznámky"
+
+msgid "Uploading notes to server"
+msgstr "Odosielajú sa poznámky na server"
+
 msgid "Upload selection"
 msgstr "Nahrať výber"
 
@@ -1966,12 +1967,18 @@ msgstr "Pridať režim poznámky"
 msgid "Click the location where you wish to create a new note"
 msgstr "Kliknite na miesto kam chcete vytvoriť novú poznámku"
 
-msgid "Enter a comment for a new note"
-msgstr "Zadajte komentár k novej poznámke"
-
 msgid "Create new note"
 msgstr "Vytvoriť novú poznámku"
 
+msgid "Create note"
+msgstr "Vytvoriť poznámku"
+
+msgid "Enter a detailed comment to create a note"
+msgstr "Zadajte detailný komentár na vytvorenie poznámky"
+
+msgid "You must enter a comment to create a new note"
+msgstr "Musíte zadať komentár, aby sa mohla vytvoriť poznámka"
+
 msgid "Delete Mode"
 msgstr "Režim mazania"
 
@@ -2929,6 +2936,15 @@ msgstr "... odkazuje na relácie"
 msgid "Cycling dependencies"
 msgstr "Cyklické závislosti"
 
+msgid "Uploading modified notes"
+msgstr "Odosielajú sa zmenené poznámky"
+
+msgid "Note {0} failed: {1}"
+msgstr "Poznámka {0} zlyhala: {1}"
+
+msgid "Notes failed to upload"
+msgstr "Poznámky sa nepodarilo odoslať"
+
 msgid ""
 "The following are results of automatic validation. Try fixing these, but be "
 "careful (don''t destroy valid data). When in doubt ignore them.<br>When you "
@@ -5338,6 +5354,12 @@ msgstr "Konflikt na pozadí: ponechať všetky značky"
 msgid "Conflict foreground: keep all tags"
 msgstr "Konflikt na popredí: ponechať všetky značky"
 
+msgid "Conflict background: sum all numeric tags"
+msgstr "Konflikt v pozadí: spočítať všetky číselné značky"
+
+msgid "Conflict foreground: sum all numeric tags"
+msgstr "Konflikt v popredí: spočítať všetky číselné značky"
+
 msgid "Conflict background: keep member"
 msgstr "Konflikt na pozadí: ponechať člena"
 
@@ -5817,12 +5839,20 @@ msgstr "žiadny"
 msgid "all"
 msgstr "všetky"
 
+msgid "sum"
+msgstr "súčet"
+
 msgid "Please decide which values to keep"
 msgstr "Prosím rozhodnite ktoré hodnoty ponechať"
 
 msgid "Value ''{0}'' is going to be applied for key ''{1}''"
 msgstr "Hodnota ''{0}'' bude použitá pre kľúč ''{1}''"
 
+msgid ""
+"All numeric values sumed as ''{0}'' are going to be applied for key ''{1}''"
+msgstr ""
+"Všetky číselné hodnoty spočítané ako \"{0}\" sa použijú na kľúč \"{1}\""
+
 msgid "The key ''{0}'' and all its values are going to be removed"
 msgstr "Kľúč ''{0}'' a všetky jeho hodnoty budú odstránené"
 
@@ -6229,24 +6259,6 @@ msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
 "</p><p>Zatvorte dialóg filtra, aby sa zobrazili všetky objekty.<p></html>"
 
-msgid "Display the history of all selected items."
-msgstr "Zobraziť históriu všetkých zobrazených objektov"
-
-msgid "Object with history"
-msgstr "Objekt s históriou(priebehom)"
-
-msgid "Reload"
-msgstr "Znovu načítať"
-
-msgid "Reload all currently selected objects and refresh the list."
-msgstr "Znovu nahrať vybrané objekty a obnoviť zoznam."
-
-msgid "Show"
-msgstr "Ukázať"
-
-msgid "Display the history of the selected objects."
-msgstr "Zobraziť históriu(priebeh) vybraných objektov."
-
 msgid "Advanced object info"
 msgstr "Rozšírené info objektov"
 
@@ -6609,6 +6621,9 @@ msgstr "Pridať komentár"
 msgid "Comment"
 msgstr "Poznámka"
 
+msgid "Comment on note"
+msgstr "Komentovať poznámku"
+
 msgid "Add comment to note:"
 msgstr "Pridať k poznámke komentár:"
 
@@ -6618,9 +6633,6 @@ msgstr "Uzavrieť poznámku"
 msgid "Close note with message:"
 msgstr "Uzavrieť poznámku so správou:"
 
-msgid "Close Note"
-msgstr "Uzavrieť poznámku"
-
 msgid "Create a new note"
 msgstr "Vytvoriť novú poznámku"
 
@@ -6698,6 +6710,9 @@ msgstr "Súčasný výber"
 msgid "Search for objects"
 msgstr "Vyhľadávanie pre objekty"
 
+msgid "Display the history of the selected objects."
+msgstr "Zobraziť históriu(priebeh) vybraných objektov."
+
 msgid "Zoom to selection"
 msgstr "Priblížiť na výber"
 
@@ -6824,6 +6839,9 @@ msgstr "Opravuje sa ({0}/{1}): ''{2}''"
 msgid "Updating map ..."
 msgstr "Aktualizujem mapu ..."
 
+msgid "anonymous"
+msgstr "anonymný"
+
 msgid "Display the basic properties of the changeset"
 msgstr "Zobraziť základné vlastnosti zmenového súboru"
 
@@ -6838,6 +6856,12 @@ msgstr ""
 "Zobrazené objekty boli vytvorené, aktualizované a vymazané podľa zmenového "
 "súboru"
 
+msgid "Discussion"
+msgstr "Diskusia"
+
+msgid "Display the public discussion around this changeset"
+msgstr "Zobraziť verejnú diskusiu k tejto sade zmien"
+
 msgid "Changeset Management Dialog"
 msgstr "Panel riadenia zmenových súborov"
 
@@ -6900,14 +6924,11 @@ msgctxt "changeset.state"
 msgid "Closed"
 msgstr "Zatvorený"
 
-msgid "anonymous"
-msgstr "anonymný"
-
 msgid "ID"
 msgstr "ID"
 
 msgid "Open"
-msgstr "Otvoriť"
+msgstr "Otvorený"
 
 msgid "User"
 msgstr "Používateľ"
@@ -6918,6 +6939,9 @@ msgstr "Vytvorený v"
 msgid "Closed at"
 msgstr "Zatvorený v"
 
+msgid "Discussions"
+msgstr "Diskusie"
+
 msgid "Downloading changeset content"
 msgstr "Sťahovanie obsahu zmenového súboru"
 
@@ -7044,6 +7068,15 @@ msgstr ""
 "Priblížiť na objekty v obsahu tohto zmenového súboru v súčasnej dátovej "
 "vrstve"
 
+msgid "Update changeset discussion"
+msgstr "Aktualizovať diskusiu k sade zmien"
+
+msgid "Update the changeset discussion from the OSM server"
+msgstr "Aktualizovať diskusiu k sade zmien zo servera OSM"
+
+msgid "Date"
+msgstr "Dátum"
+
 msgid "Download changesets"
 msgstr "Stiahnuť súbory zmien"
 
@@ -7512,8 +7545,8 @@ msgstr "Vyberte prosím hodnotu"
 msgid "Set number of recently added tags"
 msgstr "Nastavte počet novo pridaných značiek"
 
-msgid "Remember last used tags"
-msgstr "Zapamätať naposledy použité značky"
+msgid "Remember last used tags after a restart"
+msgstr "Zapamätať naposledy používané značky aj po reštarte"
 
 msgid "Please enter the number of recently added tags to display"
 msgstr "Zadajte prosím počet nedávno pridaných značiek pre zobrazenie"
@@ -7893,6 +7926,9 @@ msgstr "zahrnúť priame deti rodičovských (nadradených) relácií"
 msgid "Load parent relations"
 msgstr "Načítať rodičovské (nadradené) relácie"
 
+msgid "Reload"
+msgstr "Znovu načítať"
+
 msgid "Loading parent relations"
 msgstr "Nahrávam nadradenú reláciu"
 
@@ -8022,6 +8058,12 @@ msgstr "Nekomprimované (Raw) GPS dáta"
 msgid "Select to download GPS traces in the selected download area."
 msgstr "Výber pre stiahnutie GPS stôp(traces) vo vybratej sťahovanej oblasti"
 
+msgid "Notes"
+msgstr "Bankovky"
+
+msgid "Select to download notes in the selected download area."
+msgstr "Zvoľte pre stiahnutie poznámok vo vybranej oblasti na stiahnutie."
+
 msgid "Download as new layer"
 msgstr "Načítať na novú vrstvu"
 
@@ -8134,13 +8176,13 @@ msgid "Querying name server ..."
 msgstr "Pýtam sa na meno servera ..."
 
 msgid "Error occured with query ''{0}'': ''{1}''"
-msgstr ""
+msgstr "Chyba nastala pri požiadavke \"{0}\": \"{1}\""
 
 msgid "Name server returned invalid data. Please try again."
-msgstr ""
+msgstr "Name server vrátil chybné údaje. Prosím skúste znovu."
 
 msgid "Bad response"
-msgstr ""
+msgstr "Chybná odpoveď"
 
 msgid "Type"
 msgstr "Typ"
@@ -8365,9 +8407,6 @@ msgstr "A"
 msgid "B"
 msgstr "B"
 
-msgid "Date"
-msgstr "Dátum"
-
 msgid ""
 "Failed to update primitive with id {0} because current edit layer is null"
 msgstr ""
@@ -9390,9 +9429,6 @@ msgstr ""
 msgid "Save Layer"
 msgstr "Uložiť vrstvu"
 
-msgid "Notes"
-msgstr "Bankovky"
-
 msgid "Notes layer"
 msgstr "Vrstva poznámok"
 
@@ -9408,9 +9444,6 @@ msgstr "Údajová vrstva {0}"
 msgid "outside downloaded area"
 msgstr "mimo ukladanej oblasti"
 
-msgid "version {0}"
-msgstr "verzia {0}"
-
 msgid "Merging layers"
 msgstr "Zlučujú sa vrstvy"
 
@@ -13456,6 +13489,15 @@ msgstr ""
 "Očakával sa otvorený zmenový súbor. Obdržaný bol však uzavretý zmenový súbor "
 "s ID {0}."
 
+msgid "Note upload failed"
+msgstr "Odoslanie poznámky zlyhalo"
+
+msgid "Error parsing note response from server"
+msgstr "Chyba pri čítaní reakcie servera na poznámku"
+
+msgid "Error encoding string: {0}"
+msgstr "Chyba pri kódovaní reťazca: {0}"
+
 msgid "(Code={0})"
 msgstr "(Kód={0})"
 
@@ -13511,6 +13553,10 @@ msgstr ""
 msgid "Parsing changeset content ..."
 msgstr "Rozkladanie obsahu zmenového súboru ..."
 
+msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
+msgstr ""
+"Chybná logická hodnota pre vlastnosť \"{0}\". Obdržaná hodnota je \"{1}\"."
+
 msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
 msgstr "Neplatná hodnota pre vlastnosť \"{0}\". Obdržaná hodnota je \"{1}\"."
 
@@ -13518,10 +13564,6 @@ msgid "Illegal numeric value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 "Chybná číselná hodnota atribútu \"{0}\". Obdržaná hodnota je \"{1}\"."
 
-msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
-msgstr ""
-"Chybná logická hodnota pre vlastnosť \"{0}\". Obdržaná hodnota je \"{1}\"."
-
 msgid "Missing mandatory attribute ''{0}'' of XML element {1}."
 msgstr "Chýbajúca povinná vlastnosť ''{0}'' z XML prvku {1}."
 
@@ -13924,10 +13966,10 @@ msgid "The minima must be less than the maxima"
 msgstr "Minimá musia byť menšie ako maximá"
 
 msgid "Remote Control has been asked to load the following data:"
-msgstr ""
+msgstr "Diaľkové ovládanie bolo požiadané o načítanie nasledovných dát:"
 
 msgid "Loading data"
-msgstr ""
+msgstr "Načítavajú sa dáta"
 
 msgid ""
 "Remote Control has been asked to load objects (specified by their id) from "
@@ -14412,9 +14454,6 @@ msgid "Failed to scan file ''{0}'' for plugin information. Skipping."
 msgstr ""
 "V súbore \"{0}\" sa nepodarilo nájsť informácie o pluginoch. Vynechávam."
 
-msgid "Processing plugin site cache icon files..."
-msgstr "Spracovávam cache súbory ikon stránok pluginov..."
-
 msgid "Processing plugin files..."
 msgstr "Spracovávam súbory pluginov ..."
 
@@ -14433,12 +14472,6 @@ msgstr "JOSM nemohol stiahnuť zoznam pluginov:"
 msgid "Details:"
 msgstr "Detaily:"
 
-msgid "Plugin icons download error"
-msgstr "Chyba pri sťahovaní ikon pluginov"
-
-msgid "JOSM failed to download plugin icons:"
-msgstr "JOSM nemohol stiahnuť ikony pluginov:"
-
 msgid ""
 "Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
 "plugin site ''{1}''."
@@ -14450,7 +14483,7 @@ msgid "Writing plugin list to local cache ''{0}''"
 msgstr "Zapisujem zoznam pluginov do miestnej cache \"{0}\""
 
 msgid "Parsing plugin list from site ''{0}''"
-msgstr "Analyzovanie zoznamu pluginu z webu \"{0}\""
+msgstr "Analyzovanie zoznamu pluginov z umiestnenia \"{0}\""
 
 msgid ""
 "Failed to parse plugin list document from site ''{0}''. Skipping site. "
@@ -14460,7 +14493,7 @@ msgstr ""
 "Vynechávam. Výnimka bola: {1}"
 
 msgid "Processing plugin list from site ''{0}''"
-msgstr "Spracovanie zoznamu pluginu z umiestnenia \"{0}\""
+msgstr "Spracovanie zoznamu pluginov z umiestnenia \"{0}\""
 
 msgid "This is after the end of the recording"
 msgstr "Toto je až za koncom nahrávky"
@@ -15559,8 +15592,12 @@ msgid ""
 "Creating and handling address nodes and buildings within Czech Republic."
 msgstr "Vytvorenie a správa adresných bodov a budov vrámci Českej Republiky."
 
-msgid "Allows to import various file formats into JOSM directly."
-msgstr "Dovoľuje import rôznych formátov súborov priamo do JOSMu."
+msgid ""
+"Allows to import various file formats into JOSM directly. Currently "
+"supported: TangoGPS, Garmin Trainings Center TCX."
+msgstr ""
+"Umožňuje priamo naimportovať do JOSM rôzne formáty súborov. V súčasnosti sú "
+"podporované: TangoGPS, Garmin Trainings Center TCX."
 
 msgid "Download your GPX tracks from openstreetmap.org"
 msgstr "Stiahnite si GPX stopy z openstreetmap.org"
@@ -15673,6 +15710,13 @@ msgid "A helper for IRS satellite adjustment."
 msgstr "Pomocník pre IRS nastavenie satelitu."
 
 msgid ""
+"Provides Java Native Access (JNA) library. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+"Poskytuje knižnicu Java Native Access (JNA). Nie je určený na priamu "
+"inštaláciu, ale ako závislosť pre iné pluginy."
+
+msgid ""
 "Provides Java Topology Suite (JTS) library and related utilities. Not meant "
 "to be installed directly by users, but rather as a dependency for other "
 "plugins."
@@ -15911,7 +15955,7 @@ msgid "Plugin to digital sign OSM-Data"
 msgstr "Plugin na digitálne podpísanie OSM dát"
 
 msgid "${plugin.description}"
-msgstr ""
+msgstr "${plugin.description}"
 
 msgid ""
 "Provides a straightforward GUI for adding, editing and deleting turn lanes."
@@ -15993,10 +16037,10 @@ msgid "cobblestone"
 msgstr "okrúhle dlažobné kamene (cobblestone)"
 
 msgid "gravel"
-msgstr "štrk (gravel)"
+msgstr "ostrý štrk (gravel)"
 
 msgid "pebblestone"
-msgstr "riečne kamene (pebblestone)"
+msgstr "oblý štrk (pebblestone)"
 
 msgid "compacted"
 msgstr "zhutnený (valcovaný)"
@@ -16039,7 +16083,7 @@ msgid "dirt"
 msgstr "blato"
 
 msgid "fine_gravel"
-msgstr "jemný štrk"
+msgstr "jemné kamienky (fine_gravel)"
 
 msgid "mud"
 msgstr "blato (mud)"
@@ -16086,6 +16130,25 @@ msgstr "Pouličné osvetlenie"
 msgid "Width (meters)"
 msgstr "Šírka (v metroch)"
 
+msgid "Sidewalk"
+msgstr "Postranný chodník"
+
+msgctxt "sidewalk"
+msgid "both"
+msgstr "po oboch stranách"
+
+msgctxt "sidewalk"
+msgid "left"
+msgstr "po ľavej strane"
+
+msgctxt "sidewalk"
+msgid "right"
+msgstr "po pravej strane"
+
+msgctxt "sidewalk"
+msgid "no"
+msgstr "žiadny"
+
 msgid "Service type"
 msgstr "Využitie"
 
@@ -16114,7 +16177,7 @@ msgid "rail"
 msgstr "koľajnica (rail)"
 
 msgid "Voltage in Volts (V)"
-msgstr "Napätie v Voltoch (V)"
+msgstr "Napätie vo Voltoch (V)"
 
 msgid "Frequency in Hertz (Hz)"
 msgstr "Kmitočet v Hertzoch (Hz)"
@@ -16451,25 +16514,29 @@ msgid "Fee"
 msgstr "Poplatok"
 
 msgid "06:00-20:00"
-msgstr ""
+msgstr "06:00-20:00"
 
 msgid "Mo-Fr 09:00-18:00,Sa 08:00-14:00"
-msgstr ""
+msgstr "Po-Pi 09:00-18:00,So 08:00-14:00"
 
 msgid "May-Sep 09:30-12:30,14:15-19:30"
-msgstr ""
+msgstr "Máj-Sep 09:30-12:30,14:15-19:30"
 
+msgctxt "parking"
 msgid "multi-storey"
-msgstr "viacposchodové"
+msgstr "poschodové"
 
+msgctxt "parking"
 msgid "surface"
 msgstr "povrchové"
 
+msgctxt "parking"
 msgid "underground"
 msgstr "podzemné"
 
+msgctxt "parking"
 msgid "rooftop"
-msgstr "zastrešené"
+msgstr "na streche"
 
 msgid "Reference number"
 msgstr "Referenčné číslo"
@@ -16925,14 +16992,25 @@ msgstr "Max. dĺžka (m)"
 msgid "Overtaking"
 msgstr "Predbiehanie"
 
+msgctxt "overtaking"
+msgid "yes"
+msgstr "povolené"
+
+msgctxt "overtaking"
 msgid "both"
-msgstr "obidva"
+msgstr "v oboch smeroch"
 
+msgctxt "overtaking"
 msgid "forward"
-msgstr "dopredu"
+msgstr "v smere cesty"
 
+msgctxt "overtaking"
 msgid "backward"
-msgstr "dozadu"
+msgstr "v opačnom smere"
+
+msgctxt "overtaking"
+msgid "no"
+msgstr "nepovolené"
 
 msgid "Roundabout"
 msgstr "Kruhový objazd"
@@ -17241,6 +17319,12 @@ msgstr ""
 msgid "tiger"
 msgstr "tiger (priechod pre chodcov a cyklistov žlté pruhy)"
 
+msgid "Button operated"
+msgstr "Dopytové tlačidlo"
+
+msgid "Sound signals"
+msgstr "Zvukový signál"
+
 msgid "Crossing attendant"
 msgstr "Priechod cez cestu s obsluhou"
 
@@ -17767,9 +17851,6 @@ msgstr "Železničné priecestie (pre autá)"
 msgid "Traffic lights"
 msgstr "Semafor"
 
-msgid "Sound signals"
-msgstr "Zvukový signál"
-
 msgid "Barrier"
 msgstr "Zábrana"
 
@@ -18080,7 +18161,7 @@ msgid "Rental"
 msgstr "Požičovňa"
 
 msgid "Second hand"
-msgstr "použitý tovar (second hand)"
+msgstr "Použitý tovar (second hand)"
 
 msgid "only"
 msgstr "výhradne"
@@ -19319,7 +19400,7 @@ msgstr "Požiarny hydrant"
 
 msgctxt "pipeline"
 msgid "underground"
-msgstr "podzemný"
+msgstr "pod zemou"
 
 msgctxt "pipeline"
 msgid "pillar"
@@ -19472,7 +19553,7 @@ msgid "water_park"
 msgstr "aquapark"
 
 msgid "Scuba Diving"
-msgstr ""
+msgstr "Potápanie"
 
 msgid "Piste type"
 msgstr "Typ lyžiarskej dráhy"
@@ -19829,6 +19910,9 @@ msgstr "Veterný mlyn"
 msgid "Gasometer"
 msgstr "Plynojem (gasometer)"
 
+msgid "Bunker Silo"
+msgstr "Silážna jama"
+
 msgid "Pipeline"
 msgstr "Potrubie"
 
@@ -19975,15 +20059,15 @@ msgstr "Meracia stanica"
 msgid "Monitoring:"
 msgstr "Meraná veličina:"
 
-msgid "Weather"
-msgstr "Počasie"
-
 msgid "Water level"
 msgstr "Vodná hladina"
 
 msgid "Tide Level"
 msgstr "Výška prílivu"
 
+msgid "Groundwater"
+msgstr ""
+
 msgid "Traffic"
 msgstr "Premávka"
 
@@ -20002,6 +20086,9 @@ msgstr "GLONASS signál"
 msgid "Galileo Signals"
 msgstr "Galileo signál"
 
+msgid "Weather"
+msgstr "Počasie"
+
 msgid "Radiation"
 msgstr "Rádioaktivita"
 
@@ -20182,6 +20269,9 @@ msgstr ""
 msgid "pivot_pier"
 msgstr ""
 
+msgid "Bridge outline"
+msgstr "Obrys mostu"
+
 msgid "Power Plant"
 msgstr "Elektráreň"
 
@@ -20789,6 +20879,15 @@ msgstr ""
 msgid "Pole"
 msgstr "Elektrický stĺp"
 
+msgid "Pole with Transformer"
+msgstr ""
+
+msgid "Pole Attributes:"
+msgstr ""
+
+msgid "Transformer Attributes:"
+msgstr ""
+
 msgid "Power Line"
 msgstr "Elektrické vedenie"
 
@@ -20838,9 +20937,15 @@ msgstr "Používané na prenos dát"
 msgid "Power Cable"
 msgstr "Elektrický kábel"
 
+msgctxt "power cable"
+msgid "underground"
+msgstr ""
+
+msgctxt "power cable"
 msgid "underwater"
 msgstr "pod hladinou"
 
+msgctxt "power cable"
 msgid "overground"
 msgstr "nad zemou"
 
@@ -20868,6 +20973,33 @@ msgstr "Veľký pamätník/monument"
 msgid "Memorial"
 msgstr "Pomník"
 
+msgctxt "memorial"
+msgid "statue"
+msgstr "socha"
+
+msgctxt "memorial"
+msgid "bust"
+msgstr "busta"
+
+msgctxt "memorial"
+msgid "plaque"
+msgstr "pamätná doska"
+
+msgctxt "memorial"
+msgid "stele"
+msgstr "stéla"
+
+msgctxt "memorial"
+msgid "stone"
+msgstr "kameň"
+
+msgctxt "memorial"
+msgid "war_memorial"
+msgstr "vojnový pamätník"
+
+msgid "Inscription"
+msgstr "Nápis"
+
 msgid "Wayside Cross"
 msgstr "Kríž pri ceste"
 
@@ -20937,6 +21069,9 @@ msgstr "Alkohol"
 msgid "Beverages"
 msgstr "Nápoje"
 
+msgid "Wine"
+msgstr "Vinotéka"
+
 msgid "Boutique"
 msgstr "Butik"
 
@@ -20982,6 +21117,9 @@ msgstr "Video"
 msgid "Video Games"
 msgstr "Videohry"
 
+msgid "Music"
+msgstr "Hudba"
+
 msgid "Cash"
 msgstr "Hotovosť"
 
@@ -21009,6 +21147,9 @@ msgstr "Kuchynské štúdio"
 msgid "Curtain"
 msgstr "Záclony"
 
+msgid "Art"
+msgstr "Umelecké diela"
+
 msgid "Frame"
 msgstr "Rámy"
 
@@ -21019,7 +21160,7 @@ msgid "Interior Decoration"
 msgstr "Bytové dekorácie"
 
 msgid "Antiques"
-msgstr ""
+msgstr "Starožitnosti"
 
 msgid "Printed Material"
 msgstr "Tlačoviny"
@@ -21054,6 +21195,9 @@ msgstr "Kaderníctvo/Holičstvo"
 msgid "Beauty"
 msgstr "Salón krásy"
 
+msgid "Tattoo"
+msgstr "Tetovanie"
+
 msgid "Optician"
 msgstr "Očná optika"
 
@@ -21105,6 +21249,9 @@ msgstr "Tašky"
 msgid "Pet"
 msgstr "Domáce zvieratá"
 
+msgid "Funeral Directors"
+msgstr "Pohrebná služba"
+
 msgid "Vending Machine"
 msgstr "Predajný automat"
 
@@ -21204,6 +21351,15 @@ msgstr "Poštové smerovacie číslo"
 msgid "National Park"
 msgstr "Národný park"
 
+msgid "Protected Area"
+msgstr "Chránené územie"
+
+msgid "Protected Class"
+msgstr "Stupeň ochrany"
+
+msgid "Title or type of protection"
+msgstr "Názov alebo typ ochrany"
+
 msgid "Places"
 msgstr "Miesta"
 
@@ -22290,8 +22446,14 @@ msgstr "Estonia Basemap (Maaamet)"
 msgid "Estonia Ortho (Maaamet)"
 msgstr "Estonia Ortho (Maaamet)"
 
-msgid "Estonia Multi (Maaamet)"
-msgstr "Estonia Multi (Maaamet)"
+msgid "Estonia Hillshade (Maaamet)"
+msgstr ""
+
+msgid "Estonia Cadastre (Maaamet)"
+msgstr ""
+
+msgid "Estonia Forestry (Maaamet)"
+msgstr ""
 
 msgid "Bordeaux - 2012"
 msgstr "Bordeaux - 2012"
@@ -22314,8 +22476,8 @@ msgstr "CRAIG - Le Puy 2010 - 15 cm"
 msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
 msgstr "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
 
-msgid "CUGN Nancy - Orthophoto 2012"
-msgstr ""
+msgid "GrandNancy Orthophotographie 2012"
+msgstr "GrandNancy Ortofotografia 2012"
 
 msgid "Géobretagne - Brest 2010 - 10 cm"
 msgstr "Géobretagne - Brest 2010 - 10 cm"
@@ -22363,9 +22525,6 @@ msgstr ""
 "Vercors - Réserve naturelle des Hauts-Plateaux du Vercors - Ortofoto 1999 - "
 "1 m"
 
-msgid "Streets NRW Geofabrik.de"
-msgstr "Ulice NRW Geofabrik.de"
-
 msgid "Hike & Bike"
 msgstr "Turistika & Cyklistika"
 
@@ -22427,11 +22586,14 @@ msgstr "NRW-Atlas: Letecké snímky"
 msgid "NRW-Atlas: Topographische Karte 1:10000"
 msgstr "NRW-Atlas: Topografická mapa 1:10000"
 
+msgid "Metropole Ruhr: Luftbilder (10 cm)"
+msgstr ""
+
 msgid "Drone Imagery (Haiti)"
 msgstr "Snímky automatických lietadiel (Haiti)"
 
 msgid "Drone Imagery 2014 (Haiti)"
-msgstr ""
+msgstr "Fotografie z bezpilotných lietadiel 2014 (Haiti)"
 
 msgid "Ireland British War Office 1:25k GSGS 3906"
 msgstr "Ireland British War Office 1:25k GSGS 3906"
@@ -22479,16 +22641,16 @@ msgid "ORT10LT (Lithuania)"
 msgstr "ORT10LT (Litva)"
 
 msgid "Luxembourg Inspire Ortho 2010"
-msgstr ""
+msgstr "Luxembourg Inspire Orto 2010"
 
 msgid "Luxembourg Inspire Ortho 2013"
-msgstr ""
+msgstr "Luxembourg Inspire Orto 2013"
 
 msgid "Luxembourg Inspire Railway"
-msgstr ""
+msgstr "Luxembourg Inspire Železnice"
 
 msgid "Luxembourg Inspire Roads"
-msgstr ""
+msgstr "Luxembourg Inspire Cesty"
 
 msgid "Niger Delta Oct 2012 Landsat"
 msgstr "Delta Nigeru Okt 2012 Landsat"
@@ -22628,6 +22790,9 @@ msgstr "Mestský mapa Zürich"
 msgid "Stadt Zürich Übersichtsplan (Strassen, Gebäude, Hausnummer)"
 msgstr "Mesto Zürich prehľadová mapa (Ulice, Budovy, Čísla domov)"
 
+msgid "Stadt Zürich Luftbild 2011"
+msgstr "Letecká snímka mesta Zürich 2011"
+
 msgid "Orthofoto Kanton Solothurn RGB (SOGIS 2011/2012/2013)"
 msgstr "Ortofoto Kanton Solothurn RGB (SOGIS 2011/2012/2013)"
 
@@ -22646,8 +22811,8 @@ msgstr "Canton du Jura 50cm (RCJU 1998)"
 msgid "Canton de Fribourg 50cm (2005)"
 msgstr "Canton de Fribourg 50cm (2005)"
 
-msgid "Stadt Bern 10cm/25cm (2008)"
-msgstr "Mesto Bern 10cm/25cm (2008)"
+msgid "Stadt Bern 10cm/25cm (2012)"
+msgstr "Mesto Bern 10cm/25cm (2012)"
 
 msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
 msgstr "HEIG-VD / Ortofoto Yverdon-les-Bains 25cm (2007)"
@@ -22685,8 +22850,8 @@ msgstr "USGS Veľké letecké snímky"
 msgid "OSM US TIGER 2012 Roads Overlay"
 msgstr "OSM US TIGER 2012 Cesty"
 
-msgid "New & Misaligned TIGER Roads (TIGER 2013)"
-msgstr "Nové a zle umiestnené TIGER cesty (TIGER 2013)"
+msgid "New & Misaligned TIGER Roads (TIGER 2014)"
+msgstr ""
 
 msgid "MassGIS L3 Parcels"
 msgstr "MassGIS L3 Parcely"
@@ -22733,9 +22898,234 @@ msgstr "OS Scottish Popular historická"
 msgid "NLS - Bartholomew Half Inch, 1897-1907"
 msgstr "NLS - Bartholomew Half Inch, 1897-1907"
 
+msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Annan 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgstr ""
+
 msgid "OS Town Plans, Cupar 1854 (NLS)"
 msgstr "OS Plány miest, Cupar 1854 (NLS)"
 
+msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Elgin 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Forres 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Galashiels 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Girvan 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Greenock 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Haddington 1853 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Haddington 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Hamilton 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Irvine 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Jedburgh 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kelso 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Lanark 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Linlithgow 1856 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Musselburgh 1853 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Musselburgh 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Oban 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Peebles 1856 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Perth 1860 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Peterhead 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Selkirk 1865 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, St Andrews 1854 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, St Andrews 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stirling 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stonehaven 1864 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1847 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Strathaven 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wick 1872 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wigtown 1848 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wigtown 1894 (NLS)"
+msgstr ""
+
 msgid "Decreasing house numbers in addresses interpolation"
 msgstr "Klesajúce čísla domov v interpolácii adries"
 
@@ -22791,19 +23181,45 @@ msgid "{0}={1} is deprecated. Please use instead a multipolygon."
 msgstr "{0}={1} je zastaralé. Prosím použite multipolygón."
 
 msgid ""
-"{0} is deprecated. Please specify ìnterval by using opening_hours syntax"
+"{0} is deprecated. Please specify interval by using opening_hours syntax"
 msgstr ""
+"{0} je zastaralé. Prosím zadajte interval použitím zápisu ako pri značke "
+"\"opening_hours\" (otváracie hodiny)."
 
 msgid ""
 "{0} is deprecated. Please delete this object and use a private layer instead"
 msgstr ""
+"{0} je zastaralé. Prosím vymažte tento objekt a použite preň súkromnú vrstvu."
+
+msgid "{0}={1} is unspecific. Please replace ''{1}'' by a specific value."
+msgstr ""
+"{0}={1} je málo špecifické. Prosím nahraďte \"{1}\" špecifickou hodnotou."
+
+msgid "{0} should be replaced with {1}"
+msgstr "{0} by malo byť nahradené {1}"
+
+msgid ""
+"{0}={1} is unspecific. Please replace ''{1}'' by ''left'', ''right'' or "
+"''both''."
+msgstr ""
+"{0}={1} je nejasné. Prosím nahraďte \"{1}\" jedným z \"vľavo\", \"vpravo\" "
+"alebo \"po oboch stranách\"."
+
+msgid "{0} on a node. Should be used on a way."
+msgstr ""
+
+msgid "{0} on a node. Should be drawn as an area."
+msgstr ""
+
+msgid "{0}=* on a node. Should be used in a relation"
+msgstr "{0}=* na bode. Malo by byť použité v relácii"
+
+msgid "{0} on a way. Should be used in a relation"
+msgstr "{0} na ceste. Malo by byť použité v relácii"
 
 msgid "{0} on a node"
 msgstr "{0} na bode"
 
-msgid "{0} on a node. Should be drawn as an area"
-msgstr "{0} na bode. Malo by byť zakreslené ako oblasť"
-
 msgid "Building inside building"
 msgstr "Budova v budove"
 
@@ -23005,18 +23421,23 @@ msgid ""
 "No command has been found. Would you like to download and install default "
 "commands now?"
 msgstr ""
+"Nenašiel sa žiadny príkaz. Chcete stiahnuť a nainštalovať predvolenú sadu "
+"príkazov?"
 
 msgid "No command found"
-msgstr ""
+msgstr "Nenašiel sa žiadny príkaz."
 
 msgid "Default commands have been successfully installed"
-msgstr ""
+msgstr "Predvolená sada príkazov bola úspešne nainštalovaná"
 
 msgid ""
 "Failed to download and install default commands.\n"
 "\n"
 "Error: {0}"
 msgstr ""
+"Nepodarilo sa stiahnuť a nainštalovať predvolenú sadu príkazov.\n"
+"\n"
+"Chyba: {0}"
 
 msgid "Processing..."
 msgstr "Spracováva sa..."
@@ -23281,7 +23702,7 @@ msgid "Try copying tags from properties table"
 msgstr ""
 
 msgid "Save settings"
-msgstr ""
+msgstr "Uložiť nastavenia"
 
 msgid "Can not read settings"
 msgstr ""
@@ -27598,6 +28019,9 @@ msgstr ""
 msgid "Find"
 msgstr ""
 
+msgid "Show"
+msgstr "Ukázať"
+
 msgid "Mark"
 msgstr ""
 
diff --git a/i18n/po/sl.po b/i18n/po/sl.po
index ed8d2a3..191665c 100644
--- a/i18n/po/sl.po
+++ b/i18n/po/sl.po
@@ -1,8 +1,13 @@
+# Slovenian translation for josm
+# Copyright (c) 2007 Rosetta Contributors and Canonical Ltd 2007
+# This file is distributed under the same license as the josm package.
+# FIRST AUTHOR <EMAIL at ADDRESS>, 2007.
+# Ales <ales at softdata.si>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-21 03:38+0200\n"
+"POT-Creation-Date: 2014-12-10 03:42+0100\n"
 "PO-Revision-Date: 2013-03-30 13:06+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad at dstoecker.de>\n"
 "Language-Team: Slovenian <sl at li.org>\n"
@@ -11,8 +16,8 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || "
 "n%100==4 ? 3 : 0);\n"
-"X-Launchpad-Export-Date: 2014-10-21 05:22+0000\n"
-"X-Generator: Launchpad (build 17203)\n"
+"X-Launchpad-Export-Date: 2014-12-10 05:11+0000\n"
+"X-Generator: Launchpad (build 17283)\n"
 "Language: sl\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -169,16 +174,6 @@ msgid "About JOSM..."
 msgstr "O JOSM..."
 
 msgid ""
-"Unexpected format of API base URL. Redirection to info or history page for "
-"OSM object will probably fail. API base URL is: ''{0}''"
-msgstr ""
-
-msgid ""
-"Unexpected format of API base URL. Redirection to user page for OSM user "
-"will probably fail. API base URL is: ''{0}''"
-msgstr ""
-
-msgid ""
 "You are about to launch {0} browser window.<br>This may both clutter your "
 "screen with browser windows<br>and take some time to finish."
 msgid_plural ""
@@ -1531,6 +1526,15 @@ msgstr "Ni sprememb za pošiljanje."
 msgid "Nothing to upload. Get some data first."
 msgstr "Ni česa poslati. Najprej pridobite kakšne podatke."
 
+msgid "Upload note changes to server"
+msgstr ""
+
+msgid "Upload notes"
+msgstr ""
+
+msgid "Uploading notes to server"
+msgstr ""
+
 msgid "Upload selection"
 msgstr ""
 
@@ -1803,10 +1807,16 @@ msgstr ""
 msgid "Click the location where you wish to create a new note"
 msgstr ""
 
-msgid "Enter a comment for a new note"
+msgid "Create new note"
 msgstr ""
 
-msgid "Create new note"
+msgid "Create note"
+msgstr ""
+
+msgid "Enter a detailed comment to create a note"
+msgstr ""
+
+msgid "You must enter a comment to create a new note"
 msgstr ""
 
 msgid "Delete Mode"
@@ -2679,6 +2689,15 @@ msgstr ""
 msgid "Cycling dependencies"
 msgstr ""
 
+msgid "Uploading modified notes"
+msgstr ""
+
+msgid "Note {0} failed: {1}"
+msgstr ""
+
+msgid "Notes failed to upload"
+msgstr ""
+
 msgid ""
 "The following are results of automatic validation. Try fixing these, but be "
 "careful (don''t destroy valid data). When in doubt ignore them.<br>When you "
@@ -4924,6 +4943,12 @@ msgstr ""
 msgid "Conflict foreground: keep all tags"
 msgstr ""
 
+msgid "Conflict background: sum all numeric tags"
+msgstr ""
+
+msgid "Conflict foreground: sum all numeric tags"
+msgstr ""
+
 msgid "Conflict background: keep member"
 msgstr ""
 
@@ -5342,12 +5367,19 @@ msgstr "brez"
 msgid "all"
 msgstr ""
 
+msgid "sum"
+msgstr ""
+
 msgid "Please decide which values to keep"
 msgstr ""
 
 msgid "Value ''{0}'' is going to be applied for key ''{1}''"
 msgstr ""
 
+msgid ""
+"All numeric values sumed as ''{0}'' are going to be applied for key ''{1}''"
+msgstr ""
+
 msgid "The key ''{0}'' and all its values are going to be removed"
 msgstr ""
 
@@ -5710,24 +5742,6 @@ msgstr[1] ""
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
 
-msgid "Display the history of all selected items."
-msgstr "Prikaži zgodovino izbranih predmetov."
-
-msgid "Object with history"
-msgstr ""
-
-msgid "Reload"
-msgstr "Ponovno naloži"
-
-msgid "Reload all currently selected objects and refresh the list."
-msgstr ""
-
-msgid "Show"
-msgstr ""
-
-msgid "Display the history of the selected objects."
-msgstr ""
-
 msgid "Advanced object info"
 msgstr ""
 
@@ -6065,6 +6079,9 @@ msgstr ""
 msgid "Comment"
 msgstr ""
 
+msgid "Comment on note"
+msgstr ""
+
 msgid "Add comment to note:"
 msgstr ""
 
@@ -6074,9 +6091,6 @@ msgstr ""
 msgid "Close note with message:"
 msgstr ""
 
-msgid "Close Note"
-msgstr ""
-
 msgid "Create a new note"
 msgstr ""
 
@@ -6149,6 +6163,9 @@ msgstr "Trenutni izbor"
 msgid "Search for objects"
 msgstr ""
 
+msgid "Display the history of the selected objects."
+msgstr ""
+
 msgid "Zoom to selection"
 msgstr "Povečava na ves izbor"
 
@@ -6268,6 +6285,9 @@ msgstr ""
 msgid "Updating map ..."
 msgstr ""
 
+msgid "anonymous"
+msgstr ""
+
 msgid "Display the basic properties of the changeset"
 msgstr ""
 
@@ -6280,6 +6300,12 @@ msgstr ""
 msgid "Display the objects created, updated, and deleted by the changeset"
 msgstr ""
 
+msgid "Discussion"
+msgstr ""
+
+msgid "Display the public discussion around this changeset"
+msgstr ""
+
 msgid "Changeset Management Dialog"
 msgstr ""
 
@@ -6337,9 +6363,6 @@ msgctxt "changeset.state"
 msgid "Closed"
 msgstr ""
 
-msgid "anonymous"
-msgstr ""
-
 msgid "ID"
 msgstr ""
 
@@ -6355,6 +6378,9 @@ msgstr ""
 msgid "Closed at"
 msgstr ""
 
+msgid "Discussions"
+msgstr ""
+
 msgid "Downloading changeset content"
 msgstr ""
 
@@ -6466,6 +6492,15 @@ msgid ""
 "layer"
 msgstr ""
 
+msgid "Update changeset discussion"
+msgstr ""
+
+msgid "Update the changeset discussion from the OSM server"
+msgstr ""
+
+msgid "Date"
+msgstr ""
+
 msgid "Download changesets"
 msgstr ""
 
@@ -6887,7 +6922,7 @@ msgstr "Izberite vrednost"
 msgid "Set number of recently added tags"
 msgstr ""
 
-msgid "Remember last used tags"
+msgid "Remember last used tags after a restart"
 msgstr ""
 
 msgid "Please enter the number of recently added tags to display"
@@ -7233,6 +7268,9 @@ msgstr ""
 msgid "Load parent relations"
 msgstr ""
 
+msgid "Reload"
+msgstr "Ponovno naloži"
+
 msgid "Loading parent relations"
 msgstr ""
 
@@ -7356,6 +7394,12 @@ msgstr "Surovi podstki GPS"
 msgid "Select to download GPS traces in the selected download area."
 msgstr ""
 
+msgid "Notes"
+msgstr "Bankovci"
+
+msgid "Select to download notes in the selected download area."
+msgstr ""
+
 msgid "Download as new layer"
 msgstr "Prenesi v novo plast"
 
@@ -7664,9 +7708,6 @@ msgstr ""
 msgid "B"
 msgstr ""
 
-msgid "Date"
-msgstr ""
-
 msgid ""
 "Failed to update primitive with id {0} because current edit layer is null"
 msgstr ""
@@ -8529,9 +8570,6 @@ msgstr ""
 msgid "Save Layer"
 msgstr ""
 
-msgid "Notes"
-msgstr "Bankovci"
-
 msgid "Notes layer"
 msgstr ""
 
@@ -8547,9 +8585,6 @@ msgstr ""
 msgid "outside downloaded area"
 msgstr "izven sprejetega področja"
 
-msgid "version {0}"
-msgstr ""
-
 msgid "Merging layers"
 msgstr ""
 
@@ -12189,6 +12224,15 @@ msgstr ""
 msgid "Open changeset expected. Got closed changeset with id {0}."
 msgstr ""
 
+msgid "Note upload failed"
+msgstr ""
+
+msgid "Error parsing note response from server"
+msgstr ""
+
+msgid "Error encoding string: {0}"
+msgstr ""
+
 msgid "(Code={0})"
 msgstr ""
 
@@ -12237,13 +12281,13 @@ msgstr ""
 msgid "Parsing changeset content ..."
 msgstr ""
 
-msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
-msgid "Illegal numeric value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
-msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal numeric value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
 msgid "Missing mandatory attribute ''{0}'' of XML element {1}."
@@ -13041,9 +13085,6 @@ msgstr ""
 msgid "Failed to scan file ''{0}'' for plugin information. Skipping."
 msgstr ""
 
-msgid "Processing plugin site cache icon files..."
-msgstr ""
-
 msgid "Processing plugin files..."
 msgstr ""
 
@@ -13062,12 +13103,6 @@ msgstr ""
 msgid "Details:"
 msgstr ""
 
-msgid "Plugin icons download error"
-msgstr ""
-
-msgid "JOSM failed to download plugin icons:"
-msgstr ""
-
 msgid ""
 "Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
 "plugin site ''{1}''."
@@ -13953,7 +13988,9 @@ msgid ""
 "Creating and handling address nodes and buildings within Czech Republic."
 msgstr ""
 
-msgid "Allows to import various file formats into JOSM directly."
+msgid ""
+"Allows to import various file formats into JOSM directly. Currently "
+"supported: TangoGPS, Garmin Trainings Center TCX."
 msgstr ""
 
 msgid "Download your GPX tracks from openstreetmap.org"
@@ -14050,6 +14087,11 @@ msgid "A helper for IRS satellite adjustment."
 msgstr ""
 
 msgid ""
+"Provides Java Native Access (JNA) library. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
+msgid ""
 "Provides Java Topology Suite (JTS) library and related utilities. Not meant "
 "to be installed directly by users, but rather as a dependency for other "
 "plugins."
@@ -14405,6 +14447,25 @@ msgstr ""
 msgid "Width (meters)"
 msgstr ""
 
+msgid "Sidewalk"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "both"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "left"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "right"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "no"
+msgstr ""
+
 msgid "Service type"
 msgstr ""
 
@@ -14769,15 +14830,19 @@ msgstr ""
 msgid "May-Sep 09:30-12:30,14:15-19:30"
 msgstr ""
 
+msgctxt "parking"
 msgid "multi-storey"
 msgstr ""
 
+msgctxt "parking"
 msgid "surface"
 msgstr ""
 
+msgctxt "parking"
 msgid "underground"
 msgstr ""
 
+msgctxt "parking"
 msgid "rooftop"
 msgstr ""
 
@@ -15235,15 +15300,26 @@ msgstr ""
 msgid "Overtaking"
 msgstr ""
 
+msgctxt "overtaking"
+msgid "yes"
+msgstr ""
+
+msgctxt "overtaking"
 msgid "both"
 msgstr ""
 
+msgctxt "overtaking"
 msgid "forward"
 msgstr ""
 
+msgctxt "overtaking"
 msgid "backward"
 msgstr ""
 
+msgctxt "overtaking"
+msgid "no"
+msgstr ""
+
 msgid "Roundabout"
 msgstr "Krožišče"
 
@@ -15537,6 +15613,12 @@ msgstr ""
 msgid "tiger"
 msgstr ""
 
+msgid "Button operated"
+msgstr ""
+
+msgid "Sound signals"
+msgstr ""
+
 msgid "Crossing attendant"
 msgstr ""
 
@@ -16058,9 +16140,6 @@ msgstr ""
 msgid "Traffic lights"
 msgstr ""
 
-msgid "Sound signals"
-msgstr ""
-
 msgid "Barrier"
 msgstr ""
 
@@ -18120,6 +18199,9 @@ msgstr "Mlin na veter"
 msgid "Gasometer"
 msgstr ""
 
+msgid "Bunker Silo"
+msgstr ""
+
 msgid "Pipeline"
 msgstr "Cevovod"
 
@@ -18266,15 +18348,15 @@ msgstr ""
 msgid "Monitoring:"
 msgstr ""
 
-msgid "Weather"
-msgstr ""
-
 msgid "Water level"
 msgstr ""
 
 msgid "Tide Level"
 msgstr ""
 
+msgid "Groundwater"
+msgstr ""
+
 msgid "Traffic"
 msgstr ""
 
@@ -18293,6 +18375,9 @@ msgstr ""
 msgid "Galileo Signals"
 msgstr ""
 
+msgid "Weather"
+msgstr ""
+
 msgid "Radiation"
 msgstr ""
 
@@ -18473,6 +18558,9 @@ msgstr ""
 msgid "pivot_pier"
 msgstr ""
 
+msgid "Bridge outline"
+msgstr ""
+
 msgid "Power Plant"
 msgstr ""
 
@@ -19080,6 +19168,15 @@ msgstr ""
 msgid "Pole"
 msgstr ""
 
+msgid "Pole with Transformer"
+msgstr ""
+
+msgid "Pole Attributes:"
+msgstr ""
+
+msgid "Transformer Attributes:"
+msgstr ""
+
 msgid "Power Line"
 msgstr ""
 
@@ -19129,9 +19226,15 @@ msgstr ""
 msgid "Power Cable"
 msgstr ""
 
+msgctxt "power cable"
+msgid "underground"
+msgstr ""
+
+msgctxt "power cable"
 msgid "underwater"
 msgstr ""
 
+msgctxt "power cable"
 msgid "overground"
 msgstr ""
 
@@ -19159,6 +19262,33 @@ msgstr ""
 msgid "Memorial"
 msgstr ""
 
+msgctxt "memorial"
+msgid "statue"
+msgstr ""
+
+msgctxt "memorial"
+msgid "bust"
+msgstr ""
+
+msgctxt "memorial"
+msgid "plaque"
+msgstr ""
+
+msgctxt "memorial"
+msgid "stele"
+msgstr ""
+
+msgctxt "memorial"
+msgid "stone"
+msgstr ""
+
+msgctxt "memorial"
+msgid "war_memorial"
+msgstr ""
+
+msgid "Inscription"
+msgstr ""
+
 msgid "Wayside Cross"
 msgstr ""
 
@@ -19228,6 +19358,9 @@ msgstr ""
 msgid "Beverages"
 msgstr ""
 
+msgid "Wine"
+msgstr ""
+
 msgid "Boutique"
 msgstr ""
 
@@ -19273,6 +19406,9 @@ msgstr ""
 msgid "Video Games"
 msgstr ""
 
+msgid "Music"
+msgstr ""
+
 msgid "Cash"
 msgstr "Denar"
 
@@ -19300,6 +19436,9 @@ msgstr ""
 msgid "Curtain"
 msgstr ""
 
+msgid "Art"
+msgstr ""
+
 msgid "Frame"
 msgstr ""
 
@@ -19345,6 +19484,9 @@ msgstr ""
 msgid "Beauty"
 msgstr ""
 
+msgid "Tattoo"
+msgstr ""
+
 msgid "Optician"
 msgstr ""
 
@@ -19396,6 +19538,9 @@ msgstr ""
 msgid "Pet"
 msgstr ""
 
+msgid "Funeral Directors"
+msgstr ""
+
 msgid "Vending Machine"
 msgstr ""
 
@@ -19495,6 +19640,15 @@ msgstr ""
 msgid "National Park"
 msgstr ""
 
+msgid "Protected Area"
+msgstr ""
+
+msgid "Protected Class"
+msgstr ""
+
+msgid "Title or type of protection"
+msgstr ""
+
 msgid "Places"
 msgstr "Kraji"
 
@@ -20571,7 +20725,13 @@ msgstr ""
 msgid "Estonia Ortho (Maaamet)"
 msgstr ""
 
-msgid "Estonia Multi (Maaamet)"
+msgid "Estonia Hillshade (Maaamet)"
+msgstr ""
+
+msgid "Estonia Cadastre (Maaamet)"
+msgstr ""
+
+msgid "Estonia Forestry (Maaamet)"
 msgstr ""
 
 msgid "Bordeaux - 2012"
@@ -20595,7 +20755,7 @@ msgstr ""
 msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
 msgstr ""
 
-msgid "CUGN Nancy - Orthophoto 2012"
+msgid "GrandNancy Orthophotographie 2012"
 msgstr ""
 
 msgid "Géobretagne - Brest 2010 - 10 cm"
@@ -20642,9 +20802,6 @@ msgid ""
 "- 1 m"
 msgstr ""
 
-msgid "Streets NRW Geofabrik.de"
-msgstr ""
-
 msgid "Hike & Bike"
 msgstr ""
 
@@ -20704,6 +20861,9 @@ msgstr ""
 msgid "NRW-Atlas: Topographische Karte 1:10000"
 msgstr ""
 
+msgid "Metropole Ruhr: Luftbilder (10 cm)"
+msgstr ""
+
 msgid "Drone Imagery (Haiti)"
 msgstr ""
 
@@ -20905,6 +21065,9 @@ msgstr ""
 msgid "Stadt Zürich Übersichtsplan (Strassen, Gebäude, Hausnummer)"
 msgstr ""
 
+msgid "Stadt Zürich Luftbild 2011"
+msgstr ""
+
 msgid "Orthofoto Kanton Solothurn RGB (SOGIS 2011/2012/2013)"
 msgstr ""
 
@@ -20923,7 +21086,7 @@ msgstr ""
 msgid "Canton de Fribourg 50cm (2005)"
 msgstr ""
 
-msgid "Stadt Bern 10cm/25cm (2008)"
+msgid "Stadt Bern 10cm/25cm (2012)"
 msgstr ""
 
 msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
@@ -20962,7 +21125,7 @@ msgstr ""
 msgid "OSM US TIGER 2012 Roads Overlay"
 msgstr ""
 
-msgid "New & Misaligned TIGER Roads (TIGER 2013)"
+msgid "New & Misaligned TIGER Roads (TIGER 2014)"
 msgstr ""
 
 msgid "MassGIS L3 Parcels"
@@ -21010,9 +21173,234 @@ msgstr ""
 msgid "NLS - Bartholomew Half Inch, 1897-1907"
 msgstr ""
 
+msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Annan 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgstr ""
+
 msgid "OS Town Plans, Cupar 1854 (NLS)"
 msgstr ""
 
+msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Elgin 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Forres 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Galashiels 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Girvan 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Greenock 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Haddington 1853 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Haddington 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Hamilton 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Irvine 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Jedburgh 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kelso 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Lanark 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Linlithgow 1856 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Musselburgh 1853 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Musselburgh 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Oban 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Peebles 1856 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Perth 1860 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Peterhead 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Selkirk 1865 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, St Andrews 1854 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, St Andrews 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stirling 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stonehaven 1864 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1847 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Strathaven 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wick 1872 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wigtown 1848 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wigtown 1894 (NLS)"
+msgstr ""
+
 msgid "Decreasing house numbers in addresses interpolation"
 msgstr ""
 
@@ -21066,17 +21454,37 @@ msgid "{0}={1} is deprecated. Please use instead a multipolygon."
 msgstr ""
 
 msgid ""
-"{0} is deprecated. Please specify ìnterval by using opening_hours syntax"
+"{0} is deprecated. Please specify interval by using opening_hours syntax"
 msgstr ""
 
 msgid ""
 "{0} is deprecated. Please delete this object and use a private layer instead"
 msgstr ""
 
-msgid "{0} on a node"
+msgid "{0}={1} is unspecific. Please replace ''{1}'' by a specific value."
 msgstr ""
 
-msgid "{0} on a node. Should be drawn as an area"
+msgid "{0} should be replaced with {1}"
+msgstr ""
+
+msgid ""
+"{0}={1} is unspecific. Please replace ''{1}'' by ''left'', ''right'' or "
+"''both''."
+msgstr ""
+
+msgid "{0} on a node. Should be used on a way."
+msgstr ""
+
+msgid "{0} on a node. Should be drawn as an area."
+msgstr ""
+
+msgid "{0}=* on a node. Should be used in a relation"
+msgstr ""
+
+msgid "{0} on a way. Should be used in a relation"
+msgstr ""
+
+msgid "{0} on a node"
 msgstr ""
 
 msgid "Building inside building"
@@ -25748,6 +26156,9 @@ msgstr ""
 msgid "Find"
 msgstr ""
 
+msgid "Show"
+msgstr ""
+
 msgid "Mark"
 msgstr ""
 
diff --git a/i18n/po/sq.po b/i18n/po/sq.po
index 9bbbb2b..2a2a2c6 100644
--- a/i18n/po/sq.po
+++ b/i18n/po/sq.po
@@ -1,8 +1,13 @@
+# Albanian translation for josm
+# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
+# This file is distributed under the same license as the josm package.
+# FIRST AUTHOR <EMAIL at ADDRESS>, 2009.
+# heroid <heroid at ayih.org>, 2009
 msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-21 03:38+0200\n"
+"POT-Creation-Date: 2014-12-10 03:42+0100\n"
 "PO-Revision-Date: 2011-11-04 19:43+0000\n"
 "Last-Translator: StefanPrifti <Unknown>\n"
 "Language-Team: FLOSS Kosova\n"
@@ -10,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-10-21 04:32+0000\n"
-"X-Generator: Launchpad (build 17203)\n"
+"X-Launchpad-Export-Date: 2014-12-10 04:32+0000\n"
+"X-Generator: Launchpad (build 17283)\n"
 "Language: \n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -168,16 +173,6 @@ msgid "About JOSM..."
 msgstr "Rreth JOSM..."
 
 msgid ""
-"Unexpected format of API base URL. Redirection to info or history page for "
-"OSM object will probably fail. API base URL is: ''{0}''"
-msgstr ""
-
-msgid ""
-"Unexpected format of API base URL. Redirection to user page for OSM user "
-"will probably fail. API base URL is: ''{0}''"
-msgstr ""
-
-msgid ""
 "You are about to launch {0} browser window.<br>This may both clutter your "
 "screen with browser windows<br>and take some time to finish."
 msgid_plural ""
@@ -1519,6 +1514,15 @@ msgstr ""
 msgid "Nothing to upload. Get some data first."
 msgstr ""
 
+msgid "Upload note changes to server"
+msgstr ""
+
+msgid "Upload notes"
+msgstr ""
+
+msgid "Uploading notes to server"
+msgstr ""
+
 msgid "Upload selection"
 msgstr ""
 
@@ -1791,10 +1795,16 @@ msgstr ""
 msgid "Click the location where you wish to create a new note"
 msgstr ""
 
-msgid "Enter a comment for a new note"
+msgid "Create new note"
 msgstr ""
 
-msgid "Create new note"
+msgid "Create note"
+msgstr ""
+
+msgid "Enter a detailed comment to create a note"
+msgstr ""
+
+msgid "You must enter a comment to create a new note"
 msgstr ""
 
 msgid "Delete Mode"
@@ -2665,6 +2675,15 @@ msgstr ""
 msgid "Cycling dependencies"
 msgstr ""
 
+msgid "Uploading modified notes"
+msgstr ""
+
+msgid "Note {0} failed: {1}"
+msgstr ""
+
+msgid "Notes failed to upload"
+msgstr ""
+
 msgid ""
 "The following are results of automatic validation. Try fixing these, but be "
 "careful (don''t destroy valid data). When in doubt ignore them.<br>When you "
@@ -4894,6 +4913,12 @@ msgstr ""
 msgid "Conflict foreground: keep all tags"
 msgstr ""
 
+msgid "Conflict background: sum all numeric tags"
+msgstr ""
+
+msgid "Conflict foreground: sum all numeric tags"
+msgstr ""
+
 msgid "Conflict background: keep member"
 msgstr ""
 
@@ -5312,12 +5337,19 @@ msgstr ""
 msgid "all"
 msgstr ""
 
+msgid "sum"
+msgstr ""
+
 msgid "Please decide which values to keep"
 msgstr ""
 
 msgid "Value ''{0}'' is going to be applied for key ''{1}''"
 msgstr ""
 
+msgid ""
+"All numeric values sumed as ''{0}'' are going to be applied for key ''{1}''"
+msgstr ""
+
 msgid "The key ''{0}'' and all its values are going to be removed"
 msgstr ""
 
@@ -5680,24 +5712,6 @@ msgstr[1] ""
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
 
-msgid "Display the history of all selected items."
-msgstr ""
-
-msgid "Object with history"
-msgstr ""
-
-msgid "Reload"
-msgstr ""
-
-msgid "Reload all currently selected objects and refresh the list."
-msgstr ""
-
-msgid "Show"
-msgstr ""
-
-msgid "Display the history of the selected objects."
-msgstr ""
-
 msgid "Advanced object info"
 msgstr ""
 
@@ -6035,6 +6049,9 @@ msgstr ""
 msgid "Comment"
 msgstr ""
 
+msgid "Comment on note"
+msgstr ""
+
 msgid "Add comment to note:"
 msgstr ""
 
@@ -6044,9 +6061,6 @@ msgstr ""
 msgid "Close note with message:"
 msgstr ""
 
-msgid "Close Note"
-msgstr ""
-
 msgid "Create a new note"
 msgstr ""
 
@@ -6119,6 +6133,9 @@ msgstr ""
 msgid "Search for objects"
 msgstr ""
 
+msgid "Display the history of the selected objects."
+msgstr ""
+
 msgid "Zoom to selection"
 msgstr ""
 
@@ -6238,6 +6255,9 @@ msgstr ""
 msgid "Updating map ..."
 msgstr ""
 
+msgid "anonymous"
+msgstr ""
+
 msgid "Display the basic properties of the changeset"
 msgstr ""
 
@@ -6250,6 +6270,12 @@ msgstr ""
 msgid "Display the objects created, updated, and deleted by the changeset"
 msgstr ""
 
+msgid "Discussion"
+msgstr ""
+
+msgid "Display the public discussion around this changeset"
+msgstr ""
+
 msgid "Changeset Management Dialog"
 msgstr ""
 
@@ -6307,9 +6333,6 @@ msgctxt "changeset.state"
 msgid "Closed"
 msgstr ""
 
-msgid "anonymous"
-msgstr ""
-
 msgid "ID"
 msgstr ""
 
@@ -6325,6 +6348,9 @@ msgstr ""
 msgid "Closed at"
 msgstr ""
 
+msgid "Discussions"
+msgstr ""
+
 msgid "Downloading changeset content"
 msgstr ""
 
@@ -6436,6 +6462,15 @@ msgid ""
 "layer"
 msgstr ""
 
+msgid "Update changeset discussion"
+msgstr ""
+
+msgid "Update the changeset discussion from the OSM server"
+msgstr ""
+
+msgid "Date"
+msgstr ""
+
 msgid "Download changesets"
 msgstr ""
 
@@ -6853,7 +6888,7 @@ msgstr ""
 msgid "Set number of recently added tags"
 msgstr ""
 
-msgid "Remember last used tags"
+msgid "Remember last used tags after a restart"
 msgstr ""
 
 msgid "Please enter the number of recently added tags to display"
@@ -7199,6 +7234,9 @@ msgstr ""
 msgid "Load parent relations"
 msgstr ""
 
+msgid "Reload"
+msgstr ""
+
 msgid "Loading parent relations"
 msgstr ""
 
@@ -7321,6 +7359,12 @@ msgstr ""
 msgid "Select to download GPS traces in the selected download area."
 msgstr ""
 
+msgid "Notes"
+msgstr ""
+
+msgid "Select to download notes in the selected download area."
+msgstr ""
+
 msgid "Download as new layer"
 msgstr ""
 
@@ -7626,9 +7670,6 @@ msgstr ""
 msgid "B"
 msgstr ""
 
-msgid "Date"
-msgstr ""
-
 msgid ""
 "Failed to update primitive with id {0} because current edit layer is null"
 msgstr ""
@@ -8483,9 +8524,6 @@ msgstr ""
 msgid "Save Layer"
 msgstr ""
 
-msgid "Notes"
-msgstr ""
-
 msgid "Notes layer"
 msgstr ""
 
@@ -8501,9 +8539,6 @@ msgstr ""
 msgid "outside downloaded area"
 msgstr ""
 
-msgid "version {0}"
-msgstr ""
-
 msgid "Merging layers"
 msgstr ""
 
@@ -12129,6 +12164,15 @@ msgstr ""
 msgid "Open changeset expected. Got closed changeset with id {0}."
 msgstr ""
 
+msgid "Note upload failed"
+msgstr ""
+
+msgid "Error parsing note response from server"
+msgstr ""
+
+msgid "Error encoding string: {0}"
+msgstr ""
+
 msgid "(Code={0})"
 msgstr ""
 
@@ -12177,13 +12221,13 @@ msgstr ""
 msgid "Parsing changeset content ..."
 msgstr ""
 
-msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
-msgid "Illegal numeric value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
-msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal numeric value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
 msgid "Missing mandatory attribute ''{0}'' of XML element {1}."
@@ -12975,9 +13019,6 @@ msgstr ""
 msgid "Failed to scan file ''{0}'' for plugin information. Skipping."
 msgstr ""
 
-msgid "Processing plugin site cache icon files..."
-msgstr ""
-
 msgid "Processing plugin files..."
 msgstr ""
 
@@ -12996,12 +13037,6 @@ msgstr ""
 msgid "Details:"
 msgstr ""
 
-msgid "Plugin icons download error"
-msgstr ""
-
-msgid "JOSM failed to download plugin icons:"
-msgstr ""
-
 msgid ""
 "Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
 "plugin site ''{1}''."
@@ -13887,7 +13922,9 @@ msgid ""
 "Creating and handling address nodes and buildings within Czech Republic."
 msgstr ""
 
-msgid "Allows to import various file formats into JOSM directly."
+msgid ""
+"Allows to import various file formats into JOSM directly. Currently "
+"supported: TangoGPS, Garmin Trainings Center TCX."
 msgstr ""
 
 msgid "Download your GPX tracks from openstreetmap.org"
@@ -13984,6 +14021,11 @@ msgid "A helper for IRS satellite adjustment."
 msgstr ""
 
 msgid ""
+"Provides Java Native Access (JNA) library. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
+msgid ""
 "Provides Java Topology Suite (JTS) library and related utilities. Not meant "
 "to be installed directly by users, but rather as a dependency for other "
 "plugins."
@@ -14339,6 +14381,25 @@ msgstr ""
 msgid "Width (meters)"
 msgstr ""
 
+msgid "Sidewalk"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "both"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "left"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "right"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "no"
+msgstr ""
+
 msgid "Service type"
 msgstr ""
 
@@ -14703,15 +14764,19 @@ msgstr ""
 msgid "May-Sep 09:30-12:30,14:15-19:30"
 msgstr ""
 
+msgctxt "parking"
 msgid "multi-storey"
 msgstr ""
 
+msgctxt "parking"
 msgid "surface"
 msgstr ""
 
+msgctxt "parking"
 msgid "underground"
 msgstr ""
 
+msgctxt "parking"
 msgid "rooftop"
 msgstr ""
 
@@ -15169,15 +15234,26 @@ msgstr ""
 msgid "Overtaking"
 msgstr ""
 
+msgctxt "overtaking"
+msgid "yes"
+msgstr ""
+
+msgctxt "overtaking"
 msgid "both"
 msgstr ""
 
+msgctxt "overtaking"
 msgid "forward"
 msgstr ""
 
+msgctxt "overtaking"
 msgid "backward"
 msgstr ""
 
+msgctxt "overtaking"
+msgid "no"
+msgstr ""
+
 msgid "Roundabout"
 msgstr ""
 
@@ -15471,6 +15547,12 @@ msgstr ""
 msgid "tiger"
 msgstr ""
 
+msgid "Button operated"
+msgstr ""
+
+msgid "Sound signals"
+msgstr ""
+
 msgid "Crossing attendant"
 msgstr ""
 
@@ -15992,9 +16074,6 @@ msgstr ""
 msgid "Traffic lights"
 msgstr ""
 
-msgid "Sound signals"
-msgstr ""
-
 msgid "Barrier"
 msgstr ""
 
@@ -18054,6 +18133,9 @@ msgstr ""
 msgid "Gasometer"
 msgstr ""
 
+msgid "Bunker Silo"
+msgstr ""
+
 msgid "Pipeline"
 msgstr ""
 
@@ -18200,15 +18282,15 @@ msgstr ""
 msgid "Monitoring:"
 msgstr ""
 
-msgid "Weather"
-msgstr ""
-
 msgid "Water level"
 msgstr ""
 
 msgid "Tide Level"
 msgstr ""
 
+msgid "Groundwater"
+msgstr ""
+
 msgid "Traffic"
 msgstr ""
 
@@ -18227,6 +18309,9 @@ msgstr ""
 msgid "Galileo Signals"
 msgstr ""
 
+msgid "Weather"
+msgstr ""
+
 msgid "Radiation"
 msgstr ""
 
@@ -18407,6 +18492,9 @@ msgstr ""
 msgid "pivot_pier"
 msgstr ""
 
+msgid "Bridge outline"
+msgstr ""
+
 msgid "Power Plant"
 msgstr ""
 
@@ -19014,6 +19102,15 @@ msgstr ""
 msgid "Pole"
 msgstr ""
 
+msgid "Pole with Transformer"
+msgstr ""
+
+msgid "Pole Attributes:"
+msgstr ""
+
+msgid "Transformer Attributes:"
+msgstr ""
+
 msgid "Power Line"
 msgstr ""
 
@@ -19063,9 +19160,15 @@ msgstr ""
 msgid "Power Cable"
 msgstr ""
 
+msgctxt "power cable"
+msgid "underground"
+msgstr ""
+
+msgctxt "power cable"
 msgid "underwater"
 msgstr ""
 
+msgctxt "power cable"
 msgid "overground"
 msgstr ""
 
@@ -19093,6 +19196,33 @@ msgstr ""
 msgid "Memorial"
 msgstr ""
 
+msgctxt "memorial"
+msgid "statue"
+msgstr ""
+
+msgctxt "memorial"
+msgid "bust"
+msgstr ""
+
+msgctxt "memorial"
+msgid "plaque"
+msgstr ""
+
+msgctxt "memorial"
+msgid "stele"
+msgstr ""
+
+msgctxt "memorial"
+msgid "stone"
+msgstr ""
+
+msgctxt "memorial"
+msgid "war_memorial"
+msgstr ""
+
+msgid "Inscription"
+msgstr ""
+
 msgid "Wayside Cross"
 msgstr ""
 
@@ -19162,6 +19292,9 @@ msgstr ""
 msgid "Beverages"
 msgstr ""
 
+msgid "Wine"
+msgstr ""
+
 msgid "Boutique"
 msgstr ""
 
@@ -19207,6 +19340,9 @@ msgstr ""
 msgid "Video Games"
 msgstr ""
 
+msgid "Music"
+msgstr ""
+
 msgid "Cash"
 msgstr ""
 
@@ -19234,6 +19370,9 @@ msgstr ""
 msgid "Curtain"
 msgstr ""
 
+msgid "Art"
+msgstr ""
+
 msgid "Frame"
 msgstr ""
 
@@ -19279,6 +19418,9 @@ msgstr ""
 msgid "Beauty"
 msgstr ""
 
+msgid "Tattoo"
+msgstr ""
+
 msgid "Optician"
 msgstr ""
 
@@ -19330,6 +19472,9 @@ msgstr ""
 msgid "Pet"
 msgstr ""
 
+msgid "Funeral Directors"
+msgstr ""
+
 msgid "Vending Machine"
 msgstr ""
 
@@ -19429,6 +19574,15 @@ msgstr ""
 msgid "National Park"
 msgstr ""
 
+msgid "Protected Area"
+msgstr ""
+
+msgid "Protected Class"
+msgstr ""
+
+msgid "Title or type of protection"
+msgstr ""
+
 msgid "Places"
 msgstr ""
 
@@ -20505,7 +20659,13 @@ msgstr ""
 msgid "Estonia Ortho (Maaamet)"
 msgstr ""
 
-msgid "Estonia Multi (Maaamet)"
+msgid "Estonia Hillshade (Maaamet)"
+msgstr ""
+
+msgid "Estonia Cadastre (Maaamet)"
+msgstr ""
+
+msgid "Estonia Forestry (Maaamet)"
 msgstr ""
 
 msgid "Bordeaux - 2012"
@@ -20529,7 +20689,7 @@ msgstr ""
 msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
 msgstr ""
 
-msgid "CUGN Nancy - Orthophoto 2012"
+msgid "GrandNancy Orthophotographie 2012"
 msgstr ""
 
 msgid "Géobretagne - Brest 2010 - 10 cm"
@@ -20576,9 +20736,6 @@ msgid ""
 "- 1 m"
 msgstr ""
 
-msgid "Streets NRW Geofabrik.de"
-msgstr ""
-
 msgid "Hike & Bike"
 msgstr ""
 
@@ -20638,6 +20795,9 @@ msgstr ""
 msgid "NRW-Atlas: Topographische Karte 1:10000"
 msgstr ""
 
+msgid "Metropole Ruhr: Luftbilder (10 cm)"
+msgstr ""
+
 msgid "Drone Imagery (Haiti)"
 msgstr ""
 
@@ -20839,6 +20999,9 @@ msgstr ""
 msgid "Stadt Zürich Übersichtsplan (Strassen, Gebäude, Hausnummer)"
 msgstr ""
 
+msgid "Stadt Zürich Luftbild 2011"
+msgstr ""
+
 msgid "Orthofoto Kanton Solothurn RGB (SOGIS 2011/2012/2013)"
 msgstr ""
 
@@ -20857,7 +21020,7 @@ msgstr ""
 msgid "Canton de Fribourg 50cm (2005)"
 msgstr ""
 
-msgid "Stadt Bern 10cm/25cm (2008)"
+msgid "Stadt Bern 10cm/25cm (2012)"
 msgstr ""
 
 msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
@@ -20896,7 +21059,7 @@ msgstr ""
 msgid "OSM US TIGER 2012 Roads Overlay"
 msgstr ""
 
-msgid "New & Misaligned TIGER Roads (TIGER 2013)"
+msgid "New & Misaligned TIGER Roads (TIGER 2014)"
 msgstr ""
 
 msgid "MassGIS L3 Parcels"
@@ -20944,9 +21107,234 @@ msgstr ""
 msgid "NLS - Bartholomew Half Inch, 1897-1907"
 msgstr ""
 
+msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Annan 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgstr ""
+
 msgid "OS Town Plans, Cupar 1854 (NLS)"
 msgstr ""
 
+msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Elgin 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Forres 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Galashiels 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Girvan 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Greenock 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Haddington 1853 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Haddington 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Hamilton 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Irvine 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Jedburgh 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kelso 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Lanark 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Linlithgow 1856 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Musselburgh 1853 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Musselburgh 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Oban 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Peebles 1856 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Perth 1860 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Peterhead 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Selkirk 1865 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, St Andrews 1854 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, St Andrews 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stirling 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stonehaven 1864 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1847 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Strathaven 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wick 1872 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wigtown 1848 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wigtown 1894 (NLS)"
+msgstr ""
+
 msgid "Decreasing house numbers in addresses interpolation"
 msgstr ""
 
@@ -21000,17 +21388,37 @@ msgid "{0}={1} is deprecated. Please use instead a multipolygon."
 msgstr ""
 
 msgid ""
-"{0} is deprecated. Please specify ìnterval by using opening_hours syntax"
+"{0} is deprecated. Please specify interval by using opening_hours syntax"
 msgstr ""
 
 msgid ""
 "{0} is deprecated. Please delete this object and use a private layer instead"
 msgstr ""
 
-msgid "{0} on a node"
+msgid "{0}={1} is unspecific. Please replace ''{1}'' by a specific value."
 msgstr ""
 
-msgid "{0} on a node. Should be drawn as an area"
+msgid "{0} should be replaced with {1}"
+msgstr ""
+
+msgid ""
+"{0}={1} is unspecific. Please replace ''{1}'' by ''left'', ''right'' or "
+"''both''."
+msgstr ""
+
+msgid "{0} on a node. Should be used on a way."
+msgstr ""
+
+msgid "{0} on a node. Should be drawn as an area."
+msgstr ""
+
+msgid "{0}=* on a node. Should be used in a relation"
+msgstr ""
+
+msgid "{0} on a way. Should be used in a relation"
+msgstr ""
+
+msgid "{0} on a node"
 msgstr ""
 
 msgid "Building inside building"
@@ -25680,6 +26088,9 @@ msgstr ""
 msgid "Find"
 msgstr ""
 
+msgid "Show"
+msgstr ""
+
 msgid "Mark"
 msgstr ""
 
diff --git a/i18n/po/sr.po b/i18n/po/sr.po
index 48408d5..806cc91 100644
--- a/i18n/po/sr.po
+++ b/i18n/po/sr.po
@@ -1,8 +1,13 @@
+# Serbian translation for josm
+# Copyright (c) 2008 Rosetta Contributors and Canonical Ltd 2008
+# This file is distributed under the same license as the josm package.
+# FIRST AUTHOR <EMAIL at ADDRESS>, 2008.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-21 03:38+0200\n"
+"POT-Creation-Date: 2014-12-10 03:42+0100\n"
 "PO-Revision-Date: 2012-07-13 07:57+0000\n"
 "Last-Translator: Никола Смоленски <Unknown>\n"
 "Language-Team: Serbian <sr at li.org>\n"
@@ -11,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-10-21 05:19+0000\n"
-"X-Generator: Launchpad (build 17203)\n"
+"X-Launchpad-Export-Date: 2014-12-10 05:09+0000\n"
+"X-Generator: Launchpad (build 17283)\n"
 "Language: sr\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -169,16 +174,6 @@ msgid "About JOSM..."
 msgstr "О програму ЈОСМ"
 
 msgid ""
-"Unexpected format of API base URL. Redirection to info or history page for "
-"OSM object will probably fail. API base URL is: ''{0}''"
-msgstr ""
-
-msgid ""
-"Unexpected format of API base URL. Redirection to user page for OSM user "
-"will probably fail. API base URL is: ''{0}''"
-msgstr ""
-
-msgid ""
 "You are about to launch {0} browser window.<br>This may both clutter your "
 "screen with browser windows<br>and take some time to finish."
 msgid_plural ""
@@ -1520,6 +1515,15 @@ msgstr ""
 msgid "Nothing to upload. Get some data first."
 msgstr ""
 
+msgid "Upload note changes to server"
+msgstr ""
+
+msgid "Upload notes"
+msgstr ""
+
+msgid "Uploading notes to server"
+msgstr ""
+
 msgid "Upload selection"
 msgstr ""
 
@@ -1792,10 +1796,16 @@ msgstr ""
 msgid "Click the location where you wish to create a new note"
 msgstr ""
 
-msgid "Enter a comment for a new note"
+msgid "Create new note"
 msgstr ""
 
-msgid "Create new note"
+msgid "Create note"
+msgstr ""
+
+msgid "Enter a detailed comment to create a note"
+msgstr ""
+
+msgid "You must enter a comment to create a new note"
 msgstr ""
 
 msgid "Delete Mode"
@@ -2666,6 +2676,15 @@ msgstr ""
 msgid "Cycling dependencies"
 msgstr ""
 
+msgid "Uploading modified notes"
+msgstr ""
+
+msgid "Note {0} failed: {1}"
+msgstr ""
+
+msgid "Notes failed to upload"
+msgstr ""
+
 msgid ""
 "The following are results of automatic validation. Try fixing these, but be "
 "careful (don''t destroy valid data). When in doubt ignore them.<br>When you "
@@ -4895,6 +4914,12 @@ msgstr ""
 msgid "Conflict foreground: keep all tags"
 msgstr ""
 
+msgid "Conflict background: sum all numeric tags"
+msgstr ""
+
+msgid "Conflict foreground: sum all numeric tags"
+msgstr ""
+
 msgid "Conflict background: keep member"
 msgstr ""
 
@@ -5313,12 +5338,19 @@ msgstr ""
 msgid "all"
 msgstr ""
 
+msgid "sum"
+msgstr ""
+
 msgid "Please decide which values to keep"
 msgstr ""
 
 msgid "Value ''{0}'' is going to be applied for key ''{1}''"
 msgstr ""
 
+msgid ""
+"All numeric values sumed as ''{0}'' are going to be applied for key ''{1}''"
+msgstr ""
+
 msgid "The key ''{0}'' and all its values are going to be removed"
 msgstr ""
 
@@ -5681,24 +5713,6 @@ msgstr[1] ""
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
 
-msgid "Display the history of all selected items."
-msgstr ""
-
-msgid "Object with history"
-msgstr ""
-
-msgid "Reload"
-msgstr ""
-
-msgid "Reload all currently selected objects and refresh the list."
-msgstr ""
-
-msgid "Show"
-msgstr ""
-
-msgid "Display the history of the selected objects."
-msgstr ""
-
 msgid "Advanced object info"
 msgstr ""
 
@@ -6036,6 +6050,9 @@ msgstr ""
 msgid "Comment"
 msgstr ""
 
+msgid "Comment on note"
+msgstr ""
+
 msgid "Add comment to note:"
 msgstr ""
 
@@ -6045,9 +6062,6 @@ msgstr ""
 msgid "Close note with message:"
 msgstr ""
 
-msgid "Close Note"
-msgstr ""
-
 msgid "Create a new note"
 msgstr ""
 
@@ -6120,6 +6134,9 @@ msgstr ""
 msgid "Search for objects"
 msgstr ""
 
+msgid "Display the history of the selected objects."
+msgstr ""
+
 msgid "Zoom to selection"
 msgstr ""
 
@@ -6239,6 +6256,9 @@ msgstr ""
 msgid "Updating map ..."
 msgstr ""
 
+msgid "anonymous"
+msgstr ""
+
 msgid "Display the basic properties of the changeset"
 msgstr ""
 
@@ -6251,6 +6271,12 @@ msgstr ""
 msgid "Display the objects created, updated, and deleted by the changeset"
 msgstr ""
 
+msgid "Discussion"
+msgstr ""
+
+msgid "Display the public discussion around this changeset"
+msgstr ""
+
 msgid "Changeset Management Dialog"
 msgstr ""
 
@@ -6308,9 +6334,6 @@ msgctxt "changeset.state"
 msgid "Closed"
 msgstr ""
 
-msgid "anonymous"
-msgstr ""
-
 msgid "ID"
 msgstr ""
 
@@ -6326,6 +6349,9 @@ msgstr ""
 msgid "Closed at"
 msgstr ""
 
+msgid "Discussions"
+msgstr ""
+
 msgid "Downloading changeset content"
 msgstr ""
 
@@ -6437,6 +6463,15 @@ msgid ""
 "layer"
 msgstr ""
 
+msgid "Update changeset discussion"
+msgstr ""
+
+msgid "Update the changeset discussion from the OSM server"
+msgstr ""
+
+msgid "Date"
+msgstr "Датум"
+
 msgid "Download changesets"
 msgstr ""
 
@@ -6854,7 +6889,7 @@ msgstr ""
 msgid "Set number of recently added tags"
 msgstr ""
 
-msgid "Remember last used tags"
+msgid "Remember last used tags after a restart"
 msgstr ""
 
 msgid "Please enter the number of recently added tags to display"
@@ -7200,6 +7235,9 @@ msgstr ""
 msgid "Load parent relations"
 msgstr ""
 
+msgid "Reload"
+msgstr ""
+
 msgid "Loading parent relations"
 msgstr ""
 
@@ -7322,6 +7360,12 @@ msgstr ""
 msgid "Select to download GPS traces in the selected download area."
 msgstr ""
 
+msgid "Notes"
+msgstr ""
+
+msgid "Select to download notes in the selected download area."
+msgstr ""
+
 msgid "Download as new layer"
 msgstr ""
 
@@ -7628,9 +7672,6 @@ msgstr ""
 msgid "B"
 msgstr ""
 
-msgid "Date"
-msgstr "Датум"
-
 msgid ""
 "Failed to update primitive with id {0} because current edit layer is null"
 msgstr ""
@@ -8485,9 +8526,6 @@ msgstr ""
 msgid "Save Layer"
 msgstr ""
 
-msgid "Notes"
-msgstr ""
-
 msgid "Notes layer"
 msgstr ""
 
@@ -8503,9 +8541,6 @@ msgstr ""
 msgid "outside downloaded area"
 msgstr ""
 
-msgid "version {0}"
-msgstr ""
-
 msgid "Merging layers"
 msgstr ""
 
@@ -12131,6 +12166,15 @@ msgstr ""
 msgid "Open changeset expected. Got closed changeset with id {0}."
 msgstr ""
 
+msgid "Note upload failed"
+msgstr ""
+
+msgid "Error parsing note response from server"
+msgstr ""
+
+msgid "Error encoding string: {0}"
+msgstr ""
+
 msgid "(Code={0})"
 msgstr ""
 
@@ -12179,13 +12223,13 @@ msgstr ""
 msgid "Parsing changeset content ..."
 msgstr ""
 
-msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
-msgid "Illegal numeric value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
-msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal numeric value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
 msgid "Missing mandatory attribute ''{0}'' of XML element {1}."
@@ -12977,9 +13021,6 @@ msgstr ""
 msgid "Failed to scan file ''{0}'' for plugin information. Skipping."
 msgstr ""
 
-msgid "Processing plugin site cache icon files..."
-msgstr ""
-
 msgid "Processing plugin files..."
 msgstr ""
 
@@ -12998,12 +13039,6 @@ msgstr ""
 msgid "Details:"
 msgstr ""
 
-msgid "Plugin icons download error"
-msgstr ""
-
-msgid "JOSM failed to download plugin icons:"
-msgstr ""
-
 msgid ""
 "Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
 "plugin site ''{1}''."
@@ -13889,7 +13924,9 @@ msgid ""
 "Creating and handling address nodes and buildings within Czech Republic."
 msgstr ""
 
-msgid "Allows to import various file formats into JOSM directly."
+msgid ""
+"Allows to import various file formats into JOSM directly. Currently "
+"supported: TangoGPS, Garmin Trainings Center TCX."
 msgstr ""
 
 msgid "Download your GPX tracks from openstreetmap.org"
@@ -13986,6 +14023,11 @@ msgid "A helper for IRS satellite adjustment."
 msgstr ""
 
 msgid ""
+"Provides Java Native Access (JNA) library. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
+msgid ""
 "Provides Java Topology Suite (JTS) library and related utilities. Not meant "
 "to be installed directly by users, but rather as a dependency for other "
 "plugins."
@@ -14341,6 +14383,25 @@ msgstr ""
 msgid "Width (meters)"
 msgstr ""
 
+msgid "Sidewalk"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "both"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "left"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "right"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "no"
+msgstr ""
+
 msgid "Service type"
 msgstr ""
 
@@ -14705,15 +14766,19 @@ msgstr ""
 msgid "May-Sep 09:30-12:30,14:15-19:30"
 msgstr ""
 
+msgctxt "parking"
 msgid "multi-storey"
 msgstr ""
 
+msgctxt "parking"
 msgid "surface"
 msgstr ""
 
+msgctxt "parking"
 msgid "underground"
 msgstr ""
 
+msgctxt "parking"
 msgid "rooftop"
 msgstr ""
 
@@ -15171,15 +15236,26 @@ msgstr ""
 msgid "Overtaking"
 msgstr ""
 
+msgctxt "overtaking"
+msgid "yes"
+msgstr ""
+
+msgctxt "overtaking"
 msgid "both"
 msgstr ""
 
+msgctxt "overtaking"
 msgid "forward"
 msgstr ""
 
+msgctxt "overtaking"
 msgid "backward"
 msgstr ""
 
+msgctxt "overtaking"
+msgid "no"
+msgstr ""
+
 msgid "Roundabout"
 msgstr ""
 
@@ -15473,6 +15549,12 @@ msgstr ""
 msgid "tiger"
 msgstr ""
 
+msgid "Button operated"
+msgstr ""
+
+msgid "Sound signals"
+msgstr ""
+
 msgid "Crossing attendant"
 msgstr ""
 
@@ -15994,9 +16076,6 @@ msgstr ""
 msgid "Traffic lights"
 msgstr ""
 
-msgid "Sound signals"
-msgstr ""
-
 msgid "Barrier"
 msgstr ""
 
@@ -18056,6 +18135,9 @@ msgstr ""
 msgid "Gasometer"
 msgstr ""
 
+msgid "Bunker Silo"
+msgstr ""
+
 msgid "Pipeline"
 msgstr ""
 
@@ -18202,15 +18284,15 @@ msgstr ""
 msgid "Monitoring:"
 msgstr ""
 
-msgid "Weather"
-msgstr ""
-
 msgid "Water level"
 msgstr ""
 
 msgid "Tide Level"
 msgstr ""
 
+msgid "Groundwater"
+msgstr ""
+
 msgid "Traffic"
 msgstr ""
 
@@ -18229,6 +18311,9 @@ msgstr ""
 msgid "Galileo Signals"
 msgstr ""
 
+msgid "Weather"
+msgstr ""
+
 msgid "Radiation"
 msgstr ""
 
@@ -18409,6 +18494,9 @@ msgstr ""
 msgid "pivot_pier"
 msgstr ""
 
+msgid "Bridge outline"
+msgstr ""
+
 msgid "Power Plant"
 msgstr ""
 
@@ -19016,6 +19104,15 @@ msgstr ""
 msgid "Pole"
 msgstr ""
 
+msgid "Pole with Transformer"
+msgstr ""
+
+msgid "Pole Attributes:"
+msgstr ""
+
+msgid "Transformer Attributes:"
+msgstr ""
+
 msgid "Power Line"
 msgstr ""
 
@@ -19065,9 +19162,15 @@ msgstr ""
 msgid "Power Cable"
 msgstr ""
 
+msgctxt "power cable"
+msgid "underground"
+msgstr ""
+
+msgctxt "power cable"
 msgid "underwater"
 msgstr ""
 
+msgctxt "power cable"
 msgid "overground"
 msgstr ""
 
@@ -19095,6 +19198,33 @@ msgstr ""
 msgid "Memorial"
 msgstr ""
 
+msgctxt "memorial"
+msgid "statue"
+msgstr ""
+
+msgctxt "memorial"
+msgid "bust"
+msgstr ""
+
+msgctxt "memorial"
+msgid "plaque"
+msgstr ""
+
+msgctxt "memorial"
+msgid "stele"
+msgstr ""
+
+msgctxt "memorial"
+msgid "stone"
+msgstr ""
+
+msgctxt "memorial"
+msgid "war_memorial"
+msgstr ""
+
+msgid "Inscription"
+msgstr ""
+
 msgid "Wayside Cross"
 msgstr ""
 
@@ -19164,6 +19294,9 @@ msgstr ""
 msgid "Beverages"
 msgstr ""
 
+msgid "Wine"
+msgstr ""
+
 msgid "Boutique"
 msgstr ""
 
@@ -19209,6 +19342,9 @@ msgstr ""
 msgid "Video Games"
 msgstr ""
 
+msgid "Music"
+msgstr ""
+
 msgid "Cash"
 msgstr ""
 
@@ -19236,6 +19372,9 @@ msgstr ""
 msgid "Curtain"
 msgstr ""
 
+msgid "Art"
+msgstr ""
+
 msgid "Frame"
 msgstr ""
 
@@ -19281,6 +19420,9 @@ msgstr ""
 msgid "Beauty"
 msgstr ""
 
+msgid "Tattoo"
+msgstr ""
+
 msgid "Optician"
 msgstr ""
 
@@ -19332,6 +19474,9 @@ msgstr ""
 msgid "Pet"
 msgstr ""
 
+msgid "Funeral Directors"
+msgstr ""
+
 msgid "Vending Machine"
 msgstr ""
 
@@ -19431,6 +19576,15 @@ msgstr ""
 msgid "National Park"
 msgstr ""
 
+msgid "Protected Area"
+msgstr ""
+
+msgid "Protected Class"
+msgstr ""
+
+msgid "Title or type of protection"
+msgstr ""
+
 msgid "Places"
 msgstr ""
 
@@ -20507,7 +20661,13 @@ msgstr ""
 msgid "Estonia Ortho (Maaamet)"
 msgstr ""
 
-msgid "Estonia Multi (Maaamet)"
+msgid "Estonia Hillshade (Maaamet)"
+msgstr ""
+
+msgid "Estonia Cadastre (Maaamet)"
+msgstr ""
+
+msgid "Estonia Forestry (Maaamet)"
 msgstr ""
 
 msgid "Bordeaux - 2012"
@@ -20531,7 +20691,7 @@ msgstr ""
 msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
 msgstr ""
 
-msgid "CUGN Nancy - Orthophoto 2012"
+msgid "GrandNancy Orthophotographie 2012"
 msgstr ""
 
 msgid "Géobretagne - Brest 2010 - 10 cm"
@@ -20578,9 +20738,6 @@ msgid ""
 "- 1 m"
 msgstr ""
 
-msgid "Streets NRW Geofabrik.de"
-msgstr ""
-
 msgid "Hike & Bike"
 msgstr ""
 
@@ -20640,6 +20797,9 @@ msgstr ""
 msgid "NRW-Atlas: Topographische Karte 1:10000"
 msgstr ""
 
+msgid "Metropole Ruhr: Luftbilder (10 cm)"
+msgstr ""
+
 msgid "Drone Imagery (Haiti)"
 msgstr ""
 
@@ -20841,6 +21001,9 @@ msgstr ""
 msgid "Stadt Zürich Übersichtsplan (Strassen, Gebäude, Hausnummer)"
 msgstr ""
 
+msgid "Stadt Zürich Luftbild 2011"
+msgstr ""
+
 msgid "Orthofoto Kanton Solothurn RGB (SOGIS 2011/2012/2013)"
 msgstr ""
 
@@ -20859,7 +21022,7 @@ msgstr ""
 msgid "Canton de Fribourg 50cm (2005)"
 msgstr ""
 
-msgid "Stadt Bern 10cm/25cm (2008)"
+msgid "Stadt Bern 10cm/25cm (2012)"
 msgstr ""
 
 msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
@@ -20898,7 +21061,7 @@ msgstr ""
 msgid "OSM US TIGER 2012 Roads Overlay"
 msgstr ""
 
-msgid "New & Misaligned TIGER Roads (TIGER 2013)"
+msgid "New & Misaligned TIGER Roads (TIGER 2014)"
 msgstr ""
 
 msgid "MassGIS L3 Parcels"
@@ -20946,9 +21109,234 @@ msgstr ""
 msgid "NLS - Bartholomew Half Inch, 1897-1907"
 msgstr ""
 
+msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Annan 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgstr ""
+
 msgid "OS Town Plans, Cupar 1854 (NLS)"
 msgstr ""
 
+msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Elgin 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Forres 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Galashiels 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Girvan 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Greenock 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Haddington 1853 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Haddington 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Hamilton 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Irvine 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Jedburgh 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kelso 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Lanark 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Linlithgow 1856 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Musselburgh 1853 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Musselburgh 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Oban 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Peebles 1856 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Perth 1860 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Peterhead 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Selkirk 1865 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, St Andrews 1854 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, St Andrews 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stirling 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stonehaven 1864 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1847 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Strathaven 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wick 1872 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wigtown 1848 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wigtown 1894 (NLS)"
+msgstr ""
+
 msgid "Decreasing house numbers in addresses interpolation"
 msgstr ""
 
@@ -21002,17 +21390,37 @@ msgid "{0}={1} is deprecated. Please use instead a multipolygon."
 msgstr ""
 
 msgid ""
-"{0} is deprecated. Please specify ìnterval by using opening_hours syntax"
+"{0} is deprecated. Please specify interval by using opening_hours syntax"
 msgstr ""
 
 msgid ""
 "{0} is deprecated. Please delete this object and use a private layer instead"
 msgstr ""
 
-msgid "{0} on a node"
+msgid "{0}={1} is unspecific. Please replace ''{1}'' by a specific value."
 msgstr ""
 
-msgid "{0} on a node. Should be drawn as an area"
+msgid "{0} should be replaced with {1}"
+msgstr ""
+
+msgid ""
+"{0}={1} is unspecific. Please replace ''{1}'' by ''left'', ''right'' or "
+"''both''."
+msgstr ""
+
+msgid "{0} on a node. Should be used on a way."
+msgstr ""
+
+msgid "{0} on a node. Should be drawn as an area."
+msgstr ""
+
+msgid "{0}=* on a node. Should be used in a relation"
+msgstr ""
+
+msgid "{0} on a way. Should be used in a relation"
+msgstr ""
+
+msgid "{0} on a node"
 msgstr ""
 
 msgid "Building inside building"
@@ -25682,6 +26090,9 @@ msgstr ""
 msgid "Find"
 msgstr ""
 
+msgid "Show"
+msgstr ""
+
 msgid "Mark"
 msgstr ""
 
diff --git a/i18n/po/sv.po b/i18n/po/sv.po
index c675a62..a6a7136 100644
--- a/i18n/po/sv.po
+++ b/i18n/po/sv.po
@@ -1,17 +1,22 @@
+# Swedish translation for josm
+# Copyright (c) (c) 2006 Canonical Ltd, and Rosetta Contributors 2006
+# This file is distributed under the same license as the josm package.
+# FIRST AUTHOR <EMAIL at ADDRESS>, 2006.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-21 03:38+0200\n"
-"PO-Revision-Date: 2014-09-15 14:19+0000\n"
-"Last-Translator: Tomas Marklund <tomasmarklund75 at gmail.com>\n"
+"POT-Creation-Date: 2014-12-10 03:42+0100\n"
+"PO-Revision-Date: 2014-11-26 22:19+0000\n"
+"Last-Translator: Niklas Henriksson <fringillus92 at gmail.com>\n"
 "Language-Team: Swedish <sv at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2014-10-21 05:24+0000\n"
-"X-Generator: Launchpad (build 17203)\n"
+"X-Launchpad-Export-Date: 2014-12-10 05:13+0000\n"
+"X-Generator: Launchpad (build 17283)\n"
 "Language: sv\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -171,21 +176,6 @@ msgid "About JOSM..."
 msgstr "Om JOSM..."
 
 msgid ""
-"Unexpected format of API base URL. Redirection to info or history page for "
-"OSM object will probably fail. API base URL is: ''{0}''"
-msgstr ""
-"Oförväntat format av API-databas-URL:en. Vidarebefordran till information "
-"eller historiken för OSM-objekten kommer troligen att misslyckas. API-"
-"databasens URL är: \"{0}\""
-
-msgid ""
-"Unexpected format of API base URL. Redirection to user page for OSM user "
-"will probably fail. API base URL is: ''{0}''"
-msgstr ""
-"Oförväntat format av API-databas-URL. Omdirigeringen till OSM-användaren "
-"kommer troligen misslyckas. API-URL:en är \"{0}\""
-
-msgid ""
 "You are about to launch {0} browser window.<br>This may both clutter your "
 "screen with browser windows<br>and take some time to finish."
 msgid_plural ""
@@ -1647,6 +1637,15 @@ msgstr "Det finns inte några ändringar att skicka in."
 msgid "Nothing to upload. Get some data first."
 msgstr "Det finns inte någonting att skicka in. Skaffa lite data först."
 
+msgid "Upload note changes to server"
+msgstr ""
+
+msgid "Upload notes"
+msgstr ""
+
+msgid "Uploading notes to server"
+msgstr ""
+
 msgid "Upload selection"
 msgstr "Ladda upp val"
 
@@ -1934,10 +1933,16 @@ msgstr ""
 msgid "Click the location where you wish to create a new note"
 msgstr ""
 
-msgid "Enter a comment for a new note"
+msgid "Create new note"
 msgstr ""
 
-msgid "Create new note"
+msgid "Create note"
+msgstr ""
+
+msgid "Enter a detailed comment to create a note"
+msgstr ""
+
+msgid "You must enter a comment to create a new note"
 msgstr ""
 
 msgid "Delete Mode"
@@ -2892,6 +2897,15 @@ msgstr "... refererar till relation"
 msgid "Cycling dependencies"
 msgstr "Cykliska beroenden"
 
+msgid "Uploading modified notes"
+msgstr ""
+
+msgid "Note {0} failed: {1}"
+msgstr ""
+
+msgid "Notes failed to upload"
+msgstr ""
+
 msgid ""
 "The following are results of automatic validation. Try fixing these, but be "
 "careful (don''t destroy valid data). When in doubt ignore them.<br>When you "
@@ -5191,6 +5205,12 @@ msgstr ""
 msgid "Conflict foreground: keep all tags"
 msgstr ""
 
+msgid "Conflict background: sum all numeric tags"
+msgstr ""
+
+msgid "Conflict foreground: sum all numeric tags"
+msgstr ""
+
 msgid "Conflict background: keep member"
 msgstr ""
 
@@ -5613,12 +5633,19 @@ msgstr "inget"
 msgid "all"
 msgstr "alla"
 
+msgid "sum"
+msgstr ""
+
 msgid "Please decide which values to keep"
 msgstr "Välj värden att behålla"
 
 msgid "Value ''{0}'' is going to be applied for key ''{1}''"
 msgstr ""
 
+msgid ""
+"All numeric values sumed as ''{0}'' are going to be applied for key ''{1}''"
+msgstr ""
+
 msgid "The key ''{0}'' and all its values are going to be removed"
 msgstr "Nyckeln \"{0}\" och alla dess värden kommer att tas bort"
 
@@ -5993,24 +6020,6 @@ msgstr[1] ""
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
 
-msgid "Display the history of all selected items."
-msgstr "Visa historik för alla valda poster."
-
-msgid "Object with history"
-msgstr ""
-
-msgid "Reload"
-msgstr "Uppdatera"
-
-msgid "Reload all currently selected objects and refresh the list."
-msgstr "Läs om alla de nu valda objekten och uppdatera listan."
-
-msgid "Show"
-msgstr "Visa"
-
-msgid "Display the history of the selected objects."
-msgstr "Visa historik för valt objekt"
-
 msgid "Advanced object info"
 msgstr "Avancerad objektinformation"
 
@@ -6349,6 +6358,9 @@ msgstr ""
 msgid "Comment"
 msgstr "Kommentar"
 
+msgid "Comment on note"
+msgstr ""
+
 msgid "Add comment to note:"
 msgstr ""
 
@@ -6358,9 +6370,6 @@ msgstr ""
 msgid "Close note with message:"
 msgstr ""
 
-msgid "Close Note"
-msgstr ""
-
 msgid "Create a new note"
 msgstr ""
 
@@ -6433,6 +6442,9 @@ msgstr "Aktuellt urval"
 msgid "Search for objects"
 msgstr "Sök efter objekt"
 
+msgid "Display the history of the selected objects."
+msgstr "Visa historik för valt objekt"
+
 msgid "Zoom to selection"
 msgstr "Zooma till urval"
 
@@ -6554,6 +6566,9 @@ msgstr ""
 msgid "Updating map ..."
 msgstr "Uppdaterar karta ..."
 
+msgid "anonymous"
+msgstr "anonym"
+
 msgid "Display the basic properties of the changeset"
 msgstr "Visa ändringsuppsättningens grundegenskaper"
 
@@ -6567,6 +6582,12 @@ msgid "Display the objects created, updated, and deleted by the changeset"
 msgstr ""
 "Visa de objekt som skapas, uppdateras eller tas bort av ändringsuppsättningen"
 
+msgid "Discussion"
+msgstr ""
+
+msgid "Display the public discussion around this changeset"
+msgstr ""
+
 msgid "Changeset Management Dialog"
 msgstr "Dialog för att hantera ändringsuppsättningar"
 
@@ -6627,9 +6648,6 @@ msgctxt "changeset.state"
 msgid "Closed"
 msgstr "Stängd"
 
-msgid "anonymous"
-msgstr "anonym"
-
 msgid "ID"
 msgstr "ID"
 
@@ -6645,6 +6663,9 @@ msgstr "Skapad den"
 msgid "Closed at"
 msgstr ""
 
+msgid "Discussions"
+msgstr ""
+
 msgid "Downloading changeset content"
 msgstr "Hämtar hem innehållet i ändringsuppsättningar"
 
@@ -6756,6 +6777,15 @@ msgid ""
 "layer"
 msgstr ""
 
+msgid "Update changeset discussion"
+msgstr ""
+
+msgid "Update the changeset discussion from the OSM server"
+msgstr ""
+
+msgid "Date"
+msgstr "Datum"
+
 msgid "Download changesets"
 msgstr "Hämta ändringsuppsättningar"
 
@@ -7182,8 +7212,8 @@ msgstr "Välj ett värde"
 msgid "Set number of recently added tags"
 msgstr ""
 
-msgid "Remember last used tags"
-msgstr "Kom ihåg senaste taggen som användes"
+msgid "Remember last used tags after a restart"
+msgstr ""
 
 msgid "Please enter the number of recently added tags to display"
 msgstr "Ange antalet nyligen använda taggar att visa"
@@ -7534,6 +7564,9 @@ msgstr ""
 msgid "Load parent relations"
 msgstr "Ladda föräldra-relationer"
 
+msgid "Reload"
+msgstr "Uppdatera"
+
 msgid "Loading parent relations"
 msgstr "Laddar föräldra-relationer"
 
@@ -7664,6 +7697,12 @@ msgstr "Rå GPS-data"
 msgid "Select to download GPS traces in the selected download area."
 msgstr "Välj för att hämta GPS-spår för det valda hämtningsområdet."
 
+msgid "Notes"
+msgstr "Sedlar"
+
+msgid "Select to download notes in the selected download area."
+msgstr ""
+
 msgid "Download as new layer"
 msgstr "Hämta som ett nytt lager"
 
@@ -7979,9 +8018,6 @@ msgstr ""
 msgid "B"
 msgstr ""
 
-msgid "Date"
-msgstr "Datum"
-
 msgid ""
 "Failed to update primitive with id {0} because current edit layer is null"
 msgstr ""
@@ -8880,9 +8916,6 @@ msgstr ""
 msgid "Save Layer"
 msgstr "Spara Lager"
 
-msgid "Notes"
-msgstr "Sedlar"
-
 msgid "Notes layer"
 msgstr ""
 
@@ -8898,9 +8931,6 @@ msgstr "Datalager {0}"
 msgid "outside downloaded area"
 msgstr "utanför hämtat område"
 
-msgid "version {0}"
-msgstr "version {0}"
-
 msgid "Merging layers"
 msgstr ""
 
@@ -12629,6 +12659,15 @@ msgstr ""
 msgid "Open changeset expected. Got closed changeset with id {0}."
 msgstr ""
 
+msgid "Note upload failed"
+msgstr ""
+
+msgid "Error parsing note response from server"
+msgstr ""
+
+msgid "Error encoding string: {0}"
+msgstr ""
+
 msgid "(Code={0})"
 msgstr ""
 
@@ -12679,13 +12718,13 @@ msgstr ""
 msgid "Parsing changeset content ..."
 msgstr "Tolkar innehåll i ändringsuppsättning ..."
 
-msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
-msgid "Illegal numeric value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
-msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal numeric value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
 msgid "Missing mandatory attribute ''{0}'' of XML element {1}."
@@ -13512,9 +13551,6 @@ msgstr ""
 "Kunde inte läsa igenom filen ''{0}'' efter insticksmodulsinformation. Hoppar "
 "över."
 
-msgid "Processing plugin site cache icon files..."
-msgstr ""
-
 msgid "Processing plugin files..."
 msgstr ""
 
@@ -13533,12 +13569,6 @@ msgstr ""
 msgid "Details:"
 msgstr "Detaljer:"
 
-msgid "Plugin icons download error"
-msgstr ""
-
-msgid "JOSM failed to download plugin icons:"
-msgstr "JOSM misslyckades att ladda ner ikoner för insticksmoduler:"
-
 msgid ""
 "Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
 "plugin site ''{1}''."
@@ -14492,7 +14522,9 @@ msgid ""
 "Creating and handling address nodes and buildings within Czech Republic."
 msgstr ""
 
-msgid "Allows to import various file formats into JOSM directly."
+msgid ""
+"Allows to import various file formats into JOSM directly. Currently "
+"supported: TangoGPS, Garmin Trainings Center TCX."
 msgstr ""
 
 msgid "Download your GPX tracks from openstreetmap.org"
@@ -14589,6 +14621,11 @@ msgid "A helper for IRS satellite adjustment."
 msgstr ""
 
 msgid ""
+"Provides Java Native Access (JNA) library. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
+msgid ""
 "Provides Java Topology Suite (JTS) library and related utilities. Not meant "
 "to be installed directly by users, but rather as a dependency for other "
 "plugins."
@@ -14954,6 +14991,25 @@ msgstr "Belyst"
 msgid "Width (meters)"
 msgstr "Bredd (meter)"
 
+msgid "Sidewalk"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "both"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "left"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "right"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "no"
+msgstr ""
+
 msgid "Service type"
 msgstr ""
 
@@ -15318,17 +15374,21 @@ msgstr ""
 msgid "May-Sep 09:30-12:30,14:15-19:30"
 msgstr ""
 
+msgctxt "parking"
 msgid "multi-storey"
-msgstr "flervånings-"
+msgstr ""
 
+msgctxt "parking"
 msgid "surface"
-msgstr "yta"
+msgstr ""
 
+msgctxt "parking"
 msgid "underground"
-msgstr "underjordisk"
+msgstr ""
 
+msgctxt "parking"
 msgid "rooftop"
-msgstr "takparkering"
+msgstr ""
 
 msgid "Reference number"
 msgstr "Referensnummer"
@@ -15784,15 +15844,26 @@ msgstr "Maxlängd (meter)"
 msgid "Overtaking"
 msgstr ""
 
+msgctxt "overtaking"
+msgid "yes"
+msgstr ""
+
+msgctxt "overtaking"
 msgid "both"
 msgstr ""
 
+msgctxt "overtaking"
 msgid "forward"
 msgstr ""
 
+msgctxt "overtaking"
 msgid "backward"
 msgstr ""
 
+msgctxt "overtaking"
+msgid "no"
+msgstr ""
+
 msgid "Roundabout"
 msgstr "Rondell"
 
@@ -16086,6 +16157,12 @@ msgstr "pegasus"
 msgid "tiger"
 msgstr "tiger"
 
+msgid "Button operated"
+msgstr ""
+
+msgid "Sound signals"
+msgstr ""
+
 msgid "Crossing attendant"
 msgstr ""
 
@@ -16607,9 +16684,6 @@ msgstr "Plankorsning"
 msgid "Traffic lights"
 msgstr ""
 
-msgid "Sound signals"
-msgstr ""
-
 msgid "Barrier"
 msgstr ""
 
@@ -18671,6 +18745,9 @@ msgstr "Väderkvarn"
 msgid "Gasometer"
 msgstr "Gasklocka"
 
+msgid "Bunker Silo"
+msgstr ""
+
 msgid "Pipeline"
 msgstr "Rörledning"
 
@@ -18817,15 +18894,15 @@ msgstr "Övervakningsstation"
 msgid "Monitoring:"
 msgstr "Övervakning:"
 
-msgid "Weather"
-msgstr "Väder"
-
 msgid "Water level"
 msgstr "Vattennivå"
 
 msgid "Tide Level"
 msgstr "Tidvattennivå"
 
+msgid "Groundwater"
+msgstr ""
+
 msgid "Traffic"
 msgstr "Trafik"
 
@@ -18844,6 +18921,9 @@ msgstr "GLONASS-signaler"
 msgid "Galileo Signals"
 msgstr "Galileo-signaler"
 
+msgid "Weather"
+msgstr "Väder"
+
 msgid "Radiation"
 msgstr "Strålning"
 
@@ -19024,6 +19104,9 @@ msgstr ""
 msgid "pivot_pier"
 msgstr ""
 
+msgid "Bridge outline"
+msgstr ""
+
 msgid "Power Plant"
 msgstr ""
 
@@ -19631,6 +19714,15 @@ msgstr ""
 msgid "Pole"
 msgstr "Elstolpe"
 
+msgid "Pole with Transformer"
+msgstr ""
+
+msgid "Pole Attributes:"
+msgstr ""
+
+msgid "Transformer Attributes:"
+msgstr ""
+
 msgid "Power Line"
 msgstr "Kraftledning"
 
@@ -19680,9 +19772,15 @@ msgstr ""
 msgid "Power Cable"
 msgstr ""
 
+msgctxt "power cable"
+msgid "underground"
+msgstr ""
+
+msgctxt "power cable"
 msgid "underwater"
 msgstr ""
 
+msgctxt "power cable"
 msgid "overground"
 msgstr ""
 
@@ -19710,6 +19808,33 @@ msgstr "Monument"
 msgid "Memorial"
 msgstr "Minnesmärke"
 
+msgctxt "memorial"
+msgid "statue"
+msgstr ""
+
+msgctxt "memorial"
+msgid "bust"
+msgstr ""
+
+msgctxt "memorial"
+msgid "plaque"
+msgstr ""
+
+msgctxt "memorial"
+msgid "stele"
+msgstr ""
+
+msgctxt "memorial"
+msgid "stone"
+msgstr ""
+
+msgctxt "memorial"
+msgid "war_memorial"
+msgstr ""
+
+msgid "Inscription"
+msgstr ""
+
 msgid "Wayside Cross"
 msgstr "Vägkors"
 
@@ -19779,6 +19904,9 @@ msgstr "Alkohol"
 msgid "Beverages"
 msgstr "Drycker"
 
+msgid "Wine"
+msgstr ""
+
 msgid "Boutique"
 msgstr ""
 
@@ -19824,6 +19952,9 @@ msgstr "Video"
 msgid "Video Games"
 msgstr "TV-spel"
 
+msgid "Music"
+msgstr ""
+
 msgid "Cash"
 msgstr "Pengar"
 
@@ -19851,6 +19982,9 @@ msgstr "Kök"
 msgid "Curtain"
 msgstr "Gardiner"
 
+msgid "Art"
+msgstr ""
+
 msgid "Frame"
 msgstr "Rambutik"
 
@@ -19896,6 +20030,9 @@ msgstr ""
 msgid "Beauty"
 msgstr ""
 
+msgid "Tattoo"
+msgstr ""
+
 msgid "Optician"
 msgstr "Optiker"
 
@@ -19947,6 +20084,9 @@ msgstr "Väskor"
 msgid "Pet"
 msgstr "Husdjur"
 
+msgid "Funeral Directors"
+msgstr ""
+
 msgid "Vending Machine"
 msgstr ""
 
@@ -20046,6 +20186,15 @@ msgstr ""
 msgid "National Park"
 msgstr ""
 
+msgid "Protected Area"
+msgstr ""
+
+msgid "Protected Class"
+msgstr ""
+
+msgid "Title or type of protection"
+msgstr ""
+
 msgid "Places"
 msgstr "Platser"
 
@@ -20187,15 +20336,17 @@ msgid "Forest"
 msgstr "Kulturskog"
 
 msgid "Grassland"
-msgstr ""
+msgstr "Gräsmark"
 
 msgid ""
 "Where vegetation is dominated by grasses (Poaceae) and other herbaceous (non-"
 "woody) plants. Excludes cultivated areas and wetlands."
 msgstr ""
+"Där mark domineras av gräs (Poaceae) och andra örtliknande (icke-träiga) "
+"plantor. Ej för odlingsmark och våtmark."
 
 msgid "pampas"
-msgstr ""
+msgstr "pampas"
 
 msgid "prairie"
 msgstr "prärie"
@@ -20219,7 +20370,7 @@ msgid "Scree"
 msgstr "Bergsluttning (med lösa stenar)"
 
 msgid "An accumulation of loose rocks."
-msgstr ""
+msgstr "En samling lösa stenar."
 
 msgid "Fell"
 msgstr "Höglandshed"
@@ -20234,7 +20385,7 @@ msgstr "Buskage"
 
 msgid ""
 "Bare lower lying uncultivated land with bushes but little or no tree cover."
-msgstr ""
+msgstr "Lågt liggande okultuverat land med buskar, med få eller inga träd."
 
 msgid "Heath"
 msgstr "Hed"
@@ -20249,23 +20400,27 @@ msgid "Sand"
 msgstr "Sand"
 
 msgid "Large area covered with sand."
-msgstr ""
+msgstr "Större område täkt med sand."
 
 msgid "Bare Rock"
-msgstr ""
+msgstr "Bar sten"
 
 msgid ""
 "For areas of solid visible rock that is sparsely vegetated or not vegetated "
 "at all."
 msgstr ""
+"För områden täkta av solid och synlig sten, som kan vara lätt beväxt eller "
+"inte alls."
 
 msgid "Stone"
-msgstr ""
+msgstr "Sten"
 
 msgid ""
 "A single notable free-standing rock, which may differ from the composition "
 "of the terrain it lies in."
 msgstr ""
+"En enskild friliggande sten, som möjligen kan skilja sig från annat i "
+"omgivningen."
 
 msgid "Land use"
 msgstr "Markanvändning"
@@ -20280,13 +20435,13 @@ msgid "Meadow"
 msgstr "Äng"
 
 msgid "Orchard"
-msgstr ""
+msgstr "Fruktodling"
 
 msgid "Vineyard"
-msgstr "Vingård"
+msgstr "Vinodling"
 
 msgid "Greenhouse Horticulture"
-msgstr ""
+msgstr "Växthusodling"
 
 msgid "Plant Nursery"
 msgstr "Plantskola"
@@ -20322,13 +20477,13 @@ msgid "Cemetery"
 msgstr "Begravningsplats"
 
 msgid "Religious"
-msgstr ""
+msgstr "Religiös"
 
 msgid "Retail"
-msgstr "Detaljhandel"
+msgstr "Handel"
 
 msgid "Commercial"
-msgstr "Affärsområde"
+msgstr "Kontorsområde"
 
 msgid "Industrial"
 msgstr "Industriområde"
@@ -20337,13 +20492,13 @@ msgid "Garages"
 msgstr "Garage"
 
 msgid "Railway Land"
-msgstr ""
+msgstr "Järnvägsmark"
 
 msgid "Military"
 msgstr "Militärt område"
 
 msgid "Construction Area"
-msgstr ""
+msgstr "Byggarbetsområde"
 
 msgid "Brownfield"
 msgstr "Övergivet industri- eller affärsområde"
@@ -20403,178 +20558,178 @@ msgid "Country code"
 msgstr "Landskod"
 
 msgid "Optional values for specific countries"
-msgstr ""
+msgstr "Valfria värden för specifika länder"
 
 msgid "Subdistrict"
 msgstr ""
 
 msgid "District"
-msgstr ""
+msgstr "Distrikt"
 
 msgid "Province"
-msgstr ""
+msgstr "Provins"
 
 msgid "AL"
-msgstr ""
+msgstr "Alabama"
 
 msgid "AK"
-msgstr ""
+msgstr "Alaska"
 
 msgid "AZ"
-msgstr ""
+msgstr "Arizona"
 
 msgid "AR"
-msgstr ""
+msgstr "Arkansas"
 
 msgid "CA"
-msgstr ""
+msgstr "Kalifornien"
 
 msgid "CO"
-msgstr ""
+msgstr "Colorado"
 
 msgid "CT"
-msgstr ""
+msgstr "Connecticut"
 
 msgid "DE"
-msgstr ""
+msgstr "Delaware"
 
 msgid "FL"
-msgstr ""
+msgstr "Florida"
 
 msgid "GA"
-msgstr ""
+msgstr "Georgia"
 
 msgid "HI"
-msgstr ""
+msgstr "Hawaii"
 
 msgid "IL"
-msgstr ""
+msgstr "Illinois"
 
 msgid "IN"
-msgstr ""
+msgstr "Indiana"
 
 msgid "IA"
-msgstr ""
+msgstr "Iowa"
 
 msgid "KS"
-msgstr ""
+msgstr "Kansas"
 
 msgid "KY"
-msgstr ""
+msgstr "Kentucky"
 
 msgid "LA"
-msgstr ""
+msgstr "Louisiana"
 
 msgid "ME"
-msgstr ""
+msgstr "Maine"
 
 msgid "MD"
-msgstr ""
+msgstr "Maryland"
 
 msgid "MA"
-msgstr ""
+msgstr "Massachusetts"
 
 msgid "MI"
-msgstr ""
+msgstr "Michigan"
 
 msgid "MN"
-msgstr ""
+msgstr "Minnesota"
 
 msgid "MS"
-msgstr ""
+msgstr "Mississippi"
 
 msgid "MO"
-msgstr ""
+msgstr "Missouri"
 
 msgid "MT"
-msgstr ""
+msgstr "Montana"
 
 msgid "NE"
-msgstr ""
+msgstr "Nebraska"
 
 msgid "NV"
-msgstr ""
+msgstr "Nevada"
 
 msgid "NH"
-msgstr ""
+msgstr "New Hampshire"
 
 msgid "NJ"
-msgstr ""
+msgstr "New Jersey"
 
 msgid "NM"
-msgstr ""
+msgstr "New Mexico"
 
 msgid "NY"
-msgstr ""
+msgstr "New York"
 
 msgid "NC"
-msgstr ""
+msgstr "North Carolina"
 
 msgid "ND"
-msgstr ""
+msgstr "North Dakota"
 
 msgid "OH"
-msgstr ""
+msgstr "Ohio"
 
 msgid "OR"
-msgstr ""
+msgstr "Oregon"
 
 msgid "PA"
-msgstr ""
+msgstr "Pennsylvania"
 
 msgid "RI"
-msgstr ""
+msgstr "Rhode Island"
 
 msgid "SC"
-msgstr ""
+msgstr "South Carolina"
 
 msgid "SD"
-msgstr ""
+msgstr "South Dakota"
 
 msgid "TN"
-msgstr ""
+msgstr "Tennessee"
 
 msgid "TX"
-msgstr ""
+msgstr "Texas"
 
 msgid "UT"
-msgstr ""
+msgstr "Utah"
 
 msgid "VT"
-msgstr ""
+msgstr "Vermont"
 
 msgid "VA"
-msgstr ""
+msgstr "Virginia"
 
 msgid "WA"
-msgstr ""
+msgstr "Washington"
 
 msgid "WV"
-msgstr ""
+msgstr "West Virginia"
 
 msgid "WI"
-msgstr ""
+msgstr "Wisconsin"
 
 msgid "DC"
-msgstr ""
+msgstr "District of Columbia"
 
 msgid "AS"
-msgstr ""
+msgstr "Amerikanska Samoa"
 
 msgid "GU"
-msgstr ""
+msgstr "Guam"
 
 msgid "MP"
-msgstr ""
+msgstr "Nordmarianerna"
 
 msgid "PR"
-msgstr ""
+msgstr "Puerto Rico"
 
 msgid "UM"
-msgstr ""
+msgstr "Mindre öar i Oceanien och Västindien"
 
 msgid "VI"
-msgstr ""
+msgstr "Amerikanska Jungfruöarna"
 
 msgid "Address Interpolation"
 msgstr "Adressinterpolation"
@@ -21122,7 +21277,13 @@ msgstr ""
 msgid "Estonia Ortho (Maaamet)"
 msgstr ""
 
-msgid "Estonia Multi (Maaamet)"
+msgid "Estonia Hillshade (Maaamet)"
+msgstr ""
+
+msgid "Estonia Cadastre (Maaamet)"
+msgstr ""
+
+msgid "Estonia Forestry (Maaamet)"
 msgstr ""
 
 msgid "Bordeaux - 2012"
@@ -21146,7 +21307,7 @@ msgstr ""
 msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
 msgstr ""
 
-msgid "CUGN Nancy - Orthophoto 2012"
+msgid "GrandNancy Orthophotographie 2012"
 msgstr ""
 
 msgid "Géobretagne - Brest 2010 - 10 cm"
@@ -21193,9 +21354,6 @@ msgid ""
 "- 1 m"
 msgstr ""
 
-msgid "Streets NRW Geofabrik.de"
-msgstr ""
-
 msgid "Hike & Bike"
 msgstr ""
 
@@ -21255,6 +21413,9 @@ msgstr ""
 msgid "NRW-Atlas: Topographische Karte 1:10000"
 msgstr ""
 
+msgid "Metropole Ruhr: Luftbilder (10 cm)"
+msgstr ""
+
 msgid "Drone Imagery (Haiti)"
 msgstr ""
 
@@ -21456,6 +21617,9 @@ msgstr ""
 msgid "Stadt Zürich Übersichtsplan (Strassen, Gebäude, Hausnummer)"
 msgstr ""
 
+msgid "Stadt Zürich Luftbild 2011"
+msgstr ""
+
 msgid "Orthofoto Kanton Solothurn RGB (SOGIS 2011/2012/2013)"
 msgstr ""
 
@@ -21474,7 +21638,7 @@ msgstr ""
 msgid "Canton de Fribourg 50cm (2005)"
 msgstr ""
 
-msgid "Stadt Bern 10cm/25cm (2008)"
+msgid "Stadt Bern 10cm/25cm (2012)"
 msgstr ""
 
 msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
@@ -21513,7 +21677,7 @@ msgstr ""
 msgid "OSM US TIGER 2012 Roads Overlay"
 msgstr ""
 
-msgid "New & Misaligned TIGER Roads (TIGER 2013)"
+msgid "New & Misaligned TIGER Roads (TIGER 2014)"
 msgstr ""
 
 msgid "MassGIS L3 Parcels"
@@ -21561,9 +21725,234 @@ msgstr ""
 msgid "NLS - Bartholomew Half Inch, 1897-1907"
 msgstr ""
 
+msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Annan 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgstr ""
+
 msgid "OS Town Plans, Cupar 1854 (NLS)"
 msgstr ""
 
+msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Elgin 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Forres 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Galashiels 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Girvan 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Greenock 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Haddington 1853 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Haddington 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Hamilton 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Irvine 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Jedburgh 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kelso 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Lanark 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Linlithgow 1856 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Musselburgh 1853 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Musselburgh 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Oban 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Peebles 1856 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Perth 1860 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Peterhead 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Selkirk 1865 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, St Andrews 1854 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, St Andrews 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stirling 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stonehaven 1864 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1847 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Strathaven 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wick 1872 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wigtown 1848 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wigtown 1894 (NLS)"
+msgstr ""
+
 msgid "Decreasing house numbers in addresses interpolation"
 msgstr ""
 
@@ -21617,19 +22006,39 @@ msgid "{0}={1} is deprecated. Please use instead a multipolygon."
 msgstr ""
 
 msgid ""
-"{0} is deprecated. Please specify ìnterval by using opening_hours syntax"
+"{0} is deprecated. Please specify interval by using opening_hours syntax"
 msgstr ""
 
 msgid ""
 "{0} is deprecated. Please delete this object and use a private layer instead"
 msgstr ""
 
-msgid "{0} on a node"
-msgstr "{0} på en nod"
+msgid "{0}={1} is unspecific. Please replace ''{1}'' by a specific value."
+msgstr ""
 
-msgid "{0} on a node. Should be drawn as an area"
+msgid "{0} should be replaced with {1}"
 msgstr ""
 
+msgid ""
+"{0}={1} is unspecific. Please replace ''{1}'' by ''left'', ''right'' or "
+"''both''."
+msgstr ""
+
+msgid "{0} on a node. Should be used on a way."
+msgstr ""
+
+msgid "{0} on a node. Should be drawn as an area."
+msgstr ""
+
+msgid "{0}=* on a node. Should be used in a relation"
+msgstr ""
+
+msgid "{0} on a way. Should be used in a relation"
+msgstr ""
+
+msgid "{0} on a node"
+msgstr "{0} på en nod"
+
 msgid "Building inside building"
 msgstr "Byggnader i byggnader"
 
@@ -26333,6 +26742,9 @@ msgstr ""
 msgid "Find"
 msgstr ""
 
+msgid "Show"
+msgstr "Visa"
+
 msgid "Mark"
 msgstr ""
 
diff --git a/i18n/po/ta.po b/i18n/po/ta.po
index 50133a1..cb0a408 100644
--- a/i18n/po/ta.po
+++ b/i18n/po/ta.po
@@ -1,8 +1,13 @@
+# Tamil translation for josm
+# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
+# This file is distributed under the same license as the josm package.
+# FIRST AUTHOR <EMAIL at ADDRESS>, 2009.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-21 03:38+0200\n"
+"POT-Creation-Date: 2014-12-10 03:42+0100\n"
 "PO-Revision-Date: 2012-10-03 22:36+0000\n"
 "Last-Translator: நவீன் குமார்(கெம்ளின்) <naveenmtp at gmail.com>\n"
 "Language-Team: Tamil <ta at li.org>\n"
@@ -10,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-10-21 05:25+0000\n"
-"X-Generator: Launchpad (build 17203)\n"
+"X-Launchpad-Export-Date: 2014-12-10 05:13+0000\n"
+"X-Generator: Launchpad (build 17283)\n"
 "X-Poedit-Country: INDIA\n"
 "Language: ta\n"
 "X-Poedit-Language: Tamil\n"
@@ -170,16 +175,6 @@ msgid "About JOSM..."
 msgstr "JOSM பற்றி"
 
 msgid ""
-"Unexpected format of API base URL. Redirection to info or history page for "
-"OSM object will probably fail. API base URL is: ''{0}''"
-msgstr ""
-
-msgid ""
-"Unexpected format of API base URL. Redirection to user page for OSM user "
-"will probably fail. API base URL is: ''{0}''"
-msgstr ""
-
-msgid ""
 "You are about to launch {0} browser window.<br>This may both clutter your "
 "screen with browser windows<br>and take some time to finish."
 msgid_plural ""
@@ -1552,6 +1547,15 @@ msgstr "பதிவேற்ற மாற்றங்கள் ஏதும்
 msgid "Nothing to upload. Get some data first."
 msgstr "பதிவேற்றுவதற்கு எதுவும் இல்லை. முதலில் விவரங்கள் அளிக்கவும்."
 
+msgid "Upload note changes to server"
+msgstr ""
+
+msgid "Upload notes"
+msgstr ""
+
+msgid "Uploading notes to server"
+msgstr ""
+
 msgid "Upload selection"
 msgstr "தேர்வைப் பதிவேற்று"
 
@@ -1825,10 +1829,16 @@ msgstr ""
 msgid "Click the location where you wish to create a new note"
 msgstr ""
 
-msgid "Enter a comment for a new note"
+msgid "Create new note"
 msgstr ""
 
-msgid "Create new note"
+msgid "Create note"
+msgstr ""
+
+msgid "Enter a detailed comment to create a note"
+msgstr ""
+
+msgid "You must enter a comment to create a new note"
 msgstr ""
 
 msgid "Delete Mode"
@@ -2699,6 +2709,15 @@ msgstr ""
 msgid "Cycling dependencies"
 msgstr ""
 
+msgid "Uploading modified notes"
+msgstr ""
+
+msgid "Note {0} failed: {1}"
+msgstr ""
+
+msgid "Notes failed to upload"
+msgstr ""
+
 msgid ""
 "The following are results of automatic validation. Try fixing these, but be "
 "careful (don''t destroy valid data). When in doubt ignore them.<br>When you "
@@ -4928,6 +4947,12 @@ msgstr ""
 msgid "Conflict foreground: keep all tags"
 msgstr ""
 
+msgid "Conflict background: sum all numeric tags"
+msgstr ""
+
+msgid "Conflict foreground: sum all numeric tags"
+msgstr ""
+
 msgid "Conflict background: keep member"
 msgstr ""
 
@@ -5346,12 +5371,19 @@ msgstr ""
 msgid "all"
 msgstr ""
 
+msgid "sum"
+msgstr ""
+
 msgid "Please decide which values to keep"
 msgstr ""
 
 msgid "Value ''{0}'' is going to be applied for key ''{1}''"
 msgstr ""
 
+msgid ""
+"All numeric values sumed as ''{0}'' are going to be applied for key ''{1}''"
+msgstr ""
+
 msgid "The key ''{0}'' and all its values are going to be removed"
 msgstr ""
 
@@ -5714,24 +5746,6 @@ msgstr[1] ""
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
 
-msgid "Display the history of all selected items."
-msgstr ""
-
-msgid "Object with history"
-msgstr ""
-
-msgid "Reload"
-msgstr ""
-
-msgid "Reload all currently selected objects and refresh the list."
-msgstr ""
-
-msgid "Show"
-msgstr ""
-
-msgid "Display the history of the selected objects."
-msgstr ""
-
 msgid "Advanced object info"
 msgstr ""
 
@@ -6069,6 +6083,9 @@ msgstr ""
 msgid "Comment"
 msgstr ""
 
+msgid "Comment on note"
+msgstr ""
+
 msgid "Add comment to note:"
 msgstr ""
 
@@ -6078,9 +6095,6 @@ msgstr ""
 msgid "Close note with message:"
 msgstr ""
 
-msgid "Close Note"
-msgstr ""
-
 msgid "Create a new note"
 msgstr ""
 
@@ -6153,6 +6167,9 @@ msgstr ""
 msgid "Search for objects"
 msgstr ""
 
+msgid "Display the history of the selected objects."
+msgstr ""
+
 msgid "Zoom to selection"
 msgstr ""
 
@@ -6272,6 +6289,9 @@ msgstr ""
 msgid "Updating map ..."
 msgstr ""
 
+msgid "anonymous"
+msgstr ""
+
 msgid "Display the basic properties of the changeset"
 msgstr ""
 
@@ -6284,6 +6304,12 @@ msgstr ""
 msgid "Display the objects created, updated, and deleted by the changeset"
 msgstr ""
 
+msgid "Discussion"
+msgstr ""
+
+msgid "Display the public discussion around this changeset"
+msgstr ""
+
 msgid "Changeset Management Dialog"
 msgstr ""
 
@@ -6341,9 +6367,6 @@ msgctxt "changeset.state"
 msgid "Closed"
 msgstr ""
 
-msgid "anonymous"
-msgstr ""
-
 msgid "ID"
 msgstr ""
 
@@ -6359,6 +6382,9 @@ msgstr ""
 msgid "Closed at"
 msgstr ""
 
+msgid "Discussions"
+msgstr ""
+
 msgid "Downloading changeset content"
 msgstr ""
 
@@ -6470,6 +6496,15 @@ msgid ""
 "layer"
 msgstr ""
 
+msgid "Update changeset discussion"
+msgstr ""
+
+msgid "Update the changeset discussion from the OSM server"
+msgstr ""
+
+msgid "Date"
+msgstr ""
+
 msgid "Download changesets"
 msgstr ""
 
@@ -6888,7 +6923,7 @@ msgstr ""
 msgid "Set number of recently added tags"
 msgstr ""
 
-msgid "Remember last used tags"
+msgid "Remember last used tags after a restart"
 msgstr ""
 
 msgid "Please enter the number of recently added tags to display"
@@ -7234,6 +7269,9 @@ msgstr ""
 msgid "Load parent relations"
 msgstr ""
 
+msgid "Reload"
+msgstr ""
+
 msgid "Loading parent relations"
 msgstr ""
 
@@ -7356,6 +7394,12 @@ msgstr ""
 msgid "Select to download GPS traces in the selected download area."
 msgstr ""
 
+msgid "Notes"
+msgstr ""
+
+msgid "Select to download notes in the selected download area."
+msgstr ""
+
 msgid "Download as new layer"
 msgstr ""
 
@@ -7661,9 +7705,6 @@ msgstr ""
 msgid "B"
 msgstr ""
 
-msgid "Date"
-msgstr ""
-
 msgid ""
 "Failed to update primitive with id {0} because current edit layer is null"
 msgstr ""
@@ -8518,9 +8559,6 @@ msgstr ""
 msgid "Save Layer"
 msgstr "அடுக்கைக் காக்க்"
 
-msgid "Notes"
-msgstr ""
-
 msgid "Notes layer"
 msgstr ""
 
@@ -8536,9 +8574,6 @@ msgstr ""
 msgid "outside downloaded area"
 msgstr ""
 
-msgid "version {0}"
-msgstr ""
-
 msgid "Merging layers"
 msgstr ""
 
@@ -12166,6 +12201,15 @@ msgstr ""
 msgid "Open changeset expected. Got closed changeset with id {0}."
 msgstr ""
 
+msgid "Note upload failed"
+msgstr ""
+
+msgid "Error parsing note response from server"
+msgstr ""
+
+msgid "Error encoding string: {0}"
+msgstr ""
+
 msgid "(Code={0})"
 msgstr ""
 
@@ -12214,13 +12258,13 @@ msgstr ""
 msgid "Parsing changeset content ..."
 msgstr ""
 
-msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
-msgid "Illegal numeric value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
-msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal numeric value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
 msgid "Missing mandatory attribute ''{0}'' of XML element {1}."
@@ -13012,9 +13056,6 @@ msgstr ""
 msgid "Failed to scan file ''{0}'' for plugin information. Skipping."
 msgstr ""
 
-msgid "Processing plugin site cache icon files..."
-msgstr ""
-
 msgid "Processing plugin files..."
 msgstr ""
 
@@ -13033,12 +13074,6 @@ msgstr ""
 msgid "Details:"
 msgstr ""
 
-msgid "Plugin icons download error"
-msgstr ""
-
-msgid "JOSM failed to download plugin icons:"
-msgstr ""
-
 msgid ""
 "Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
 "plugin site ''{1}''."
@@ -13924,7 +13959,9 @@ msgid ""
 "Creating and handling address nodes and buildings within Czech Republic."
 msgstr ""
 
-msgid "Allows to import various file formats into JOSM directly."
+msgid ""
+"Allows to import various file formats into JOSM directly. Currently "
+"supported: TangoGPS, Garmin Trainings Center TCX."
 msgstr ""
 
 msgid "Download your GPX tracks from openstreetmap.org"
@@ -14021,6 +14058,11 @@ msgid "A helper for IRS satellite adjustment."
 msgstr ""
 
 msgid ""
+"Provides Java Native Access (JNA) library. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
+msgid ""
 "Provides Java Topology Suite (JTS) library and related utilities. Not meant "
 "to be installed directly by users, but rather as a dependency for other "
 "plugins."
@@ -14376,6 +14418,25 @@ msgstr ""
 msgid "Width (meters)"
 msgstr ""
 
+msgid "Sidewalk"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "both"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "left"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "right"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "no"
+msgstr ""
+
 msgid "Service type"
 msgstr ""
 
@@ -14740,15 +14801,19 @@ msgstr ""
 msgid "May-Sep 09:30-12:30,14:15-19:30"
 msgstr ""
 
+msgctxt "parking"
 msgid "multi-storey"
 msgstr ""
 
+msgctxt "parking"
 msgid "surface"
 msgstr ""
 
+msgctxt "parking"
 msgid "underground"
 msgstr ""
 
+msgctxt "parking"
 msgid "rooftop"
 msgstr ""
 
@@ -15206,15 +15271,26 @@ msgstr ""
 msgid "Overtaking"
 msgstr ""
 
+msgctxt "overtaking"
+msgid "yes"
+msgstr ""
+
+msgctxt "overtaking"
 msgid "both"
 msgstr ""
 
+msgctxt "overtaking"
 msgid "forward"
 msgstr ""
 
+msgctxt "overtaking"
 msgid "backward"
 msgstr ""
 
+msgctxt "overtaking"
+msgid "no"
+msgstr ""
+
 msgid "Roundabout"
 msgstr ""
 
@@ -15508,6 +15584,12 @@ msgstr ""
 msgid "tiger"
 msgstr ""
 
+msgid "Button operated"
+msgstr ""
+
+msgid "Sound signals"
+msgstr ""
+
 msgid "Crossing attendant"
 msgstr ""
 
@@ -16029,9 +16111,6 @@ msgstr ""
 msgid "Traffic lights"
 msgstr ""
 
-msgid "Sound signals"
-msgstr ""
-
 msgid "Barrier"
 msgstr ""
 
@@ -18091,6 +18170,9 @@ msgstr ""
 msgid "Gasometer"
 msgstr ""
 
+msgid "Bunker Silo"
+msgstr ""
+
 msgid "Pipeline"
 msgstr ""
 
@@ -18237,15 +18319,15 @@ msgstr ""
 msgid "Monitoring:"
 msgstr ""
 
-msgid "Weather"
-msgstr ""
-
 msgid "Water level"
 msgstr ""
 
 msgid "Tide Level"
 msgstr ""
 
+msgid "Groundwater"
+msgstr ""
+
 msgid "Traffic"
 msgstr ""
 
@@ -18264,6 +18346,9 @@ msgstr ""
 msgid "Galileo Signals"
 msgstr ""
 
+msgid "Weather"
+msgstr ""
+
 msgid "Radiation"
 msgstr ""
 
@@ -18444,6 +18529,9 @@ msgstr ""
 msgid "pivot_pier"
 msgstr ""
 
+msgid "Bridge outline"
+msgstr ""
+
 msgid "Power Plant"
 msgstr ""
 
@@ -19051,6 +19139,15 @@ msgstr ""
 msgid "Pole"
 msgstr ""
 
+msgid "Pole with Transformer"
+msgstr ""
+
+msgid "Pole Attributes:"
+msgstr ""
+
+msgid "Transformer Attributes:"
+msgstr ""
+
 msgid "Power Line"
 msgstr ""
 
@@ -19100,9 +19197,15 @@ msgstr ""
 msgid "Power Cable"
 msgstr ""
 
+msgctxt "power cable"
+msgid "underground"
+msgstr ""
+
+msgctxt "power cable"
 msgid "underwater"
 msgstr ""
 
+msgctxt "power cable"
 msgid "overground"
 msgstr ""
 
@@ -19130,6 +19233,33 @@ msgstr ""
 msgid "Memorial"
 msgstr ""
 
+msgctxt "memorial"
+msgid "statue"
+msgstr ""
+
+msgctxt "memorial"
+msgid "bust"
+msgstr ""
+
+msgctxt "memorial"
+msgid "plaque"
+msgstr ""
+
+msgctxt "memorial"
+msgid "stele"
+msgstr ""
+
+msgctxt "memorial"
+msgid "stone"
+msgstr ""
+
+msgctxt "memorial"
+msgid "war_memorial"
+msgstr ""
+
+msgid "Inscription"
+msgstr ""
+
 msgid "Wayside Cross"
 msgstr ""
 
@@ -19199,6 +19329,9 @@ msgstr ""
 msgid "Beverages"
 msgstr ""
 
+msgid "Wine"
+msgstr ""
+
 msgid "Boutique"
 msgstr ""
 
@@ -19244,6 +19377,9 @@ msgstr "வீடியோ"
 msgid "Video Games"
 msgstr ""
 
+msgid "Music"
+msgstr ""
+
 msgid "Cash"
 msgstr "பணம்"
 
@@ -19271,6 +19407,9 @@ msgstr ""
 msgid "Curtain"
 msgstr ""
 
+msgid "Art"
+msgstr ""
+
 msgid "Frame"
 msgstr ""
 
@@ -19316,6 +19455,9 @@ msgstr ""
 msgid "Beauty"
 msgstr ""
 
+msgid "Tattoo"
+msgstr ""
+
 msgid "Optician"
 msgstr ""
 
@@ -19367,6 +19509,9 @@ msgstr ""
 msgid "Pet"
 msgstr ""
 
+msgid "Funeral Directors"
+msgstr ""
+
 msgid "Vending Machine"
 msgstr ""
 
@@ -19466,6 +19611,15 @@ msgstr ""
 msgid "National Park"
 msgstr ""
 
+msgid "Protected Area"
+msgstr ""
+
+msgid "Protected Class"
+msgstr ""
+
+msgid "Title or type of protection"
+msgstr ""
+
 msgid "Places"
 msgstr ""
 
@@ -20542,7 +20696,13 @@ msgstr ""
 msgid "Estonia Ortho (Maaamet)"
 msgstr ""
 
-msgid "Estonia Multi (Maaamet)"
+msgid "Estonia Hillshade (Maaamet)"
+msgstr ""
+
+msgid "Estonia Cadastre (Maaamet)"
+msgstr ""
+
+msgid "Estonia Forestry (Maaamet)"
 msgstr ""
 
 msgid "Bordeaux - 2012"
@@ -20566,7 +20726,7 @@ msgstr ""
 msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
 msgstr ""
 
-msgid "CUGN Nancy - Orthophoto 2012"
+msgid "GrandNancy Orthophotographie 2012"
 msgstr ""
 
 msgid "Géobretagne - Brest 2010 - 10 cm"
@@ -20613,9 +20773,6 @@ msgid ""
 "- 1 m"
 msgstr ""
 
-msgid "Streets NRW Geofabrik.de"
-msgstr ""
-
 msgid "Hike & Bike"
 msgstr ""
 
@@ -20675,6 +20832,9 @@ msgstr ""
 msgid "NRW-Atlas: Topographische Karte 1:10000"
 msgstr ""
 
+msgid "Metropole Ruhr: Luftbilder (10 cm)"
+msgstr ""
+
 msgid "Drone Imagery (Haiti)"
 msgstr ""
 
@@ -20876,6 +21036,9 @@ msgstr ""
 msgid "Stadt Zürich Übersichtsplan (Strassen, Gebäude, Hausnummer)"
 msgstr ""
 
+msgid "Stadt Zürich Luftbild 2011"
+msgstr ""
+
 msgid "Orthofoto Kanton Solothurn RGB (SOGIS 2011/2012/2013)"
 msgstr ""
 
@@ -20894,7 +21057,7 @@ msgstr ""
 msgid "Canton de Fribourg 50cm (2005)"
 msgstr ""
 
-msgid "Stadt Bern 10cm/25cm (2008)"
+msgid "Stadt Bern 10cm/25cm (2012)"
 msgstr ""
 
 msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
@@ -20933,7 +21096,7 @@ msgstr ""
 msgid "OSM US TIGER 2012 Roads Overlay"
 msgstr ""
 
-msgid "New & Misaligned TIGER Roads (TIGER 2013)"
+msgid "New & Misaligned TIGER Roads (TIGER 2014)"
 msgstr ""
 
 msgid "MassGIS L3 Parcels"
@@ -20981,9 +21144,234 @@ msgstr ""
 msgid "NLS - Bartholomew Half Inch, 1897-1907"
 msgstr ""
 
+msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Annan 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgstr ""
+
 msgid "OS Town Plans, Cupar 1854 (NLS)"
 msgstr ""
 
+msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Elgin 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Forres 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Galashiels 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Girvan 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Greenock 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Haddington 1853 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Haddington 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Hamilton 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Irvine 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Jedburgh 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kelso 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Lanark 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Linlithgow 1856 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Musselburgh 1853 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Musselburgh 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Oban 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Peebles 1856 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Perth 1860 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Peterhead 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Selkirk 1865 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, St Andrews 1854 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, St Andrews 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stirling 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stonehaven 1864 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1847 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Strathaven 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wick 1872 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wigtown 1848 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wigtown 1894 (NLS)"
+msgstr ""
+
 msgid "Decreasing house numbers in addresses interpolation"
 msgstr ""
 
@@ -21037,17 +21425,37 @@ msgid "{0}={1} is deprecated. Please use instead a multipolygon."
 msgstr ""
 
 msgid ""
-"{0} is deprecated. Please specify ìnterval by using opening_hours syntax"
+"{0} is deprecated. Please specify interval by using opening_hours syntax"
 msgstr ""
 
 msgid ""
 "{0} is deprecated. Please delete this object and use a private layer instead"
 msgstr ""
 
-msgid "{0} on a node"
+msgid "{0}={1} is unspecific. Please replace ''{1}'' by a specific value."
 msgstr ""
 
-msgid "{0} on a node. Should be drawn as an area"
+msgid "{0} should be replaced with {1}"
+msgstr ""
+
+msgid ""
+"{0}={1} is unspecific. Please replace ''{1}'' by ''left'', ''right'' or "
+"''both''."
+msgstr ""
+
+msgid "{0} on a node. Should be used on a way."
+msgstr ""
+
+msgid "{0} on a node. Should be drawn as an area."
+msgstr ""
+
+msgid "{0}=* on a node. Should be used in a relation"
+msgstr ""
+
+msgid "{0} on a way. Should be used in a relation"
+msgstr ""
+
+msgid "{0} on a node"
 msgstr ""
 
 msgid "Building inside building"
@@ -25723,6 +26131,9 @@ msgstr ""
 msgid "Find"
 msgstr ""
 
+msgid "Show"
+msgstr ""
+
 msgid "Mark"
 msgstr ""
 
diff --git a/i18n/po/te.po b/i18n/po/te.po
index ca70786..56db770 100644
--- a/i18n/po/te.po
+++ b/i18n/po/te.po
@@ -1,8 +1,13 @@
+# Telugu translation for josm
+# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
+# This file is distributed under the same license as the josm package.
+# FIRST AUTHOR <EMAIL at ADDRESS>, 2009.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-21 03:38+0200\n"
+"POT-Creation-Date: 2014-12-10 03:42+0100\n"
 "PO-Revision-Date: 2011-05-13 08:50+0000\n"
 "Last-Translator: Praveen Illa <mail2ipn at gmail.com>\n"
 "Language-Team: Telugu <te at li.org>\n"
@@ -10,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-10-21 05:26+0000\n"
-"X-Generator: Launchpad (build 17203)\n"
+"X-Launchpad-Export-Date: 2014-12-10 05:14+0000\n"
+"X-Generator: Launchpad (build 17283)\n"
 "Language: te\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -168,16 +173,6 @@ msgid "About JOSM..."
 msgstr "JOSM గురించి..."
 
 msgid ""
-"Unexpected format of API base URL. Redirection to info or history page for "
-"OSM object will probably fail. API base URL is: ''{0}''"
-msgstr ""
-
-msgid ""
-"Unexpected format of API base URL. Redirection to user page for OSM user "
-"will probably fail. API base URL is: ''{0}''"
-msgstr ""
-
-msgid ""
 "You are about to launch {0} browser window.<br>This may both clutter your "
 "screen with browser windows<br>and take some time to finish."
 msgid_plural ""
@@ -1519,6 +1514,15 @@ msgstr ""
 msgid "Nothing to upload. Get some data first."
 msgstr ""
 
+msgid "Upload note changes to server"
+msgstr ""
+
+msgid "Upload notes"
+msgstr ""
+
+msgid "Uploading notes to server"
+msgstr ""
+
 msgid "Upload selection"
 msgstr ""
 
@@ -1791,10 +1795,16 @@ msgstr ""
 msgid "Click the location where you wish to create a new note"
 msgstr ""
 
-msgid "Enter a comment for a new note"
+msgid "Create new note"
 msgstr ""
 
-msgid "Create new note"
+msgid "Create note"
+msgstr ""
+
+msgid "Enter a detailed comment to create a note"
+msgstr ""
+
+msgid "You must enter a comment to create a new note"
 msgstr ""
 
 msgid "Delete Mode"
@@ -2665,6 +2675,15 @@ msgstr ""
 msgid "Cycling dependencies"
 msgstr ""
 
+msgid "Uploading modified notes"
+msgstr ""
+
+msgid "Note {0} failed: {1}"
+msgstr ""
+
+msgid "Notes failed to upload"
+msgstr ""
+
 msgid ""
 "The following are results of automatic validation. Try fixing these, but be "
 "careful (don''t destroy valid data). When in doubt ignore them.<br>When you "
@@ -4894,6 +4913,12 @@ msgstr ""
 msgid "Conflict foreground: keep all tags"
 msgstr ""
 
+msgid "Conflict background: sum all numeric tags"
+msgstr ""
+
+msgid "Conflict foreground: sum all numeric tags"
+msgstr ""
+
 msgid "Conflict background: keep member"
 msgstr ""
 
@@ -5312,12 +5337,19 @@ msgstr ""
 msgid "all"
 msgstr ""
 
+msgid "sum"
+msgstr ""
+
 msgid "Please decide which values to keep"
 msgstr ""
 
 msgid "Value ''{0}'' is going to be applied for key ''{1}''"
 msgstr ""
 
+msgid ""
+"All numeric values sumed as ''{0}'' are going to be applied for key ''{1}''"
+msgstr ""
+
 msgid "The key ''{0}'' and all its values are going to be removed"
 msgstr ""
 
@@ -5680,24 +5712,6 @@ msgstr[1] ""
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
 
-msgid "Display the history of all selected items."
-msgstr ""
-
-msgid "Object with history"
-msgstr ""
-
-msgid "Reload"
-msgstr ""
-
-msgid "Reload all currently selected objects and refresh the list."
-msgstr ""
-
-msgid "Show"
-msgstr ""
-
-msgid "Display the history of the selected objects."
-msgstr ""
-
 msgid "Advanced object info"
 msgstr ""
 
@@ -6035,6 +6049,9 @@ msgstr ""
 msgid "Comment"
 msgstr ""
 
+msgid "Comment on note"
+msgstr ""
+
 msgid "Add comment to note:"
 msgstr ""
 
@@ -6044,9 +6061,6 @@ msgstr ""
 msgid "Close note with message:"
 msgstr ""
 
-msgid "Close Note"
-msgstr ""
-
 msgid "Create a new note"
 msgstr ""
 
@@ -6119,6 +6133,9 @@ msgstr ""
 msgid "Search for objects"
 msgstr ""
 
+msgid "Display the history of the selected objects."
+msgstr ""
+
 msgid "Zoom to selection"
 msgstr ""
 
@@ -6238,6 +6255,9 @@ msgstr ""
 msgid "Updating map ..."
 msgstr ""
 
+msgid "anonymous"
+msgstr ""
+
 msgid "Display the basic properties of the changeset"
 msgstr ""
 
@@ -6250,6 +6270,12 @@ msgstr ""
 msgid "Display the objects created, updated, and deleted by the changeset"
 msgstr ""
 
+msgid "Discussion"
+msgstr ""
+
+msgid "Display the public discussion around this changeset"
+msgstr ""
+
 msgid "Changeset Management Dialog"
 msgstr ""
 
@@ -6307,9 +6333,6 @@ msgctxt "changeset.state"
 msgid "Closed"
 msgstr ""
 
-msgid "anonymous"
-msgstr ""
-
 msgid "ID"
 msgstr ""
 
@@ -6325,6 +6348,9 @@ msgstr ""
 msgid "Closed at"
 msgstr ""
 
+msgid "Discussions"
+msgstr ""
+
 msgid "Downloading changeset content"
 msgstr ""
 
@@ -6436,6 +6462,15 @@ msgid ""
 "layer"
 msgstr ""
 
+msgid "Update changeset discussion"
+msgstr ""
+
+msgid "Update the changeset discussion from the OSM server"
+msgstr ""
+
+msgid "Date"
+msgstr ""
+
 msgid "Download changesets"
 msgstr ""
 
@@ -6853,7 +6888,7 @@ msgstr ""
 msgid "Set number of recently added tags"
 msgstr ""
 
-msgid "Remember last used tags"
+msgid "Remember last used tags after a restart"
 msgstr ""
 
 msgid "Please enter the number of recently added tags to display"
@@ -7199,6 +7234,9 @@ msgstr ""
 msgid "Load parent relations"
 msgstr ""
 
+msgid "Reload"
+msgstr ""
+
 msgid "Loading parent relations"
 msgstr ""
 
@@ -7321,6 +7359,12 @@ msgstr ""
 msgid "Select to download GPS traces in the selected download area."
 msgstr ""
 
+msgid "Notes"
+msgstr ""
+
+msgid "Select to download notes in the selected download area."
+msgstr ""
+
 msgid "Download as new layer"
 msgstr ""
 
@@ -7626,9 +7670,6 @@ msgstr ""
 msgid "B"
 msgstr ""
 
-msgid "Date"
-msgstr ""
-
 msgid ""
 "Failed to update primitive with id {0} because current edit layer is null"
 msgstr ""
@@ -8483,9 +8524,6 @@ msgstr ""
 msgid "Save Layer"
 msgstr ""
 
-msgid "Notes"
-msgstr ""
-
 msgid "Notes layer"
 msgstr ""
 
@@ -8501,9 +8539,6 @@ msgstr ""
 msgid "outside downloaded area"
 msgstr ""
 
-msgid "version {0}"
-msgstr ""
-
 msgid "Merging layers"
 msgstr ""
 
@@ -12129,6 +12164,15 @@ msgstr ""
 msgid "Open changeset expected. Got closed changeset with id {0}."
 msgstr ""
 
+msgid "Note upload failed"
+msgstr ""
+
+msgid "Error parsing note response from server"
+msgstr ""
+
+msgid "Error encoding string: {0}"
+msgstr ""
+
 msgid "(Code={0})"
 msgstr ""
 
@@ -12177,13 +12221,13 @@ msgstr ""
 msgid "Parsing changeset content ..."
 msgstr ""
 
-msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
-msgid "Illegal numeric value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
-msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal numeric value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
 msgid "Missing mandatory attribute ''{0}'' of XML element {1}."
@@ -12975,9 +13019,6 @@ msgstr ""
 msgid "Failed to scan file ''{0}'' for plugin information. Skipping."
 msgstr ""
 
-msgid "Processing plugin site cache icon files..."
-msgstr ""
-
 msgid "Processing plugin files..."
 msgstr ""
 
@@ -12996,12 +13037,6 @@ msgstr ""
 msgid "Details:"
 msgstr ""
 
-msgid "Plugin icons download error"
-msgstr ""
-
-msgid "JOSM failed to download plugin icons:"
-msgstr ""
-
 msgid ""
 "Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
 "plugin site ''{1}''."
@@ -13887,7 +13922,9 @@ msgid ""
 "Creating and handling address nodes and buildings within Czech Republic."
 msgstr ""
 
-msgid "Allows to import various file formats into JOSM directly."
+msgid ""
+"Allows to import various file formats into JOSM directly. Currently "
+"supported: TangoGPS, Garmin Trainings Center TCX."
 msgstr ""
 
 msgid "Download your GPX tracks from openstreetmap.org"
@@ -13984,6 +14021,11 @@ msgid "A helper for IRS satellite adjustment."
 msgstr ""
 
 msgid ""
+"Provides Java Native Access (JNA) library. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
+msgid ""
 "Provides Java Topology Suite (JTS) library and related utilities. Not meant "
 "to be installed directly by users, but rather as a dependency for other "
 "plugins."
@@ -14339,6 +14381,25 @@ msgstr ""
 msgid "Width (meters)"
 msgstr ""
 
+msgid "Sidewalk"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "both"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "left"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "right"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "no"
+msgstr ""
+
 msgid "Service type"
 msgstr ""
 
@@ -14703,15 +14764,19 @@ msgstr ""
 msgid "May-Sep 09:30-12:30,14:15-19:30"
 msgstr ""
 
+msgctxt "parking"
 msgid "multi-storey"
 msgstr ""
 
+msgctxt "parking"
 msgid "surface"
 msgstr ""
 
+msgctxt "parking"
 msgid "underground"
 msgstr ""
 
+msgctxt "parking"
 msgid "rooftop"
 msgstr ""
 
@@ -15169,15 +15234,26 @@ msgstr ""
 msgid "Overtaking"
 msgstr ""
 
+msgctxt "overtaking"
+msgid "yes"
+msgstr ""
+
+msgctxt "overtaking"
 msgid "both"
 msgstr ""
 
+msgctxt "overtaking"
 msgid "forward"
 msgstr ""
 
+msgctxt "overtaking"
 msgid "backward"
 msgstr ""
 
+msgctxt "overtaking"
+msgid "no"
+msgstr ""
+
 msgid "Roundabout"
 msgstr ""
 
@@ -15471,6 +15547,12 @@ msgstr ""
 msgid "tiger"
 msgstr ""
 
+msgid "Button operated"
+msgstr ""
+
+msgid "Sound signals"
+msgstr ""
+
 msgid "Crossing attendant"
 msgstr ""
 
@@ -15992,9 +16074,6 @@ msgstr ""
 msgid "Traffic lights"
 msgstr ""
 
-msgid "Sound signals"
-msgstr ""
-
 msgid "Barrier"
 msgstr ""
 
@@ -18054,6 +18133,9 @@ msgstr ""
 msgid "Gasometer"
 msgstr ""
 
+msgid "Bunker Silo"
+msgstr ""
+
 msgid "Pipeline"
 msgstr ""
 
@@ -18200,15 +18282,15 @@ msgstr ""
 msgid "Monitoring:"
 msgstr ""
 
-msgid "Weather"
-msgstr ""
-
 msgid "Water level"
 msgstr ""
 
 msgid "Tide Level"
 msgstr ""
 
+msgid "Groundwater"
+msgstr ""
+
 msgid "Traffic"
 msgstr ""
 
@@ -18227,6 +18309,9 @@ msgstr ""
 msgid "Galileo Signals"
 msgstr ""
 
+msgid "Weather"
+msgstr ""
+
 msgid "Radiation"
 msgstr ""
 
@@ -18407,6 +18492,9 @@ msgstr ""
 msgid "pivot_pier"
 msgstr ""
 
+msgid "Bridge outline"
+msgstr ""
+
 msgid "Power Plant"
 msgstr ""
 
@@ -19014,6 +19102,15 @@ msgstr ""
 msgid "Pole"
 msgstr ""
 
+msgid "Pole with Transformer"
+msgstr ""
+
+msgid "Pole Attributes:"
+msgstr ""
+
+msgid "Transformer Attributes:"
+msgstr ""
+
 msgid "Power Line"
 msgstr ""
 
@@ -19063,9 +19160,15 @@ msgstr ""
 msgid "Power Cable"
 msgstr ""
 
+msgctxt "power cable"
+msgid "underground"
+msgstr ""
+
+msgctxt "power cable"
 msgid "underwater"
 msgstr ""
 
+msgctxt "power cable"
 msgid "overground"
 msgstr ""
 
@@ -19093,6 +19196,33 @@ msgstr ""
 msgid "Memorial"
 msgstr ""
 
+msgctxt "memorial"
+msgid "statue"
+msgstr ""
+
+msgctxt "memorial"
+msgid "bust"
+msgstr ""
+
+msgctxt "memorial"
+msgid "plaque"
+msgstr ""
+
+msgctxt "memorial"
+msgid "stele"
+msgstr ""
+
+msgctxt "memorial"
+msgid "stone"
+msgstr ""
+
+msgctxt "memorial"
+msgid "war_memorial"
+msgstr ""
+
+msgid "Inscription"
+msgstr ""
+
 msgid "Wayside Cross"
 msgstr ""
 
@@ -19162,6 +19292,9 @@ msgstr ""
 msgid "Beverages"
 msgstr ""
 
+msgid "Wine"
+msgstr ""
+
 msgid "Boutique"
 msgstr ""
 
@@ -19207,6 +19340,9 @@ msgstr ""
 msgid "Video Games"
 msgstr ""
 
+msgid "Music"
+msgstr ""
+
 msgid "Cash"
 msgstr ""
 
@@ -19234,6 +19370,9 @@ msgstr ""
 msgid "Curtain"
 msgstr ""
 
+msgid "Art"
+msgstr ""
+
 msgid "Frame"
 msgstr ""
 
@@ -19279,6 +19418,9 @@ msgstr ""
 msgid "Beauty"
 msgstr ""
 
+msgid "Tattoo"
+msgstr ""
+
 msgid "Optician"
 msgstr ""
 
@@ -19330,6 +19472,9 @@ msgstr ""
 msgid "Pet"
 msgstr ""
 
+msgid "Funeral Directors"
+msgstr ""
+
 msgid "Vending Machine"
 msgstr ""
 
@@ -19429,6 +19574,15 @@ msgstr ""
 msgid "National Park"
 msgstr ""
 
+msgid "Protected Area"
+msgstr ""
+
+msgid "Protected Class"
+msgstr ""
+
+msgid "Title or type of protection"
+msgstr ""
+
 msgid "Places"
 msgstr ""
 
@@ -20505,7 +20659,13 @@ msgstr ""
 msgid "Estonia Ortho (Maaamet)"
 msgstr ""
 
-msgid "Estonia Multi (Maaamet)"
+msgid "Estonia Hillshade (Maaamet)"
+msgstr ""
+
+msgid "Estonia Cadastre (Maaamet)"
+msgstr ""
+
+msgid "Estonia Forestry (Maaamet)"
 msgstr ""
 
 msgid "Bordeaux - 2012"
@@ -20529,7 +20689,7 @@ msgstr ""
 msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
 msgstr ""
 
-msgid "CUGN Nancy - Orthophoto 2012"
+msgid "GrandNancy Orthophotographie 2012"
 msgstr ""
 
 msgid "Géobretagne - Brest 2010 - 10 cm"
@@ -20576,9 +20736,6 @@ msgid ""
 "- 1 m"
 msgstr ""
 
-msgid "Streets NRW Geofabrik.de"
-msgstr ""
-
 msgid "Hike & Bike"
 msgstr ""
 
@@ -20638,6 +20795,9 @@ msgstr ""
 msgid "NRW-Atlas: Topographische Karte 1:10000"
 msgstr ""
 
+msgid "Metropole Ruhr: Luftbilder (10 cm)"
+msgstr ""
+
 msgid "Drone Imagery (Haiti)"
 msgstr ""
 
@@ -20839,6 +20999,9 @@ msgstr ""
 msgid "Stadt Zürich Übersichtsplan (Strassen, Gebäude, Hausnummer)"
 msgstr ""
 
+msgid "Stadt Zürich Luftbild 2011"
+msgstr ""
+
 msgid "Orthofoto Kanton Solothurn RGB (SOGIS 2011/2012/2013)"
 msgstr ""
 
@@ -20857,7 +21020,7 @@ msgstr ""
 msgid "Canton de Fribourg 50cm (2005)"
 msgstr ""
 
-msgid "Stadt Bern 10cm/25cm (2008)"
+msgid "Stadt Bern 10cm/25cm (2012)"
 msgstr ""
 
 msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
@@ -20896,7 +21059,7 @@ msgstr ""
 msgid "OSM US TIGER 2012 Roads Overlay"
 msgstr ""
 
-msgid "New & Misaligned TIGER Roads (TIGER 2013)"
+msgid "New & Misaligned TIGER Roads (TIGER 2014)"
 msgstr ""
 
 msgid "MassGIS L3 Parcels"
@@ -20944,9 +21107,234 @@ msgstr ""
 msgid "NLS - Bartholomew Half Inch, 1897-1907"
 msgstr ""
 
+msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Annan 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgstr ""
+
 msgid "OS Town Plans, Cupar 1854 (NLS)"
 msgstr ""
 
+msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Elgin 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Forres 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Galashiels 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Girvan 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Greenock 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Haddington 1853 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Haddington 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Hamilton 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Irvine 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Jedburgh 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kelso 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Lanark 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Linlithgow 1856 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Musselburgh 1853 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Musselburgh 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Oban 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Peebles 1856 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Perth 1860 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Peterhead 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Selkirk 1865 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, St Andrews 1854 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, St Andrews 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stirling 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stonehaven 1864 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1847 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Strathaven 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wick 1872 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wigtown 1848 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wigtown 1894 (NLS)"
+msgstr ""
+
 msgid "Decreasing house numbers in addresses interpolation"
 msgstr ""
 
@@ -21000,17 +21388,37 @@ msgid "{0}={1} is deprecated. Please use instead a multipolygon."
 msgstr ""
 
 msgid ""
-"{0} is deprecated. Please specify ìnterval by using opening_hours syntax"
+"{0} is deprecated. Please specify interval by using opening_hours syntax"
 msgstr ""
 
 msgid ""
 "{0} is deprecated. Please delete this object and use a private layer instead"
 msgstr ""
 
-msgid "{0} on a node"
+msgid "{0}={1} is unspecific. Please replace ''{1}'' by a specific value."
 msgstr ""
 
-msgid "{0} on a node. Should be drawn as an area"
+msgid "{0} should be replaced with {1}"
+msgstr ""
+
+msgid ""
+"{0}={1} is unspecific. Please replace ''{1}'' by ''left'', ''right'' or "
+"''both''."
+msgstr ""
+
+msgid "{0} on a node. Should be used on a way."
+msgstr ""
+
+msgid "{0} on a node. Should be drawn as an area."
+msgstr ""
+
+msgid "{0}=* on a node. Should be used in a relation"
+msgstr ""
+
+msgid "{0} on a way. Should be used in a relation"
+msgstr ""
+
+msgid "{0} on a node"
 msgstr ""
 
 msgid "Building inside building"
@@ -25680,6 +26088,9 @@ msgstr ""
 msgid "Find"
 msgstr ""
 
+msgid "Show"
+msgstr ""
+
 msgid "Mark"
 msgstr ""
 
diff --git a/i18n/po/th.po b/i18n/po/th.po
index 12c6813..018d3d2 100644
--- a/i18n/po/th.po
+++ b/i18n/po/th.po
@@ -1,8 +1,13 @@
+# Thai translation for josm
+# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
+# This file is distributed under the same license as the josm package.
+# FIRST AUTHOR <EMAIL at ADDRESS>, 2009.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-21 03:38+0200\n"
+"POT-Creation-Date: 2014-12-10 03:42+0100\n"
 "PO-Revision-Date: 2009-03-23 02:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: Thai <th at li.org>\n"
@@ -10,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-10-21 05:27+0000\n"
-"X-Generator: Launchpad (build 17203)\n"
+"X-Launchpad-Export-Date: 2014-12-10 05:14+0000\n"
+"X-Generator: Launchpad (build 17283)\n"
 "Language: th\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -168,16 +173,6 @@ msgid "About JOSM..."
 msgstr ""
 
 msgid ""
-"Unexpected format of API base URL. Redirection to info or history page for "
-"OSM object will probably fail. API base URL is: ''{0}''"
-msgstr ""
-
-msgid ""
-"Unexpected format of API base URL. Redirection to user page for OSM user "
-"will probably fail. API base URL is: ''{0}''"
-msgstr ""
-
-msgid ""
 "You are about to launch {0} browser window.<br>This may both clutter your "
 "screen with browser windows<br>and take some time to finish."
 msgid_plural ""
@@ -1519,6 +1514,15 @@ msgstr ""
 msgid "Nothing to upload. Get some data first."
 msgstr ""
 
+msgid "Upload note changes to server"
+msgstr ""
+
+msgid "Upload notes"
+msgstr ""
+
+msgid "Uploading notes to server"
+msgstr ""
+
 msgid "Upload selection"
 msgstr ""
 
@@ -1791,10 +1795,16 @@ msgstr ""
 msgid "Click the location where you wish to create a new note"
 msgstr ""
 
-msgid "Enter a comment for a new note"
+msgid "Create new note"
 msgstr ""
 
-msgid "Create new note"
+msgid "Create note"
+msgstr ""
+
+msgid "Enter a detailed comment to create a note"
+msgstr ""
+
+msgid "You must enter a comment to create a new note"
 msgstr ""
 
 msgid "Delete Mode"
@@ -2665,6 +2675,15 @@ msgstr ""
 msgid "Cycling dependencies"
 msgstr ""
 
+msgid "Uploading modified notes"
+msgstr ""
+
+msgid "Note {0} failed: {1}"
+msgstr ""
+
+msgid "Notes failed to upload"
+msgstr ""
+
 msgid ""
 "The following are results of automatic validation. Try fixing these, but be "
 "careful (don''t destroy valid data). When in doubt ignore them.<br>When you "
@@ -4894,6 +4913,12 @@ msgstr ""
 msgid "Conflict foreground: keep all tags"
 msgstr ""
 
+msgid "Conflict background: sum all numeric tags"
+msgstr ""
+
+msgid "Conflict foreground: sum all numeric tags"
+msgstr ""
+
 msgid "Conflict background: keep member"
 msgstr ""
 
@@ -5312,12 +5337,19 @@ msgstr ""
 msgid "all"
 msgstr ""
 
+msgid "sum"
+msgstr ""
+
 msgid "Please decide which values to keep"
 msgstr ""
 
 msgid "Value ''{0}'' is going to be applied for key ''{1}''"
 msgstr ""
 
+msgid ""
+"All numeric values sumed as ''{0}'' are going to be applied for key ''{1}''"
+msgstr ""
+
 msgid "The key ''{0}'' and all its values are going to be removed"
 msgstr ""
 
@@ -5680,24 +5712,6 @@ msgstr[1] ""
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
 
-msgid "Display the history of all selected items."
-msgstr ""
-
-msgid "Object with history"
-msgstr ""
-
-msgid "Reload"
-msgstr ""
-
-msgid "Reload all currently selected objects and refresh the list."
-msgstr ""
-
-msgid "Show"
-msgstr ""
-
-msgid "Display the history of the selected objects."
-msgstr ""
-
 msgid "Advanced object info"
 msgstr ""
 
@@ -6035,6 +6049,9 @@ msgstr ""
 msgid "Comment"
 msgstr ""
 
+msgid "Comment on note"
+msgstr ""
+
 msgid "Add comment to note:"
 msgstr ""
 
@@ -6044,9 +6061,6 @@ msgstr ""
 msgid "Close note with message:"
 msgstr ""
 
-msgid "Close Note"
-msgstr ""
-
 msgid "Create a new note"
 msgstr ""
 
@@ -6119,6 +6133,9 @@ msgstr ""
 msgid "Search for objects"
 msgstr ""
 
+msgid "Display the history of the selected objects."
+msgstr ""
+
 msgid "Zoom to selection"
 msgstr ""
 
@@ -6238,6 +6255,9 @@ msgstr ""
 msgid "Updating map ..."
 msgstr ""
 
+msgid "anonymous"
+msgstr ""
+
 msgid "Display the basic properties of the changeset"
 msgstr ""
 
@@ -6250,6 +6270,12 @@ msgstr ""
 msgid "Display the objects created, updated, and deleted by the changeset"
 msgstr ""
 
+msgid "Discussion"
+msgstr ""
+
+msgid "Display the public discussion around this changeset"
+msgstr ""
+
 msgid "Changeset Management Dialog"
 msgstr ""
 
@@ -6307,9 +6333,6 @@ msgctxt "changeset.state"
 msgid "Closed"
 msgstr ""
 
-msgid "anonymous"
-msgstr ""
-
 msgid "ID"
 msgstr ""
 
@@ -6325,6 +6348,9 @@ msgstr ""
 msgid "Closed at"
 msgstr ""
 
+msgid "Discussions"
+msgstr ""
+
 msgid "Downloading changeset content"
 msgstr ""
 
@@ -6436,6 +6462,15 @@ msgid ""
 "layer"
 msgstr ""
 
+msgid "Update changeset discussion"
+msgstr ""
+
+msgid "Update the changeset discussion from the OSM server"
+msgstr ""
+
+msgid "Date"
+msgstr ""
+
 msgid "Download changesets"
 msgstr ""
 
@@ -6853,7 +6888,7 @@ msgstr ""
 msgid "Set number of recently added tags"
 msgstr ""
 
-msgid "Remember last used tags"
+msgid "Remember last used tags after a restart"
 msgstr ""
 
 msgid "Please enter the number of recently added tags to display"
@@ -7199,6 +7234,9 @@ msgstr ""
 msgid "Load parent relations"
 msgstr ""
 
+msgid "Reload"
+msgstr ""
+
 msgid "Loading parent relations"
 msgstr ""
 
@@ -7321,6 +7359,12 @@ msgstr ""
 msgid "Select to download GPS traces in the selected download area."
 msgstr ""
 
+msgid "Notes"
+msgstr ""
+
+msgid "Select to download notes in the selected download area."
+msgstr ""
+
 msgid "Download as new layer"
 msgstr ""
 
@@ -7626,9 +7670,6 @@ msgstr ""
 msgid "B"
 msgstr ""
 
-msgid "Date"
-msgstr ""
-
 msgid ""
 "Failed to update primitive with id {0} because current edit layer is null"
 msgstr ""
@@ -8483,9 +8524,6 @@ msgstr ""
 msgid "Save Layer"
 msgstr ""
 
-msgid "Notes"
-msgstr ""
-
 msgid "Notes layer"
 msgstr ""
 
@@ -8501,9 +8539,6 @@ msgstr ""
 msgid "outside downloaded area"
 msgstr ""
 
-msgid "version {0}"
-msgstr ""
-
 msgid "Merging layers"
 msgstr ""
 
@@ -12129,6 +12164,15 @@ msgstr ""
 msgid "Open changeset expected. Got closed changeset with id {0}."
 msgstr ""
 
+msgid "Note upload failed"
+msgstr ""
+
+msgid "Error parsing note response from server"
+msgstr ""
+
+msgid "Error encoding string: {0}"
+msgstr ""
+
 msgid "(Code={0})"
 msgstr ""
 
@@ -12177,13 +12221,13 @@ msgstr ""
 msgid "Parsing changeset content ..."
 msgstr ""
 
-msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
-msgid "Illegal numeric value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
-msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal numeric value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
 msgid "Missing mandatory attribute ''{0}'' of XML element {1}."
@@ -12975,9 +13019,6 @@ msgstr ""
 msgid "Failed to scan file ''{0}'' for plugin information. Skipping."
 msgstr ""
 
-msgid "Processing plugin site cache icon files..."
-msgstr ""
-
 msgid "Processing plugin files..."
 msgstr ""
 
@@ -12996,12 +13037,6 @@ msgstr ""
 msgid "Details:"
 msgstr ""
 
-msgid "Plugin icons download error"
-msgstr ""
-
-msgid "JOSM failed to download plugin icons:"
-msgstr ""
-
 msgid ""
 "Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
 "plugin site ''{1}''."
@@ -13887,7 +13922,9 @@ msgid ""
 "Creating and handling address nodes and buildings within Czech Republic."
 msgstr ""
 
-msgid "Allows to import various file formats into JOSM directly."
+msgid ""
+"Allows to import various file formats into JOSM directly. Currently "
+"supported: TangoGPS, Garmin Trainings Center TCX."
 msgstr ""
 
 msgid "Download your GPX tracks from openstreetmap.org"
@@ -13984,6 +14021,11 @@ msgid "A helper for IRS satellite adjustment."
 msgstr ""
 
 msgid ""
+"Provides Java Native Access (JNA) library. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
+msgid ""
 "Provides Java Topology Suite (JTS) library and related utilities. Not meant "
 "to be installed directly by users, but rather as a dependency for other "
 "plugins."
@@ -14339,6 +14381,25 @@ msgstr ""
 msgid "Width (meters)"
 msgstr ""
 
+msgid "Sidewalk"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "both"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "left"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "right"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "no"
+msgstr ""
+
 msgid "Service type"
 msgstr ""
 
@@ -14703,15 +14764,19 @@ msgstr ""
 msgid "May-Sep 09:30-12:30,14:15-19:30"
 msgstr ""
 
+msgctxt "parking"
 msgid "multi-storey"
 msgstr ""
 
+msgctxt "parking"
 msgid "surface"
 msgstr ""
 
+msgctxt "parking"
 msgid "underground"
 msgstr ""
 
+msgctxt "parking"
 msgid "rooftop"
 msgstr ""
 
@@ -15169,15 +15234,26 @@ msgstr ""
 msgid "Overtaking"
 msgstr ""
 
+msgctxt "overtaking"
+msgid "yes"
+msgstr ""
+
+msgctxt "overtaking"
 msgid "both"
 msgstr ""
 
+msgctxt "overtaking"
 msgid "forward"
 msgstr ""
 
+msgctxt "overtaking"
 msgid "backward"
 msgstr ""
 
+msgctxt "overtaking"
+msgid "no"
+msgstr ""
+
 msgid "Roundabout"
 msgstr ""
 
@@ -15471,6 +15547,12 @@ msgstr ""
 msgid "tiger"
 msgstr ""
 
+msgid "Button operated"
+msgstr ""
+
+msgid "Sound signals"
+msgstr ""
+
 msgid "Crossing attendant"
 msgstr ""
 
@@ -15992,9 +16074,6 @@ msgstr ""
 msgid "Traffic lights"
 msgstr ""
 
-msgid "Sound signals"
-msgstr ""
-
 msgid "Barrier"
 msgstr ""
 
@@ -18054,6 +18133,9 @@ msgstr ""
 msgid "Gasometer"
 msgstr ""
 
+msgid "Bunker Silo"
+msgstr ""
+
 msgid "Pipeline"
 msgstr ""
 
@@ -18200,15 +18282,15 @@ msgstr ""
 msgid "Monitoring:"
 msgstr ""
 
-msgid "Weather"
-msgstr ""
-
 msgid "Water level"
 msgstr ""
 
 msgid "Tide Level"
 msgstr ""
 
+msgid "Groundwater"
+msgstr ""
+
 msgid "Traffic"
 msgstr ""
 
@@ -18227,6 +18309,9 @@ msgstr ""
 msgid "Galileo Signals"
 msgstr ""
 
+msgid "Weather"
+msgstr ""
+
 msgid "Radiation"
 msgstr ""
 
@@ -18407,6 +18492,9 @@ msgstr ""
 msgid "pivot_pier"
 msgstr ""
 
+msgid "Bridge outline"
+msgstr ""
+
 msgid "Power Plant"
 msgstr ""
 
@@ -19014,6 +19102,15 @@ msgstr ""
 msgid "Pole"
 msgstr ""
 
+msgid "Pole with Transformer"
+msgstr ""
+
+msgid "Pole Attributes:"
+msgstr ""
+
+msgid "Transformer Attributes:"
+msgstr ""
+
 msgid "Power Line"
 msgstr ""
 
@@ -19063,9 +19160,15 @@ msgstr ""
 msgid "Power Cable"
 msgstr ""
 
+msgctxt "power cable"
+msgid "underground"
+msgstr ""
+
+msgctxt "power cable"
 msgid "underwater"
 msgstr ""
 
+msgctxt "power cable"
 msgid "overground"
 msgstr ""
 
@@ -19093,6 +19196,33 @@ msgstr ""
 msgid "Memorial"
 msgstr ""
 
+msgctxt "memorial"
+msgid "statue"
+msgstr ""
+
+msgctxt "memorial"
+msgid "bust"
+msgstr ""
+
+msgctxt "memorial"
+msgid "plaque"
+msgstr ""
+
+msgctxt "memorial"
+msgid "stele"
+msgstr ""
+
+msgctxt "memorial"
+msgid "stone"
+msgstr ""
+
+msgctxt "memorial"
+msgid "war_memorial"
+msgstr ""
+
+msgid "Inscription"
+msgstr ""
+
 msgid "Wayside Cross"
 msgstr ""
 
@@ -19162,6 +19292,9 @@ msgstr ""
 msgid "Beverages"
 msgstr ""
 
+msgid "Wine"
+msgstr ""
+
 msgid "Boutique"
 msgstr ""
 
@@ -19207,6 +19340,9 @@ msgstr ""
 msgid "Video Games"
 msgstr ""
 
+msgid "Music"
+msgstr ""
+
 msgid "Cash"
 msgstr ""
 
@@ -19234,6 +19370,9 @@ msgstr ""
 msgid "Curtain"
 msgstr ""
 
+msgid "Art"
+msgstr ""
+
 msgid "Frame"
 msgstr ""
 
@@ -19279,6 +19418,9 @@ msgstr ""
 msgid "Beauty"
 msgstr ""
 
+msgid "Tattoo"
+msgstr ""
+
 msgid "Optician"
 msgstr ""
 
@@ -19330,6 +19472,9 @@ msgstr ""
 msgid "Pet"
 msgstr ""
 
+msgid "Funeral Directors"
+msgstr ""
+
 msgid "Vending Machine"
 msgstr ""
 
@@ -19429,6 +19574,15 @@ msgstr ""
 msgid "National Park"
 msgstr ""
 
+msgid "Protected Area"
+msgstr ""
+
+msgid "Protected Class"
+msgstr ""
+
+msgid "Title or type of protection"
+msgstr ""
+
 msgid "Places"
 msgstr ""
 
@@ -20505,7 +20659,13 @@ msgstr ""
 msgid "Estonia Ortho (Maaamet)"
 msgstr ""
 
-msgid "Estonia Multi (Maaamet)"
+msgid "Estonia Hillshade (Maaamet)"
+msgstr ""
+
+msgid "Estonia Cadastre (Maaamet)"
+msgstr ""
+
+msgid "Estonia Forestry (Maaamet)"
 msgstr ""
 
 msgid "Bordeaux - 2012"
@@ -20529,7 +20689,7 @@ msgstr ""
 msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
 msgstr ""
 
-msgid "CUGN Nancy - Orthophoto 2012"
+msgid "GrandNancy Orthophotographie 2012"
 msgstr ""
 
 msgid "Géobretagne - Brest 2010 - 10 cm"
@@ -20576,9 +20736,6 @@ msgid ""
 "- 1 m"
 msgstr ""
 
-msgid "Streets NRW Geofabrik.de"
-msgstr ""
-
 msgid "Hike & Bike"
 msgstr ""
 
@@ -20638,6 +20795,9 @@ msgstr ""
 msgid "NRW-Atlas: Topographische Karte 1:10000"
 msgstr ""
 
+msgid "Metropole Ruhr: Luftbilder (10 cm)"
+msgstr ""
+
 msgid "Drone Imagery (Haiti)"
 msgstr ""
 
@@ -20839,6 +20999,9 @@ msgstr ""
 msgid "Stadt Zürich Übersichtsplan (Strassen, Gebäude, Hausnummer)"
 msgstr ""
 
+msgid "Stadt Zürich Luftbild 2011"
+msgstr ""
+
 msgid "Orthofoto Kanton Solothurn RGB (SOGIS 2011/2012/2013)"
 msgstr ""
 
@@ -20857,7 +21020,7 @@ msgstr ""
 msgid "Canton de Fribourg 50cm (2005)"
 msgstr ""
 
-msgid "Stadt Bern 10cm/25cm (2008)"
+msgid "Stadt Bern 10cm/25cm (2012)"
 msgstr ""
 
 msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
@@ -20896,7 +21059,7 @@ msgstr ""
 msgid "OSM US TIGER 2012 Roads Overlay"
 msgstr ""
 
-msgid "New & Misaligned TIGER Roads (TIGER 2013)"
+msgid "New & Misaligned TIGER Roads (TIGER 2014)"
 msgstr ""
 
 msgid "MassGIS L3 Parcels"
@@ -20944,9 +21107,234 @@ msgstr ""
 msgid "NLS - Bartholomew Half Inch, 1897-1907"
 msgstr ""
 
+msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Annan 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgstr ""
+
 msgid "OS Town Plans, Cupar 1854 (NLS)"
 msgstr ""
 
+msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Elgin 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Forres 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Galashiels 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Girvan 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Greenock 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Haddington 1853 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Haddington 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Hamilton 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Irvine 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Jedburgh 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kelso 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Lanark 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Linlithgow 1856 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Musselburgh 1853 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Musselburgh 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Oban 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Peebles 1856 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Perth 1860 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Peterhead 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Selkirk 1865 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, St Andrews 1854 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, St Andrews 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stirling 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stonehaven 1864 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1847 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Strathaven 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wick 1872 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wigtown 1848 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wigtown 1894 (NLS)"
+msgstr ""
+
 msgid "Decreasing house numbers in addresses interpolation"
 msgstr ""
 
@@ -21000,17 +21388,37 @@ msgid "{0}={1} is deprecated. Please use instead a multipolygon."
 msgstr ""
 
 msgid ""
-"{0} is deprecated. Please specify ìnterval by using opening_hours syntax"
+"{0} is deprecated. Please specify interval by using opening_hours syntax"
 msgstr ""
 
 msgid ""
 "{0} is deprecated. Please delete this object and use a private layer instead"
 msgstr ""
 
-msgid "{0} on a node"
+msgid "{0}={1} is unspecific. Please replace ''{1}'' by a specific value."
 msgstr ""
 
-msgid "{0} on a node. Should be drawn as an area"
+msgid "{0} should be replaced with {1}"
+msgstr ""
+
+msgid ""
+"{0}={1} is unspecific. Please replace ''{1}'' by ''left'', ''right'' or "
+"''both''."
+msgstr ""
+
+msgid "{0} on a node. Should be used on a way."
+msgstr ""
+
+msgid "{0} on a node. Should be drawn as an area."
+msgstr ""
+
+msgid "{0}=* on a node. Should be used in a relation"
+msgstr ""
+
+msgid "{0} on a way. Should be used in a relation"
+msgstr ""
+
+msgid "{0} on a node"
 msgstr ""
 
 msgid "Building inside building"
@@ -25680,6 +26088,9 @@ msgstr ""
 msgid "Find"
 msgstr ""
 
+msgid "Show"
+msgstr ""
+
 msgid "Mark"
 msgstr ""
 
diff --git a/i18n/po/tr.po b/i18n/po/tr.po
index 7949220..0f028cf 100644
--- a/i18n/po/tr.po
+++ b/i18n/po/tr.po
@@ -1,8 +1,15 @@
+# Turkish translation of JOSM.
+# JOSM Türkçe Dil Dosyası
+# Copyright (C) 2009 ikinokta
+# Bu dosya JOSM sürümü ile aynı pakette dağıtılır.
+#
+# Cezmi Topaloğlu <cezmi.topaloglu at ikinokta.com>, 2009.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-21 03:38+0200\n"
+"POT-Creation-Date: 2014-12-10 03:42+0100\n"
 "PO-Revision-Date: 2014-05-16 05:31+0000\n"
 "Last-Translator: katpatuka <email at katpatuka.org>\n"
 "Language-Team: Türkçe <>\n"
@@ -10,8 +17,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2014-10-21 05:27+0000\n"
-"X-Generator: Launchpad (build 17203)\n"
+"X-Launchpad-Export-Date: 2014-12-10 05:15+0000\n"
+"X-Generator: Launchpad (build 17283)\n"
 "Language: \n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -170,16 +177,6 @@ msgid "About JOSM..."
 msgstr "JOSM Hakkında..."
 
 msgid ""
-"Unexpected format of API base URL. Redirection to info or history page for "
-"OSM object will probably fail. API base URL is: ''{0}''"
-msgstr ""
-
-msgid ""
-"Unexpected format of API base URL. Redirection to user page for OSM user "
-"will probably fail. API base URL is: ''{0}''"
-msgstr ""
-
-msgid ""
 "You are about to launch {0} browser window.<br>This may both clutter your "
 "screen with browser windows<br>and take some time to finish."
 msgid_plural ""
@@ -1561,6 +1558,15 @@ msgstr "Yüklenilecek değişiklik yok."
 msgid "Nothing to upload. Get some data first."
 msgstr "Yüklenilecek bişey yok. Lütfen ilk seçim yapınız."
 
+msgid "Upload note changes to server"
+msgstr ""
+
+msgid "Upload notes"
+msgstr ""
+
+msgid "Uploading notes to server"
+msgstr ""
+
 msgid "Upload selection"
 msgstr "Gönderme seçimi"
 
@@ -1832,10 +1838,16 @@ msgstr ""
 msgid "Click the location where you wish to create a new note"
 msgstr ""
 
-msgid "Enter a comment for a new note"
+msgid "Create new note"
 msgstr ""
 
-msgid "Create new note"
+msgid "Create note"
+msgstr ""
+
+msgid "Enter a detailed comment to create a note"
+msgstr ""
+
+msgid "You must enter a comment to create a new note"
 msgstr ""
 
 msgid "Delete Mode"
@@ -2722,6 +2734,15 @@ msgstr ""
 msgid "Cycling dependencies"
 msgstr "Döngü bağımlılıkları"
 
+msgid "Uploading modified notes"
+msgstr ""
+
+msgid "Note {0} failed: {1}"
+msgstr ""
+
+msgid "Notes failed to upload"
+msgstr ""
+
 msgid ""
 "The following are results of automatic validation. Try fixing these, but be "
 "careful (don''t destroy valid data). When in doubt ignore them.<br>When you "
@@ -4964,6 +4985,12 @@ msgstr ""
 msgid "Conflict foreground: keep all tags"
 msgstr ""
 
+msgid "Conflict background: sum all numeric tags"
+msgstr ""
+
+msgid "Conflict foreground: sum all numeric tags"
+msgstr ""
+
 msgid "Conflict background: keep member"
 msgstr ""
 
@@ -5381,12 +5408,19 @@ msgstr "boş"
 msgid "all"
 msgstr "hepsi"
 
+msgid "sum"
+msgstr ""
+
 msgid "Please decide which values to keep"
 msgstr ""
 
 msgid "Value ''{0}'' is going to be applied for key ''{1}''"
 msgstr ""
 
+msgid ""
+"All numeric values sumed as ''{0}'' are going to be applied for key ''{1}''"
+msgstr ""
+
 msgid "The key ''{0}'' and all its values are going to be removed"
 msgstr ""
 
@@ -5748,24 +5782,6 @@ msgstr[1] ""
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
 
-msgid "Display the history of all selected items."
-msgstr "Seçili nesnelerin geçmişini göster."
-
-msgid "Object with history"
-msgstr ""
-
-msgid "Reload"
-msgstr "Yenile"
-
-msgid "Reload all currently selected objects and refresh the list."
-msgstr "Reload all currently selected objects and refresh the list."
-
-msgid "Show"
-msgstr ""
-
-msgid "Display the history of the selected objects."
-msgstr ""
-
 msgid "Advanced object info"
 msgstr ""
 
@@ -6103,6 +6119,9 @@ msgstr ""
 msgid "Comment"
 msgstr "Açıklama"
 
+msgid "Comment on note"
+msgstr ""
+
 msgid "Add comment to note:"
 msgstr ""
 
@@ -6112,9 +6131,6 @@ msgstr ""
 msgid "Close note with message:"
 msgstr ""
 
-msgid "Close Note"
-msgstr ""
-
 msgid "Create a new note"
 msgstr ""
 
@@ -6187,6 +6203,9 @@ msgstr "Güncel Seçim"
 msgid "Search for objects"
 msgstr ""
 
+msgid "Display the history of the selected objects."
+msgstr ""
+
 msgid "Zoom to selection"
 msgstr "Seçime yakınlaş"
 
@@ -6306,6 +6325,9 @@ msgstr ""
 msgid "Updating map ..."
 msgstr ""
 
+msgid "anonymous"
+msgstr ""
+
 msgid "Display the basic properties of the changeset"
 msgstr ""
 
@@ -6318,6 +6340,12 @@ msgstr ""
 msgid "Display the objects created, updated, and deleted by the changeset"
 msgstr ""
 
+msgid "Discussion"
+msgstr ""
+
+msgid "Display the public discussion around this changeset"
+msgstr ""
+
 msgid "Changeset Management Dialog"
 msgstr "Değişiklik Takımları Görüntüle"
 
@@ -6375,9 +6403,6 @@ msgctxt "changeset.state"
 msgid "Closed"
 msgstr ""
 
-msgid "anonymous"
-msgstr ""
-
 msgid "ID"
 msgstr ""
 
@@ -6393,6 +6418,9 @@ msgstr "Oluşturulma Tarihi"
 msgid "Closed at"
 msgstr "Kapanış Tarihi"
 
+msgid "Discussions"
+msgstr ""
+
 msgid "Downloading changeset content"
 msgstr ""
 
@@ -6504,6 +6532,15 @@ msgid ""
 "layer"
 msgstr ""
 
+msgid "Update changeset discussion"
+msgstr ""
+
+msgid "Update the changeset discussion from the OSM server"
+msgstr ""
+
+msgid "Date"
+msgstr "Tarih"
+
 msgid "Download changesets"
 msgstr ""
 
@@ -6921,7 +6958,7 @@ msgstr "Lütfen bir değer seçiniz"
 msgid "Set number of recently added tags"
 msgstr ""
 
-msgid "Remember last used tags"
+msgid "Remember last used tags after a restart"
 msgstr ""
 
 msgid "Please enter the number of recently added tags to display"
@@ -7267,6 +7304,9 @@ msgstr ""
 msgid "Load parent relations"
 msgstr ""
 
+msgid "Reload"
+msgstr "Yenile"
+
 msgid "Loading parent relations"
 msgstr ""
 
@@ -7391,6 +7431,12 @@ msgstr "Ham GPS verisi"
 msgid "Select to download GPS traces in the selected download area."
 msgstr ""
 
+msgid "Notes"
+msgstr "Notlar"
+
+msgid "Select to download notes in the selected download area."
+msgstr ""
+
 msgid "Download as new layer"
 msgstr "Yeni tabaka olarak indir"
 
@@ -7696,9 +7742,6 @@ msgstr ""
 msgid "B"
 msgstr ""
 
-msgid "Date"
-msgstr "Tarih"
-
 msgid ""
 "Failed to update primitive with id {0} because current edit layer is null"
 msgstr ""
@@ -8553,9 +8596,6 @@ msgstr ""
 msgid "Save Layer"
 msgstr "Katmanı Kaydet"
 
-msgid "Notes"
-msgstr "Notlar"
-
 msgid "Notes layer"
 msgstr ""
 
@@ -8571,9 +8611,6 @@ msgstr ""
 msgid "outside downloaded area"
 msgstr "indirilen alanın dışında"
 
-msgid "version {0}"
-msgstr ""
-
 msgid "Merging layers"
 msgstr ""
 
@@ -12232,6 +12269,15 @@ msgstr ""
 msgid "Open changeset expected. Got closed changeset with id {0}."
 msgstr ""
 
+msgid "Note upload failed"
+msgstr ""
+
+msgid "Error parsing note response from server"
+msgstr ""
+
+msgid "Error encoding string: {0}"
+msgstr ""
+
 msgid "(Code={0})"
 msgstr ""
 
@@ -12280,13 +12326,13 @@ msgstr ""
 msgid "Parsing changeset content ..."
 msgstr ""
 
-msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
-msgid "Illegal numeric value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
-msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal numeric value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
 msgid "Missing mandatory attribute ''{0}'' of XML element {1}."
@@ -13083,9 +13129,6 @@ msgstr ""
 msgid "Failed to scan file ''{0}'' for plugin information. Skipping."
 msgstr ""
 
-msgid "Processing plugin site cache icon files..."
-msgstr ""
-
 msgid "Processing plugin files..."
 msgstr ""
 
@@ -13104,12 +13147,6 @@ msgstr ""
 msgid "Details:"
 msgstr ""
 
-msgid "Plugin icons download error"
-msgstr ""
-
-msgid "JOSM failed to download plugin icons:"
-msgstr ""
-
 msgid ""
 "Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
 "plugin site ''{1}''."
@@ -13999,7 +14036,9 @@ msgid ""
 "Creating and handling address nodes and buildings within Czech Republic."
 msgstr ""
 
-msgid "Allows to import various file formats into JOSM directly."
+msgid ""
+"Allows to import various file formats into JOSM directly. Currently "
+"supported: TangoGPS, Garmin Trainings Center TCX."
 msgstr ""
 
 msgid "Download your GPX tracks from openstreetmap.org"
@@ -14096,6 +14135,11 @@ msgid "A helper for IRS satellite adjustment."
 msgstr ""
 
 msgid ""
+"Provides Java Native Access (JNA) library. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
+msgid ""
 "Provides Java Topology Suite (JTS) library and related utilities. Not meant "
 "to be installed directly by users, but rather as a dependency for other "
 "plugins."
@@ -14451,6 +14495,25 @@ msgstr ""
 msgid "Width (meters)"
 msgstr ""
 
+msgid "Sidewalk"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "both"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "left"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "right"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "no"
+msgstr ""
+
 msgid "Service type"
 msgstr ""
 
@@ -14815,15 +14878,19 @@ msgstr ""
 msgid "May-Sep 09:30-12:30,14:15-19:30"
 msgstr ""
 
+msgctxt "parking"
 msgid "multi-storey"
-msgstr "kat otoparkı"
+msgstr ""
 
+msgctxt "parking"
 msgid "surface"
-msgstr "yüzey"
+msgstr ""
 
+msgctxt "parking"
 msgid "underground"
-msgstr "yer altı"
+msgstr ""
 
+msgctxt "parking"
 msgid "rooftop"
 msgstr ""
 
@@ -15281,15 +15348,26 @@ msgstr ""
 msgid "Overtaking"
 msgstr ""
 
+msgctxt "overtaking"
+msgid "yes"
+msgstr ""
+
+msgctxt "overtaking"
 msgid "both"
 msgstr ""
 
+msgctxt "overtaking"
 msgid "forward"
 msgstr ""
 
+msgctxt "overtaking"
 msgid "backward"
 msgstr ""
 
+msgctxt "overtaking"
+msgid "no"
+msgstr ""
+
 msgid "Roundabout"
 msgstr "Döner Kavşak"
 
@@ -15583,6 +15661,12 @@ msgstr ""
 msgid "tiger"
 msgstr ""
 
+msgid "Button operated"
+msgstr ""
+
+msgid "Sound signals"
+msgstr ""
+
 msgid "Crossing attendant"
 msgstr ""
 
@@ -16104,9 +16188,6 @@ msgstr "hemzemin geçit"
 msgid "Traffic lights"
 msgstr ""
 
-msgid "Sound signals"
-msgstr ""
-
 msgid "Barrier"
 msgstr ""
 
@@ -18166,6 +18247,9 @@ msgstr "Yeldeğerimeni"
 msgid "Gasometer"
 msgstr "Gazdeposu"
 
+msgid "Bunker Silo"
+msgstr ""
+
 msgid "Pipeline"
 msgstr "Suboru Hattı"
 
@@ -18312,15 +18396,15 @@ msgstr ""
 msgid "Monitoring:"
 msgstr ""
 
-msgid "Weather"
-msgstr ""
-
 msgid "Water level"
 msgstr ""
 
 msgid "Tide Level"
 msgstr ""
 
+msgid "Groundwater"
+msgstr ""
+
 msgid "Traffic"
 msgstr ""
 
@@ -18339,6 +18423,9 @@ msgstr ""
 msgid "Galileo Signals"
 msgstr ""
 
+msgid "Weather"
+msgstr ""
+
 msgid "Radiation"
 msgstr ""
 
@@ -18519,6 +18606,9 @@ msgstr ""
 msgid "pivot_pier"
 msgstr ""
 
+msgid "Bridge outline"
+msgstr ""
+
 msgid "Power Plant"
 msgstr ""
 
@@ -19126,6 +19216,15 @@ msgstr ""
 msgid "Pole"
 msgstr ""
 
+msgid "Pole with Transformer"
+msgstr ""
+
+msgid "Pole Attributes:"
+msgstr ""
+
+msgid "Transformer Attributes:"
+msgstr ""
+
 msgid "Power Line"
 msgstr "Güç Hattı"
 
@@ -19175,9 +19274,15 @@ msgstr ""
 msgid "Power Cable"
 msgstr ""
 
+msgctxt "power cable"
+msgid "underground"
+msgstr ""
+
+msgctxt "power cable"
 msgid "underwater"
 msgstr ""
 
+msgctxt "power cable"
 msgid "overground"
 msgstr ""
 
@@ -19205,6 +19310,33 @@ msgstr "Anıt"
 msgid "Memorial"
 msgstr "Abide"
 
+msgctxt "memorial"
+msgid "statue"
+msgstr ""
+
+msgctxt "memorial"
+msgid "bust"
+msgstr ""
+
+msgctxt "memorial"
+msgid "plaque"
+msgstr ""
+
+msgctxt "memorial"
+msgid "stele"
+msgstr ""
+
+msgctxt "memorial"
+msgid "stone"
+msgstr ""
+
+msgctxt "memorial"
+msgid "war_memorial"
+msgstr ""
+
+msgid "Inscription"
+msgstr ""
+
 msgid "Wayside Cross"
 msgstr "Yol Kenar Geçişi"
 
@@ -19274,6 +19406,9 @@ msgstr ""
 msgid "Beverages"
 msgstr ""
 
+msgid "Wine"
+msgstr ""
+
 msgid "Boutique"
 msgstr ""
 
@@ -19319,6 +19454,9 @@ msgstr ""
 msgid "Video Games"
 msgstr ""
 
+msgid "Music"
+msgstr ""
+
 msgid "Cash"
 msgstr "Kasa"
 
@@ -19346,6 +19484,9 @@ msgstr ""
 msgid "Curtain"
 msgstr ""
 
+msgid "Art"
+msgstr ""
+
 msgid "Frame"
 msgstr ""
 
@@ -19391,6 +19532,9 @@ msgstr ""
 msgid "Beauty"
 msgstr ""
 
+msgid "Tattoo"
+msgstr ""
+
 msgid "Optician"
 msgstr ""
 
@@ -19442,6 +19586,9 @@ msgstr ""
 msgid "Pet"
 msgstr ""
 
+msgid "Funeral Directors"
+msgstr ""
+
 msgid "Vending Machine"
 msgstr ""
 
@@ -19541,6 +19688,15 @@ msgstr ""
 msgid "National Park"
 msgstr ""
 
+msgid "Protected Area"
+msgstr ""
+
+msgid "Protected Class"
+msgstr ""
+
+msgid "Title or type of protection"
+msgstr ""
+
 msgid "Places"
 msgstr "Yerler"
 
@@ -20617,7 +20773,13 @@ msgstr ""
 msgid "Estonia Ortho (Maaamet)"
 msgstr ""
 
-msgid "Estonia Multi (Maaamet)"
+msgid "Estonia Hillshade (Maaamet)"
+msgstr ""
+
+msgid "Estonia Cadastre (Maaamet)"
+msgstr ""
+
+msgid "Estonia Forestry (Maaamet)"
 msgstr ""
 
 msgid "Bordeaux - 2012"
@@ -20641,7 +20803,7 @@ msgstr ""
 msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
 msgstr ""
 
-msgid "CUGN Nancy - Orthophoto 2012"
+msgid "GrandNancy Orthophotographie 2012"
 msgstr ""
 
 msgid "Géobretagne - Brest 2010 - 10 cm"
@@ -20688,9 +20850,6 @@ msgid ""
 "- 1 m"
 msgstr ""
 
-msgid "Streets NRW Geofabrik.de"
-msgstr ""
-
 msgid "Hike & Bike"
 msgstr ""
 
@@ -20750,6 +20909,9 @@ msgstr ""
 msgid "NRW-Atlas: Topographische Karte 1:10000"
 msgstr ""
 
+msgid "Metropole Ruhr: Luftbilder (10 cm)"
+msgstr ""
+
 msgid "Drone Imagery (Haiti)"
 msgstr ""
 
@@ -20951,6 +21113,9 @@ msgstr ""
 msgid "Stadt Zürich Übersichtsplan (Strassen, Gebäude, Hausnummer)"
 msgstr ""
 
+msgid "Stadt Zürich Luftbild 2011"
+msgstr ""
+
 msgid "Orthofoto Kanton Solothurn RGB (SOGIS 2011/2012/2013)"
 msgstr ""
 
@@ -20969,7 +21134,7 @@ msgstr ""
 msgid "Canton de Fribourg 50cm (2005)"
 msgstr ""
 
-msgid "Stadt Bern 10cm/25cm (2008)"
+msgid "Stadt Bern 10cm/25cm (2012)"
 msgstr ""
 
 msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
@@ -21008,7 +21173,7 @@ msgstr ""
 msgid "OSM US TIGER 2012 Roads Overlay"
 msgstr ""
 
-msgid "New & Misaligned TIGER Roads (TIGER 2013)"
+msgid "New & Misaligned TIGER Roads (TIGER 2014)"
 msgstr ""
 
 msgid "MassGIS L3 Parcels"
@@ -21056,9 +21221,234 @@ msgstr ""
 msgid "NLS - Bartholomew Half Inch, 1897-1907"
 msgstr ""
 
+msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Annan 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgstr ""
+
 msgid "OS Town Plans, Cupar 1854 (NLS)"
 msgstr ""
 
+msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Elgin 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Forres 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Galashiels 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Girvan 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Greenock 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Haddington 1853 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Haddington 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Hamilton 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Irvine 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Jedburgh 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kelso 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Lanark 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Linlithgow 1856 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Musselburgh 1853 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Musselburgh 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Oban 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Peebles 1856 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Perth 1860 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Peterhead 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Selkirk 1865 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, St Andrews 1854 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, St Andrews 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stirling 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stonehaven 1864 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1847 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Strathaven 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wick 1872 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wigtown 1848 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wigtown 1894 (NLS)"
+msgstr ""
+
 msgid "Decreasing house numbers in addresses interpolation"
 msgstr ""
 
@@ -21112,17 +21502,37 @@ msgid "{0}={1} is deprecated. Please use instead a multipolygon."
 msgstr ""
 
 msgid ""
-"{0} is deprecated. Please specify ìnterval by using opening_hours syntax"
+"{0} is deprecated. Please specify interval by using opening_hours syntax"
 msgstr ""
 
 msgid ""
 "{0} is deprecated. Please delete this object and use a private layer instead"
 msgstr ""
 
-msgid "{0} on a node"
+msgid "{0}={1} is unspecific. Please replace ''{1}'' by a specific value."
 msgstr ""
 
-msgid "{0} on a node. Should be drawn as an area"
+msgid "{0} should be replaced with {1}"
+msgstr ""
+
+msgid ""
+"{0}={1} is unspecific. Please replace ''{1}'' by ''left'', ''right'' or "
+"''both''."
+msgstr ""
+
+msgid "{0} on a node. Should be used on a way."
+msgstr ""
+
+msgid "{0} on a node. Should be drawn as an area."
+msgstr ""
+
+msgid "{0}=* on a node. Should be used in a relation"
+msgstr ""
+
+msgid "{0} on a way. Should be used in a relation"
+msgstr ""
+
+msgid "{0} on a node"
 msgstr ""
 
 msgid "Building inside building"
@@ -25806,6 +26216,9 @@ msgstr ""
 msgid "Find"
 msgstr "Bul"
 
+msgid "Show"
+msgstr ""
+
 msgid "Mark"
 msgstr "İşaretle"
 
diff --git a/i18n/po/ug.po b/i18n/po/ug.po
index 709c12d..de205fd 100644
--- a/i18n/po/ug.po
+++ b/i18n/po/ug.po
@@ -1,8 +1,13 @@
+# Uyghur translation for josm
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the josm package.
+# FIRST AUTHOR <EMAIL at ADDRESS>, 2012.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-21 03:38+0200\n"
+"POT-Creation-Date: 2014-12-10 03:42+0100\n"
 "PO-Revision-Date: 2012-07-14 16:22+0000\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: Uyghur <ug at li.org>\n"
@@ -10,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-10-21 05:28+0000\n"
-"X-Generator: Launchpad (build 17203)\n"
+"X-Launchpad-Export-Date: 2014-12-10 05:16+0000\n"
+"X-Generator: Launchpad (build 17283)\n"
 "Language: \n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -168,16 +173,6 @@ msgid "About JOSM..."
 msgstr ""
 
 msgid ""
-"Unexpected format of API base URL. Redirection to info or history page for "
-"OSM object will probably fail. API base URL is: ''{0}''"
-msgstr ""
-
-msgid ""
-"Unexpected format of API base URL. Redirection to user page for OSM user "
-"will probably fail. API base URL is: ''{0}''"
-msgstr ""
-
-msgid ""
 "You are about to launch {0} browser window.<br>This may both clutter your "
 "screen with browser windows<br>and take some time to finish."
 msgid_plural ""
@@ -1519,6 +1514,15 @@ msgstr ""
 msgid "Nothing to upload. Get some data first."
 msgstr ""
 
+msgid "Upload note changes to server"
+msgstr ""
+
+msgid "Upload notes"
+msgstr ""
+
+msgid "Uploading notes to server"
+msgstr ""
+
 msgid "Upload selection"
 msgstr ""
 
@@ -1791,10 +1795,16 @@ msgstr ""
 msgid "Click the location where you wish to create a new note"
 msgstr ""
 
-msgid "Enter a comment for a new note"
+msgid "Create new note"
 msgstr ""
 
-msgid "Create new note"
+msgid "Create note"
+msgstr ""
+
+msgid "Enter a detailed comment to create a note"
+msgstr ""
+
+msgid "You must enter a comment to create a new note"
 msgstr ""
 
 msgid "Delete Mode"
@@ -2665,6 +2675,15 @@ msgstr ""
 msgid "Cycling dependencies"
 msgstr ""
 
+msgid "Uploading modified notes"
+msgstr ""
+
+msgid "Note {0} failed: {1}"
+msgstr ""
+
+msgid "Notes failed to upload"
+msgstr ""
+
 msgid ""
 "The following are results of automatic validation. Try fixing these, but be "
 "careful (don''t destroy valid data). When in doubt ignore them.<br>When you "
@@ -4894,6 +4913,12 @@ msgstr ""
 msgid "Conflict foreground: keep all tags"
 msgstr ""
 
+msgid "Conflict background: sum all numeric tags"
+msgstr ""
+
+msgid "Conflict foreground: sum all numeric tags"
+msgstr ""
+
 msgid "Conflict background: keep member"
 msgstr ""
 
@@ -5312,12 +5337,19 @@ msgstr ""
 msgid "all"
 msgstr ""
 
+msgid "sum"
+msgstr ""
+
 msgid "Please decide which values to keep"
 msgstr ""
 
 msgid "Value ''{0}'' is going to be applied for key ''{1}''"
 msgstr ""
 
+msgid ""
+"All numeric values sumed as ''{0}'' are going to be applied for key ''{1}''"
+msgstr ""
+
 msgid "The key ''{0}'' and all its values are going to be removed"
 msgstr ""
 
@@ -5680,24 +5712,6 @@ msgstr[1] ""
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
 
-msgid "Display the history of all selected items."
-msgstr ""
-
-msgid "Object with history"
-msgstr ""
-
-msgid "Reload"
-msgstr ""
-
-msgid "Reload all currently selected objects and refresh the list."
-msgstr ""
-
-msgid "Show"
-msgstr ""
-
-msgid "Display the history of the selected objects."
-msgstr ""
-
 msgid "Advanced object info"
 msgstr ""
 
@@ -6035,6 +6049,9 @@ msgstr ""
 msgid "Comment"
 msgstr ""
 
+msgid "Comment on note"
+msgstr ""
+
 msgid "Add comment to note:"
 msgstr ""
 
@@ -6044,9 +6061,6 @@ msgstr ""
 msgid "Close note with message:"
 msgstr ""
 
-msgid "Close Note"
-msgstr ""
-
 msgid "Create a new note"
 msgstr ""
 
@@ -6119,6 +6133,9 @@ msgstr ""
 msgid "Search for objects"
 msgstr ""
 
+msgid "Display the history of the selected objects."
+msgstr ""
+
 msgid "Zoom to selection"
 msgstr ""
 
@@ -6238,6 +6255,9 @@ msgstr ""
 msgid "Updating map ..."
 msgstr ""
 
+msgid "anonymous"
+msgstr ""
+
 msgid "Display the basic properties of the changeset"
 msgstr ""
 
@@ -6250,6 +6270,12 @@ msgstr ""
 msgid "Display the objects created, updated, and deleted by the changeset"
 msgstr ""
 
+msgid "Discussion"
+msgstr ""
+
+msgid "Display the public discussion around this changeset"
+msgstr ""
+
 msgid "Changeset Management Dialog"
 msgstr ""
 
@@ -6307,9 +6333,6 @@ msgctxt "changeset.state"
 msgid "Closed"
 msgstr ""
 
-msgid "anonymous"
-msgstr ""
-
 msgid "ID"
 msgstr ""
 
@@ -6325,6 +6348,9 @@ msgstr ""
 msgid "Closed at"
 msgstr ""
 
+msgid "Discussions"
+msgstr ""
+
 msgid "Downloading changeset content"
 msgstr ""
 
@@ -6436,6 +6462,15 @@ msgid ""
 "layer"
 msgstr ""
 
+msgid "Update changeset discussion"
+msgstr ""
+
+msgid "Update the changeset discussion from the OSM server"
+msgstr ""
+
+msgid "Date"
+msgstr ""
+
 msgid "Download changesets"
 msgstr ""
 
@@ -6853,7 +6888,7 @@ msgstr ""
 msgid "Set number of recently added tags"
 msgstr ""
 
-msgid "Remember last used tags"
+msgid "Remember last used tags after a restart"
 msgstr ""
 
 msgid "Please enter the number of recently added tags to display"
@@ -7199,6 +7234,9 @@ msgstr ""
 msgid "Load parent relations"
 msgstr ""
 
+msgid "Reload"
+msgstr ""
+
 msgid "Loading parent relations"
 msgstr ""
 
@@ -7321,6 +7359,12 @@ msgstr ""
 msgid "Select to download GPS traces in the selected download area."
 msgstr ""
 
+msgid "Notes"
+msgstr ""
+
+msgid "Select to download notes in the selected download area."
+msgstr ""
+
 msgid "Download as new layer"
 msgstr ""
 
@@ -7626,9 +7670,6 @@ msgstr ""
 msgid "B"
 msgstr ""
 
-msgid "Date"
-msgstr ""
-
 msgid ""
 "Failed to update primitive with id {0} because current edit layer is null"
 msgstr ""
@@ -8483,9 +8524,6 @@ msgstr ""
 msgid "Save Layer"
 msgstr ""
 
-msgid "Notes"
-msgstr ""
-
 msgid "Notes layer"
 msgstr ""
 
@@ -8501,9 +8539,6 @@ msgstr ""
 msgid "outside downloaded area"
 msgstr ""
 
-msgid "version {0}"
-msgstr ""
-
 msgid "Merging layers"
 msgstr ""
 
@@ -12129,6 +12164,15 @@ msgstr ""
 msgid "Open changeset expected. Got closed changeset with id {0}."
 msgstr ""
 
+msgid "Note upload failed"
+msgstr ""
+
+msgid "Error parsing note response from server"
+msgstr ""
+
+msgid "Error encoding string: {0}"
+msgstr ""
+
 msgid "(Code={0})"
 msgstr ""
 
@@ -12177,13 +12221,13 @@ msgstr ""
 msgid "Parsing changeset content ..."
 msgstr ""
 
-msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
-msgid "Illegal numeric value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
-msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal numeric value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
 msgid "Missing mandatory attribute ''{0}'' of XML element {1}."
@@ -12975,9 +13019,6 @@ msgstr ""
 msgid "Failed to scan file ''{0}'' for plugin information. Skipping."
 msgstr ""
 
-msgid "Processing plugin site cache icon files..."
-msgstr ""
-
 msgid "Processing plugin files..."
 msgstr ""
 
@@ -12996,12 +13037,6 @@ msgstr ""
 msgid "Details:"
 msgstr ""
 
-msgid "Plugin icons download error"
-msgstr ""
-
-msgid "JOSM failed to download plugin icons:"
-msgstr ""
-
 msgid ""
 "Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
 "plugin site ''{1}''."
@@ -13887,7 +13922,9 @@ msgid ""
 "Creating and handling address nodes and buildings within Czech Republic."
 msgstr ""
 
-msgid "Allows to import various file formats into JOSM directly."
+msgid ""
+"Allows to import various file formats into JOSM directly. Currently "
+"supported: TangoGPS, Garmin Trainings Center TCX."
 msgstr ""
 
 msgid "Download your GPX tracks from openstreetmap.org"
@@ -13984,6 +14021,11 @@ msgid "A helper for IRS satellite adjustment."
 msgstr ""
 
 msgid ""
+"Provides Java Native Access (JNA) library. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
+msgid ""
 "Provides Java Topology Suite (JTS) library and related utilities. Not meant "
 "to be installed directly by users, but rather as a dependency for other "
 "plugins."
@@ -14339,6 +14381,25 @@ msgstr ""
 msgid "Width (meters)"
 msgstr ""
 
+msgid "Sidewalk"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "both"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "left"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "right"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "no"
+msgstr ""
+
 msgid "Service type"
 msgstr ""
 
@@ -14703,15 +14764,19 @@ msgstr ""
 msgid "May-Sep 09:30-12:30,14:15-19:30"
 msgstr ""
 
+msgctxt "parking"
 msgid "multi-storey"
 msgstr ""
 
+msgctxt "parking"
 msgid "surface"
 msgstr ""
 
+msgctxt "parking"
 msgid "underground"
 msgstr ""
 
+msgctxt "parking"
 msgid "rooftop"
 msgstr ""
 
@@ -15169,15 +15234,26 @@ msgstr ""
 msgid "Overtaking"
 msgstr ""
 
+msgctxt "overtaking"
+msgid "yes"
+msgstr ""
+
+msgctxt "overtaking"
 msgid "both"
 msgstr ""
 
+msgctxt "overtaking"
 msgid "forward"
 msgstr ""
 
+msgctxt "overtaking"
 msgid "backward"
 msgstr ""
 
+msgctxt "overtaking"
+msgid "no"
+msgstr ""
+
 msgid "Roundabout"
 msgstr ""
 
@@ -15471,6 +15547,12 @@ msgstr ""
 msgid "tiger"
 msgstr ""
 
+msgid "Button operated"
+msgstr ""
+
+msgid "Sound signals"
+msgstr ""
+
 msgid "Crossing attendant"
 msgstr ""
 
@@ -15992,9 +16074,6 @@ msgstr ""
 msgid "Traffic lights"
 msgstr ""
 
-msgid "Sound signals"
-msgstr ""
-
 msgid "Barrier"
 msgstr ""
 
@@ -18054,6 +18133,9 @@ msgstr ""
 msgid "Gasometer"
 msgstr ""
 
+msgid "Bunker Silo"
+msgstr ""
+
 msgid "Pipeline"
 msgstr ""
 
@@ -18200,15 +18282,15 @@ msgstr ""
 msgid "Monitoring:"
 msgstr ""
 
-msgid "Weather"
-msgstr ""
-
 msgid "Water level"
 msgstr ""
 
 msgid "Tide Level"
 msgstr ""
 
+msgid "Groundwater"
+msgstr ""
+
 msgid "Traffic"
 msgstr ""
 
@@ -18227,6 +18309,9 @@ msgstr ""
 msgid "Galileo Signals"
 msgstr ""
 
+msgid "Weather"
+msgstr ""
+
 msgid "Radiation"
 msgstr ""
 
@@ -18407,6 +18492,9 @@ msgstr ""
 msgid "pivot_pier"
 msgstr ""
 
+msgid "Bridge outline"
+msgstr ""
+
 msgid "Power Plant"
 msgstr ""
 
@@ -19014,6 +19102,15 @@ msgstr ""
 msgid "Pole"
 msgstr ""
 
+msgid "Pole with Transformer"
+msgstr ""
+
+msgid "Pole Attributes:"
+msgstr ""
+
+msgid "Transformer Attributes:"
+msgstr ""
+
 msgid "Power Line"
 msgstr ""
 
@@ -19063,9 +19160,15 @@ msgstr ""
 msgid "Power Cable"
 msgstr ""
 
+msgctxt "power cable"
+msgid "underground"
+msgstr ""
+
+msgctxt "power cable"
 msgid "underwater"
 msgstr ""
 
+msgctxt "power cable"
 msgid "overground"
 msgstr ""
 
@@ -19093,6 +19196,33 @@ msgstr ""
 msgid "Memorial"
 msgstr ""
 
+msgctxt "memorial"
+msgid "statue"
+msgstr ""
+
+msgctxt "memorial"
+msgid "bust"
+msgstr ""
+
+msgctxt "memorial"
+msgid "plaque"
+msgstr ""
+
+msgctxt "memorial"
+msgid "stele"
+msgstr ""
+
+msgctxt "memorial"
+msgid "stone"
+msgstr ""
+
+msgctxt "memorial"
+msgid "war_memorial"
+msgstr ""
+
+msgid "Inscription"
+msgstr ""
+
 msgid "Wayside Cross"
 msgstr ""
 
@@ -19162,6 +19292,9 @@ msgstr ""
 msgid "Beverages"
 msgstr ""
 
+msgid "Wine"
+msgstr ""
+
 msgid "Boutique"
 msgstr ""
 
@@ -19207,6 +19340,9 @@ msgstr ""
 msgid "Video Games"
 msgstr ""
 
+msgid "Music"
+msgstr ""
+
 msgid "Cash"
 msgstr ""
 
@@ -19234,6 +19370,9 @@ msgstr ""
 msgid "Curtain"
 msgstr ""
 
+msgid "Art"
+msgstr ""
+
 msgid "Frame"
 msgstr ""
 
@@ -19279,6 +19418,9 @@ msgstr ""
 msgid "Beauty"
 msgstr ""
 
+msgid "Tattoo"
+msgstr ""
+
 msgid "Optician"
 msgstr ""
 
@@ -19330,6 +19472,9 @@ msgstr ""
 msgid "Pet"
 msgstr ""
 
+msgid "Funeral Directors"
+msgstr ""
+
 msgid "Vending Machine"
 msgstr ""
 
@@ -19429,6 +19574,15 @@ msgstr ""
 msgid "National Park"
 msgstr ""
 
+msgid "Protected Area"
+msgstr ""
+
+msgid "Protected Class"
+msgstr ""
+
+msgid "Title or type of protection"
+msgstr ""
+
 msgid "Places"
 msgstr ""
 
@@ -20505,7 +20659,13 @@ msgstr ""
 msgid "Estonia Ortho (Maaamet)"
 msgstr ""
 
-msgid "Estonia Multi (Maaamet)"
+msgid "Estonia Hillshade (Maaamet)"
+msgstr ""
+
+msgid "Estonia Cadastre (Maaamet)"
+msgstr ""
+
+msgid "Estonia Forestry (Maaamet)"
 msgstr ""
 
 msgid "Bordeaux - 2012"
@@ -20529,7 +20689,7 @@ msgstr ""
 msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
 msgstr ""
 
-msgid "CUGN Nancy - Orthophoto 2012"
+msgid "GrandNancy Orthophotographie 2012"
 msgstr ""
 
 msgid "Géobretagne - Brest 2010 - 10 cm"
@@ -20576,9 +20736,6 @@ msgid ""
 "- 1 m"
 msgstr ""
 
-msgid "Streets NRW Geofabrik.de"
-msgstr ""
-
 msgid "Hike & Bike"
 msgstr ""
 
@@ -20638,6 +20795,9 @@ msgstr ""
 msgid "NRW-Atlas: Topographische Karte 1:10000"
 msgstr ""
 
+msgid "Metropole Ruhr: Luftbilder (10 cm)"
+msgstr ""
+
 msgid "Drone Imagery (Haiti)"
 msgstr ""
 
@@ -20839,6 +20999,9 @@ msgstr ""
 msgid "Stadt Zürich Übersichtsplan (Strassen, Gebäude, Hausnummer)"
 msgstr ""
 
+msgid "Stadt Zürich Luftbild 2011"
+msgstr ""
+
 msgid "Orthofoto Kanton Solothurn RGB (SOGIS 2011/2012/2013)"
 msgstr ""
 
@@ -20857,7 +21020,7 @@ msgstr ""
 msgid "Canton de Fribourg 50cm (2005)"
 msgstr ""
 
-msgid "Stadt Bern 10cm/25cm (2008)"
+msgid "Stadt Bern 10cm/25cm (2012)"
 msgstr ""
 
 msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
@@ -20896,7 +21059,7 @@ msgstr ""
 msgid "OSM US TIGER 2012 Roads Overlay"
 msgstr ""
 
-msgid "New & Misaligned TIGER Roads (TIGER 2013)"
+msgid "New & Misaligned TIGER Roads (TIGER 2014)"
 msgstr ""
 
 msgid "MassGIS L3 Parcels"
@@ -20944,9 +21107,234 @@ msgstr ""
 msgid "NLS - Bartholomew Half Inch, 1897-1907"
 msgstr ""
 
+msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Annan 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgstr ""
+
 msgid "OS Town Plans, Cupar 1854 (NLS)"
 msgstr ""
 
+msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Elgin 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Forres 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Galashiels 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Girvan 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Greenock 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Haddington 1853 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Haddington 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Hamilton 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Irvine 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Jedburgh 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kelso 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Lanark 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Linlithgow 1856 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Musselburgh 1853 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Musselburgh 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Oban 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Peebles 1856 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Perth 1860 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Peterhead 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Selkirk 1865 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, St Andrews 1854 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, St Andrews 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stirling 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stonehaven 1864 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1847 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Strathaven 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wick 1872 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wigtown 1848 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wigtown 1894 (NLS)"
+msgstr ""
+
 msgid "Decreasing house numbers in addresses interpolation"
 msgstr ""
 
@@ -21000,17 +21388,37 @@ msgid "{0}={1} is deprecated. Please use instead a multipolygon."
 msgstr ""
 
 msgid ""
-"{0} is deprecated. Please specify ìnterval by using opening_hours syntax"
+"{0} is deprecated. Please specify interval by using opening_hours syntax"
 msgstr ""
 
 msgid ""
 "{0} is deprecated. Please delete this object and use a private layer instead"
 msgstr ""
 
-msgid "{0} on a node"
+msgid "{0}={1} is unspecific. Please replace ''{1}'' by a specific value."
 msgstr ""
 
-msgid "{0} on a node. Should be drawn as an area"
+msgid "{0} should be replaced with {1}"
+msgstr ""
+
+msgid ""
+"{0}={1} is unspecific. Please replace ''{1}'' by ''left'', ''right'' or "
+"''both''."
+msgstr ""
+
+msgid "{0} on a node. Should be used on a way."
+msgstr ""
+
+msgid "{0} on a node. Should be drawn as an area."
+msgstr ""
+
+msgid "{0}=* on a node. Should be used in a relation"
+msgstr ""
+
+msgid "{0} on a way. Should be used in a relation"
+msgstr ""
+
+msgid "{0} on a node"
 msgstr ""
 
 msgid "Building inside building"
@@ -25680,6 +26088,9 @@ msgstr ""
 msgid "Find"
 msgstr ""
 
+msgid "Show"
+msgstr ""
+
 msgid "Mark"
 msgstr ""
 
diff --git a/i18n/po/uk.po b/i18n/po/uk.po
index 918f747..1cf5262 100644
--- a/i18n/po/uk.po
+++ b/i18n/po/uk.po
@@ -1,9 +1,14 @@
+# Ukrainian translation for josm
+# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
+# This file is distributed under the same license as the josm package.
+# FIRST AUTHOR <EMAIL at ADDRESS>, 2009.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-21 03:38+0200\n"
-"PO-Revision-Date: 2014-10-19 06:20+0000\n"
+"POT-Creation-Date: 2014-12-10 03:42+0100\n"
+"PO-Revision-Date: 2014-12-08 20:55+0000\n"
 "Last-Translator: andygol <Unknown>\n"
 "Language-Team: Ukrainian <uk at li.org>\n"
 "MIME-Version: 1.0\n"
@@ -11,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-10-21 05:29+0000\n"
-"X-Generator: Launchpad (build 17203)\n"
+"X-Launchpad-Export-Date: 2014-12-10 05:16+0000\n"
+"X-Generator: Launchpad (build 17283)\n"
 "Language: uk\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -175,22 +180,6 @@ msgid "About JOSM..."
 msgstr "Про JOSM…"
 
 msgid ""
-"Unexpected format of API base URL. Redirection to info or history page for "
-"OSM object will probably fail. API base URL is: ''{0}''"
-msgstr ""
-"Неочікуваний формат посилання (URL) для API. Перенаправлення на сторінку з "
-"інформацією або історією об’єкта OSM можливо не відбудеться. Основне "
-"посилання (URL) на API: ''{0}''"
-
-msgid ""
-"Unexpected format of API base URL. Redirection to user page for OSM user "
-"will probably fail. API base URL is: ''{0}''"
-msgstr ""
-"Неочікуваний формат посилання (URL) для API. Перенаправлення на сторінку з "
-"інформацією про учасника OSM можливо не відбудеться. Основне посилання (URL) "
-"на API: ''{0}''"
-
-msgid ""
 "You are about to launch {0} browser window.<br>This may both clutter your "
 "screen with browser windows<br>and take some time to finish."
 msgid_plural ""
@@ -576,7 +565,7 @@ msgstr "Історія (веб)"
 msgid ""
 "Display history information about OSM ways, nodes, or relations in web "
 "browser."
-msgstr "Показати істрію про лінії, точки чи зв’язки OSM у веб-оглядачі."
+msgstr "Показати історію лінії, точки чи зв’язку OSM у веб-оглядачі."
 
 msgid "New offset"
 msgstr "Нове положення"
@@ -633,7 +622,7 @@ msgid "Join overlapping Areas"
 msgstr "Об’єднати полігони, що перекриваються"
 
 msgid "Joins areas that overlap each other"
-msgstr "Об’єднати полігони, що перекривають друг друга"
+msgstr "Об’єднати полігони, що перекривають один одного"
 
 msgid "Please select at least one closed way that should be joined."
 msgstr ""
@@ -646,7 +635,7 @@ msgstr ""
 "інших."
 
 msgid "Join area confirmation"
-msgstr "Підтверджння злиття ділянок"
+msgstr "Підтвердження злиття ділянок"
 
 msgid "The selected way has nodes outside of the downloaded data region."
 msgid_plural ""
@@ -1125,7 +1114,7 @@ msgstr ""
 
 msgid "Please select ways with angles of approximately 90 or 180 degrees."
 msgstr ""
-"Будь ласка, виберіть ліній з кутами, близькими до 90 або 180 градусів."
+"Будь ласка, виберіть лінії з кутами, близькими до 90 або 180 градусів."
 
 msgid "Paste"
 msgstr "Вставити"
@@ -1509,7 +1498,7 @@ msgstr "Жодна з цих точок ні до чого не прикріпл
 
 msgid "None of this way''s nodes are glued to anything else."
 msgstr ""
-"Жодна з цих точок, що знаходяться на лініях, ні до чого не прикріплена."
+"Жодна з точок, що знаходяться на цих лініях, ні до чого не прикріплена."
 
 msgid "The current selection cannot be used for unglueing."
 msgstr "Виділені об’єкти неможливо роз’єднати."
@@ -1693,7 +1682,16 @@ msgid "No changes to upload."
 msgstr "Немає змін для надсилання."
 
 msgid "Nothing to upload. Get some data first."
-msgstr "Нічого надсилати. Сопчатку отримайте деякі дані."
+msgstr "Нічого надсилати. Спочатку отримайте які-небудь дані."
+
+msgid "Upload note changes to server"
+msgstr "Надсилання змін нотатки на сервер"
+
+msgid "Upload notes"
+msgstr "Надіслати нотатки"
+
+msgid "Uploading notes to server"
+msgstr "Надсилання нотаток на сервер"
 
 msgid "Upload selection"
 msgstr "Надіслати на сервер виділене"
@@ -1827,7 +1825,7 @@ msgstr "Попередня мітка"
 
 msgctxt "audio"
 msgid "Play previous marker."
-msgstr "Відтворити попередні мітку."
+msgstr "Відтворити попередню мітку."
 
 msgctxt "audio"
 msgid "Slower"
@@ -1862,7 +1860,7 @@ msgid "Download Compressed OSM"
 msgstr "Завантаження стиснених даних OSM"
 
 msgid "Download OSM"
-msgstr "Заватажити OSM"
+msgstr "Завантажити OSM"
 
 msgid "Downloading data"
 msgstr "Отримання даних"
@@ -1989,12 +1987,18 @@ msgstr "Режим додавання нотаток"
 msgid "Click the location where you wish to create a new note"
 msgstr "Клацніть в місці, де ви збираєтесь додати нову нотатку"
 
-msgid "Enter a comment for a new note"
-msgstr "Додайте пояснення для нової нотатки"
-
 msgid "Create new note"
 msgstr "Створити нову нотатку"
 
+msgid "Create note"
+msgstr "Створити нотатку"
+
+msgid "Enter a detailed comment to create a note"
+msgstr "Додайте докладний окментар для стоврення нотатки"
+
+msgid "You must enter a comment to create a new note"
+msgstr "Потрібно додати коментар для створення нотатки"
+
 msgid "Delete Mode"
 msgstr "Режим вилучення"
 
@@ -2177,7 +2181,7 @@ msgid ""
 "delete."
 msgstr ""
 "Клацніть для додання нової точки. Відпустіть Ctrl для переміщення існуючих "
-"точок або тримайте Alt вилучення."
+"точок або тримайте Alt для вилучення."
 
 msgid ""
 "Click to delete the highlighted node. Release Alt to move existing nodes or "
@@ -2235,7 +2239,7 @@ msgstr ""
 "Виділені лінії повинні формувати простий, без відгалужень, шлях"
 
 msgid "Make parallel way error"
-msgstr "Зробити помилку для паралельних ліній"
+msgstr "Помилка створення паралельної лінії"
 
 msgid "Drag play head"
 msgstr "Перетягнути повзунок"
@@ -2698,7 +2702,7 @@ msgid "''key'' with any value"
 msgstr "''key'' з будь-яким значенням"
 
 msgid "''value'' in any key"
-msgstr "''value'' у будьякому ключі"
+msgstr "''value'' у будь-якому ключі"
 
 msgid "matches if ''key'' exists"
 msgstr "збігається якщо ''key'' існує"
@@ -2892,7 +2896,7 @@ msgstr ""
 
 msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
 msgstr ""
-"Невідомий тип елементу: {0}. Дозволені значення: точка, лінія або зв’язко"
+"Невідомий тип елементу: {0}. Дозволені значення: node, way або relation"
 
 msgid "Positive integer expected"
 msgstr "Очікується позитивне ціле число"
@@ -2962,6 +2966,15 @@ msgstr "… належить до зв’язку"
 msgid "Cycling dependencies"
 msgstr "Циклічні залежності"
 
+msgid "Uploading modified notes"
+msgstr "Надсилання змінених нотаток"
+
+msgid "Note {0} failed: {1}"
+msgstr "Нотатка {0}, збій: {1}"
+
+msgid "Notes failed to upload"
+msgstr "Збій надсилання нотаток"
+
 msgid ""
 "The following are results of automatic validation. Try fixing these, but be "
 "careful (don''t destroy valid data). When in doubt ignore them.<br>When you "
@@ -3560,12 +3573,12 @@ msgstr ""
 "{0}"
 
 msgid "A primitive with ID = 0 cannot be invisible."
-msgstr "Елемент з ідентифікатором =0 не може бути видимий."
+msgstr "Елемент з ідентифікатором =0 не може бути невидимим."
 
 msgid ""
 "Unable to add primitive {0} to the dataset because it is already included"
 msgstr ""
-"Неможливо додати елемент {0} до набору даних, так як він вже присутній"
+"Неможливо додати елемент {0} до набору даних, оскільки він вже присутній"
 
 msgid ""
 "JOSM expected to find primitive [{0} {1}] in dataset but it is not there. "
@@ -3641,7 +3654,7 @@ msgid "relation"
 msgid_plural "relations"
 msgstr[0] "зв’язок"
 msgstr[1] "зв’язки"
-msgstr[2] "зв’зяків"
+msgstr[2] "зв’язків"
 
 msgid "closedway"
 msgstr "замкнена лінія"
@@ -3919,13 +3932,13 @@ msgid "House number without street"
 msgstr "Номер будинку без зазначення вулиці"
 
 msgid "House number ''{0}'' duplicated"
-msgstr "Дублювання номеру дома ''{0}''"
+msgstr "Дублювання номеру будинку ''{0}''"
 
 msgid "Duplicate house numbers"
 msgstr "Дублікати номерів будинків"
 
 msgid "Multiple street names in relation"
-msgstr "Частини вулиці у зв’язку мають різні назваи"
+msgstr "Частини вулиці у зв’язку мають різні назви"
 
 msgid "House number too far from street"
 msgstr "Будинок з номером доволі далеко від вулиці"
@@ -3953,7 +3966,7 @@ msgid "Checks for errors in barriers and entrances."
 msgstr "Перевірка помилок бар’єрів та під’їздів"
 
 msgid "Barrier entrance not set on a barrier"
-msgstr "Точка входу/в’їзду не на ліні огорожі"
+msgstr "Точка входу/в’їзду не на лінії огорожі"
 
 msgid "Coastlines"
 msgstr "Берегова лінія"
@@ -3962,10 +3975,10 @@ msgid "This test checks that coastlines are correct."
 msgstr "Цей тест перевіряє, що берегові лінії є правильними."
 
 msgid "Unconnected coastline"
-msgstr "Роз’єднанні берегові лінії"
+msgstr "Роз’єднана берегова лінія"
 
 msgid "Unordered coastline"
-msgstr "Невпорядковані берегові лінії"
+msgstr "Невпорядкована берегова лінія"
 
 msgid "Reversed coastline"
 msgstr "Зворотня берегова лінія"
@@ -4020,7 +4033,7 @@ msgid "This test checks that there are no nodes at the very same location."
 msgstr "Цей тест перевіряє на наявність однакових точок в одному місці."
 
 msgid "Mixed type duplicated nodes"
-msgstr "Змішаний тип точок, що дублюються"
+msgstr "Точки змішаного типу, що дублюються"
 
 msgid "Highway duplicated nodes"
 msgstr "Дорожні точки, що дублюються"
@@ -4053,17 +4066,17 @@ msgid "Nodes at same position"
 msgstr "Точки з тими же координатами"
 
 msgid "Duplicated relations"
-msgstr "Подвоєнні зв’язки"
+msgstr "Подвоєні зв’язки"
 
 msgid ""
 "This test checks that there are no relations with same tags and same members "
 "with same roles."
 msgstr ""
-"Цей тест перевіряє на наявність зв’язків із однаковими тегами та спільними "
+"Цей тест перевіряє на наявність зв’язків із однаковими теґами та однаковими "
 "членами з однаковими ролями."
 
 msgid "Relations with same members"
-msgstr "Зв’язки із спільними членами"
+msgstr "Зв’язки із однаковими членами"
 
 msgid "Delete duplicate relations"
 msgstr "Вилучення подвоєних зв’язків"
@@ -4088,7 +4101,7 @@ msgid "Duplicated way nodes"
 msgstr "Подвійні точки ліній"
 
 msgid "Checks for ways with identical consecutive nodes."
-msgstr "Перевіряє ліні на наявність однакових послідовних точок."
+msgstr "Перевіряє лінії на наявність однакових послідовних точок."
 
 msgid "Highways"
 msgstr "Дороги"
@@ -4214,7 +4227,7 @@ msgid "Multipolygon is not closed"
 msgstr "Мультиполігон не замкнений"
 
 msgid "Multipolygon inner way is outside"
-msgstr "Внутрішня ліня мультиполігону знаходиться ззовні"
+msgstr "Внутрішня лінія мультиполігону знаходиться ззовні"
 
 msgid "Intersection between multipolygon ways"
 msgstr "Перетин між лініями мультиполігону"
@@ -4308,7 +4321,7 @@ msgid "Way contains segment twice"
 msgstr "Лінія містить відрізок двічі"
 
 msgid "Power lines"
-msgstr "Лінії електропредачі"
+msgstr "Лінії електропередачі"
 
 msgid ""
 "Checks for nodes in power lines that do not have a power=tower/pole tag."
@@ -4383,7 +4396,7 @@ msgid "Tag checker"
 msgstr "Перевірка теґів"
 
 msgid "Adding {0} to ignore tags"
-msgstr "Додавання {0} до ігноруємиї теґів"
+msgstr "Додавання {0} до ігноруємих теґів"
 
 msgid "Invalid tagchecker line - {0}: {1}"
 msgstr "Невірний рядок перевірки теґів — {0}: {1}"
@@ -5387,6 +5400,12 @@ msgstr "Підґрунтя конфлікту: лишить все теґи"
 msgid "Conflict foreground: keep all tags"
 msgstr "Передній план конфлікту: лишить все теґи"
 
+msgid "Conflict background: sum all numeric tags"
+msgstr "Тло конфлікту: сума всіх числових теґів"
+
+msgid "Conflict foreground: sum all numeric tags"
+msgstr "Колір конфлікту: сума всіх числових теґів"
+
 msgid "Conflict background: keep member"
 msgstr "Підґрунтя конфлікту: залишить учасника"
 
@@ -5869,12 +5888,20 @@ msgstr "нічого"
 msgid "all"
 msgstr "всі"
 
+msgid "sum"
+msgstr "сума"
+
 msgid "Please decide which values to keep"
 msgstr "Будь ласка, вирішите, які значення залишити"
 
 msgid "Value ''{0}'' is going to be applied for key ''{1}''"
 msgstr "Значення ''{0}'' буде встановлене ключу ''{1}''"
 
+msgid ""
+"All numeric values sumed as ''{0}'' are going to be applied for key ''{1}''"
+msgstr ""
+"Підсумок всіх числових значень ''{0}'' застосовується для ключа ''{1}''"
+
 msgid "The key ''{0}'' and all its values are going to be removed"
 msgstr "Ключ ''{0}'' і всі його значення будуть вилучені"
 
@@ -6274,24 +6301,6 @@ msgstr[2] "<p><b>{0}</b> об’єкти виключено"
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr "</p><p>Закрийте діалог фільтра, щоб побачити всі об’єкти.<p></html>"
 
-msgid "Display the history of all selected items."
-msgstr "Показати історію всіх обраних об’єктів."
-
-msgid "Object with history"
-msgstr "Об’єкт із історією"
-
-msgid "Reload"
-msgstr "Перезавантажити"
-
-msgid "Reload all currently selected objects and refresh the list."
-msgstr "Завантажити заново всі виділені об’єкти і оновити список."
-
-msgid "Show"
-msgstr "Показати"
-
-msgid "Display the history of the selected objects."
-msgstr "Показати історію виділених об’єктів."
-
 msgid "Advanced object info"
 msgstr "Розширена інформація про об’єкт"
 
@@ -6654,6 +6663,9 @@ msgstr "Додати коментар"
 msgid "Comment"
 msgstr "Коментар"
 
+msgid "Comment on note"
+msgstr "Коментар нотатки"
+
 msgid "Add comment to note:"
 msgstr "Додати коментар до нотатки:"
 
@@ -6663,9 +6675,6 @@ msgstr "Закрити нотатку"
 msgid "Close note with message:"
 msgstr "Закрити нотатку з повідомленням:"
 
-msgid "Close Note"
-msgstr "Закрити Нотатку"
-
 msgid "Create a new note"
 msgstr "Створити нову нотатку"
 
@@ -6744,6 +6753,9 @@ msgstr "Поточне виділення"
 msgid "Search for objects"
 msgstr "Пошук об’єктів"
 
+msgid "Display the history of the selected objects."
+msgstr "Показати історію виділених об’єктів."
+
 msgid "Zoom to selection"
 msgstr "Наблизитися до виділеного"
 
@@ -6870,6 +6882,9 @@ msgstr "Виправлення ({0}/{1}): ''{2}''"
 msgid "Updating map ..."
 msgstr "Оновлення мапи…"
 
+msgid "anonymous"
+msgstr "анонімний"
+
 msgid "Display the basic properties of the changeset"
 msgstr "Показати основні властивості набору змін"
 
@@ -6882,6 +6897,12 @@ msgstr "Вміст"
 msgid "Display the objects created, updated, and deleted by the changeset"
 msgstr "Показати об’єкти, створені, оновлені і вилучені цим набором змін"
 
+msgid "Discussion"
+msgstr "Обговорення"
+
+msgid "Display the public discussion around this changeset"
+msgstr "Показати публічні обговорення цього набору змін"
+
 msgid "Changeset Management Dialog"
 msgstr "Вікно керування набором змін"
 
@@ -6942,9 +6963,6 @@ msgctxt "changeset.state"
 msgid "Closed"
 msgstr "Закритий"
 
-msgid "anonymous"
-msgstr "анонімний"
-
 msgid "ID"
 msgstr "Ідентифікатор"
 
@@ -6960,6 +6978,9 @@ msgstr "Створено"
 msgid "Closed at"
 msgstr "Закрито"
 
+msgid "Discussions"
+msgstr "Обговорення"
+
 msgid "Downloading changeset content"
 msgstr "Завантаження з сервера вмісту набору змін"
 
@@ -7084,6 +7105,15 @@ msgstr ""
 "Наблизитись до відповідних об’єктів, що містяться в наборі змін у поточному "
 "шарі"
 
+msgid "Update changeset discussion"
+msgstr "Оновити обговорення набору змін"
+
+msgid "Update the changeset discussion from the OSM server"
+msgstr "Оновити обговорення набору змін з сервера OSM"
+
+msgid "Date"
+msgstr "Дата"
+
 msgid "Download changesets"
 msgstr "Завантажити з сервера набори змін"
 
@@ -7550,8 +7580,8 @@ msgstr "Будь ласка, оберіть значення"
 msgid "Set number of recently added tags"
 msgstr "Встановити кількість щойно доданий теґів"
 
-msgid "Remember last used tags"
-msgstr "Запам’ятати останні використані теґи"
+msgid "Remember last used tags after a restart"
+msgstr "Запам’ятати останні теґи після перезавантаження"
 
 msgid "Please enter the number of recently added tags to display"
 msgstr "Введіть, будь ласка, кількість щойно доданих теґів для показу"
@@ -7934,6 +7964,9 @@ msgstr "в тому числі безпосередні нащадки бать
 msgid "Load parent relations"
 msgstr "Завантажити батьківські зв’язки"
 
+msgid "Reload"
+msgstr "Перезавантажити"
+
 msgid "Loading parent relations"
 msgstr "Завантаження батьківських зв’язків"
 
@@ -8063,6 +8096,12 @@ msgstr "Дані GPS"
 msgid "Select to download GPS traces in the selected download area."
 msgstr "Позначте, щоб завантажити з сервера GPS-треки, для виділеної ділянки"
 
+msgid "Notes"
+msgstr "Нотатки"
+
+msgid "Select to download notes in the selected download area."
+msgstr "Оберіть для завантаження нотатки з виділеної ділянки."
+
 msgid "Download as new layer"
 msgstr "Завантажити як новий шар"
 
@@ -8408,9 +8447,6 @@ msgstr "A"
 msgid "B"
 msgstr "B"
 
-msgid "Date"
-msgstr "Дата"
-
 msgid ""
 "Failed to update primitive with id {0} because current edit layer is null"
 msgstr ""
@@ -9444,9 +9480,6 @@ msgstr ""
 msgid "Save Layer"
 msgstr "Зберегти шар"
 
-msgid "Notes"
-msgstr "Нотатки"
-
 msgid "Notes layer"
 msgstr "Шар Нотатки"
 
@@ -9462,9 +9495,6 @@ msgstr "Дані {0}"
 msgid "outside downloaded area"
 msgstr "по-за межами завантаженої ділянки"
 
-msgid "version {0}"
-msgstr "версія {0}"
-
 msgid "Merging layers"
 msgstr "Злиття шарів"
 
@@ -13487,6 +13517,15 @@ msgstr ""
 "Очікується відкритий набір змін. Отримано закритий набір змін з "
 "ідентифікатором {0}."
 
+msgid "Note upload failed"
+msgstr "Збій надсилання нотатки"
+
+msgid "Error parsing note response from server"
+msgstr "Помилка аналізу відповіді з сервера на нотатку"
+
+msgid "Error encoding string: {0}"
+msgstr "Помилка кодування: {0}"
+
 msgid "(Code={0})"
 msgstr "(Код={0})"
 
@@ -13544,15 +13583,15 @@ msgstr ""
 msgid "Parsing changeset content ..."
 msgstr "Розбір вмісту набору змін…"
 
+msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
+msgstr "Неприпустиме булівське значення атрибуту ''{0}''. Отримано ''{1}''."
+
 msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
 msgstr "Неприпустиме значення атрибуту ''{0}''. Отримано ''{1}''."
 
 msgid "Illegal numeric value for attribute ''{0}''. Got ''{1}''."
 msgstr "Неприпустиме числове значення атрибуту ''{0}''. Отримано ''{1}''."
 
-msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
-msgstr "Неприпустиме булівське значення атрибуту ''{0}''. Отримано ''{1}''."
-
 msgid "Missing mandatory attribute ''{0}'' of XML element {1}."
 msgstr "Відсутній обов’язковий атрибут ''{0}'' XML-елемента {1}."
 
@@ -13891,7 +13930,7 @@ msgstr ""
 "{1}"
 
 msgid "Unable to initialize Remote Control HTTPS Server"
-msgstr "Неможливо ініціалізувати HTTPS Сервер віддаленого керування"
+msgstr "Неможливо ініціалізувати HTTPS Сервер Дистанційного керування"
 
 msgid "RemoteControl::Accepting secure connections on port {0}"
 msgstr "RemoteControl::Прийняття безпечного з’єднання на порт {0}"
@@ -13954,9 +13993,10 @@ msgstr "Мінімум має бути менше максимуму"
 
 msgid "Remote Control has been asked to load the following data:"
 msgstr ""
+"Було запропоновано завантажити наступні дані через Дистанційне керування:"
 
 msgid "Loading data"
-msgstr ""
+msgstr "Завантаження даних"
 
 msgid ""
 "Remote Control has been asked to load objects (specified by their id) from "
@@ -14444,9 +14484,6 @@ msgstr ""
 "Не вдалось просканувати файл ''{0}'' на наявність інформації про втулок. "
 "Пропускаємо."
 
-msgid "Processing plugin site cache icon files..."
-msgstr "Обробка файлів значків втулків з кешу сайта…"
-
 msgid "Processing plugin files..."
 msgstr "Обробка файлів втулків…"
 
@@ -14465,12 +14502,6 @@ msgstr "JOSM не вдалось завантажити перелік втул
 msgid "Details:"
 msgstr "Подробиці:"
 
-msgid "Plugin icons download error"
-msgstr "Помилка завантаження значків втулків"
-
-msgid "JOSM failed to download plugin icons:"
-msgstr "JOSM не вдалось завантажити значки втулків:"
-
 msgid ""
 "Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
 "plugin site ''{1}''."
@@ -15593,8 +15624,12 @@ msgid ""
 msgstr ""
 "Створення і керування адресними точками і будівлями в Чеській Республіці"
 
-msgid "Allows to import various file formats into JOSM directly."
-msgstr "Дозволяє імпортувати файли різних форматів безпосередньо в JOSM"
+msgid ""
+"Allows to import various file formats into JOSM directly. Currently "
+"supported: TangoGPS, Garmin Trainings Center TCX."
+msgstr ""
+"Дозволяє імпортувати файли різних форматів безпосередньо в JOSM. Зараз "
+"підтримуються: TangoGPS, Garmin Trainings Center TCX."
 
 msgid "Download your GPX tracks from openstreetmap.org"
 msgstr "Завантажує ваші GPX-треки з openstreetmap.org"
@@ -15712,6 +15747,14 @@ msgid "A helper for IRS satellite adjustment."
 msgstr "Допомагає у вірівнюванні тла зі супутниковими знімками від IRS."
 
 msgid ""
+"Provides Java Native Access (JNA) library. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+"Надає бібліотеку Java Native Access (JNA). Не потребує встановлення "
+"безпосередньо самим користувачем, лише для розв’язання залежностей із іншими "
+"втулками."
+
+msgid ""
 "Provides Java Topology Suite (JTS) library and related utilities. Not meant "
 "to be installed directly by users, but rather as a dependency for other "
 "plugins."
@@ -15956,7 +15999,7 @@ msgid "Plugin to digital sign OSM-Data"
 msgstr "Втулок для накладення цифрового підпису на дані OSM"
 
 msgid "${plugin.description}"
-msgstr ""
+msgstr "${plugin.description}"
 
 msgid ""
 "Provides a straightforward GUI for adding, editing and deleting turn lanes."
@@ -16133,6 +16176,25 @@ msgstr "Освітлення"
 msgid "Width (meters)"
 msgstr "Ширина (метри)"
 
+msgid "Sidewalk"
+msgstr "Тротуар"
+
+msgctxt "sidewalk"
+msgid "both"
+msgstr "з обох боків"
+
+msgctxt "sidewalk"
+msgid "left"
+msgstr "ліворуч"
+
+msgctxt "sidewalk"
+msgid "right"
+msgstr "праворуч"
+
+msgctxt "sidewalk"
+msgid "no"
+msgstr "немає"
+
 msgid "Service type"
 msgstr "Тип"
 
@@ -16499,17 +16561,21 @@ msgstr "Пн-Пт 09:00-18:00,Сб 08:00-14:00"
 msgid "May-Sep 09:30-12:30,14:15-19:30"
 msgstr "Тра-Вер 09:30-12:30,14:15-19:30"
 
+msgctxt "parking"
 msgid "multi-storey"
 msgstr "багаторівнева"
 
+msgctxt "parking"
 msgid "surface"
 msgstr "наземна"
 
+msgctxt "parking"
 msgid "underground"
 msgstr "підземна"
 
+msgctxt "parking"
 msgid "rooftop"
-msgstr "дах"
+msgstr "на даху"
 
 msgid "Reference number"
 msgstr "Номер"
@@ -16650,7 +16716,7 @@ msgid "evangelical"
 msgstr "євангелізм"
 
 msgid "jehovahs_witness"
-msgstr "свідки ієгови"
+msgstr "свідки єгови"
 
 msgid "lutheran"
 msgstr "лютеранство"
@@ -16965,14 +17031,25 @@ msgstr "Макс. довжина (м.)"
 msgid "Overtaking"
 msgstr "Обгін"
 
+msgctxt "overtaking"
+msgid "yes"
+msgstr "так"
+
+msgctxt "overtaking"
 msgid "both"
-msgstr "обидва"
+msgstr "з обох боків"
 
+msgctxt "overtaking"
 msgid "forward"
 msgstr "за напрямком лінії"
 
+msgctxt "overtaking"
 msgid "backward"
-msgstr "в протилежному напрямку лінії"
+msgstr "проти напрямку лінії"
+
+msgctxt "overtaking"
+msgid "no"
+msgstr "немає"
 
 msgid "Roundabout"
 msgstr "Круг"
@@ -17281,6 +17358,12 @@ msgstr "pegasus (для вершників)"
 msgid "tiger"
 msgstr "tiger (нерегульований вело-пішохідний)"
 
+msgid "Button operated"
+msgstr "Вмикається кнопкою"
+
+msgid "Sound signals"
+msgstr "Звукові сигнали"
+
 msgid "Crossing attendant"
 msgstr "Під наглядом регулювальника"
 
@@ -17806,9 +17889,6 @@ msgstr "Залізничний переїзд"
 msgid "Traffic lights"
 msgstr "Семафор"
 
-msgid "Sound signals"
-msgstr "Звукові сигнали"
-
 msgid "Barrier"
 msgstr "Огорожа"
 
@@ -18906,7 +18986,7 @@ msgstr "грецька православна"
 
 msgctxt "christian"
 msgid "jehovahs_witness"
-msgstr "свідки ієгови"
+msgstr "свідки єгови"
 
 msgctxt "christian"
 msgid "lutheran"
@@ -19868,6 +19948,9 @@ msgstr "Вітряк"
 msgid "Gasometer"
 msgstr "Газгольдер"
 
+msgid "Bunker Silo"
+msgstr "Силосна яма"
+
 msgid "Pipeline"
 msgstr "Трубопровід"
 
@@ -20014,15 +20097,15 @@ msgstr "Станція спостереження"
 msgid "Monitoring:"
 msgstr "Спостерігається:"
 
-msgid "Weather"
-msgstr "Погода"
-
 msgid "Water level"
 msgstr "Рівень води"
 
 msgid "Tide Level"
 msgstr "Висота хвиль"
 
+msgid "Groundwater"
+msgstr ""
+
 msgid "Traffic"
 msgstr "Трафік"
 
@@ -20041,6 +20124,9 @@ msgstr "Сигнал GLONASS"
 msgid "Galileo Signals"
 msgstr "Сигнал Galileo"
 
+msgid "Weather"
+msgstr "Погода"
+
 msgid "Radiation"
 msgstr "Радіаційний фон"
 
@@ -20221,6 +20307,9 @@ msgstr "ліфтовий бик"
 msgid "pivot_pier"
 msgstr "опроно-обертальний бик"
 
+msgid "Bridge outline"
+msgstr "Контур мосту"
+
 msgid "Power Plant"
 msgstr "Електростанція"
 
@@ -20830,6 +20919,15 @@ msgstr "неповні"
 msgid "Pole"
 msgstr "Опора"
 
+msgid "Pole with Transformer"
+msgstr "Опора з траснформатором"
+
+msgid "Pole Attributes:"
+msgstr "Атрибути опори:"
+
+msgid "Transformer Attributes:"
+msgstr "Атрибути трансформатора:"
+
 msgid "Power Line"
 msgstr "Лінія електропередач"
 
@@ -20879,9 +20977,15 @@ msgstr "Використовується для передачі даних"
 msgid "Power Cable"
 msgstr "Силовий кабель"
 
+msgctxt "power cable"
+msgid "underground"
+msgstr "підземний"
+
+msgctxt "power cable"
 msgid "underwater"
 msgstr "підводний"
 
+msgctxt "power cable"
 msgid "overground"
 msgstr "надземний"
 
@@ -20909,6 +21013,33 @@ msgstr "Монумент"
 msgid "Memorial"
 msgstr "Пам’ятник"
 
+msgctxt "memorial"
+msgid "statue"
+msgstr "статуя"
+
+msgctxt "memorial"
+msgid "bust"
+msgstr "бюст"
+
+msgctxt "memorial"
+msgid "plaque"
+msgstr "табличка"
+
+msgctxt "memorial"
+msgid "stele"
+msgstr "стела"
+
+msgctxt "memorial"
+msgid "stone"
+msgstr "камінь"
+
+msgctxt "memorial"
+msgid "war_memorial"
+msgstr "військовий меморіал"
+
+msgid "Inscription"
+msgstr "Напис"
+
 msgid "Wayside Cross"
 msgstr "Придорожній Хрест"
 
@@ -20978,6 +21109,9 @@ msgstr "Алкогольні напої"
 msgid "Beverages"
 msgstr "Напої"
 
+msgid "Wine"
+msgstr "Вино"
+
 msgid "Boutique"
 msgstr "Бутік"
 
@@ -21023,6 +21157,9 @@ msgstr "Відео"
 msgid "Video Games"
 msgstr "Відеоігри"
 
+msgid "Music"
+msgstr "Музика"
+
 msgid "Cash"
 msgstr "Гроші"
 
@@ -21050,6 +21187,9 @@ msgstr "Все для кухні"
 msgid "Curtain"
 msgstr "Штори та гардини"
 
+msgid "Art"
+msgstr "Оздоблення"
+
 msgid "Frame"
 msgstr "Рами"
 
@@ -21095,6 +21235,9 @@ msgstr "Перукарня"
 msgid "Beauty"
 msgstr "Салон краси"
 
+msgid "Tattoo"
+msgstr "Тату"
+
 msgid "Optician"
 msgstr "Оптика"
 
@@ -21146,6 +21289,9 @@ msgstr "Валізи"
 msgid "Pet"
 msgstr "Домашні улюбленці"
 
+msgid "Funeral Directors"
+msgstr "Служба поховань"
+
 msgid "Vending Machine"
 msgstr "Торговий автомат"
 
@@ -21245,6 +21391,15 @@ msgstr "Поштовий індекс"
 msgid "National Park"
 msgstr "Національний парк"
 
+msgid "Protected Area"
+msgstr "Охоронювана територія"
+
+msgid "Protected Class"
+msgstr "Клас охорони"
+
+msgid "Title or type of protection"
+msgstr "Назва чи тип захисту"
+
 msgid "Places"
 msgstr "Місця"
 
@@ -22339,8 +22494,14 @@ msgstr "Естонія Базова мапа (Maaamet)"
 msgid "Estonia Ortho (Maaamet)"
 msgstr "Естонія Ортомапа (Maaamet)"
 
-msgid "Estonia Multi (Maaamet)"
-msgstr "Естонія Multi (Maaamet)"
+msgid "Estonia Hillshade (Maaamet)"
+msgstr ""
+
+msgid "Estonia Cadastre (Maaamet)"
+msgstr ""
+
+msgid "Estonia Forestry (Maaamet)"
+msgstr ""
 
 msgid "Bordeaux - 2012"
 msgstr "Бордо - 2012"
@@ -22363,8 +22524,8 @@ msgstr "CRIGE - Ле-Пюї 2010 - 15 см"
 msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
 msgstr "CRIGE PACA Приморські Альпи 2009 - 40 см"
 
-msgid "CUGN Nancy - Orthophoto 2012"
-msgstr "CUGN Нансі - отофото 2012"
+msgid "GrandNancy Orthophotographie 2012"
+msgstr "GrandNancy Orthophotographie 2012"
 
 msgid "Géobretagne - Brest 2010 - 10 cm"
 msgstr "Géobretagne - Брест 2010 - 10 см"
@@ -22410,9 +22571,6 @@ msgid ""
 "- 1 m"
 msgstr "Веркор - заповідник Хайлендс Веркор - ортофото 1999-1 м"
 
-msgid "Streets NRW Geofabrik.de"
-msgstr "Вулиці NRW Geofabrik.de"
-
 msgid "Hike & Bike"
 msgstr "Піший та велотуризм"
 
@@ -22473,6 +22631,9 @@ msgstr "NRW-Атлас: Аерофотознімки"
 msgid "NRW-Atlas: Topographische Karte 1:10000"
 msgstr "NRW-Atlas: Топографічна мапа 1:10000"
 
+msgid "Metropole Ruhr: Luftbilder (10 cm)"
+msgstr "Агломерація Рур: Аерофотозйомка (10 см)"
+
 msgid "Drone Imagery (Haiti)"
 msgstr "Знімки дронів (Гаїті)"
 
@@ -22675,6 +22836,9 @@ msgstr "Цюрих - план міста"
 msgid "Stadt Zürich Übersichtsplan (Strassen, Gebäude, Hausnummer)"
 msgstr "Цюрих: оглядовий план міста (вулиці, будівлі, номери будинків)"
 
+msgid "Stadt Zürich Luftbild 2011"
+msgstr "Місто Цюріх Вид з повітря 2011"
+
 msgid "Orthofoto Kanton Solothurn RGB (SOGIS 2011/2012/2013)"
 msgstr "Кантон Золотурн: ортофото RGB (SOGIS 2011/2012/2013)"
 
@@ -22693,8 +22857,8 @@ msgstr "Кантон Юра 50см (RCJU 1998)"
 msgid "Canton de Fribourg 50cm (2005)"
 msgstr "Кантон Фрібур 50см (2005)"
 
-msgid "Stadt Bern 10cm/25cm (2008)"
-msgstr "Місто Берн 10см/25см (2008)"
+msgid "Stadt Bern 10cm/25cm (2012)"
+msgstr "Місто Берн 10см/25см (2012)"
 
 msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
 msgstr "HEIG-VD / Ортофото Івердон-ле-Бен 25cm (2007)"
@@ -22732,8 +22896,8 @@ msgstr "USGS: великомасштабні знимки"
 msgid "OSM US TIGER 2012 Roads Overlay"
 msgstr "OSM US TIGER 2012: оверлей доріг"
 
-msgid "New & Misaligned TIGER Roads (TIGER 2013)"
-msgstr "Нові та зміщені дороги TIGER (TIGER 2013)"
+msgid "New & Misaligned TIGER Roads (TIGER 2014)"
+msgstr "Нові та невирівняні дороги TIGER (TIGER 2014)"
 
 msgid "MassGIS L3 Parcels"
 msgstr "MassGIS L3 Ділянки"
@@ -22780,9 +22944,234 @@ msgstr "OS Scottish Popular історична"
 msgid "NLS - Bartholomew Half Inch, 1897-1907"
 msgstr "NLS - изд. Bartholomew, напівдюймова, 1897-1907"
 
+msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgstr "Плани міст від OS, Абердін 1866-1867 (NLS)"
+
+msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgstr "Плани міст від OS, Еірдрі 1858 (NLS)"
+
+msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgstr "Плани міст від OS, Олександрія  1859 (NLS)"
+
+msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgstr "Плани міст від OS, Оулла 1861-1862 (NLS)"
+
+msgid "OS Town Plans, Annan 1859 (NLS)"
+msgstr "Плани міст від OS, Ананн 1859 (NLS)"
+
+msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgstr "Плани міст від OS, Аброас 1858 (NLS)"
+
+msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgstr "Плани міст від OS, Ер 1855 (NLS)"
+
+msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgstr "Плани міст від OS, Бервік-на-Твід 1852 (NLS)"
+
+msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgstr "Плани міст від OS, Бріхін 1862 (NLS)"
+
+msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgstr "Плани міст від OS, Бурнтісланд 1894 (NLS)"
+
+msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgstr "Плани міст від OS, Кемпбелтон 1865 (NLS)"
+
+msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgstr "Плани міст від OS, Коатбрідж 1858 (NLS)"
+
 msgid "OS Town Plans, Cupar 1854 (NLS)"
 msgstr "OS: плани міст, Купар 1854 (NLS)"
 
+msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgstr "Плани міст від OS, Купар 1893-1894 (NLS)"
+
+msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgstr "Плани міст від OS, Далкейт  1852 (NLS)"
+
+msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgstr "Плани міст від OS, Далкейт 1893 (NLS)"
+
+msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgstr "Плани міст від OS, Дамбартон 1859 (NLS)"
+
+msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgstr "Плани міст від OS, Дамфріз 1850 (NLS)"
+
+msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgstr "Плани міст від OS, Дамфріз 1893 (NLS)"
+
+msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgstr "Плани міст від OS, Данді 1857-1858 (NLS)"
+
+msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgstr "Плани міст від OS, Данді 1870-1872 (NLS)"
+
+msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgstr "Плани міст від OS, Данфермлін 1854 (NLS)"
+
+msgid "OS Town Plans, Dunfermline 1894 (NLS)"
+msgstr "Плани міст від OS, Данфермлін 1894 (NLS)"
+
+msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
+msgstr "Плани міст від OS, Едінбург 1849-1851 (NLS)"
+
+msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
+msgstr "Плани міст від OS, Едінбург 1876-1877 (NLS)"
+
+msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
+msgstr "Плани міст від OS, Едінбург 1893-1894 (NLS)"
+
+msgid "OS Town Plans, Elgin 1868 (NLS)"
+msgstr "Плани міст від OS, Елгін 1868 (NLS)"
+
+msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
+msgstr "Плани міст від OS, Фалкірк 1858-1859 (NLS)"
+
+msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
+msgstr "Плани міст від OS, Форфар 1860-1861 (NLS)"
+
+msgid "OS Town Plans, Forres 1868 (NLS)"
+msgstr "Плани міст від OS, Форрес Forres 1868 (NLS)"
+
+msgid "OS Town Plans, Galashiels 1858 (NLS)"
+msgstr "Плани міст від OS, Галашилс 1858 (NLS)"
+
+msgid "OS Town Plans, Girvan 1857 (NLS)"
+msgstr "Плани міст від OS, Гірван 1857 (NLS)"
+
+msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
+msgstr "Плани міст від OS, Глазго 1857-1858 (NLS)"
+
+msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
+msgstr "Плани міст від OS, Глазго 1892-1894 (NLS)"
+
+msgid "OS Town Plans, Greenock 1857 (NLS)"
+msgstr "Плани міст від OS, Грінок 1857 (NLS)"
+
+msgid "OS Town Plans, Haddington 1853 (NLS)"
+msgstr "Плани міст від OS,  Хаддінгтон 1853 (NLS)"
+
+msgid "OS Town Plans, Haddington 1893 (NLS)"
+msgstr "Плани міст від OS, Хаддінгтон 1893 (NLS)"
+
+msgid "OS Town Plans, Hamilton 1858 (NLS)"
+msgstr "Плани міст від OS, Гамільтон 1858 (NLS)"
+
+msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
+msgstr "Плани міст від OS, Хоїк 1857-1858 (NLS)"
+
+msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
+msgstr "Плани міст від OS, Інвернесс 1867-1868 (NLS)"
+
+msgid "OS Town Plans, Irvine 1859 (NLS)"
+msgstr "Плани міст від OS, Ірвін 1859 (NLS)"
+
+msgid "OS Town Plans, Jedburgh 1858 (NLS)"
+msgstr "Плани міст від OS, Джедбург 1858 (NLS)"
+
+msgid "OS Town Plans, Kelso 1857 (NLS)"
+msgstr "Плани міст від OS, Келсо 1857 (NLS)"
+
+msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
+msgstr "Плани міст від OS, Кілмарнок 1857-1859 (NLS)"
+
+msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
+msgstr "Плани міст від OS, Киркалді 1855 (NLS)"
+
+msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
+msgstr "Плани міст від OS, Киркалді 1894 (NLS)"
+
+msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
+msgstr "Плани міст від OS, Кіркудбрайт 1850 (NLS)"
+
+msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
+msgstr "Плани міст від OS, Кіркудбрайт 1893 (NLS)"
+
+msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
+msgstr "Плани міст від OS, Кьоркентілек 1859 (NLS)"
+
+msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
+msgstr "Плани міст від OS, Кір’ємуір 1861 (NLS)"
+
+msgid "OS Town Plans, Lanark 1858 (NLS)"
+msgstr "Плани міст від OS, Ланарк 1858 (NLS)"
+
+msgid "OS Town Plans, Linlithgow 1856 (NLS)"
+msgstr "Плани міст від OS, Лінлітго 1856 (NLS)"
+
+msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
+msgstr "Плани міст від OS, Майол 1856-1857 (NLS)"
+
+msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
+msgstr "Плани міст від OS, Монтроуз 1861-1862 (NLS)"
+
+msgid "OS Town Plans, Musselburgh 1853 (NLS)"
+msgstr "Плани міст від OS, Массельбург 1853 (NLS)"
+
+msgid "OS Town Plans, Musselburgh 1893 (NLS)"
+msgstr "Плани міст від OS,  Массельбург 1893 (NLS)"
+
+msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
+msgstr "Плани міст від OS, Наїрн 1867-1868 (NLS)"
+
+msgid "OS Town Plans, Oban 1867-1868 (NLS)"
+msgstr "Плани міст від OS, Обан 1867-1868 (NLS)"
+
+msgid "OS Town Plans, Peebles 1856 (NLS)"
+msgstr "Плани міст від OS, Піблз 1856 (NLS)"
+
+msgid "OS Town Plans, Perth 1860 (NLS)"
+msgstr "Плани міст від OS, Перт 1860 (NLS)"
+
+msgid "OS Town Plans, Peterhead 1868 (NLS)"
+msgstr "Плани міст від OS, Петерхед 1868 (NLS)"
+
+msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
+msgstr "Плани міст від OS, Порт Глазго 1856-1857 (NLS)"
+
+msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
+msgstr "Плани міст від OS, Портобелло 1893-1894 (NLS)"
+
+msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
+msgstr "Плани міст від OS, Ротсей 1862-1863 (NLS)"
+
+msgid "OS Town Plans, Selkirk 1865 (NLS)"
+msgstr "Плани міст від OS, Селкирк 1865 (NLS)"
+
+msgid "OS Town Plans, St Andrews 1854 (NLS)"
+msgstr "Плани міст від OS, Сент-Ендрюс 1854 (NLS)"
+
+msgid "OS Town Plans, St Andrews 1893 (NLS)"
+msgstr "Плани міст від OS, Сент-Ендрюс 1893 (NLS)"
+
+msgid "OS Town Plans, Stirling 1858 (NLS)"
+msgstr "Плани міст від OS, Стірлінг 1858 (NLS)"
+
+msgid "OS Town Plans, Stonehaven 1864 (NLS)"
+msgstr "Плани міст від OS, Стонхейвен 1864 (NLS)"
+
+msgid "OS Town Plans, Stranraer 1847 (NLS)"
+msgstr "Плани міст від OS, Странріїр 1847 (NLS)"
+
+msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
+msgstr "Плани міст від OS, Странріїр 1863-1877 (NLS)"
+
+msgid "OS Town Plans, Stranraer 1893 (NLS)"
+msgstr "Плани міст від OS, Странріїр 1893 (NLS)"
+
+msgid "OS Town Plans, Strathaven 1858 (NLS)"
+msgstr "Плани міст від OS, Стартхевен 1858 (NLS)"
+
+msgid "OS Town Plans, Wick 1872 (NLS)"
+msgstr "Плани міст від OS, Виік 1872 (NLS)"
+
+msgid "OS Town Plans, Wigtown 1848 (NLS)"
+msgstr "Плани міст від OS, Вінгтон 1848 (NLS)"
+
+msgid "OS Town Plans, Wigtown 1894 (NLS)"
+msgstr "Плани міст від OS, Вінгтон 1894 (NLS)"
+
 msgid "Decreasing house numbers in addresses interpolation"
 msgstr "Зменшення номерів будинків під час інтерполяції"
 
@@ -22842,9 +23231,9 @@ msgstr ""
 "{0}={1} є застарілим. Будь ласка, використовуйте замість цього мультиполігон."
 
 msgid ""
-"{0} is deprecated. Please specify ìnterval by using opening_hours syntax"
+"{0} is deprecated. Please specify interval by using opening_hours syntax"
 msgstr ""
-"{0} є застарілим. Будь ласка, вказуйте час роботи використовуючи синтаксис "
+"{0} є застарілим. Будь ласка, вказуйте час роботи, використовуючи синтаксис "
 "opening_hours"
 
 msgid ""
@@ -22853,12 +23242,36 @@ msgstr ""
 "{0} є застарілим. Будь ласка, вилучіть цей об’єкт та використовуйте "
 "приватний шар"
 
+msgid "{0}={1} is unspecific. Please replace ''{1}'' by a specific value."
+msgstr ""
+"{0}={1} є неспецифічним. Будь ласка,  вкажіть замість ''{1}'' більш "
+"конкретне значення."
+
+msgid "{0} should be replaced with {1}"
+msgstr "{0} потрібно замінити на {1}"
+
+msgid ""
+"{0}={1} is unspecific. Please replace ''{1}'' by ''left'', ''right'' or "
+"''both''."
+msgstr ""
+"{0}={1} не визначено. Будь ласка, замініть ''{1}'' на ''left'', ''right'' "
+"або ''both''."
+
+msgid "{0} on a node. Should be used on a way."
+msgstr "{0} на точці. Слід застосовувати до лінії."
+
+msgid "{0} on a node. Should be drawn as an area."
+msgstr "{0} на точці. Слід застосовувати до полігону."
+
+msgid "{0}=* on a node. Should be used in a relation"
+msgstr "{0}=* на точці. Потрібно використовувати у зв’язку"
+
+msgid "{0} on a way. Should be used in a relation"
+msgstr "{0} на лінії, а повинен бути на зв’язку"
+
 msgid "{0} on a node"
 msgstr "{0} на точці"
 
-msgid "{0} on a node. Should be drawn as an area"
-msgstr "{0} на точці. Треба креслити як полігон"
-
 msgid "Building inside building"
 msgstr "Будівля всередині іншої будівлі"
 
@@ -27912,6 +28325,9 @@ msgstr "Пропонувати зупинки"
 msgid "Find"
 msgstr "Шукати"
 
+msgid "Show"
+msgstr "Показати"
+
 msgid "Mark"
 msgstr "Позначити"
 
diff --git a/i18n/po/ur.po b/i18n/po/ur.po
index f2ede1a..e445c7c 100644
--- a/i18n/po/ur.po
+++ b/i18n/po/ur.po
@@ -1,8 +1,13 @@
+# Urdu translation for josm
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the josm package.
+# FIRST AUTHOR <EMAIL at ADDRESS>, 2010.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-21 03:38+0200\n"
+"POT-Creation-Date: 2014-12-10 03:42+0100\n"
 "PO-Revision-Date: 2010-05-13 04:15+0000\n"
 "Last-Translator: Shoaib Mirza <Unknown>\n"
 "Language-Team: Urdu <ur at li.org>\n"
@@ -10,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-10-21 05:29+0000\n"
-"X-Generator: Launchpad (build 17203)\n"
+"X-Launchpad-Export-Date: 2014-12-10 05:17+0000\n"
+"X-Generator: Launchpad (build 17283)\n"
 "Language: ur\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -168,16 +173,6 @@ msgid "About JOSM..."
 msgstr ""
 
 msgid ""
-"Unexpected format of API base URL. Redirection to info or history page for "
-"OSM object will probably fail. API base URL is: ''{0}''"
-msgstr ""
-
-msgid ""
-"Unexpected format of API base URL. Redirection to user page for OSM user "
-"will probably fail. API base URL is: ''{0}''"
-msgstr ""
-
-msgid ""
 "You are about to launch {0} browser window.<br>This may both clutter your "
 "screen with browser windows<br>and take some time to finish."
 msgid_plural ""
@@ -1519,6 +1514,15 @@ msgstr ""
 msgid "Nothing to upload. Get some data first."
 msgstr ""
 
+msgid "Upload note changes to server"
+msgstr ""
+
+msgid "Upload notes"
+msgstr ""
+
+msgid "Uploading notes to server"
+msgstr ""
+
 msgid "Upload selection"
 msgstr ""
 
@@ -1791,10 +1795,16 @@ msgstr ""
 msgid "Click the location where you wish to create a new note"
 msgstr ""
 
-msgid "Enter a comment for a new note"
+msgid "Create new note"
 msgstr ""
 
-msgid "Create new note"
+msgid "Create note"
+msgstr ""
+
+msgid "Enter a detailed comment to create a note"
+msgstr ""
+
+msgid "You must enter a comment to create a new note"
 msgstr ""
 
 msgid "Delete Mode"
@@ -2665,6 +2675,15 @@ msgstr ""
 msgid "Cycling dependencies"
 msgstr ""
 
+msgid "Uploading modified notes"
+msgstr ""
+
+msgid "Note {0} failed: {1}"
+msgstr ""
+
+msgid "Notes failed to upload"
+msgstr ""
+
 msgid ""
 "The following are results of automatic validation. Try fixing these, but be "
 "careful (don''t destroy valid data). When in doubt ignore them.<br>When you "
@@ -4894,6 +4913,12 @@ msgstr ""
 msgid "Conflict foreground: keep all tags"
 msgstr ""
 
+msgid "Conflict background: sum all numeric tags"
+msgstr ""
+
+msgid "Conflict foreground: sum all numeric tags"
+msgstr ""
+
 msgid "Conflict background: keep member"
 msgstr ""
 
@@ -5312,12 +5337,19 @@ msgstr ""
 msgid "all"
 msgstr ""
 
+msgid "sum"
+msgstr ""
+
 msgid "Please decide which values to keep"
 msgstr ""
 
 msgid "Value ''{0}'' is going to be applied for key ''{1}''"
 msgstr ""
 
+msgid ""
+"All numeric values sumed as ''{0}'' are going to be applied for key ''{1}''"
+msgstr ""
+
 msgid "The key ''{0}'' and all its values are going to be removed"
 msgstr ""
 
@@ -5680,24 +5712,6 @@ msgstr[1] ""
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
 
-msgid "Display the history of all selected items."
-msgstr ""
-
-msgid "Object with history"
-msgstr ""
-
-msgid "Reload"
-msgstr ""
-
-msgid "Reload all currently selected objects and refresh the list."
-msgstr ""
-
-msgid "Show"
-msgstr ""
-
-msgid "Display the history of the selected objects."
-msgstr ""
-
 msgid "Advanced object info"
 msgstr ""
 
@@ -6035,6 +6049,9 @@ msgstr ""
 msgid "Comment"
 msgstr ""
 
+msgid "Comment on note"
+msgstr ""
+
 msgid "Add comment to note:"
 msgstr ""
 
@@ -6044,9 +6061,6 @@ msgstr ""
 msgid "Close note with message:"
 msgstr ""
 
-msgid "Close Note"
-msgstr ""
-
 msgid "Create a new note"
 msgstr ""
 
@@ -6119,6 +6133,9 @@ msgstr ""
 msgid "Search for objects"
 msgstr ""
 
+msgid "Display the history of the selected objects."
+msgstr ""
+
 msgid "Zoom to selection"
 msgstr ""
 
@@ -6238,6 +6255,9 @@ msgstr ""
 msgid "Updating map ..."
 msgstr ""
 
+msgid "anonymous"
+msgstr ""
+
 msgid "Display the basic properties of the changeset"
 msgstr ""
 
@@ -6250,6 +6270,12 @@ msgstr ""
 msgid "Display the objects created, updated, and deleted by the changeset"
 msgstr ""
 
+msgid "Discussion"
+msgstr ""
+
+msgid "Display the public discussion around this changeset"
+msgstr ""
+
 msgid "Changeset Management Dialog"
 msgstr ""
 
@@ -6307,9 +6333,6 @@ msgctxt "changeset.state"
 msgid "Closed"
 msgstr ""
 
-msgid "anonymous"
-msgstr ""
-
 msgid "ID"
 msgstr ""
 
@@ -6325,6 +6348,9 @@ msgstr ""
 msgid "Closed at"
 msgstr ""
 
+msgid "Discussions"
+msgstr ""
+
 msgid "Downloading changeset content"
 msgstr ""
 
@@ -6436,6 +6462,15 @@ msgid ""
 "layer"
 msgstr ""
 
+msgid "Update changeset discussion"
+msgstr ""
+
+msgid "Update the changeset discussion from the OSM server"
+msgstr ""
+
+msgid "Date"
+msgstr ""
+
 msgid "Download changesets"
 msgstr ""
 
@@ -6853,7 +6888,7 @@ msgstr ""
 msgid "Set number of recently added tags"
 msgstr ""
 
-msgid "Remember last used tags"
+msgid "Remember last used tags after a restart"
 msgstr ""
 
 msgid "Please enter the number of recently added tags to display"
@@ -7199,6 +7234,9 @@ msgstr ""
 msgid "Load parent relations"
 msgstr ""
 
+msgid "Reload"
+msgstr ""
+
 msgid "Loading parent relations"
 msgstr ""
 
@@ -7321,6 +7359,12 @@ msgstr ""
 msgid "Select to download GPS traces in the selected download area."
 msgstr ""
 
+msgid "Notes"
+msgstr ""
+
+msgid "Select to download notes in the selected download area."
+msgstr ""
+
 msgid "Download as new layer"
 msgstr ""
 
@@ -7626,9 +7670,6 @@ msgstr ""
 msgid "B"
 msgstr ""
 
-msgid "Date"
-msgstr ""
-
 msgid ""
 "Failed to update primitive with id {0} because current edit layer is null"
 msgstr ""
@@ -8483,9 +8524,6 @@ msgstr ""
 msgid "Save Layer"
 msgstr ""
 
-msgid "Notes"
-msgstr ""
-
 msgid "Notes layer"
 msgstr ""
 
@@ -8501,9 +8539,6 @@ msgstr ""
 msgid "outside downloaded area"
 msgstr ""
 
-msgid "version {0}"
-msgstr ""
-
 msgid "Merging layers"
 msgstr ""
 
@@ -12129,6 +12164,15 @@ msgstr ""
 msgid "Open changeset expected. Got closed changeset with id {0}."
 msgstr ""
 
+msgid "Note upload failed"
+msgstr ""
+
+msgid "Error parsing note response from server"
+msgstr ""
+
+msgid "Error encoding string: {0}"
+msgstr ""
+
 msgid "(Code={0})"
 msgstr ""
 
@@ -12177,13 +12221,13 @@ msgstr ""
 msgid "Parsing changeset content ..."
 msgstr ""
 
-msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
-msgid "Illegal numeric value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
-msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal numeric value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
 msgid "Missing mandatory attribute ''{0}'' of XML element {1}."
@@ -12975,9 +13019,6 @@ msgstr ""
 msgid "Failed to scan file ''{0}'' for plugin information. Skipping."
 msgstr ""
 
-msgid "Processing plugin site cache icon files..."
-msgstr ""
-
 msgid "Processing plugin files..."
 msgstr ""
 
@@ -12996,12 +13037,6 @@ msgstr ""
 msgid "Details:"
 msgstr ""
 
-msgid "Plugin icons download error"
-msgstr ""
-
-msgid "JOSM failed to download plugin icons:"
-msgstr ""
-
 msgid ""
 "Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
 "plugin site ''{1}''."
@@ -13887,7 +13922,9 @@ msgid ""
 "Creating and handling address nodes and buildings within Czech Republic."
 msgstr ""
 
-msgid "Allows to import various file formats into JOSM directly."
+msgid ""
+"Allows to import various file formats into JOSM directly. Currently "
+"supported: TangoGPS, Garmin Trainings Center TCX."
 msgstr ""
 
 msgid "Download your GPX tracks from openstreetmap.org"
@@ -13984,6 +14021,11 @@ msgid "A helper for IRS satellite adjustment."
 msgstr ""
 
 msgid ""
+"Provides Java Native Access (JNA) library. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
+msgid ""
 "Provides Java Topology Suite (JTS) library and related utilities. Not meant "
 "to be installed directly by users, but rather as a dependency for other "
 "plugins."
@@ -14339,6 +14381,25 @@ msgstr ""
 msgid "Width (meters)"
 msgstr ""
 
+msgid "Sidewalk"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "both"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "left"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "right"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "no"
+msgstr ""
+
 msgid "Service type"
 msgstr ""
 
@@ -14703,15 +14764,19 @@ msgstr ""
 msgid "May-Sep 09:30-12:30,14:15-19:30"
 msgstr ""
 
+msgctxt "parking"
 msgid "multi-storey"
 msgstr ""
 
+msgctxt "parking"
 msgid "surface"
 msgstr ""
 
+msgctxt "parking"
 msgid "underground"
 msgstr ""
 
+msgctxt "parking"
 msgid "rooftop"
 msgstr ""
 
@@ -15169,15 +15234,26 @@ msgstr ""
 msgid "Overtaking"
 msgstr ""
 
+msgctxt "overtaking"
+msgid "yes"
+msgstr ""
+
+msgctxt "overtaking"
 msgid "both"
 msgstr ""
 
+msgctxt "overtaking"
 msgid "forward"
 msgstr ""
 
+msgctxt "overtaking"
 msgid "backward"
 msgstr ""
 
+msgctxt "overtaking"
+msgid "no"
+msgstr ""
+
 msgid "Roundabout"
 msgstr ""
 
@@ -15471,6 +15547,12 @@ msgstr ""
 msgid "tiger"
 msgstr ""
 
+msgid "Button operated"
+msgstr ""
+
+msgid "Sound signals"
+msgstr ""
+
 msgid "Crossing attendant"
 msgstr ""
 
@@ -15992,9 +16074,6 @@ msgstr ""
 msgid "Traffic lights"
 msgstr ""
 
-msgid "Sound signals"
-msgstr ""
-
 msgid "Barrier"
 msgstr ""
 
@@ -18054,6 +18133,9 @@ msgstr ""
 msgid "Gasometer"
 msgstr ""
 
+msgid "Bunker Silo"
+msgstr ""
+
 msgid "Pipeline"
 msgstr ""
 
@@ -18200,15 +18282,15 @@ msgstr ""
 msgid "Monitoring:"
 msgstr ""
 
-msgid "Weather"
-msgstr ""
-
 msgid "Water level"
 msgstr ""
 
 msgid "Tide Level"
 msgstr ""
 
+msgid "Groundwater"
+msgstr ""
+
 msgid "Traffic"
 msgstr ""
 
@@ -18227,6 +18309,9 @@ msgstr ""
 msgid "Galileo Signals"
 msgstr ""
 
+msgid "Weather"
+msgstr ""
+
 msgid "Radiation"
 msgstr ""
 
@@ -18407,6 +18492,9 @@ msgstr ""
 msgid "pivot_pier"
 msgstr ""
 
+msgid "Bridge outline"
+msgstr ""
+
 msgid "Power Plant"
 msgstr ""
 
@@ -19014,6 +19102,15 @@ msgstr ""
 msgid "Pole"
 msgstr ""
 
+msgid "Pole with Transformer"
+msgstr ""
+
+msgid "Pole Attributes:"
+msgstr ""
+
+msgid "Transformer Attributes:"
+msgstr ""
+
 msgid "Power Line"
 msgstr ""
 
@@ -19063,9 +19160,15 @@ msgstr ""
 msgid "Power Cable"
 msgstr ""
 
+msgctxt "power cable"
+msgid "underground"
+msgstr ""
+
+msgctxt "power cable"
 msgid "underwater"
 msgstr ""
 
+msgctxt "power cable"
 msgid "overground"
 msgstr ""
 
@@ -19093,6 +19196,33 @@ msgstr ""
 msgid "Memorial"
 msgstr ""
 
+msgctxt "memorial"
+msgid "statue"
+msgstr ""
+
+msgctxt "memorial"
+msgid "bust"
+msgstr ""
+
+msgctxt "memorial"
+msgid "plaque"
+msgstr ""
+
+msgctxt "memorial"
+msgid "stele"
+msgstr ""
+
+msgctxt "memorial"
+msgid "stone"
+msgstr ""
+
+msgctxt "memorial"
+msgid "war_memorial"
+msgstr ""
+
+msgid "Inscription"
+msgstr ""
+
 msgid "Wayside Cross"
 msgstr ""
 
@@ -19162,6 +19292,9 @@ msgstr ""
 msgid "Beverages"
 msgstr ""
 
+msgid "Wine"
+msgstr ""
+
 msgid "Boutique"
 msgstr ""
 
@@ -19207,6 +19340,9 @@ msgstr ""
 msgid "Video Games"
 msgstr ""
 
+msgid "Music"
+msgstr ""
+
 msgid "Cash"
 msgstr ""
 
@@ -19234,6 +19370,9 @@ msgstr ""
 msgid "Curtain"
 msgstr ""
 
+msgid "Art"
+msgstr ""
+
 msgid "Frame"
 msgstr ""
 
@@ -19279,6 +19418,9 @@ msgstr ""
 msgid "Beauty"
 msgstr ""
 
+msgid "Tattoo"
+msgstr ""
+
 msgid "Optician"
 msgstr ""
 
@@ -19330,6 +19472,9 @@ msgstr ""
 msgid "Pet"
 msgstr ""
 
+msgid "Funeral Directors"
+msgstr ""
+
 msgid "Vending Machine"
 msgstr ""
 
@@ -19429,6 +19574,15 @@ msgstr ""
 msgid "National Park"
 msgstr ""
 
+msgid "Protected Area"
+msgstr ""
+
+msgid "Protected Class"
+msgstr ""
+
+msgid "Title or type of protection"
+msgstr ""
+
 msgid "Places"
 msgstr ""
 
@@ -20505,7 +20659,13 @@ msgstr ""
 msgid "Estonia Ortho (Maaamet)"
 msgstr ""
 
-msgid "Estonia Multi (Maaamet)"
+msgid "Estonia Hillshade (Maaamet)"
+msgstr ""
+
+msgid "Estonia Cadastre (Maaamet)"
+msgstr ""
+
+msgid "Estonia Forestry (Maaamet)"
 msgstr ""
 
 msgid "Bordeaux - 2012"
@@ -20529,7 +20689,7 @@ msgstr ""
 msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
 msgstr ""
 
-msgid "CUGN Nancy - Orthophoto 2012"
+msgid "GrandNancy Orthophotographie 2012"
 msgstr ""
 
 msgid "Géobretagne - Brest 2010 - 10 cm"
@@ -20576,9 +20736,6 @@ msgid ""
 "- 1 m"
 msgstr ""
 
-msgid "Streets NRW Geofabrik.de"
-msgstr ""
-
 msgid "Hike & Bike"
 msgstr ""
 
@@ -20638,6 +20795,9 @@ msgstr ""
 msgid "NRW-Atlas: Topographische Karte 1:10000"
 msgstr ""
 
+msgid "Metropole Ruhr: Luftbilder (10 cm)"
+msgstr ""
+
 msgid "Drone Imagery (Haiti)"
 msgstr ""
 
@@ -20839,6 +20999,9 @@ msgstr ""
 msgid "Stadt Zürich Übersichtsplan (Strassen, Gebäude, Hausnummer)"
 msgstr ""
 
+msgid "Stadt Zürich Luftbild 2011"
+msgstr ""
+
 msgid "Orthofoto Kanton Solothurn RGB (SOGIS 2011/2012/2013)"
 msgstr ""
 
@@ -20857,7 +21020,7 @@ msgstr ""
 msgid "Canton de Fribourg 50cm (2005)"
 msgstr ""
 
-msgid "Stadt Bern 10cm/25cm (2008)"
+msgid "Stadt Bern 10cm/25cm (2012)"
 msgstr ""
 
 msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
@@ -20896,7 +21059,7 @@ msgstr ""
 msgid "OSM US TIGER 2012 Roads Overlay"
 msgstr ""
 
-msgid "New & Misaligned TIGER Roads (TIGER 2013)"
+msgid "New & Misaligned TIGER Roads (TIGER 2014)"
 msgstr ""
 
 msgid "MassGIS L3 Parcels"
@@ -20944,9 +21107,234 @@ msgstr ""
 msgid "NLS - Bartholomew Half Inch, 1897-1907"
 msgstr ""
 
+msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Annan 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgstr ""
+
 msgid "OS Town Plans, Cupar 1854 (NLS)"
 msgstr ""
 
+msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Elgin 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Forres 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Galashiels 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Girvan 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Greenock 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Haddington 1853 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Haddington 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Hamilton 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Irvine 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Jedburgh 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kelso 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Lanark 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Linlithgow 1856 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Musselburgh 1853 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Musselburgh 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Oban 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Peebles 1856 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Perth 1860 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Peterhead 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Selkirk 1865 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, St Andrews 1854 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, St Andrews 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stirling 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stonehaven 1864 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1847 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Strathaven 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wick 1872 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wigtown 1848 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wigtown 1894 (NLS)"
+msgstr ""
+
 msgid "Decreasing house numbers in addresses interpolation"
 msgstr ""
 
@@ -21000,17 +21388,37 @@ msgid "{0}={1} is deprecated. Please use instead a multipolygon."
 msgstr ""
 
 msgid ""
-"{0} is deprecated. Please specify ìnterval by using opening_hours syntax"
+"{0} is deprecated. Please specify interval by using opening_hours syntax"
 msgstr ""
 
 msgid ""
 "{0} is deprecated. Please delete this object and use a private layer instead"
 msgstr ""
 
-msgid "{0} on a node"
+msgid "{0}={1} is unspecific. Please replace ''{1}'' by a specific value."
 msgstr ""
 
-msgid "{0} on a node. Should be drawn as an area"
+msgid "{0} should be replaced with {1}"
+msgstr ""
+
+msgid ""
+"{0}={1} is unspecific. Please replace ''{1}'' by ''left'', ''right'' or "
+"''both''."
+msgstr ""
+
+msgid "{0} on a node. Should be used on a way."
+msgstr ""
+
+msgid "{0} on a node. Should be drawn as an area."
+msgstr ""
+
+msgid "{0}=* on a node. Should be used in a relation"
+msgstr ""
+
+msgid "{0} on a way. Should be used in a relation"
+msgstr ""
+
+msgid "{0} on a node"
 msgstr ""
 
 msgid "Building inside building"
@@ -25680,6 +26088,9 @@ msgstr ""
 msgid "Find"
 msgstr ""
 
+msgid "Show"
+msgstr ""
+
 msgid "Mark"
 msgstr ""
 
diff --git a/i18n/po/vi.po b/i18n/po/vi.po
index 756e66f..5845602 100644
--- a/i18n/po/vi.po
+++ b/i18n/po/vi.po
@@ -1,8 +1,13 @@
+# Vietnamese translation for josm
+# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
+# This file is distributed under the same license as the josm package.
+# FIRST AUTHOR <EMAIL at ADDRESS>, 2009.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-21 03:38+0200\n"
+"POT-Creation-Date: 2014-12-10 03:42+0100\n"
 "PO-Revision-Date: 2013-03-13 05:33+0000\n"
 "Last-Translator: Minh Nguyễn <mxn at 1ec5.org>\n"
 "Language-Team: Vietnamese <vi at li.org>\n"
@@ -10,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-10-21 05:30+0000\n"
-"X-Generator: Launchpad (build 17203)\n"
+"X-Launchpad-Export-Date: 2014-12-10 05:17+0000\n"
+"X-Generator: Launchpad (build 17283)\n"
 "Language: vi\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -168,16 +173,6 @@ msgid "About JOSM..."
 msgstr "Thông tin về JOSM..."
 
 msgid ""
-"Unexpected format of API base URL. Redirection to info or history page for "
-"OSM object will probably fail. API base URL is: ''{0}''"
-msgstr ""
-
-msgid ""
-"Unexpected format of API base URL. Redirection to user page for OSM user "
-"will probably fail. API base URL is: ''{0}''"
-msgstr ""
-
-msgid ""
 "You are about to launch {0} browser window.<br>This may both clutter your "
 "screen with browser windows<br>and take some time to finish."
 msgid_plural ""
@@ -1530,6 +1525,15 @@ msgstr "Không có thay đổi nào để tải lên"
 msgid "Nothing to upload. Get some data first."
 msgstr "Không có gì để tải lên."
 
+msgid "Upload note changes to server"
+msgstr ""
+
+msgid "Upload notes"
+msgstr ""
+
+msgid "Uploading notes to server"
+msgstr ""
+
 msgid "Upload selection"
 msgstr ""
 
@@ -1802,10 +1806,16 @@ msgstr ""
 msgid "Click the location where you wish to create a new note"
 msgstr ""
 
-msgid "Enter a comment for a new note"
+msgid "Create new note"
 msgstr ""
 
-msgid "Create new note"
+msgid "Create note"
+msgstr ""
+
+msgid "Enter a detailed comment to create a note"
+msgstr ""
+
+msgid "You must enter a comment to create a new note"
 msgstr ""
 
 msgid "Delete Mode"
@@ -2682,6 +2692,15 @@ msgstr ""
 msgid "Cycling dependencies"
 msgstr ""
 
+msgid "Uploading modified notes"
+msgstr ""
+
+msgid "Note {0} failed: {1}"
+msgstr ""
+
+msgid "Notes failed to upload"
+msgstr ""
+
 msgid ""
 "The following are results of automatic validation. Try fixing these, but be "
 "careful (don''t destroy valid data). When in doubt ignore them.<br>When you "
@@ -4904,6 +4923,12 @@ msgstr ""
 msgid "Conflict foreground: keep all tags"
 msgstr ""
 
+msgid "Conflict background: sum all numeric tags"
+msgstr ""
+
+msgid "Conflict foreground: sum all numeric tags"
+msgstr ""
+
 msgid "Conflict background: keep member"
 msgstr ""
 
@@ -5322,12 +5347,19 @@ msgstr ""
 msgid "all"
 msgstr ""
 
+msgid "sum"
+msgstr ""
+
 msgid "Please decide which values to keep"
 msgstr ""
 
 msgid "Value ''{0}'' is going to be applied for key ''{1}''"
 msgstr ""
 
+msgid ""
+"All numeric values sumed as ''{0}'' are going to be applied for key ''{1}''"
+msgstr ""
+
 msgid "The key ''{0}'' and all its values are going to be removed"
 msgstr ""
 
@@ -5690,24 +5722,6 @@ msgstr[1] ""
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
 
-msgid "Display the history of all selected items."
-msgstr ""
-
-msgid "Object with history"
-msgstr ""
-
-msgid "Reload"
-msgstr "Tải lại"
-
-msgid "Reload all currently selected objects and refresh the list."
-msgstr ""
-
-msgid "Show"
-msgstr ""
-
-msgid "Display the history of the selected objects."
-msgstr ""
-
 msgid "Advanced object info"
 msgstr ""
 
@@ -6045,6 +6059,9 @@ msgstr ""
 msgid "Comment"
 msgstr ""
 
+msgid "Comment on note"
+msgstr ""
+
 msgid "Add comment to note:"
 msgstr ""
 
@@ -6054,9 +6071,6 @@ msgstr ""
 msgid "Close note with message:"
 msgstr ""
 
-msgid "Close Note"
-msgstr ""
-
 msgid "Create a new note"
 msgstr ""
 
@@ -6129,6 +6143,9 @@ msgstr ""
 msgid "Search for objects"
 msgstr ""
 
+msgid "Display the history of the selected objects."
+msgstr ""
+
 msgid "Zoom to selection"
 msgstr ""
 
@@ -6248,6 +6265,9 @@ msgstr ""
 msgid "Updating map ..."
 msgstr ""
 
+msgid "anonymous"
+msgstr ""
+
 msgid "Display the basic properties of the changeset"
 msgstr ""
 
@@ -6260,6 +6280,12 @@ msgstr ""
 msgid "Display the objects created, updated, and deleted by the changeset"
 msgstr ""
 
+msgid "Discussion"
+msgstr ""
+
+msgid "Display the public discussion around this changeset"
+msgstr ""
+
 msgid "Changeset Management Dialog"
 msgstr ""
 
@@ -6317,9 +6343,6 @@ msgctxt "changeset.state"
 msgid "Closed"
 msgstr ""
 
-msgid "anonymous"
-msgstr ""
-
 msgid "ID"
 msgstr ""
 
@@ -6335,6 +6358,9 @@ msgstr ""
 msgid "Closed at"
 msgstr ""
 
+msgid "Discussions"
+msgstr ""
+
 msgid "Downloading changeset content"
 msgstr ""
 
@@ -6446,6 +6472,15 @@ msgid ""
 "layer"
 msgstr ""
 
+msgid "Update changeset discussion"
+msgstr ""
+
+msgid "Update the changeset discussion from the OSM server"
+msgstr ""
+
+msgid "Date"
+msgstr ""
+
 msgid "Download changesets"
 msgstr ""
 
@@ -6863,7 +6898,7 @@ msgstr ""
 msgid "Set number of recently added tags"
 msgstr ""
 
-msgid "Remember last used tags"
+msgid "Remember last used tags after a restart"
 msgstr ""
 
 msgid "Please enter the number of recently added tags to display"
@@ -7209,6 +7244,9 @@ msgstr ""
 msgid "Load parent relations"
 msgstr ""
 
+msgid "Reload"
+msgstr "Tải lại"
+
 msgid "Loading parent relations"
 msgstr ""
 
@@ -7331,6 +7369,12 @@ msgstr "Dữ liệu GPS thô"
 msgid "Select to download GPS traces in the selected download area."
 msgstr ""
 
+msgid "Notes"
+msgstr ""
+
+msgid "Select to download notes in the selected download area."
+msgstr ""
+
 msgid "Download as new layer"
 msgstr ""
 
@@ -7636,9 +7680,6 @@ msgstr ""
 msgid "B"
 msgstr ""
 
-msgid "Date"
-msgstr ""
-
 msgid ""
 "Failed to update primitive with id {0} because current edit layer is null"
 msgstr ""
@@ -8501,9 +8542,6 @@ msgstr ""
 msgid "Save Layer"
 msgstr "Lưu Layer"
 
-msgid "Notes"
-msgstr ""
-
 msgid "Notes layer"
 msgstr ""
 
@@ -8519,9 +8557,6 @@ msgstr "Lớp dữ liệu {0}"
 msgid "outside downloaded area"
 msgstr ""
 
-msgid "version {0}"
-msgstr ""
-
 msgid "Merging layers"
 msgstr ""
 
@@ -12153,6 +12188,15 @@ msgstr ""
 msgid "Open changeset expected. Got closed changeset with id {0}."
 msgstr ""
 
+msgid "Note upload failed"
+msgstr ""
+
+msgid "Error parsing note response from server"
+msgstr ""
+
+msgid "Error encoding string: {0}"
+msgstr ""
+
 msgid "(Code={0})"
 msgstr ""
 
@@ -12201,13 +12245,13 @@ msgstr ""
 msgid "Parsing changeset content ..."
 msgstr ""
 
-msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
-msgid "Illegal numeric value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
-msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal numeric value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
 msgid "Missing mandatory attribute ''{0}'' of XML element {1}."
@@ -12999,9 +13043,6 @@ msgstr ""
 msgid "Failed to scan file ''{0}'' for plugin information. Skipping."
 msgstr ""
 
-msgid "Processing plugin site cache icon files..."
-msgstr ""
-
 msgid "Processing plugin files..."
 msgstr ""
 
@@ -13020,12 +13061,6 @@ msgstr ""
 msgid "Details:"
 msgstr ""
 
-msgid "Plugin icons download error"
-msgstr ""
-
-msgid "JOSM failed to download plugin icons:"
-msgstr ""
-
 msgid ""
 "Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
 "plugin site ''{1}''."
@@ -13911,7 +13946,9 @@ msgid ""
 "Creating and handling address nodes and buildings within Czech Republic."
 msgstr ""
 
-msgid "Allows to import various file formats into JOSM directly."
+msgid ""
+"Allows to import various file formats into JOSM directly. Currently "
+"supported: TangoGPS, Garmin Trainings Center TCX."
 msgstr ""
 
 msgid "Download your GPX tracks from openstreetmap.org"
@@ -14008,6 +14045,11 @@ msgid "A helper for IRS satellite adjustment."
 msgstr ""
 
 msgid ""
+"Provides Java Native Access (JNA) library. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
+msgid ""
 "Provides Java Topology Suite (JTS) library and related utilities. Not meant "
 "to be installed directly by users, but rather as a dependency for other "
 "plugins."
@@ -14363,6 +14405,25 @@ msgstr ""
 msgid "Width (meters)"
 msgstr ""
 
+msgid "Sidewalk"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "both"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "left"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "right"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "no"
+msgstr ""
+
 msgid "Service type"
 msgstr ""
 
@@ -14727,15 +14788,19 @@ msgstr ""
 msgid "May-Sep 09:30-12:30,14:15-19:30"
 msgstr ""
 
+msgctxt "parking"
 msgid "multi-storey"
 msgstr ""
 
+msgctxt "parking"
 msgid "surface"
 msgstr ""
 
+msgctxt "parking"
 msgid "underground"
 msgstr ""
 
+msgctxt "parking"
 msgid "rooftop"
 msgstr ""
 
@@ -15193,15 +15258,26 @@ msgstr ""
 msgid "Overtaking"
 msgstr ""
 
+msgctxt "overtaking"
+msgid "yes"
+msgstr ""
+
+msgctxt "overtaking"
 msgid "both"
 msgstr ""
 
+msgctxt "overtaking"
 msgid "forward"
 msgstr ""
 
+msgctxt "overtaking"
 msgid "backward"
 msgstr ""
 
+msgctxt "overtaking"
+msgid "no"
+msgstr ""
+
 msgid "Roundabout"
 msgstr ""
 
@@ -15495,6 +15571,12 @@ msgstr ""
 msgid "tiger"
 msgstr ""
 
+msgid "Button operated"
+msgstr ""
+
+msgid "Sound signals"
+msgstr ""
+
 msgid "Crossing attendant"
 msgstr ""
 
@@ -16016,9 +16098,6 @@ msgstr ""
 msgid "Traffic lights"
 msgstr ""
 
-msgid "Sound signals"
-msgstr ""
-
 msgid "Barrier"
 msgstr ""
 
@@ -18078,6 +18157,9 @@ msgstr ""
 msgid "Gasometer"
 msgstr ""
 
+msgid "Bunker Silo"
+msgstr ""
+
 msgid "Pipeline"
 msgstr ""
 
@@ -18224,15 +18306,15 @@ msgstr ""
 msgid "Monitoring:"
 msgstr ""
 
-msgid "Weather"
-msgstr ""
-
 msgid "Water level"
 msgstr ""
 
 msgid "Tide Level"
 msgstr ""
 
+msgid "Groundwater"
+msgstr ""
+
 msgid "Traffic"
 msgstr ""
 
@@ -18251,6 +18333,9 @@ msgstr ""
 msgid "Galileo Signals"
 msgstr ""
 
+msgid "Weather"
+msgstr ""
+
 msgid "Radiation"
 msgstr ""
 
@@ -18431,6 +18516,9 @@ msgstr ""
 msgid "pivot_pier"
 msgstr ""
 
+msgid "Bridge outline"
+msgstr ""
+
 msgid "Power Plant"
 msgstr ""
 
@@ -19038,6 +19126,15 @@ msgstr ""
 msgid "Pole"
 msgstr ""
 
+msgid "Pole with Transformer"
+msgstr ""
+
+msgid "Pole Attributes:"
+msgstr ""
+
+msgid "Transformer Attributes:"
+msgstr ""
+
 msgid "Power Line"
 msgstr ""
 
@@ -19087,9 +19184,15 @@ msgstr ""
 msgid "Power Cable"
 msgstr ""
 
+msgctxt "power cable"
+msgid "underground"
+msgstr ""
+
+msgctxt "power cable"
 msgid "underwater"
 msgstr ""
 
+msgctxt "power cable"
 msgid "overground"
 msgstr ""
 
@@ -19117,6 +19220,33 @@ msgstr ""
 msgid "Memorial"
 msgstr ""
 
+msgctxt "memorial"
+msgid "statue"
+msgstr ""
+
+msgctxt "memorial"
+msgid "bust"
+msgstr ""
+
+msgctxt "memorial"
+msgid "plaque"
+msgstr ""
+
+msgctxt "memorial"
+msgid "stele"
+msgstr ""
+
+msgctxt "memorial"
+msgid "stone"
+msgstr ""
+
+msgctxt "memorial"
+msgid "war_memorial"
+msgstr ""
+
+msgid "Inscription"
+msgstr ""
+
 msgid "Wayside Cross"
 msgstr ""
 
@@ -19186,6 +19316,9 @@ msgstr ""
 msgid "Beverages"
 msgstr ""
 
+msgid "Wine"
+msgstr ""
+
 msgid "Boutique"
 msgstr ""
 
@@ -19231,6 +19364,9 @@ msgstr ""
 msgid "Video Games"
 msgstr ""
 
+msgid "Music"
+msgstr ""
+
 msgid "Cash"
 msgstr ""
 
@@ -19258,6 +19394,9 @@ msgstr ""
 msgid "Curtain"
 msgstr ""
 
+msgid "Art"
+msgstr ""
+
 msgid "Frame"
 msgstr ""
 
@@ -19303,6 +19442,9 @@ msgstr ""
 msgid "Beauty"
 msgstr ""
 
+msgid "Tattoo"
+msgstr ""
+
 msgid "Optician"
 msgstr ""
 
@@ -19354,6 +19496,9 @@ msgstr ""
 msgid "Pet"
 msgstr ""
 
+msgid "Funeral Directors"
+msgstr ""
+
 msgid "Vending Machine"
 msgstr ""
 
@@ -19453,6 +19598,15 @@ msgstr ""
 msgid "National Park"
 msgstr ""
 
+msgid "Protected Area"
+msgstr ""
+
+msgid "Protected Class"
+msgstr ""
+
+msgid "Title or type of protection"
+msgstr ""
+
 msgid "Places"
 msgstr ""
 
@@ -20529,7 +20683,13 @@ msgstr ""
 msgid "Estonia Ortho (Maaamet)"
 msgstr ""
 
-msgid "Estonia Multi (Maaamet)"
+msgid "Estonia Hillshade (Maaamet)"
+msgstr ""
+
+msgid "Estonia Cadastre (Maaamet)"
+msgstr ""
+
+msgid "Estonia Forestry (Maaamet)"
 msgstr ""
 
 msgid "Bordeaux - 2012"
@@ -20553,7 +20713,7 @@ msgstr ""
 msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
 msgstr ""
 
-msgid "CUGN Nancy - Orthophoto 2012"
+msgid "GrandNancy Orthophotographie 2012"
 msgstr ""
 
 msgid "Géobretagne - Brest 2010 - 10 cm"
@@ -20600,9 +20760,6 @@ msgid ""
 "- 1 m"
 msgstr ""
 
-msgid "Streets NRW Geofabrik.de"
-msgstr ""
-
 msgid "Hike & Bike"
 msgstr ""
 
@@ -20662,6 +20819,9 @@ msgstr ""
 msgid "NRW-Atlas: Topographische Karte 1:10000"
 msgstr ""
 
+msgid "Metropole Ruhr: Luftbilder (10 cm)"
+msgstr ""
+
 msgid "Drone Imagery (Haiti)"
 msgstr ""
 
@@ -20863,6 +21023,9 @@ msgstr ""
 msgid "Stadt Zürich Übersichtsplan (Strassen, Gebäude, Hausnummer)"
 msgstr ""
 
+msgid "Stadt Zürich Luftbild 2011"
+msgstr ""
+
 msgid "Orthofoto Kanton Solothurn RGB (SOGIS 2011/2012/2013)"
 msgstr ""
 
@@ -20881,7 +21044,7 @@ msgstr ""
 msgid "Canton de Fribourg 50cm (2005)"
 msgstr ""
 
-msgid "Stadt Bern 10cm/25cm (2008)"
+msgid "Stadt Bern 10cm/25cm (2012)"
 msgstr ""
 
 msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
@@ -20920,7 +21083,7 @@ msgstr ""
 msgid "OSM US TIGER 2012 Roads Overlay"
 msgstr ""
 
-msgid "New & Misaligned TIGER Roads (TIGER 2013)"
+msgid "New & Misaligned TIGER Roads (TIGER 2014)"
 msgstr ""
 
 msgid "MassGIS L3 Parcels"
@@ -20968,9 +21131,234 @@ msgstr ""
 msgid "NLS - Bartholomew Half Inch, 1897-1907"
 msgstr ""
 
+msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Annan 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgstr ""
+
 msgid "OS Town Plans, Cupar 1854 (NLS)"
 msgstr ""
 
+msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Elgin 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Forres 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Galashiels 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Girvan 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Greenock 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Haddington 1853 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Haddington 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Hamilton 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Irvine 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Jedburgh 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kelso 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Lanark 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Linlithgow 1856 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Musselburgh 1853 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Musselburgh 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Oban 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Peebles 1856 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Perth 1860 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Peterhead 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Selkirk 1865 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, St Andrews 1854 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, St Andrews 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stirling 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stonehaven 1864 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1847 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Strathaven 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wick 1872 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wigtown 1848 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wigtown 1894 (NLS)"
+msgstr ""
+
 msgid "Decreasing house numbers in addresses interpolation"
 msgstr ""
 
@@ -21024,17 +21412,37 @@ msgid "{0}={1} is deprecated. Please use instead a multipolygon."
 msgstr ""
 
 msgid ""
-"{0} is deprecated. Please specify ìnterval by using opening_hours syntax"
+"{0} is deprecated. Please specify interval by using opening_hours syntax"
 msgstr ""
 
 msgid ""
 "{0} is deprecated. Please delete this object and use a private layer instead"
 msgstr ""
 
-msgid "{0} on a node"
+msgid "{0}={1} is unspecific. Please replace ''{1}'' by a specific value."
 msgstr ""
 
-msgid "{0} on a node. Should be drawn as an area"
+msgid "{0} should be replaced with {1}"
+msgstr ""
+
+msgid ""
+"{0}={1} is unspecific. Please replace ''{1}'' by ''left'', ''right'' or "
+"''both''."
+msgstr ""
+
+msgid "{0} on a node. Should be used on a way."
+msgstr ""
+
+msgid "{0} on a node. Should be drawn as an area."
+msgstr ""
+
+msgid "{0}=* on a node. Should be used in a relation"
+msgstr ""
+
+msgid "{0} on a way. Should be used in a relation"
+msgstr ""
+
+msgid "{0} on a node"
 msgstr ""
 
 msgid "Building inside building"
@@ -25704,6 +26112,9 @@ msgstr ""
 msgid "Find"
 msgstr ""
 
+msgid "Show"
+msgstr ""
+
 msgid "Mark"
 msgstr ""
 
diff --git a/i18n/po/zh_CN.po b/i18n/po/zh_CN.po
index f48b08b..60c9138 100644
--- a/i18n/po/zh_CN.po
+++ b/i18n/po/zh_CN.po
@@ -1,8 +1,16 @@
+# Simplified Chinese translation for josm
+# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
+# This file is distributed under the same license as the josm package.
+# FIRST AUTHOR <EMAIL at ADDRESS>, 2009.
+# mmyangfl <mmyangfl at gmail.com>, 2012.
+# mmyfl <mmyangfl at gmail.com>, 2011, 2012, 2013.
+# yangfl <yangfl at localhost>, 2014.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-21 03:38+0200\n"
+"POT-Creation-Date: 2014-12-10 03:42+0100\n"
 "PO-Revision-Date: 2014-10-03 16:07+0000\n"
 "Last-Translator: rc1028 <q371320247 at live.com>\n"
 "Language-Team: 汉语 <>\n"
@@ -10,8 +18,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2014-10-21 05:36+0000\n"
-"X-Generator: Launchpad (build 17203)\n"
+"X-Launchpad-Export-Date: 2014-12-10 05:21+0000\n"
+"X-Generator: Launchpad (build 17283)\n"
 "Language: zh_CN\n"
 
 msgid "yard"
@@ -173,16 +181,6 @@ msgid "About JOSM..."
 msgstr "关于 JOSM..."
 
 msgid ""
-"Unexpected format of API base URL. Redirection to info or history page for "
-"OSM object will probably fail. API base URL is: ''{0}''"
-msgstr "意外的 API 基础 URL 格式。重定向到 OSM 对象信息或历史页面可能会失败。API 基础 URL 为:“{0}”"
-
-msgid ""
-"Unexpected format of API base URL. Redirection to user page for OSM user "
-"will probably fail. API base URL is: ''{0}''"
-msgstr "意外的 API 基础 URL 格式。重定向到 OSM 用户页面可能会失败。API 基础 URL 为:“{0}”"
-
-msgid ""
 "You are about to launch {0} browser window.<br>This may both clutter your "
 "screen with browser windows<br>and take some time to finish."
 msgid_plural ""
@@ -1522,6 +1520,15 @@ msgstr "没有要上传的修改。"
 msgid "Nothing to upload. Get some data first."
 msgstr "没有要上传的东西。请先取得一些数据。"
 
+msgid "Upload note changes to server"
+msgstr ""
+
+msgid "Upload notes"
+msgstr ""
+
+msgid "Uploading notes to server"
+msgstr ""
+
 msgid "Upload selection"
 msgstr "上传选择范围"
 
@@ -1790,10 +1797,16 @@ msgstr ""
 msgid "Click the location where you wish to create a new note"
 msgstr ""
 
-msgid "Enter a comment for a new note"
+msgid "Create new note"
 msgstr ""
 
-msgid "Create new note"
+msgid "Create note"
+msgstr ""
+
+msgid "Enter a detailed comment to create a note"
+msgstr ""
+
+msgid "You must enter a comment to create a new note"
 msgstr ""
 
 msgid "Delete Mode"
@@ -2689,6 +2702,15 @@ msgstr "...参照到关系"
 msgid "Cycling dependencies"
 msgstr "循环相依性"
 
+msgid "Uploading modified notes"
+msgstr ""
+
+msgid "Note {0} failed: {1}"
+msgstr ""
+
+msgid "Notes failed to upload"
+msgstr ""
+
 msgid ""
 "The following are results of automatic validation. Try fixing these, but be "
 "careful (don''t destroy valid data). When in doubt ignore them.<br>When you "
@@ -4905,6 +4927,12 @@ msgstr "冲突背景:保持所有标签"
 msgid "Conflict foreground: keep all tags"
 msgstr "冲突前景:保持所有标签"
 
+msgid "Conflict background: sum all numeric tags"
+msgstr ""
+
+msgid "Conflict foreground: sum all numeric tags"
+msgstr ""
+
 msgid "Conflict background: keep member"
 msgstr "冲突背景:保持成员"
 
@@ -5320,12 +5348,19 @@ msgstr "无"
 msgid "all"
 msgstr "全部"
 
+msgid "sum"
+msgstr ""
+
 msgid "Please decide which values to keep"
 msgstr "请决定要保留的数值"
 
 msgid "Value ''{0}'' is going to be applied for key ''{1}''"
 msgstr "键值“{0}”即将接受数值“{1}”"
 
+msgid ""
+"All numeric values sumed as ''{0}'' are going to be applied for key ''{1}''"
+msgstr ""
+
 msgid "The key ''{0}'' and all its values are going to be removed"
 msgstr "键值“{0}”和它所有的数值都会删除"
 
@@ -5687,24 +5722,6 @@ msgstr[0] "已禁用 <b>{0}</b> 个对象"
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr "</p><p>关闭过滤器对话框,以查看所有的对象。<p></html>"
 
-msgid "Display the history of all selected items."
-msgstr "显示所有选定项目的历史记录。"
-
-msgid "Object with history"
-msgstr "有历史记录的对象"
-
-msgid "Reload"
-msgstr "重新加载"
-
-msgid "Reload all currently selected objects and refresh the list."
-msgstr "重新加载所有目前的对象,并重新整理列表。"
-
-msgid "Show"
-msgstr "显示"
-
-msgid "Display the history of the selected objects."
-msgstr "显示选定对象的历史记录。"
-
 msgid "Advanced object info"
 msgstr "高级的对象信息"
 
@@ -6059,6 +6076,9 @@ msgstr ""
 msgid "Comment"
 msgstr "备注"
 
+msgid "Comment on note"
+msgstr ""
+
 msgid "Add comment to note:"
 msgstr ""
 
@@ -6068,9 +6088,6 @@ msgstr ""
 msgid "Close note with message:"
 msgstr ""
 
-msgid "Close Note"
-msgstr ""
-
 msgid "Create a new note"
 msgstr ""
 
@@ -6148,6 +6165,9 @@ msgstr "当前的选择范围"
 msgid "Search for objects"
 msgstr "查找对象"
 
+msgid "Display the history of the selected objects."
+msgstr "显示选定对象的历史记录。"
+
 msgid "Zoom to selection"
 msgstr "缩放至选择范围"
 
@@ -6266,6 +6286,9 @@ msgstr "修正({0}/{1}):“{2}”"
 msgid "Updating map ..."
 msgstr "正在更新地图..."
 
+msgid "anonymous"
+msgstr "匿名"
+
 msgid "Display the basic properties of the changeset"
 msgstr "显示这个修改集合的基本属性"
 
@@ -6278,6 +6301,12 @@ msgstr "内容"
 msgid "Display the objects created, updated, and deleted by the changeset"
 msgstr "显示由这个修改集合建立、更新和删除的对象"
 
+msgid "Discussion"
+msgstr ""
+
+msgid "Display the public discussion around this changeset"
+msgstr ""
+
 msgid "Changeset Management Dialog"
 msgstr "修改集合管理对话框"
 
@@ -6337,9 +6366,6 @@ msgctxt "changeset.state"
 msgid "Closed"
 msgstr "关闭"
 
-msgid "anonymous"
-msgstr "匿名"
-
 msgid "ID"
 msgstr "ID"
 
@@ -6355,6 +6381,9 @@ msgstr "建立于"
 msgid "Closed at"
 msgstr "关闭于"
 
+msgid "Discussions"
+msgstr ""
+
 msgid "Downloading changeset content"
 msgstr "下载修改集合内容"
 
@@ -6465,6 +6494,15 @@ msgid ""
 "layer"
 msgstr "缩放到当前数据图层中,这个修改集合的对象"
 
+msgid "Update changeset discussion"
+msgstr ""
+
+msgid "Update the changeset discussion from the OSM server"
+msgstr ""
+
+msgid "Date"
+msgstr "日期"
+
 msgid "Download changesets"
 msgstr "下载修改集合"
 
@@ -6880,8 +6918,8 @@ msgstr "请选择一个数值"
 msgid "Set number of recently added tags"
 msgstr "设置最近添加的标签数"
 
-msgid "Remember last used tags"
-msgstr "记住上次使用的标签"
+msgid "Remember last used tags after a restart"
+msgstr ""
 
 msgid "Please enter the number of recently added tags to display"
 msgstr "请输入应显示多少最近的新标签"
@@ -7227,6 +7265,9 @@ msgstr "包含父关系的直接子项"
 msgid "Load parent relations"
 msgstr "加载父关系"
 
+msgid "Reload"
+msgstr "重新加载"
+
 msgid "Loading parent relations"
 msgstr "正在加载父关系"
 
@@ -7349,6 +7390,12 @@ msgstr "原始 GPS 数据"
 msgid "Select to download GPS traces in the selected download area."
 msgstr "选择以下载选定下载区域中的 GPS 轨迹。"
 
+msgid "Notes"
+msgstr "纸币"
+
+msgid "Select to download notes in the selected download area."
+msgstr ""
+
 msgid "Download as new layer"
 msgstr "下载为新图层"
 
@@ -7665,9 +7712,6 @@ msgstr "A"
 msgid "B"
 msgstr "B"
 
-msgid "Date"
-msgstr "日期"
-
 msgid ""
 "Failed to update primitive with id {0} because current edit layer is null"
 msgstr "无法更新 id {0} 的原型,因为目前编辑的图层为空"
@@ -8534,9 +8578,6 @@ msgstr ""
 msgid "Save Layer"
 msgstr "保存图层"
 
-msgid "Notes"
-msgstr "纸币"
-
 msgid "Notes layer"
 msgstr "注释层"
 
@@ -8552,9 +8593,6 @@ msgstr "数据图层 {0}"
 msgid "outside downloaded area"
 msgstr "超出下载的区域"
 
-msgid "version {0}"
-msgstr "版本 {0}"
-
 msgid "Merging layers"
 msgstr "合并图层"
 
@@ -12246,6 +12284,15 @@ msgstr "目前的修改集合 ID 必须大于 0。目前的 ID 是 {0}。"
 msgid "Open changeset expected. Got closed changeset with id {0}."
 msgstr "需要开放的修改集合。却发现 id {0} 的关闭修改集合。"
 
+msgid "Note upload failed"
+msgstr ""
+
+msgid "Error parsing note response from server"
+msgstr ""
+
+msgid "Error encoding string: {0}"
+msgstr ""
+
 msgid "(Code={0})"
 msgstr "(代码={0})"
 
@@ -12294,15 +12341,15 @@ msgstr ""
 msgid "Parsing changeset content ..."
 msgstr "正在分析修改集合内容..."
 
+msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
+msgstr "属性“{0}”有不合法的布尔值。得到“{1}”。"
+
 msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
 msgstr "属性“{0}”有不合法的数值。得到“{1}”。"
 
 msgid "Illegal numeric value for attribute ''{0}''. Got ''{1}''."
 msgstr "属性“{0}”有不合法的数字值。得到“{1}”。"
 
-msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
-msgstr "属性“{0}”有不合法的布尔值。得到“{1}”。"
-
 msgid "Missing mandatory attribute ''{0}'' of XML element {1}."
 msgstr "XML 元素“{0}”缺少必要属性“{1}”。"
 
@@ -13091,9 +13138,6 @@ msgstr "正在处理文件“{0}”"
 msgid "Failed to scan file ''{0}'' for plugin information. Skipping."
 msgstr ""
 
-msgid "Processing plugin site cache icon files..."
-msgstr "正在处理插件网站的缓存图标文件..."
-
 msgid "Processing plugin files..."
 msgstr "正在处理插件文件..."
 
@@ -13112,12 +13156,6 @@ msgstr ""
 msgid "Details:"
 msgstr ""
 
-msgid "Plugin icons download error"
-msgstr ""
-
-msgid "JOSM failed to download plugin icons:"
-msgstr ""
-
 msgid ""
 "Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
 "plugin site ''{1}''."
@@ -14018,8 +14056,10 @@ msgid ""
 "Creating and handling address nodes and buildings within Czech Republic."
 msgstr "建立并处理捷克共和国中的地址节点与建筑。"
 
-msgid "Allows to import various file formats into JOSM directly."
-msgstr "允许直接将多种文件格式输入 JOSM。"
+msgid ""
+"Allows to import various file formats into JOSM directly. Currently "
+"supported: TangoGPS, Garmin Trainings Center TCX."
+msgstr ""
 
 msgid "Download your GPX tracks from openstreetmap.org"
 msgstr "从 openstreetmap.org 下载您的轨迹"
@@ -14117,6 +14157,11 @@ msgid "A helper for IRS satellite adjustment."
 msgstr "IRS 卫星调整协助程序"
 
 msgid ""
+"Provides Java Native Access (JNA) library. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
+msgid ""
 "Provides Java Topology Suite (JTS) library and related utilities. Not meant "
 "to be installed directly by users, but rather as a dependency for other "
 "plugins."
@@ -14472,6 +14517,25 @@ msgstr "路灯"
 msgid "Width (meters)"
 msgstr "宽度(米)"
 
+msgid "Sidewalk"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "both"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "left"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "right"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "no"
+msgstr ""
+
 msgid "Service type"
 msgstr ""
 
@@ -14833,17 +14897,21 @@ msgstr ""
 msgid "May-Sep 09:30-12:30,14:15-19:30"
 msgstr ""
 
+msgctxt "parking"
 msgid "multi-storey"
-msgstr "多层"
+msgstr ""
 
+msgctxt "parking"
 msgid "surface"
-msgstr "平面"
+msgstr ""
 
+msgctxt "parking"
 msgid "underground"
-msgstr "地下"
+msgstr ""
 
+msgctxt "parking"
 msgid "rooftop"
-msgstr "屋顶"
+msgstr ""
 
 msgid "Reference number"
 msgstr "编号"
@@ -15299,14 +15367,25 @@ msgstr "限长(米)"
 msgid "Overtaking"
 msgstr "超车"
 
+msgctxt "overtaking"
+msgid "yes"
+msgstr ""
+
+msgctxt "overtaking"
 msgid "both"
-msgstr "双向"
+msgstr ""
 
+msgctxt "overtaking"
 msgid "forward"
-msgstr "向前"
+msgstr ""
 
+msgctxt "overtaking"
 msgid "backward"
-msgstr "向后"
+msgstr ""
+
+msgctxt "overtaking"
+msgid "no"
+msgstr ""
 
 msgid "Roundabout"
 msgstr "环岛"
@@ -15601,6 +15680,12 @@ msgstr ""
 msgid "tiger"
 msgstr ""
 
+msgid "Button operated"
+msgstr ""
+
+msgid "Sound signals"
+msgstr "声音信号"
+
 msgid "Crossing attendant"
 msgstr "有人陪同穿越"
 
@@ -16122,9 +16207,6 @@ msgstr "铁路平交道"
 msgid "Traffic lights"
 msgstr "信号灯"
 
-msgid "Sound signals"
-msgstr "声音信号"
-
 msgid "Barrier"
 msgstr "障碍物"
 
@@ -18184,6 +18266,9 @@ msgstr "风车"
 msgid "Gasometer"
 msgstr "贮气桶"
 
+msgid "Bunker Silo"
+msgstr ""
+
 msgid "Pipeline"
 msgstr "管道"
 
@@ -18330,15 +18415,15 @@ msgstr "监测站"
 msgid "Monitoring:"
 msgstr "监测:"
 
-msgid "Weather"
-msgstr "气象"
-
 msgid "Water level"
 msgstr "水位"
 
 msgid "Tide Level"
 msgstr "潮位"
 
+msgid "Groundwater"
+msgstr ""
+
 msgid "Traffic"
 msgstr "交通"
 
@@ -18357,6 +18442,9 @@ msgstr "GLONASS 信号"
 msgid "Galileo Signals"
 msgstr "Galileo 信号"
 
+msgid "Weather"
+msgstr "气象"
+
 msgid "Radiation"
 msgstr "辐射"
 
@@ -18537,6 +18625,9 @@ msgstr ""
 msgid "pivot_pier"
 msgstr ""
 
+msgid "Bridge outline"
+msgstr ""
+
 msgid "Power Plant"
 msgstr "发电厂"
 
@@ -19144,6 +19235,15 @@ msgstr ""
 msgid "Pole"
 msgstr "电竿"
 
+msgid "Pole with Transformer"
+msgstr ""
+
+msgid "Pole Attributes:"
+msgstr ""
+
+msgid "Transformer Attributes:"
+msgstr ""
+
 msgid "Power Line"
 msgstr "电线"
 
@@ -19193,9 +19293,15 @@ msgstr ""
 msgid "Power Cable"
 msgstr ""
 
+msgctxt "power cable"
+msgid "underground"
+msgstr ""
+
+msgctxt "power cable"
 msgid "underwater"
 msgstr ""
 
+msgctxt "power cable"
 msgid "overground"
 msgstr ""
 
@@ -19223,6 +19329,33 @@ msgstr "纪念建筑"
 msgid "Memorial"
 msgstr "纪念碑"
 
+msgctxt "memorial"
+msgid "statue"
+msgstr ""
+
+msgctxt "memorial"
+msgid "bust"
+msgstr ""
+
+msgctxt "memorial"
+msgid "plaque"
+msgstr ""
+
+msgctxt "memorial"
+msgid "stele"
+msgstr ""
+
+msgctxt "memorial"
+msgid "stone"
+msgstr ""
+
+msgctxt "memorial"
+msgid "war_memorial"
+msgstr ""
+
+msgid "Inscription"
+msgstr ""
+
 msgid "Wayside Cross"
 msgstr "路边十字架"
 
@@ -19292,6 +19425,9 @@ msgstr "酒"
 msgid "Beverages"
 msgstr "饮料"
 
+msgid "Wine"
+msgstr ""
+
 msgid "Boutique"
 msgstr "时装"
 
@@ -19337,6 +19473,9 @@ msgstr "影片"
 msgid "Video Games"
 msgstr ""
 
+msgid "Music"
+msgstr ""
+
 msgid "Cash"
 msgstr "现金"
 
@@ -19364,6 +19503,9 @@ msgstr "炊具"
 msgid "Curtain"
 msgstr "窗帘"
 
+msgid "Art"
+msgstr ""
+
 msgid "Frame"
 msgstr "框架"
 
@@ -19409,6 +19551,9 @@ msgstr ""
 msgid "Beauty"
 msgstr ""
 
+msgid "Tattoo"
+msgstr ""
+
 msgid "Optician"
 msgstr "眼镜店"
 
@@ -19460,6 +19605,9 @@ msgstr ""
 msgid "Pet"
 msgstr ""
 
+msgid "Funeral Directors"
+msgstr ""
+
 msgid "Vending Machine"
 msgstr ""
 
@@ -19559,6 +19707,15 @@ msgstr ""
 msgid "National Park"
 msgstr ""
 
+msgid "Protected Area"
+msgstr ""
+
+msgid "Protected Class"
+msgstr ""
+
+msgid "Title or type of protection"
+msgstr ""
+
 msgid "Places"
 msgstr "地名"
 
@@ -20635,7 +20792,13 @@ msgstr ""
 msgid "Estonia Ortho (Maaamet)"
 msgstr ""
 
-msgid "Estonia Multi (Maaamet)"
+msgid "Estonia Hillshade (Maaamet)"
+msgstr ""
+
+msgid "Estonia Cadastre (Maaamet)"
+msgstr ""
+
+msgid "Estonia Forestry (Maaamet)"
 msgstr ""
 
 msgid "Bordeaux - 2012"
@@ -20659,7 +20822,7 @@ msgstr ""
 msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
 msgstr ""
 
-msgid "CUGN Nancy - Orthophoto 2012"
+msgid "GrandNancy Orthophotographie 2012"
 msgstr ""
 
 msgid "Géobretagne - Brest 2010 - 10 cm"
@@ -20706,9 +20869,6 @@ msgid ""
 "- 1 m"
 msgstr ""
 
-msgid "Streets NRW Geofabrik.de"
-msgstr ""
-
 msgid "Hike & Bike"
 msgstr ""
 
@@ -20768,6 +20928,9 @@ msgstr ""
 msgid "NRW-Atlas: Topographische Karte 1:10000"
 msgstr ""
 
+msgid "Metropole Ruhr: Luftbilder (10 cm)"
+msgstr ""
+
 msgid "Drone Imagery (Haiti)"
 msgstr ""
 
@@ -20969,6 +21132,9 @@ msgstr ""
 msgid "Stadt Zürich Übersichtsplan (Strassen, Gebäude, Hausnummer)"
 msgstr ""
 
+msgid "Stadt Zürich Luftbild 2011"
+msgstr ""
+
 msgid "Orthofoto Kanton Solothurn RGB (SOGIS 2011/2012/2013)"
 msgstr ""
 
@@ -20987,7 +21153,7 @@ msgstr ""
 msgid "Canton de Fribourg 50cm (2005)"
 msgstr ""
 
-msgid "Stadt Bern 10cm/25cm (2008)"
+msgid "Stadt Bern 10cm/25cm (2012)"
 msgstr ""
 
 msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
@@ -21026,7 +21192,7 @@ msgstr ""
 msgid "OSM US TIGER 2012 Roads Overlay"
 msgstr ""
 
-msgid "New & Misaligned TIGER Roads (TIGER 2013)"
+msgid "New & Misaligned TIGER Roads (TIGER 2014)"
 msgstr ""
 
 msgid "MassGIS L3 Parcels"
@@ -21074,9 +21240,234 @@ msgstr ""
 msgid "NLS - Bartholomew Half Inch, 1897-1907"
 msgstr ""
 
+msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Annan 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgstr ""
+
 msgid "OS Town Plans, Cupar 1854 (NLS)"
 msgstr ""
 
+msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Elgin 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Forres 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Galashiels 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Girvan 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Greenock 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Haddington 1853 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Haddington 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Hamilton 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Irvine 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Jedburgh 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kelso 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Lanark 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Linlithgow 1856 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Musselburgh 1853 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Musselburgh 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Oban 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Peebles 1856 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Perth 1860 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Peterhead 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Selkirk 1865 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, St Andrews 1854 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, St Andrews 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stirling 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stonehaven 1864 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1847 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Strathaven 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wick 1872 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wigtown 1848 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wigtown 1894 (NLS)"
+msgstr ""
+
 msgid "Decreasing house numbers in addresses interpolation"
 msgstr ""
 
@@ -21130,17 +21521,37 @@ msgid "{0}={1} is deprecated. Please use instead a multipolygon."
 msgstr ""
 
 msgid ""
-"{0} is deprecated. Please specify ìnterval by using opening_hours syntax"
+"{0} is deprecated. Please specify interval by using opening_hours syntax"
 msgstr ""
 
 msgid ""
 "{0} is deprecated. Please delete this object and use a private layer instead"
 msgstr ""
 
-msgid "{0} on a node"
+msgid "{0}={1} is unspecific. Please replace ''{1}'' by a specific value."
 msgstr ""
 
-msgid "{0} on a node. Should be drawn as an area"
+msgid "{0} should be replaced with {1}"
+msgstr ""
+
+msgid ""
+"{0}={1} is unspecific. Please replace ''{1}'' by ''left'', ''right'' or "
+"''both''."
+msgstr ""
+
+msgid "{0} on a node. Should be used on a way."
+msgstr ""
+
+msgid "{0} on a node. Should be drawn as an area."
+msgstr ""
+
+msgid "{0}=* on a node. Should be used in a relation"
+msgstr ""
+
+msgid "{0} on a way. Should be used in a relation"
+msgstr ""
+
+msgid "{0} on a node"
 msgstr ""
 
 msgid "Building inside building"
@@ -25929,6 +26340,9 @@ msgstr ""
 msgid "Find"
 msgstr "查找"
 
+msgid "Show"
+msgstr "显示"
+
 msgid "Mark"
 msgstr "标记"
 
diff --git a/i18n/po/zh_TW.po b/i18n/po/zh_TW.po
index e18c29b..de31122 100644
--- a/i18n/po/zh_TW.po
+++ b/i18n/po/zh_TW.po
@@ -1,17 +1,22 @@
+# Traditional Chinese translation for josm
+# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
+# This file is distributed under the same license as the josm package.
+# FIRST AUTHOR <EMAIL at ADDRESS>, 2009.
+# Chao-Hsiung Liao <j_h_liau at yahoo.com.tw>, 2009
 msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-21 03:38+0200\n"
-"PO-Revision-Date: 2014-08-01 13:06+0000\n"
+"POT-Creation-Date: 2014-12-10 03:42+0100\n"
+"PO-Revision-Date: 2014-12-06 16:09+0000\n"
 "Last-Translator: yellowsoar <Unknown>\n"
 "Language-Team: Traditional Chinese\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2014-10-21 05:35+0000\n"
-"X-Generator: Launchpad (build 17203)\n"
+"X-Launchpad-Export-Date: 2014-12-10 05:20+0000\n"
+"X-Generator: Launchpad (build 17283)\n"
 "Language: zh_TW\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -170,16 +175,6 @@ msgid "About JOSM..."
 msgstr "關於 JOSM"
 
 msgid ""
-"Unexpected format of API base URL. Redirection to info or history page for "
-"OSM object will probably fail. API base URL is: ''{0}''"
-msgstr ""
-
-msgid ""
-"Unexpected format of API base URL. Redirection to user page for OSM user "
-"will probably fail. API base URL is: ''{0}''"
-msgstr ""
-
-msgid ""
 "You are about to launch {0} browser window.<br>This may both clutter your "
 "screen with browser windows<br>and take some time to finish."
 msgid_plural ""
@@ -420,7 +415,7 @@ msgid "Those nodes are not in a circle. Aborting."
 msgstr "這些節點不在一個圓上。正在中止。"
 
 msgid "Update multipolygon"
-msgstr ""
+msgstr "更新多邊形"
 
 msgid "Create multipolygon"
 msgstr "建立多重多邊形"
@@ -626,7 +621,7 @@ msgid "No intersection found. Nothing was changed."
 msgstr "找不到交叉點。沒有東西變更。"
 
 msgid "Move tags from ways to relations"
-msgstr ""
+msgstr "把路徑的tag移到關係中"
 
 msgid "Reverting changes"
 msgstr "回復變更"
@@ -652,7 +647,7 @@ msgstr "已連結重疊的區域"
 msgid ""
 "Some of the ways were part of relations that have been modified.<br>Please "
 "verify no errors have been introduced."
-msgstr ""
+msgstr "一些編輯過的路徑屬於關係的一部分,<br>請檢查這之中有沒有編輯錯誤。"
 
 msgid "Fix tag conflicts"
 msgstr "修正標籤的衝突"
@@ -692,10 +687,10 @@ msgid "Include a node into the nearest way segments"
 msgstr "將節點加入最靠近的路徑區段"
 
 msgid "Move Node onto Way"
-msgstr ""
+msgstr "把節點移到路徑上"
 
 msgid "Move the node onto the nearest way segments and include it"
-msgstr ""
+msgstr "把節點移動並結合到最近的路徑上"
 
 msgid "No Shortcut"
 msgstr "沒有捷徑鍵"
@@ -794,7 +789,7 @@ msgid ""
 msgstr ""
 
 msgid "Ignore this hint and merge anyway"
-msgstr ""
+msgstr "無視建議直接合併"
 
 msgid "Merge Nodes"
 msgstr "合併節點"
@@ -1520,6 +1515,15 @@ msgstr "沒有要上傳的變更。"
 msgid "Nothing to upload. Get some data first."
 msgstr "沒有要上傳的項目。請先取得一些資料。"
 
+msgid "Upload note changes to server"
+msgstr ""
+
+msgid "Upload notes"
+msgstr ""
+
+msgid "Uploading notes to server"
+msgstr ""
+
 msgid "Upload selection"
 msgstr "上傳選擇區域"
 
@@ -1789,10 +1793,16 @@ msgstr ""
 msgid "Click the location where you wish to create a new note"
 msgstr ""
 
-msgid "Enter a comment for a new note"
+msgid "Create new note"
 msgstr ""
 
-msgid "Create new note"
+msgid "Create note"
+msgstr ""
+
+msgid "Enter a detailed comment to create a note"
+msgstr ""
+
+msgid "You must enter a comment to create a new note"
 msgstr ""
 
 msgid "Delete Mode"
@@ -2677,6 +2687,15 @@ msgstr "... 參照到關係"
 msgid "Cycling dependencies"
 msgstr "循環相依性"
 
+msgid "Uploading modified notes"
+msgstr ""
+
+msgid "Note {0} failed: {1}"
+msgstr ""
+
+msgid "Notes failed to upload"
+msgstr ""
+
 msgid ""
 "The following are results of automatic validation. Try fixing these, but be "
 "careful (don''t destroy valid data). When in doubt ignore them.<br>When you "
@@ -4898,6 +4917,12 @@ msgstr ""
 msgid "Conflict foreground: keep all tags"
 msgstr ""
 
+msgid "Conflict background: sum all numeric tags"
+msgstr ""
+
+msgid "Conflict foreground: sum all numeric tags"
+msgstr ""
+
 msgid "Conflict background: keep member"
 msgstr ""
 
@@ -5311,12 +5336,19 @@ msgstr "沒有"
 msgid "all"
 msgstr "全部"
 
+msgid "sum"
+msgstr ""
+
 msgid "Please decide which values to keep"
 msgstr "請決定要保留的數值"
 
 msgid "Value ''{0}'' is going to be applied for key ''{1}''"
 msgstr "數值「{0}」即將接受鍵值「{1}」"
 
+msgid ""
+"All numeric values sumed as ''{0}'' are going to be applied for key ''{1}''"
+msgstr ""
+
 msgid "The key ''{0}'' and all its values are going to be removed"
 msgstr "鍵值「{0}」和它所有的數值都會移除"
 
@@ -5678,24 +5710,6 @@ msgstr[1] ""
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr "</p><p>關閉過濾條件對話盒以查看所有的物件。<p></html>"
 
-msgid "Display the history of all selected items."
-msgstr "顯示所有選取的項目歷史紀錄。"
-
-msgid "Object with history"
-msgstr "有歷史紀錄的物件"
-
-msgid "Reload"
-msgstr "重新載入"
-
-msgid "Reload all currently selected objects and refresh the list."
-msgstr "重新載入所有目前的物件並重新整理清單。"
-
-msgid "Show"
-msgstr "顯示"
-
-msgid "Display the history of the selected objects."
-msgstr "顯示選取物件的歷史紀錄。"
-
 msgid "Advanced object info"
 msgstr "進階的物件資訊"
 
@@ -6034,6 +6048,9 @@ msgstr ""
 msgid "Comment"
 msgstr "備註"
 
+msgid "Comment on note"
+msgstr ""
+
 msgid "Add comment to note:"
 msgstr ""
 
@@ -6043,9 +6060,6 @@ msgstr ""
 msgid "Close note with message:"
 msgstr ""
 
-msgid "Close Note"
-msgstr ""
-
 msgid "Create a new note"
 msgstr ""
 
@@ -6118,6 +6132,9 @@ msgstr "目前的選擇區域"
 msgid "Search for objects"
 msgstr "搜尋物件"
 
+msgid "Display the history of the selected objects."
+msgstr "顯示選取物件的歷史紀錄。"
+
 msgid "Zoom to selection"
 msgstr "縮放至選擇區域"
 
@@ -6236,6 +6253,9 @@ msgstr "正在修正 ({0}/{1}):「{2}」"
 msgid "Updating map ..."
 msgstr "正在更新地圖 ..."
 
+msgid "anonymous"
+msgstr "匿名"
+
 msgid "Display the basic properties of the changeset"
 msgstr "顯示這個變更組合的基本屬性"
 
@@ -6248,6 +6268,12 @@ msgstr "內容"
 msgid "Display the objects created, updated, and deleted by the changeset"
 msgstr "顯示由這個變更組合建立、更新和刪除的物件"
 
+msgid "Discussion"
+msgstr ""
+
+msgid "Display the public discussion around this changeset"
+msgstr ""
+
 msgid "Changeset Management Dialog"
 msgstr "變更組合管理對話盒"
 
@@ -6307,9 +6333,6 @@ msgctxt "changeset.state"
 msgid "Closed"
 msgstr "已關閉"
 
-msgid "anonymous"
-msgstr "匿名"
-
 msgid "ID"
 msgstr "ID"
 
@@ -6325,6 +6348,9 @@ msgstr "建立於"
 msgid "Closed at"
 msgstr "關閉於"
 
+msgid "Discussions"
+msgstr ""
+
 msgid "Downloading changeset content"
 msgstr "下載變更組合內容"
 
@@ -6435,6 +6461,15 @@ msgid ""
 "layer"
 msgstr "縮放到目前資料圖層中這個變更組合內容的物件"
 
+msgid "Update changeset discussion"
+msgstr ""
+
+msgid "Update the changeset discussion from the OSM server"
+msgstr ""
+
+msgid "Date"
+msgstr "日期"
+
 msgid "Download changesets"
 msgstr "下載變更組合"
 
@@ -6850,7 +6885,7 @@ msgstr "請選擇一個數值"
 msgid "Set number of recently added tags"
 msgstr ""
 
-msgid "Remember last used tags"
+msgid "Remember last used tags after a restart"
 msgstr ""
 
 msgid "Please enter the number of recently added tags to display"
@@ -7196,6 +7231,9 @@ msgstr "包含父關係的直接子項"
 msgid "Load parent relations"
 msgstr "載入上層關係"
 
+msgid "Reload"
+msgstr "重新載入"
+
 msgid "Loading parent relations"
 msgstr "正在載入上層關係"
 
@@ -7318,6 +7356,12 @@ msgstr "原始 GPS 資料"
 msgid "Select to download GPS traces in the selected download area."
 msgstr "選擇以下載選取下載區域中的 GPS 軌跡。"
 
+msgid "Notes"
+msgstr "備註"
+
+msgid "Select to download notes in the selected download area."
+msgstr ""
+
 msgid "Download as new layer"
 msgstr "下載為新圖層"
 
@@ -7630,9 +7674,6 @@ msgstr "A"
 msgid "B"
 msgstr "B"
 
-msgid "Date"
-msgstr "日期"
-
 msgid ""
 "Failed to update primitive with id {0} because current edit layer is null"
 msgstr "無法更新 id {0} 的原型,因為目前編輯的圖層為 null"
@@ -8493,9 +8534,6 @@ msgstr ""
 msgid "Save Layer"
 msgstr "儲存圖層"
 
-msgid "Notes"
-msgstr "備註"
-
 msgid "Notes layer"
 msgstr ""
 
@@ -8511,9 +8549,6 @@ msgstr "資料圖層 {0}"
 msgid "outside downloaded area"
 msgstr "超出下載的區域"
 
-msgid "version {0}"
-msgstr "版本 {0}"
-
 msgid "Merging layers"
 msgstr "合併圖層"
 
@@ -12190,6 +12225,15 @@ msgstr "目前的變更組合 ID 必須大於 0。目前的 ID 是 {0}。"
 msgid "Open changeset expected. Got closed changeset with id {0}."
 msgstr "需要開放的變更組合。卻找到 id {0} 的關閉變更組合。"
 
+msgid "Note upload failed"
+msgstr ""
+
+msgid "Error parsing note response from server"
+msgstr ""
+
+msgid "Error encoding string: {0}"
+msgstr ""
+
 msgid "(Code={0})"
 msgstr "(代碼={0})"
 
@@ -12238,15 +12282,15 @@ msgstr ""
 msgid "Parsing changeset content ..."
 msgstr "正在分析變更組合內容 ..."
 
+msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
+msgstr "屬性「{0}」有不合格的布林值。得到「{1}」。"
+
 msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
 msgstr "屬性「{0}」有不合格的數值。得到「{1}」。"
 
 msgid "Illegal numeric value for attribute ''{0}''. Got ''{1}''."
 msgstr "屬性「{0}」有不合格的數字值。得到「{1}」。"
 
-msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
-msgstr "屬性「{0}」有不合格的布林值。得到「{1}」。"
-
 msgid "Missing mandatory attribute ''{0}'' of XML element {1}."
 msgstr "缺少 XML 元素「{0}」的必要屬性「{1}」。"
 
@@ -13035,9 +13079,6 @@ msgstr "正在處理檔案「{0}」"
 msgid "Failed to scan file ''{0}'' for plugin information. Skipping."
 msgstr ""
 
-msgid "Processing plugin site cache icon files..."
-msgstr "正在處理外掛程式網站快取圖示檔案..."
-
 msgid "Processing plugin files..."
 msgstr "正在處理外掛程式檔案..."
 
@@ -13056,12 +13097,6 @@ msgstr ""
 msgid "Details:"
 msgstr ""
 
-msgid "Plugin icons download error"
-msgstr ""
-
-msgid "JOSM failed to download plugin icons:"
-msgstr ""
-
 msgid ""
 "Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
 "plugin site ''{1}''."
@@ -13960,8 +13995,10 @@ msgid ""
 "Creating and handling address nodes and buildings within Czech Republic."
 msgstr "建立並處理捷克共和國中的地址節點與建築。"
 
-msgid "Allows to import various file formats into JOSM directly."
-msgstr "允許直接將多種檔案格式匯入 JOSM。"
+msgid ""
+"Allows to import various file formats into JOSM directly. Currently "
+"supported: TangoGPS, Garmin Trainings Center TCX."
+msgstr ""
 
 msgid "Download your GPX tracks from openstreetmap.org"
 msgstr "從 openstreetmap.org 下載您的 GPX 軌跡"
@@ -14059,6 +14096,11 @@ msgid "A helper for IRS satellite adjustment."
 msgstr "IRS 衛星調整協助程式"
 
 msgid ""
+"Provides Java Native Access (JNA) library. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
+msgid ""
 "Provides Java Topology Suite (JTS) library and related utilities. Not meant "
 "to be installed directly by users, but rather as a dependency for other "
 "plugins."
@@ -14414,6 +14456,25 @@ msgstr ""
 msgid "Width (meters)"
 msgstr "寬度 (米)"
 
+msgid "Sidewalk"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "both"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "left"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "right"
+msgstr ""
+
+msgctxt "sidewalk"
+msgid "no"
+msgstr ""
+
 msgid "Service type"
 msgstr ""
 
@@ -14778,15 +14839,19 @@ msgstr ""
 msgid "May-Sep 09:30-12:30,14:15-19:30"
 msgstr ""
 
+msgctxt "parking"
 msgid "multi-storey"
-msgstr "塔式"
+msgstr ""
 
+msgctxt "parking"
 msgid "surface"
-msgstr "平面式"
+msgstr ""
 
+msgctxt "parking"
 msgid "underground"
-msgstr "地下"
+msgstr ""
 
+msgctxt "parking"
 msgid "rooftop"
 msgstr ""
 
@@ -15244,15 +15309,26 @@ msgstr "最大長度 (公尺)"
 msgid "Overtaking"
 msgstr ""
 
+msgctxt "overtaking"
+msgid "yes"
+msgstr ""
+
+msgctxt "overtaking"
 msgid "both"
 msgstr ""
 
+msgctxt "overtaking"
 msgid "forward"
 msgstr ""
 
+msgctxt "overtaking"
 msgid "backward"
 msgstr ""
 
+msgctxt "overtaking"
+msgid "no"
+msgstr ""
+
 msgid "Roundabout"
 msgstr "圓環"
 
@@ -15546,6 +15622,12 @@ msgstr ""
 msgid "tiger"
 msgstr ""
 
+msgid "Button operated"
+msgstr ""
+
+msgid "Sound signals"
+msgstr ""
+
 msgid "Crossing attendant"
 msgstr "有人陪同穿越"
 
@@ -16067,9 +16149,6 @@ msgstr "鐵路平交道"
 msgid "Traffic lights"
 msgstr ""
 
-msgid "Sound signals"
-msgstr ""
-
 msgid "Barrier"
 msgstr ""
 
@@ -18129,6 +18208,9 @@ msgstr "風車"
 msgid "Gasometer"
 msgstr "貯氣桶"
 
+msgid "Bunker Silo"
+msgstr ""
+
 msgid "Pipeline"
 msgstr "油管"
 
@@ -18275,15 +18357,15 @@ msgstr ""
 msgid "Monitoring:"
 msgstr ""
 
-msgid "Weather"
-msgstr ""
-
 msgid "Water level"
 msgstr ""
 
 msgid "Tide Level"
 msgstr ""
 
+msgid "Groundwater"
+msgstr ""
+
 msgid "Traffic"
 msgstr ""
 
@@ -18302,6 +18384,9 @@ msgstr ""
 msgid "Galileo Signals"
 msgstr ""
 
+msgid "Weather"
+msgstr ""
+
 msgid "Radiation"
 msgstr ""
 
@@ -18482,6 +18567,9 @@ msgstr ""
 msgid "pivot_pier"
 msgstr ""
 
+msgid "Bridge outline"
+msgstr ""
+
 msgid "Power Plant"
 msgstr ""
 
@@ -19089,6 +19177,15 @@ msgstr ""
 msgid "Pole"
 msgstr "電線竿"
 
+msgid "Pole with Transformer"
+msgstr ""
+
+msgid "Pole Attributes:"
+msgstr ""
+
+msgid "Transformer Attributes:"
+msgstr ""
+
 msgid "Power Line"
 msgstr "電線"
 
@@ -19138,9 +19235,15 @@ msgstr ""
 msgid "Power Cable"
 msgstr ""
 
+msgctxt "power cable"
+msgid "underground"
+msgstr ""
+
+msgctxt "power cable"
 msgid "underwater"
 msgstr ""
 
+msgctxt "power cable"
 msgid "overground"
 msgstr ""
 
@@ -19168,6 +19271,33 @@ msgstr "紀念建築"
 msgid "Memorial"
 msgstr "紀念碑"
 
+msgctxt "memorial"
+msgid "statue"
+msgstr ""
+
+msgctxt "memorial"
+msgid "bust"
+msgstr ""
+
+msgctxt "memorial"
+msgid "plaque"
+msgstr ""
+
+msgctxt "memorial"
+msgid "stele"
+msgstr ""
+
+msgctxt "memorial"
+msgid "stone"
+msgstr ""
+
+msgctxt "memorial"
+msgid "war_memorial"
+msgstr ""
+
+msgid "Inscription"
+msgstr ""
+
 msgid "Wayside Cross"
 msgstr ""
 
@@ -19237,6 +19367,9 @@ msgstr "酒類"
 msgid "Beverages"
 msgstr "飲料類"
 
+msgid "Wine"
+msgstr ""
+
 msgid "Boutique"
 msgstr ""
 
@@ -19282,6 +19415,9 @@ msgstr "影片類"
 msgid "Video Games"
 msgstr ""
 
+msgid "Music"
+msgstr ""
+
 msgid "Cash"
 msgstr "現金"
 
@@ -19309,6 +19445,9 @@ msgstr "廚房"
 msgid "Curtain"
 msgstr ""
 
+msgid "Art"
+msgstr ""
+
 msgid "Frame"
 msgstr ""
 
@@ -19354,6 +19493,9 @@ msgstr ""
 msgid "Beauty"
 msgstr ""
 
+msgid "Tattoo"
+msgstr ""
+
 msgid "Optician"
 msgstr "眼鏡類"
 
@@ -19405,6 +19547,9 @@ msgstr ""
 msgid "Pet"
 msgstr ""
 
+msgid "Funeral Directors"
+msgstr ""
+
 msgid "Vending Machine"
 msgstr ""
 
@@ -19504,6 +19649,15 @@ msgstr ""
 msgid "National Park"
 msgstr ""
 
+msgid "Protected Area"
+msgstr ""
+
+msgid "Protected Class"
+msgstr ""
+
+msgid "Title or type of protection"
+msgstr ""
+
 msgid "Places"
 msgstr "地名"
 
@@ -20580,7 +20734,13 @@ msgstr ""
 msgid "Estonia Ortho (Maaamet)"
 msgstr ""
 
-msgid "Estonia Multi (Maaamet)"
+msgid "Estonia Hillshade (Maaamet)"
+msgstr ""
+
+msgid "Estonia Cadastre (Maaamet)"
+msgstr ""
+
+msgid "Estonia Forestry (Maaamet)"
 msgstr ""
 
 msgid "Bordeaux - 2012"
@@ -20604,7 +20764,7 @@ msgstr ""
 msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
 msgstr ""
 
-msgid "CUGN Nancy - Orthophoto 2012"
+msgid "GrandNancy Orthophotographie 2012"
 msgstr ""
 
 msgid "Géobretagne - Brest 2010 - 10 cm"
@@ -20651,9 +20811,6 @@ msgid ""
 "- 1 m"
 msgstr ""
 
-msgid "Streets NRW Geofabrik.de"
-msgstr ""
-
 msgid "Hike & Bike"
 msgstr ""
 
@@ -20713,6 +20870,9 @@ msgstr ""
 msgid "NRW-Atlas: Topographische Karte 1:10000"
 msgstr ""
 
+msgid "Metropole Ruhr: Luftbilder (10 cm)"
+msgstr ""
+
 msgid "Drone Imagery (Haiti)"
 msgstr ""
 
@@ -20914,6 +21074,9 @@ msgstr ""
 msgid "Stadt Zürich Übersichtsplan (Strassen, Gebäude, Hausnummer)"
 msgstr ""
 
+msgid "Stadt Zürich Luftbild 2011"
+msgstr ""
+
 msgid "Orthofoto Kanton Solothurn RGB (SOGIS 2011/2012/2013)"
 msgstr ""
 
@@ -20932,7 +21095,7 @@ msgstr ""
 msgid "Canton de Fribourg 50cm (2005)"
 msgstr ""
 
-msgid "Stadt Bern 10cm/25cm (2008)"
+msgid "Stadt Bern 10cm/25cm (2012)"
 msgstr ""
 
 msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
@@ -20971,7 +21134,7 @@ msgstr ""
 msgid "OSM US TIGER 2012 Roads Overlay"
 msgstr ""
 
-msgid "New & Misaligned TIGER Roads (TIGER 2013)"
+msgid "New & Misaligned TIGER Roads (TIGER 2014)"
 msgstr ""
 
 msgid "MassGIS L3 Parcels"
@@ -21019,9 +21182,234 @@ msgstr ""
 msgid "NLS - Bartholomew Half Inch, 1897-1907"
 msgstr ""
 
+msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Annan 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgstr ""
+
 msgid "OS Town Plans, Cupar 1854 (NLS)"
 msgstr ""
 
+msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Elgin 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Forres 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Galashiels 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Girvan 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Greenock 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Haddington 1853 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Haddington 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Hamilton 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Irvine 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Jedburgh 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kelso 1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Lanark 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Linlithgow 1856 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Musselburgh 1853 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Musselburgh 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Oban 1867-1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Peebles 1856 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Perth 1860 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Peterhead 1868 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Selkirk 1865 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, St Andrews 1854 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, St Andrews 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stirling 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stonehaven 1864 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1847 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Stranraer 1893 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Strathaven 1858 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wick 1872 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wigtown 1848 (NLS)"
+msgstr ""
+
+msgid "OS Town Plans, Wigtown 1894 (NLS)"
+msgstr ""
+
 msgid "Decreasing house numbers in addresses interpolation"
 msgstr ""
 
@@ -21075,17 +21463,37 @@ msgid "{0}={1} is deprecated. Please use instead a multipolygon."
 msgstr ""
 
 msgid ""
-"{0} is deprecated. Please specify ìnterval by using opening_hours syntax"
+"{0} is deprecated. Please specify interval by using opening_hours syntax"
 msgstr ""
 
 msgid ""
 "{0} is deprecated. Please delete this object and use a private layer instead"
 msgstr ""
 
-msgid "{0} on a node"
+msgid "{0}={1} is unspecific. Please replace ''{1}'' by a specific value."
 msgstr ""
 
-msgid "{0} on a node. Should be drawn as an area"
+msgid "{0} should be replaced with {1}"
+msgstr ""
+
+msgid ""
+"{0}={1} is unspecific. Please replace ''{1}'' by ''left'', ''right'' or "
+"''both''."
+msgstr ""
+
+msgid "{0} on a node. Should be used on a way."
+msgstr ""
+
+msgid "{0} on a node. Should be drawn as an area."
+msgstr ""
+
+msgid "{0}=* on a node. Should be used in a relation"
+msgstr ""
+
+msgid "{0} on a way. Should be used in a relation"
+msgstr ""
+
+msgid "{0} on a node"
 msgstr ""
 
 msgid "Building inside building"
@@ -25829,6 +26237,9 @@ msgstr ""
 msgid "Find"
 msgstr ""
 
+msgid "Show"
+msgstr "顯示"
+
 msgid "Mark"
 msgstr ""
 
diff --git a/images/about.png b/images/about.png
deleted file mode 100644
index 9e3862a..0000000
Binary files a/images/about.png and /dev/null differ
diff --git a/images/cursor/modifier/add_node.png b/images/cursor/modifier/add_node.png
deleted file mode 100644
index 4b008bb..0000000
Binary files a/images/cursor/modifier/add_node.png and /dev/null differ
diff --git a/images/data/user.png b/images/data/user.png
new file mode 100644
index 0000000..2d5e986
Binary files /dev/null and b/images/data/user.png differ
diff --git a/images/dialogs/conflict/mergecomplete.png b/images/dialogs/conflict/mergecomplete.png
deleted file mode 100644
index 3efd54d..0000000
Binary files a/images/dialogs/conflict/mergecomplete.png and /dev/null differ
diff --git a/images/dialogs/mappaint/josm_small.png b/images/dialogs/mappaint/josm_small.png
index cb6c4dc..b113325 100644
Binary files a/images/dialogs/mappaint/josm_small.png and b/images/dialogs/mappaint/josm_small.png differ
diff --git a/images/icons/airport.png b/images/icons/airport.png
deleted file mode 100644
index cda709a..0000000
Binary files a/images/icons/airport.png and /dev/null differ
diff --git a/images/icons/bar.png b/images/icons/bar.png
deleted file mode 100644
index 437aecf..0000000
Binary files a/images/icons/bar.png and /dev/null differ
diff --git a/images/icons/bus_stop.png b/images/icons/bus_stop.png
deleted file mode 100644
index 80ace90..0000000
Binary files a/images/icons/bus_stop.png and /dev/null differ
diff --git a/images/icons/cafe.png b/images/icons/cafe.png
deleted file mode 100644
index 2a4be6c..0000000
Binary files a/images/icons/cafe.png and /dev/null differ
diff --git a/images/icons/cinema.png b/images/icons/cinema.png
deleted file mode 100644
index ee5d287..0000000
Binary files a/images/icons/cinema.png and /dev/null differ
diff --git a/images/icons/convenience.png b/images/icons/convenience.png
deleted file mode 100644
index 3bb602b..0000000
Binary files a/images/icons/convenience.png and /dev/null differ
diff --git a/images/icons/fast_food.png b/images/icons/fast_food.png
deleted file mode 100644
index 08ce5ad..0000000
Binary files a/images/icons/fast_food.png and /dev/null differ
diff --git a/images/icons/ferry_terminal.png b/images/icons/ferry_terminal.png
deleted file mode 100644
index 39fc56c..0000000
Binary files a/images/icons/ferry_terminal.png and /dev/null differ
diff --git a/images/icons/fire_station.png b/images/icons/fire_station.png
deleted file mode 100644
index 4a0b5b9..0000000
Binary files a/images/icons/fire_station.png and /dev/null differ
diff --git a/images/icons/gate.png b/images/icons/gate.png
deleted file mode 100644
index 894c94f..0000000
Binary files a/images/icons/gate.png and /dev/null differ
diff --git a/images/icons/hospital.png b/images/icons/hospital.png
deleted file mode 100644
index d60110f..0000000
Binary files a/images/icons/hospital.png and /dev/null differ
diff --git a/images/icons/hotel.png b/images/icons/hotel.png
deleted file mode 100644
index 8333b23..0000000
Binary files a/images/icons/hotel.png and /dev/null differ
diff --git a/images/icons/museum.png b/images/icons/museum.png
deleted file mode 100644
index dfb7e81..0000000
Binary files a/images/icons/museum.png and /dev/null differ
diff --git a/images/icons/natural_blank.png b/images/icons/natural_blank.png
deleted file mode 100644
index dd66be2..0000000
Binary files a/images/icons/natural_blank.png and /dev/null differ
diff --git a/images/icons/pharmacy.png b/images/icons/pharmacy.png
deleted file mode 100644
index 155a4eb..0000000
Binary files a/images/icons/pharmacy.png and /dev/null differ
diff --git a/images/icons/pharmacy_dispensing.png b/images/icons/pharmacy_dispensing.png
deleted file mode 100644
index f35c296..0000000
Binary files a/images/icons/pharmacy_dispensing.png and /dev/null differ
diff --git a/images/icons/place_of_worship.png b/images/icons/place_of_worship.png
deleted file mode 100644
index c84f737..0000000
Binary files a/images/icons/place_of_worship.png and /dev/null differ
diff --git a/images/icons/police.png b/images/icons/police.png
deleted file mode 100644
index 0c81809..0000000
Binary files a/images/icons/police.png and /dev/null differ
diff --git a/images/icons/post_box.png b/images/icons/post_box.png
deleted file mode 100644
index 6aa7e51..0000000
Binary files a/images/icons/post_box.png and /dev/null differ
diff --git a/images/icons/pub.png b/images/icons/pub.png
deleted file mode 100644
index 7069b0d..0000000
Binary files a/images/icons/pub.png and /dev/null differ
diff --git a/images/icons/recycling.png b/images/icons/recycling.png
deleted file mode 100644
index f9c39b0..0000000
Binary files a/images/icons/recycling.png and /dev/null differ
diff --git a/images/icons/restaurant.png b/images/icons/restaurant.png
deleted file mode 100644
index 0b5b437..0000000
Binary files a/images/icons/restaurant.png and /dev/null differ
diff --git a/images/icons/restriction.png b/images/icons/restriction.png
deleted file mode 100644
index 672c60c..0000000
Binary files a/images/icons/restriction.png and /dev/null differ
diff --git a/images/icons/school.png b/images/icons/school.png
deleted file mode 100644
index 09abead..0000000
Binary files a/images/icons/school.png and /dev/null differ
diff --git a/images/icons/speed_hump_16.png b/images/icons/speed_hump_16.png
deleted file mode 100644
index 08c216d..0000000
Binary files a/images/icons/speed_hump_16.png and /dev/null differ
diff --git a/images/icons/station.png b/images/icons/station.png
deleted file mode 100644
index 3d3a249..0000000
Binary files a/images/icons/station.png and /dev/null differ
diff --git a/images/icons/supermarket.png b/images/icons/supermarket.png
deleted file mode 100644
index 530a3b3..0000000
Binary files a/images/icons/supermarket.png and /dev/null differ
diff --git a/images/icons/taxi.png b/images/icons/taxi.png
deleted file mode 100644
index a845a3d..0000000
Binary files a/images/icons/taxi.png and /dev/null differ
diff --git a/images/icons/theatre.png b/images/icons/theatre.png
deleted file mode 100644
index b94d631..0000000
Binary files a/images/icons/theatre.png and /dev/null differ
diff --git a/images/logo.png b/images/logo.png
index 61d7f88..8001837 100644
Binary files a/images/logo.png and b/images/logo.png differ
diff --git a/images/logo.svg b/images/logo.svg
new file mode 100644
index 0000000..b7e4787
--- /dev/null
+++ b/images/logo.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 1000 1000"><defs><filter id="1" x="-.033" width="1.066" y="-.309" height="1.618"><feGaussianBlur stdDeviation="11.58046"/></filter><filter id="2" color-interpolation-filters="sRGB"><feGaussianBlur stdDeviation=".5"/></filter><filter id="0"><feGaussianBlur stdDeviation="10"/></filter><linearGradient id="8" gradientUnits="userSpaceOnUse" x1="470" y1="540" x2="570" y2="600"><stop stop-color="#ddc [...]
\ No newline at end of file
diff --git a/images/logo_16x16x32.png b/images/logo_16x16x32.png
index dc14f3d..475ce92 100644
Binary files a/images/logo_16x16x32.png and b/images/logo_16x16x32.png differ
diff --git a/images/logo_16x16x8.png b/images/logo_16x16x8.png
index 2a2fce2..b68a243 100644
Binary files a/images/logo_16x16x8.png and b/images/logo_16x16x8.png differ
diff --git a/images/logo_32x32x32.png b/images/logo_32x32x32.png
index 48deadb..ad68382 100644
Binary files a/images/logo_32x32x32.png and b/images/logo_32x32x32.png differ
diff --git a/images/logo_32x32x8.png b/images/logo_32x32x8.png
index 9c59ff1..cdb0525 100644
Binary files a/images/logo_32x32x8.png and b/images/logo_32x32x8.png differ
diff --git a/images/logo_48x48x32.png b/images/logo_48x48x32.png
index 9ed9328..de7fe89 100644
Binary files a/images/logo_48x48x32.png and b/images/logo_48x48x32.png differ
diff --git a/images/logo_48x48x8.png b/images/logo_48x48x8.png
index d0f41a5..b9c61a6 100644
Binary files a/images/logo_48x48x8.png and b/images/logo_48x48x8.png differ
diff --git a/images/misc/grey_check.png b/images/misc/grey_check.png
deleted file mode 100644
index 80964a0..0000000
Binary files a/images/misc/grey_check.png and /dev/null differ
diff --git a/images/misc/red_x.png b/images/misc/red_x.png
deleted file mode 100644
index e85d879..0000000
Binary files a/images/misc/red_x.png and /dev/null differ
diff --git a/images/presets/baseball.png b/images/presets/baseball.png
deleted file mode 100644
index 0f2d0e9..0000000
Binary files a/images/presets/baseball.png and /dev/null differ
diff --git a/images/presets/breakwater.png b/images/presets/breakwater.png
new file mode 100644
index 0000000..42ab644
Binary files /dev/null and b/images/presets/breakwater.png differ
diff --git a/images/presets/canoe.png b/images/presets/canoe.png
deleted file mode 100644
index 38de389..0000000
Binary files a/images/presets/canoe.png and /dev/null differ
diff --git a/images/presets/chicane.png b/images/presets/chicane.png
deleted file mode 100644
index 501a453..0000000
Binary files a/images/presets/chicane.png and /dev/null differ
diff --git a/images/presets/church.png b/images/presets/church.png
deleted file mode 100644
index 0a526f9..0000000
Binary files a/images/presets/church.png and /dev/null differ
diff --git a/images/presets/cricket.png b/images/presets/cricket.png
deleted file mode 100644
index c073b79..0000000
Binary files a/images/presets/cricket.png and /dev/null differ
diff --git a/images/presets/cycling.png b/images/presets/cycling.png
deleted file mode 100644
index 0e67e3f..0000000
Binary files a/images/presets/cycling.png and /dev/null differ
diff --git a/images/presets/drinking_water.png b/images/presets/drinking_water.png
deleted file mode 100644
index 73ec40f..0000000
Binary files a/images/presets/drinking_water.png and /dev/null differ
diff --git a/images/presets/equestrian.png b/images/presets/equestrian.png
index 61ff64d..3684df2 100644
Binary files a/images/presets/equestrian.png and b/images/presets/equestrian.png differ
diff --git a/images/presets/golf.png b/images/presets/golf.png
deleted file mode 100644
index 18d02d9..0000000
Binary files a/images/presets/golf.png and /dev/null differ
diff --git a/images/presets/gymnastics.png b/images/presets/gymnastics.png
index f1815a2..a9389db 100644
Binary files a/images/presets/gymnastics.png and b/images/presets/gymnastics.png differ
diff --git a/images/presets/incline.png b/images/presets/incline.png
deleted file mode 100644
index b5bf465..0000000
Binary files a/images/presets/incline.png and /dev/null differ
diff --git a/images/presets/incline_steep.png b/images/presets/incline_steep.png
deleted file mode 100644
index 38abafe..0000000
Binary files a/images/presets/incline_steep.png and /dev/null differ
diff --git a/images/presets/pitch.png b/images/presets/pitch.png
deleted file mode 100644
index 339caea..0000000
Binary files a/images/presets/pitch.png and /dev/null differ
diff --git a/images/presets/racquetball.png b/images/presets/racquetball.png
deleted file mode 100644
index 732344e..0000000
Binary files a/images/presets/racquetball.png and /dev/null differ
diff --git a/images/presets/skiing_downhill.png b/images/presets/skiing_downhill.png
deleted file mode 100644
index 4f5ebb4..0000000
Binary files a/images/presets/skiing_downhill.png and /dev/null differ
diff --git a/images/presets/soccer.png b/images/presets/soccer.png
deleted file mode 100644
index cf2923f..0000000
Binary files a/images/presets/soccer.png and /dev/null differ
diff --git a/images/presets/sports_centre.png b/images/presets/sports_centre.png
deleted file mode 100644
index 7608349..0000000
Binary files a/images/presets/sports_centre.png and /dev/null differ
diff --git a/images/presets/tennis.png b/images/presets/tennis.png
deleted file mode 100644
index 8a904e5..0000000
Binary files a/images/presets/tennis.png and /dev/null differ
diff --git a/images/upload-preferences.png b/images/upload-preferences.png
deleted file mode 100644
index 858a6c3..0000000
Binary files a/images/upload-preferences.png and /dev/null differ
diff --git a/linux/latest/usr/share/appdata/josm-latest.appdata.xml b/linux/latest/usr/share/appdata/josm-latest.appdata.xml
index 508b965..e35c97b 100644
--- a/linux/latest/usr/share/appdata/josm-latest.appdata.xml
+++ b/linux/latest/usr/share/appdata/josm-latest.appdata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <application>
   <id type="desktop">josm-latest.desktop</id>
-  <metadata_license>CC BY-SA-3.0</metadata_license>
+  <metadata_license>CC-BY-SA-3.0</metadata_license>
   <project_license>GPL-2.0+</project_license>
   <name>JOSM</name>
   <summary>Java OpenStreetMap Editor</summary>
diff --git a/linux/latest/usr/share/pixmaps/josm-latest-16.xpm b/linux/latest/usr/share/pixmaps/josm-latest-16.xpm
index 06c8e67..0e179ee 100644
--- a/linux/latest/usr/share/pixmaps/josm-latest-16.xpm
+++ b/linux/latest/usr/share/pixmaps/josm-latest-16.xpm
@@ -1,220 +1,213 @@
 /* XPM */
-static char *josm___[] = {
-/* columns rows colors chars-per-pixel */
-"16 16 198 2",
-"   c #513F11",
-".  c #513E12",
-"X  c #433426",
-"o  c #493A2A",
-"O  c #534113",
-"+  c #534014",
-"@  c #5C4711",
-"#  c #5C4713",
-"$  c #684D10",
-"%  c #694E11",
-"&  c #604C19",
-"*  c #644F19",
-"=  c #5E4921",
-"-  c #564F36",
-";  c #5D4933",
-":  c #604426",
-">  c #6D4B28",
-",  c #724D26",
-"<  c #605021",
-"1  c #655121",
-"2  c #655324",
-"3  c #685923",
-"4  c #785E27",
-"5  c #776731",
-"6  c #716136",
-"7  c #7A6636",
-"8  c #7C713D",
-"9  c #7F743D",
-"0  c #474647",
-"q  c #484946",
-"w  c #4F4A44",
-"e  c #4A494A",
-"r  c #4B4E4A",
-"t  c #4C4C4C",
-"y  c #515051",
-"u  c #575956",
-"i  c #595A5A",
-"p  c #5E5E5F",
-"a  c #5D605A",
-"s  c #5E635A",
-"d  c #636F5B",
-"f  c #646C5C",
-"g  c #69775D",
-"h  c #68785E",
-"j  c #616161",
-"k  c #6A6E65",
-"l  c #6A6D66",
-"z  c #6B6A6B",
-"x  c #6B6F68",
-"c  c #6B6F69",
-"v  c #6D6C6D",
-"b  c #6A7361",
-"n  c #6A7362",
-"m  c #6E7965",
-"M  c #787162",
-"N  c #747569",
-"B  c #71786C",
-"V  c #717372",
-"C  c #757A72",
-"Z  c #797F76",
-"A  c #7F7D7C",
-"S  c #80733F",
-"D  c #806E44",
-"F  c #827D7A",
-"G  c #699746",
-"H  c #678055",
-"J  c #6C9B56",
-"K  c #7A866D",
-"L  c #7C8675",
-"P  c #7C827B",
-"I  c #7AAE68",
-"U  c #75AA7B",
-"Y  c #8A8F68",
-"T  c #818F73",
-"R  c #82877B",
-"E  c #8F897A",
-"W  c #908172",
-"Q  c #8B9372",
-"!  c #88967B",
-"~  c #899B79",
-"^  c #8A9A78",
-"/  c #8E997B",
-"(  c #8F9D7F",
-")  c #8F9F7F",
-"_  c #9A9871",
-"`  c #86AA68",
-"'  c #8CBD60",
-"]  c #8FBD6C",
-"[  c #96B17E",
-"{  c #93C175",
-"}  c #9DC07D",
-"|  c #769683",
-" . c #6395B2",
-".. c #868D81",
-"X. c #8F9D83",
-"o. c #8F9D85",
-"O. c #919D88",
-"+. c #929291",
-"@. c #979A92",
-"#. c #AC9F84",
-"$. c #9CA282",
-"%. c #96A882",
-"&. c #9EAD8A",
-"*. c #9DAF8B",
-"=. c #9AA491",
-"-. c #9EA29C",
-";. c #AAAB87",
-":. c #ABAB89",
-">. c #BBAF85",
-",. c #A1BC85",
-"<. c #A1BD8D",
-"1. c #ADA49B",
-"2. c #ADA89A",
-"3. c #B5A697",
-"4. c #B6AA9F",
-"5. c #A9B593",
-"6. c #A5BD90",
-"7. c #A6BC93",
-"8. c #A9B892",
-"9. c #ACBD96",
-"0. c #87B0AB",
-"q. c #88AFB1",
-"w. c #A6A6A6",
-"e. c #A7A8A6",
-"r. c #AEAEAE",
-"t. c #B0BDA7",
-"y. c #B3B3B3",
-"u. c #B5B5B5",
-"i. c #BCB7B1",
-"p. c #BBBBBB",
-"a. c #BEBEBF",
-"s. c #C2BFAD",
-"d. c #A2C184",
-"f. c #ACCB8F",
-"g. c #A8C292",
-"h. c #ABC893",
-"j. c #AAC098",
-"k. c #ADC19A",
-"l. c #AEC699",
-"z. c #AFC19E",
-"x. c #ADC99A",
-"c. c #B0C798",
-"v. c #B1C59F",
-"b. c #B4CF9A",
-"n. c #B3CA9C",
-"m. c #BBDF98",
-"M. c #B5E78A",
-"N. c #ADC4A0",
-"B. c #B0C2A0",
-"V. c #B4C8A3",
-"C. c #B7CEA2",
-"Z. c #B6CBA4",
-"A. c #BED4A5",
-"S. c #B9D1AA",
-"D. c #CFC296",
-"F. c #C5D5A2",
-"G. c #C8D7AC",
-"H. c #C3D9A9",
-"J. c #DED8A7",
-"K. c #DFDFAC",
-"L. c #C3D3BA",
-"P. c #D5D9B0",
-"I. c #E2DCAA",
-"U. c #D1E0A6",
-"Y. c #DEE0AE",
-"T. c #D4E9B7",
-"R. c #DCE9B4",
-"E. c #DEE9B7",
-"W. c #DFEDB9",
-"Q. c #DFEEB9",
-"!. c #DCF0B6",
-"~. c #D8F4BA",
-"^. c #DCF7BF",
-"/. c #DEF9BF",
-"(. c #E5E2AF",
-"). c #E5E3B2",
-"_. c #E3E6B3",
-"`. c #E3EFB9",
-"'. c #E0F5BD",
-"]. c #C1C1C1",
-"[. c #CFCDC2",
-"{. c #C8C8C8",
-"}. c #CFD1C8",
-"|. c #D1D4CA",
-" X c #D1D0CF",
-".X c #D1D1D1",
-"XX c #D3D3D3",
-"oX c #D9D9D9",
-"OX c #D1E3C4",
-"+X c #DAF4C3",
-"@X c #E2F8C1",
-"#X c #E0FBC2",
-"$X c #E3FAC2",
-"%X c #E2E2E2",
-"&X c #E6E5E4",
-"*X c #EAEAEA",
-"=X c #FBFBFC",
-"-X c None",
-/* pixels */
-"-X-X-X-X-X-X-X-X-X-X0 e -X-X-X-X",
-"-X&.:./ ~ [ } T u n f b a t -X-X",
-"-X9.).E.^.M.` c %.L.h.,.*.B i -X",
-"-X) Q._.+Xm.h H h.OXS.j.C.7.c -X",
-"-X) (.Q.^.l.n G I { ] <.N.l.s p ",
-"-X5.I.'.+X<.m J  .U ' g.Z.%.q z ",
-"-XA.'.I.!.b.P | q.0.d.B.Z.h t v ",
-"-XH.'.I.E.T.E L n.x.B.t.z.d j -X",
-"-Xk.$XK.D.#.C V K Q / X.=.l y -X",
-"-Xo.+XU.S = M Z N F @. at .e.E -X-X",
-"-X! F.8   @ 2 5.L.1.3.3.i.XXR -X",
-"-XY 9   @ % 5 G.1.> , : X A s.-X",
-"-X< + # % 4 >.P.[.W ; o t +..XXX",
-"7 + # % 3 _ ;.$.}.=X&X.X{.u.p.{.",
-"D & % * - -X-X-X-X%X*XoX].r.-X-X",
-"-X6 1 -X-X-X-X-X-X-Xy.w.-X-X-X-X"
-};
+static char * josm16DG2_xpm[] = {
+"16 16 194 2",
+"  	c None",
+". 	c #9B4B19",
+"+ 	c #873B0C",
+"@ 	c #5FD15E",
+"# 	c #5FD15F",
+"$ 	c #5492FE",
+"% 	c #92B6ED",
+"& 	c #F8F5E1",
+"* 	c #C89066",
+"= 	c #924510",
+"- 	c #753207",
+"; 	c #7A5033",
+"> 	c #5DCD5D",
+", 	c #5DCE5D",
+"' 	c #55CB57",
+") 	c #BCE5A6",
+"! 	c #CCE5D1",
+"~ 	c #9ED8C7",
+"{ 	c #83B8C7",
+"] 	c #5A95FF",
+"^ 	c #CAD8E2",
+"/ 	c #F4D5AB",
+"( 	c #A45C2D",
+"_ 	c #864107",
+": 	c #794B2A",
+"< 	c #F9F0D9",
+"[ 	c #59C559",
+"} 	c #57C558",
+"| 	c #4DC150",
+"1 	c #CCE7B0",
+"2 	c #BADDCB",
+"3 	c #A5D9C2",
+"4 	c #75A8DA",
+"5 	c #669CF9",
+"6 	c #EEE4C7",
+"7 	c #C58C5C",
+"8 	c #8C3D0B",
+"9 	c #672A02",
+"0 	c #D3AB93",
+"a 	c #FFE9D1",
+"b 	c #48BA4B",
+"c 	c #55BD55",
+"d 	c #97D387",
+"e 	c #EEF0CA",
+"f 	c #F8F1CF",
+"g 	c #FFF1C4",
+"h 	c #C7D1D5",
+"i 	c #5292FB",
+"j 	c #B3A6A2",
+"k 	c #A0501A",
+"l 	c #742C00",
+"m 	c #987554",
+"n 	c #F9CDB6",
+"o 	c #FED2BB",
+"p 	c #EBEAC3",
+"q 	c #F2EDC9",
+"r 	c #F7E8CB",
+"s 	c #FAECCF",
+"t 	c #FFF2C9",
+"u 	c #FFF0BF",
+"v 	c #EDE4BD",
+"w 	c #628CDE",
+"x 	c #865E5B",
+"y 	c #8A3904",
+"z 	c #6C340F",
+"A 	c #E9D9B8",
+"B 	c #FDF2D2",
+"C 	c #F8E7CB",
+"D 	c #FAEFCE",
+"E 	c #DFC2B9",
+"F 	c #E6ABAE",
+"G 	c #F6DCC6",
+"H 	c #FFF0C5",
+"I 	c #F9E6B4",
+"J 	c #D5E8AB",
+"K 	c #A49698",
+"L 	c #933E09",
+"M 	c #6E2A00",
+"N 	c #AB8C6A",
+"O 	c #EBE0C0",
+"P 	c #E7D79A",
+"Q 	c #F3DF74",
+"R 	c #F4E9C4",
+"S 	c #D9C1B1",
+"T 	c #E8AFB1",
+"U 	c #F0CDBC",
+"V 	c #F0C9B1",
+"W 	c #EDC9A3",
+"X 	c #F8DFA5",
+"Y 	c #AF632C",
+"Z 	c #7F3304",
+"` 	c #66381D",
+" .	c #988C78",
+"..	c #BEB28A",
+"+.	c #DECC6C",
+"@.	c #F2DF7C",
+"#.	c #F7EBC2",
+"$.	c #DAC5B1",
+"%.	c #EAB5B3",
+"&.	c #E5AEB0",
+"*.	c #E5A6A3",
+"=.	c #F3CD9F",
+"-.	c #E7C695",
+";.	c #995027",
+">.	c #6C2E07",
+",.	c #53494B",
+"'.	c #9D9B8F",
+").	c #CFC079",
+"!.	c #EAD56C",
+"~.	c #F5E59F",
+"{.	c #F8EBC0",
+"].	c #E1D2B8",
+"^.	c #F5D4BA",
+"/.	c #FCDDBC",
+"(.	c #FFE2B0",
+"_.	c #DDD4A1",
+":.	c #E6CAAA",
+"<.	c #C19884",
+"[.	c #6F5654",
+"}.	c #4D6CA3",
+"|.	c #D0CFBE",
+"1.	c #FCEBB3",
+"2.	c #F5E4A0",
+"3.	c #F7EAC3",
+"4.	c #F5E5B9",
+"5.	c #DED3B2",
+"6.	c #D2D2BA",
+"7.	c #BBC9BE",
+"8.	c #95B0B0",
+"9.	c #8AA59F",
+"0.	c #D5B89B",
+"a.	c #9D8980",
+"b.	c #476EB0",
+"c.	c #598FEB",
+"d.	c #95B6EB",
+"e.	c #D0CEC0",
+"f.	c #FBEBBB",
+"g.	c #FEEEBE",
+"h.	c #F6E6B6",
+"i.	c #D9D0AE",
+"j.	c #B2C2BB",
+"k.	c #8DAFBF",
+"l.	c #7FA4B1",
+"m.	c #97A08C",
+"n.	c #B5A883",
+"o.	c #E0D097",
+"p.	c #6B95D2",
+"q.	c #568FF0",
+"r.	c #7CA5EC",
+"s.	c #7DA3E4",
+"t.	c #B9C8D5",
+"u.	c #FFF0B8",
+"v.	c #F0E1B1",
+"w.	c #D1C7AA",
+"x.	c #C6C0A8",
+"y.	c #C1BCA6",
+"z.	c #BCB08F",
+"A.	c #D5C186",
+"B.	c #FFEB97",
+"C.	c #FFE796",
+"D.	c #BEC1AD",
+"E.	c #6C97E0",
+"F.	c #7EA4E4",
+"G.	c #76A2EE",
+"H.	c #72A0F0",
+"I.	c #B8C7D2",
+"J.	c #CDC5A9",
+"K.	c #D8D2B8",
+"L.	c #C4CAC5",
+"M.	c #C1CACC",
+"N.	c #BBC3BD",
+"O.	c #A7B1AF",
+"P.	c #DFD099",
+"Q.	c #FFE38E",
+"R.	c #FFE288",
+"S.	c #D5CDA7",
+"T.	c #81A7E6",
+"U.	c #73A1EE",
+"V.	c #74A1ED",
+"W.	c #77A2EB",
+"X.	c #D9D3B5",
+"Y.	c #A3B8D4",
+"Z.	c #7AA2E6",
+"`.	c #6D9CEC",
+" +	c #4F88EA",
+".+	c #286DE4",
+"++	c #5D84BE",
+"@+	c #CFBD7F",
+"#+	c #CAB36D",
+"$+	c #BBAC7D",
+"%+	c #7692BF",
+"&+	c #6991D5",
+"*+	c #6E98E0",
+"=+	c #739FEA",
+"                        . +     ",
+"  @ #           $ % & * = - ;   ",
+"  > , ' ) ! ~ { ] ^ / ( _ : <   ",
+"  [ } | 1 2 3 4 5 6 7 8 9 0 a   ",
+"  b c d e f g h i j k l m n o   ",
+"  p q r s t u v w x y z A B C   ",
+"  D E F G H I J K L M N O P Q   ",
+"  R S T U V W X Y Z `  ...+. at .  ",
+"  #.$.%.&.*.=.-.;.>.,.'.).!.~.  ",
+"  {.].^./.(._.:.<.[.}.|.1.2.3.  ",
+"  4.5.6.7.8.9.0.a.b.c.d.e.f.g.  ",
+"  h.i.j.k.l.m.n.o.p.q.r.s.t.u.  ",
+"  v.w.x.y.z.A.B.C.D.E.F.G.H.I.  ",
+"  J.K.L.M.N.O.P.Q.R.S.T.U.V.W.  ",
+"  X.Y.Z.`. +.+++ at +#+$+%+&+*+=+  ",
+"                                "};
diff --git a/linux/latest/usr/share/pixmaps/josm-latest-32.xpm b/linux/latest/usr/share/pixmaps/josm-latest-32.xpm
index 2f4db3f..641838a 100644
--- a/linux/latest/usr/share/pixmaps/josm-latest-32.xpm
+++ b/linux/latest/usr/share/pixmaps/josm-latest-32.xpm
@@ -1,294 +1,714 @@
 /* XPM */
-static char *josm___[] = {
-/* columns rows colors chars-per-pixel */
-"32 32 256 2",
-"   c #0F0F0F",
-".  c #14100D",
-"X  c #190D01",
-"o  c #2C1A08",
-"O  c #3E2205",
-"+  c #21251E",
-"@  c #362412",
-"#  c #222322",
-"$  c #262A25",
-"%  c #333433",
-"&  c #363932",
-"*  c #393A37",
-"=  c #3D3D3E",
-"-  c #383638",
-";  c #333A2E",
-":  c #44280B",
-">  c #50300E",
-",  c #4E3B12",
-"<  c #4B3B1B",
-"1  c #503E15",
-"2  c #5D3710",
-"3  c #532E08",
-"4  c #613A12",
-"5  c #4B3F38",
-"6  c #30422C",
-"7  c #3E413B",
-"8  c #554412",
-"9  c #5D4813",
-"0  c #5E4B18",
-"q  c #5C4613",
-"w  c #6D550F",
-"e  c #70540F",
-"r  c #634B13",
-"t  c #6B4F12",
-"y  c #614A18",
-"u  c #6D5A1D",
-"i  c #6B5010",
-"p  c #715311",
-"a  c #5C4B29",
-"s  c #5C522F",
-"d  c #41433C",
-"f  c #444A3C",
-"g  c #4B453B",
-"h  c #574A3A",
-"j  c #465D38",
-"k  c #625120",
-"l  c #6D5823",
-"z  c #715D22",
-"x  c #634F3B",
-"c  c #635338",
-"v  c #795A3A",
-"b  c #6F603A",
-"n  c #736029",
-"m  c #454546",
-"M  c #464A42",
-"N  c #4A4A4A",
-"B  c #504E4F",
-"V  c #5A4642",
-"C  c #4D514E",
-"Z  c #525A4C",
-"A  c #53584D",
-"S  c #4F4D50",
-"D  c #535253",
-"F  c #555D52",
-"G  c #595D55",
-"H  c #5C5C5A",
-"J  c #5C5653",
-"K  c #635940",
-"L  c #645D55",
-"P  c #53614D",
-"I  c #5A6453",
-"U  c #5D625D",
-"Y  c #5B6A50",
-"T  c #587840",
-"R  c #776B44",
-"E  c #626B5B",
-"W  c #646559",
-"Q  c #796C59",
-"!  c #6D7B5F",
-"~  c #5C5D60",
-"^  c #5F6560",
-"/  c #616261",
-"(  c #69696A",
-")  c #686A65",
-"_  c #6E7962",
-"`  c #6C7266",
-"'  c #737C66",
-"]  c #73766D",
-"[  c #6F6E70",
-"{  c #60767F",
-"}  c #727473",
-"|  c #7B7B7B",
-" . c #777878",
-".. c #736D69",
-"X. c #84592C",
-"o. c #8D6339",
-"O. c #876A48",
-"+. c #877A5B",
-"@. c #806867",
-"#. c #689844",
-"$. c #6B8555",
-"%. c #75A74A",
-"&. c #7AAB53",
-"*. c #7EB551",
-"=. c #6FA358",
-"-. c #7A856D",
-";. c #78876A",
-":. c #7B9566",
-">. c #7C8B75",
-",. c #709279",
-"<. c #6B8F73",
-"1. c #77AE7F",
-"2. c #71A971",
-"3. c #848357",
-"4. c #928054",
-"5. c #84B55B",
-"6. c #808163",
-"7. c #988666",
-"8. c #82877D",
-"9. c #998876",
-"0. c #8B9B7B",
-"q. c #869578",
-"w. c #8B9872",
-"e. c #AE977E",
-"r. c #A7856A",
-"t. c #86B764",
-"y. c #92B96D",
-"u. c #8DA07E",
-"i. c #90A17F",
-"p. c #94B977",
-"a. c #87A76D",
-"s. c #B1AA76",
-"d. c #B8BA7D",
-"f. c #8AC657",
-"g. c #91C467",
-"h. c #99C276",
-"j. c #96D663",
-"k. c #A1DC6C",
-"l. c #A0CD73",
-"z. c #BFC27E",
-"x. c #A6DD7A",
-"c. c #7E7E81",
-"v. c #6091BB",
-"b. c #709BB9",
-"n. c #669AA1",
-"m. c #70A0B6",
-"M. c #6BA0B7",
-"N. c #5B8ACE",
-"B. c #6091CB",
-"V. c #848384",
-"C. c #8B8B8B",
-"Z. c #898685",
-"A. c #99978C",
-"S. c #929294",
-"D. c #9B9B9B",
-"F. c #969398",
-"G. c #A79A8E",
-"H. c #91A281",
-"J. c #95AC82",
-"K. c #98AA86",
-"L. c #9BAB8A",
-"P. c #97A389",
-"I. c #9CB28C",
-"U. c #98B382",
-"Y. c #A4A68C",
-"T. c #A5BA8D",
-"R. c #A2AF9B",
-"E. c #A3B396",
-"W. c #A6BA98",
-"Q. c #BCBE96",
-"!. c #8FAFA3",
-"~. c #96B8A3",
-"^. c #ABABAB",
-"/. c #A5A5A5",
-"(. c #B1BEA6",
-"). c #B8B6A7",
-"_. c #B2B2B2",
-"`. c #BCBCBC",
-"'. c #BFBAB5",
-"]. c #B0B4A4",
-"[. c #D6B994",
-"{. c #E0BB91",
-"}. c #A7C78B",
-"|. c #ACC395",
-" X c #AEC29A",
-".X c #B1C59C",
-"XX c #B4C99D",
-"oX c #B5C899",
-"OX c #B2D192",
-"+X c #B1E286",
-"@X c #9FC0AB",
-"#X c #A7C6A8",
-"$X c #B2C5A3",
-"%X c #B5CBA3",
-"&X c #B9CDA2",
-"*X c #B7C8AA",
-"=X c #BDD4A4",
-"-X c #B8D5AA",
-";X c #BDCBB5",
-":X c #DBCD9D",
-">X c #D6C497",
-",X c #CAC69A",
-"<X c #E3CC9D",
-"1X c #D9C6A0",
-"2X c #C2DBAB",
-"3X c #C4D7AB",
-"4X c #DDD2A3",
-"5X c #DFDCA8",
-"6X c #C9C5BA",
-"7X c #C3D3B6",
-"8X c #C9DBB8",
-"9X c #C8CBA8",
-"0X c #E3CEA2",
-"qX c #E1D3A3",
-"wX c #E3DAAA",
-"eX c #E8D6A5",
-"rX c #C2E7A4",
-"tX c #D9E0AE",
-"yX c #CEF1AB",
-"uX c #D1F3AE",
-"iX c #CDE4B6",
-"pX c #D3EBBB",
-"aX c #DBECBB",
-"sX c #D5E8B6",
-"dX c #D3F3B2",
-"fX c #DBF5BD",
-"gX c #DCF8BC",
-"hX c #D9F3B8",
-"jX c #E0E4AF",
-"kX c #E4EAB7",
-"lX c #E5F5BE",
-"zX c #E2FABE",
-"xX c #C3C3C3",
-"cX c #CCCCCC",
-"vX c #C9C9C5",
-"bX c #CDD7C6",
-"nX c #D1DEC3",
-"mX c #D3D3D3",
-"MX c #DCDCDC",
-"NX c #DAD8D6",
-"BX c #D5EAC7",
-"VX c #DCF5C2",
-"CX c #DFFAC2",
-"ZX c #D3E0D2",
-"AX c #CDE1C5",
-"SX c #E3FBC4",
-"DX c #E4FFC9",
-"FX c #E7FBC8",
-"GX c #E0EADB",
-"HX c #E4E5E4",
-"JX c #ECECEC",
-"KX c #E8E8E7",
-"LX c #F4F5F5",
-"PX c #FEFEFE",
-"IX c #E7F2E1",
-"UX c None",
-/* pixels */
-"UXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUX",
-"UX& ; UXUXUXUXUXUXUXUXUXUX6 f M UXUX* m N C N m % UX& UXUXUXUXUX",
-"UX* 0.A._ g d UXUX7 Z ;.:.t.oX6.% H ( / D B H ^ ( B f & UXUXUXUX",
-"UXUXK.FXlX[..XH.u. XrXrX+XyXL.U } G E -.I ;.;.;.A / ( = UXUXUXUX",
-"UXUX' SXwX0XFXDXCXgX+Xj.k.U.U ] D q.;X8X|.h.y.}.W.;.F  .N UXUXUX",
-"UXUXZ sXSX0X0XSXgXCXdXk.*.P  .Z T.;XZXBX-X}.T.}.&X%X0.I  .= UXUX",
-"UXUXM XXDXlX<XSXgXCXhXx.T  .P :.=XiXGXIXAX;XXXoX|.2XXXu.( ( UXUX",
-"UXUXUXH.DXlX<XFXCXgXgXOXI  .7 %.t.}.8XAX&X|.#XI.$X8X-X-XI c.5 UX",
-"UXUXUXH.zX4XqXCXVXhXgXa.` W #.#.%.5.h.}.p.t.U.$XI.#XT.2XZ ` H UX",
-"UXUXd &XkX<XSXgXhXpXVX:.8.Z %.%.*.n.f.g.t.f.p.XXW.&X=X2X; D } UX",
-"UXUXI pXeXkXDXDXVXVXdX;.C.Z %.#.M.B.2.*.5.h.U.&XW.iX.XL.# S c.UX",
-"UXUX' CXeXwXSXzXgXVXyX$.C.Y =.=.v.N.n.5.*.g.|.(. X%X=X! # D V.UX",
-"UXUXi.SXlX:X<XjXVXhXyX:.C.` ,.2.M.B.B.#Xy.5.}.(.$X.XXXf # [  .UX",
-"UX7 oXFXSXSXkX{.tXuXyXXXV.c.{ !.-X~.m. at X|.XX*X*XW.2XJ.+   S./ UX",
-"UXM 3XgXgXzXwX<XaXzXSXpX] F.P  X=X-X}.OX$X$X6X(.$X Xu.$ m D.m UX",
-"UX7 W.SXfXaX>XsXpXtXhXFXL.} ( _ =X}.&X&X|.-XR.(.R.$X0.& | / UXUX",
-"UXUXw.DXSXzX4X:X1X[.1X9XP.C C.C w.T.U.I.w.I.0.E.(.$X] / ( - UXUX",
-"UXUXE pXSXFXSX:X1X[.r...C } V.| G E 6.+.;.u.;.L.A.8. .~ - UXUXUX",
-"UXUXC *XVXSXzXSXQ.z y k  .S.C.G U ( J V ` 8.) } V.S.] h 5 UXUXUX",
-"UXUX7 E.BXVXFXz.u , 1 9 b Z.^ >.0.L F.^._.`.xXxXcX_.Y.,XW UXUXUX",
-"UXUXUX0.VXiXT.u , , 8 8 r a >.8X4X).xX`.`.xXcXcXNXKXHXnX_ UXUXUX",
-"UXUXUXL.gXd.u , 8 8 9 r i 0 Y.VX6XxXD.r.r.e.G.+.9.].KXKX| UXUXUX",
-"UXUXd &Xz.u , , 8 0 r i p y |.aXvXS.v X.o.O.o.v x 5 ) mX`.UXUXUX",
-"UXUXI s.l , 8 8 q r i w r 3.aXsXvXO.3 2 4 2 > : @ o . C.`.UXUXUX",
-"UXUXs u 1 1 8 q r t p r O.9XpXAXcX'.c : : O o o X   N _.mXmXcXUX",
-"UX4.0 , 1 1 q r i e r O.>X:X>X>X6XLXNXA.L h 5 g H C.^.`.cXMXKXxX",
-"s.z , 1 8 q r t w 9 3.<X5XiXoXtX8XLXPXPXJXMXmXmXmXvX`.^.`.`.mXUX",
-"7.r 1 8 q r p p r R W.0.Q Z M F 8.HXPXPXPXLXHXMXmXxX`.^._.xX`.UX",
-"UXl 8 9 r t i r < M f UXUXUXUXUXUXvXJXPXPXLXJXHXNXcX_./._.UXUXUX",
-"UX7.y r p p 0 s UXUXUXUXUXUXUXUXUXUX`.NXHXHXMXmX`./.^.UXUXUXUXUX",
-"UXUX+.y t y a UXUXUXUXUXUXUXUXUXUXUXUX_._.^.D.D.D.UXUXUXUXUXUXUX",
-"UXUXUXUXc K UXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUX"
-};
+static char * josm32DG2_xpm[] = {
+"32 32 679 2",
+"  	c None",
+". 	c #9F4D1B",
+"+ 	c #904211",
+"@ 	c #873C0B",
+"# 	c #A95522",
+"$ 	c #964614",
+"% 	c #883B0C",
+"& 	c #853909",
+"* 	c #6A2F08",
+"= 	c #5FD15F",
+"- 	c #659BF8",
+"; 	c #DADFD9",
+"> 	c #FFF8DC",
+", 	c #FFFBE4",
+"' 	c #CB9168",
+") 	c #9D4916",
+"! 	c #8D3E0E",
+"~ 	c #873A0A",
+"{ 	c #76340A",
+"] 	c #5D2604",
+"^ 	c #5ED15E",
+"/ 	c #5FD15E",
+"( 	c #5FD25F",
+"_ 	c #5DD15E",
+": 	c #FFF2D6",
+"< 	c #6FA1F6",
+"[ 	c #5291FF",
+"} 	c #5191FF",
+"| 	c #8FB4EC",
+"1 	c #FAF1D1",
+"2 	c #FFF8DE",
+"3 	c #F8E8CE",
+"4 	c #AD5F2E",
+"5 	c #934310",
+"6 	c #8D450A",
+"7 	c #823C09",
+"8 	c #652B05",
+"9 	c #70472A",
+"0 	c #5DCF5D",
+"a 	c #58CE59",
+"b 	c #A3DE95",
+"c 	c #FBF5DC",
+"d 	c #FFF9E0",
+"e 	c #FFF7D1",
+"f 	c #FFF5D1",
+"g 	c #DBE8C9",
+"h 	c #89BFB7",
+"i 	c #5494F7",
+"j 	c #629AFA",
+"k 	c #E6E5D5",
+"l 	c #FFF6CF",
+"m 	c #FFFFE8",
+"n 	c #CB8E64",
+"o 	c #974411",
+"p 	c #90460F",
+"q 	c #8E4C09",
+"r 	c #733508",
+"s 	c #592404",
+"t 	c #E6D9C1",
+"u 	c #FCF2DF",
+"v 	c #5BCB5B",
+"w 	c #55CA56",
+"x 	c #A9DF99",
+"y 	c #D4DFCE",
+"z 	c #9DD3C1",
+"A 	c #5AC2BE",
+"B 	c #45BCBC",
+"C 	c #459EA5",
+"D 	c #4F90F4",
+"E 	c #5190FE",
+"F 	c #94B5E9",
+"G 	c #FFF8CC",
+"H 	c #FFF7D2",
+"I 	c #EED2AF",
+"J 	c #A45422",
+"K 	c #944412",
+"L 	c #8A450C",
+"M 	c #81410C",
+"N 	c #5F2300",
+"O 	c #A4876B",
+"P 	c #FFF8E0",
+"Q 	c #FCF1DB",
+"R 	c #5AC75A",
+"S 	c #54C556",
+"T 	c #9CD88E",
+"U 	c #FFF7D8",
+"V 	c #A5DAD1",
+"W 	c #3BBEBF",
+"X 	c #49C2C0",
+"Y 	c #64B7AF",
+"Z 	c #5B95E6",
+"` 	c #4F8FFE",
+" .	c #5090FC",
+"..	c #C0CEDA",
+"+.	c #FFF7CB",
+"@.	c #FFF5CE",
+"#.	c #C07D4D",
+"$.	c #974613",
+"%.	c #8A3D0D",
+"&.	c #833809",
+"*.	c #6E2F06",
+"=.	c #673719",
+"-.	c #F3E5CA",
+";.	c #FFF5DA",
+">.	c #FCF0D9",
+",.	c #FFF7DC",
+"'.	c #57C357",
+").	c #55C255",
+"!.	c #B8DFA2",
+"~.	c #C1DBCB",
+"{.	c #9DD4BE",
+"].	c #E0E6C2",
+"^.	c #FFF4C8",
+"/.	c #80A9EE",
+"(.	c #4C8DFC",
+"_.	c #4F8EFB",
+":.	c #C3CFD7",
+"<.	c #FFF9CB",
+"[.	c #E3BC8F",
+"}.	c #A35522",
+"|.	c #914311",
+"1.	c #843808",
+"2.	c #7B3508",
+"3.	c #5C2704",
+"4.	c #B88970",
+"5.	c #FBCCB8",
+"6.	c #FDD9C2",
+"7.	c #F4E1CA",
+"8.	c #FBF0D8",
+"9.	c #55BF55",
+"0.	c #51BE52",
+"a.	c #4EBD4F",
+"b.	c #75C86E",
+"c.	c #E7EDC6",
+"d.	c #FFF6DA",
+"e.	c #FFF4C6",
+"f.	c #FFF3C6",
+"g.	c #FFF6C3",
+"h.	c #98B6E1",
+"i.	c #4E8DFA",
+"j.	c #4D8DFA",
+"k.	c #9AB8E2",
+"l.	c #FFEDB7",
+"m.	c #BD7B4A",
+"n.	c #974412",
+"o.	c #873B0A",
+"p.	c #833909",
+"q.	c #672A03",
+"r.	c #7F5837",
+"s.	c #EDC8B0",
+"t.	c #FFCFB9",
+"u.	c #FFCDB7",
+"v.	c #FDDBC3",
+"w.	c #FCF2D9",
+"x.	c #48B74B",
+"y.	c #47B74A",
+"z.	c #7EC973",
+"A.	c #A4D690",
+"B.	c #DBE9BA",
+"C.	c #FFF6D7",
+"D.	c #FFF5D6",
+"E.	c #FFF5D4",
+"F.	c #FFF0C2",
+"G.	c #FFF0C3",
+"H.	c #FFF2C2",
+"I.	c #E4E1C8",
+"J.	c #5892F4",
+"K.	c #4A8BF9",
+"L.	c #669AF0",
+"M.	c #CEAC89",
+"N.	c #A24F1A",
+"O.	c #8D3F0E",
+"P.	c #863909",
+"Q.	c #773309",
+"R.	c #64310F",
+"S.	c #BCA787",
+"T.	c #F8E0C5",
+"U.	c #FCCCB5",
+"V.	c #FFCAB4",
+"W.	c #FEDCC2",
+"X.	c #FCF2D6",
+"Y.	c #CDE1AD",
+"Z.	c #D0E3B0",
+"`.	c #D5E5B4",
+" +	c #F1EEC9",
+".+	c #F8EDCF",
+"++	c #FEF1D4",
+"@+	c #FBEED1",
+"#+	c #FEF3D3",
+"$+	c #FFF4D2",
+"%+	c #FFF0BF",
+"&+	c #FFF0C0",
+"*+	c #FFF1C0",
+"=+	c #FFF2BC",
+"-+	c #7FA4E0",
+";+	c #4989F9",
+">+	c #5487E7",
+",+	c #A06242",
+"'+	c #95430E",
+")+	c #84390A",
+"!+	c #642B06",
+"~+	c #7F5839",
+"{+	c #FAF0CF",
+"]+	c #FEF3D2",
+"^+	c #FFF0D0",
+"/+	c #FDE7C8",
+"(+	c #F1DAC0",
+"_+	c #FAEED2",
+":+	c #FCEED0",
+"<+	c #FAECCE",
+"[+	c #FEF2D1",
+"}+	c #F8E8CA",
+"|+	c #EED4BF",
+"1+	c #F2E0C7",
+"2+	c #FFF3D2",
+"3+	c #FFF4D1",
+"4+	c #FFEFBC",
+"5+	c #FFEFBD",
+"6+	c #FFEBBC",
+"7+	c #EFEAAF",
+"8+	c #B0BCCB",
+"9+	c #4787F7",
+"0+	c #75749C",
+"a+	c #A24A0F",
+"b+	c #8C3E0D",
+"c+	c #873A09",
+"d+	c #6F3108",
+"e+	c #65320F",
+"f+	c #CAB695",
+"g+	c #FFFAD8",
+"h+	c #FFF5D2",
+"i+	c #F8EBCE",
+"j+	c #F8EACE",
+"k+	c #FEF1D1",
+"l+	c #F4EED6",
+"m+	c #E7D1BD",
+"n+	c #E6B3B0",
+"o+	c #E7AFB1",
+"p+	c #E7B1B1",
+"q+	c #F4D7C2",
+"r+	c #FFF3D0",
+"s+	c #FFF3CE",
+"t+	c #FFEEB9",
+"u+	c #FDEAB9",
+"v+	c #E7E5AF",
+"w+	c #D0ECA7",
+"x+	c #D7DBB4",
+"y+	c #4E83E7",
+"z+	c #A65729",
+"A+	c #92410E",
+"B+	c #7D3609",
+"C+	c #632A05",
+"D+	c #825E3F",
+"E+	c #FFFEDA",
+"F+	c #FCF1CC",
+"G+	c #EEDE9E",
+"H+	c #ECD76B",
+"I+	c #FBEDBE",
+"J+	c #FEF2CD",
+"K+	c #FFF5D0",
+"L+	c #C4C2B6",
+"M+	c #EAD6BF",
+"N+	c #E8B1B2",
+"O+	c #E8B2B2",
+"P+	c #F2D1BE",
+"Q+	c #FDEFCC",
+"R+	c #FEF1CC",
+"S+	c #FDEAB5",
+"T+	c #F4DFAF",
+"U+	c #E6EDAE",
+"V+	c #E6ECAD",
+"W+	c #FFF5BA",
+"X+	c #917172",
+"Y+	c #9C460E",
+"Z+	c #843909",
+"`+	c #6C2F07",
+" @	c #5C2B0B",
+".@	c #CFC1A1",
+"+@	c #E1D8B7",
+"@@	c #DBD1B4",
+"#@	c #D3C8A9",
+"$@	c #E0CE74",
+"%@	c #F1DA57",
+"&@	c #F2DA53",
+"*@	c #F3E185",
+"=@	c #FCF0C9",
+"-@	c #CFC8B1",
+";@	c #E5D9BB",
+">@	c #E7B0B1",
+",@	c #EFC9BA",
+"'@	c #FBEDC9",
+")@	c #FBECC7",
+"!@	c #EDC3A1",
+"~@	c #E9C69F",
+"{@	c #FEF0B4",
+"]@	c #FFF0B7",
+"^@	c #F0D098",
+"/@	c #A8531C",
+"(@	c #90410F",
+"_@	c #783409",
+":@	c #5F2501",
+"<@	c #735942",
+"[@	c #AFA992",
+"}@	c #B5AB93",
+"|@	c #C3B899",
+"1@	c #CDBC64",
+"2@	c #E6D47A",
+"3@	c #F1DF87",
+"4@	c #F4DF75",
+"5@	c #ECD66A",
+"6@	c #FEF1C8",
+"7@	c #E2D8B9",
+"8@	c #D7D1B5",
+"9@	c #E7B6B1",
+"0@	c #E4B6B1",
+"a@	c #EAC4B6",
+"b@	c #EDC1B6",
+"c@	c #DD928E",
+"d@	c #E6AD98",
+"e@	c #FFF3B4",
+"f@	c #FFEFB4",
+"g@	c #BF7A45",
+"h@	c #873B0B",
+"i@	c #813709",
+"j@	c #6C2D05",
+"k@	c #512B19",
+"l@	c #777773",
+"m@	c #A49B83",
+"n@	c #B6AD91",
+"o@	c #C2B78E",
+"p@	c #D6C676",
+"q@	c #E9D14A",
+"r@	c #F4DD61",
+"s@	c #EADA91",
+"t@	c #FAEDC2",
+"u@	c #FDEFC6",
+"v@	c #F3E6C0",
+"w@	c #C6C1AB",
+"x@	c #EBC3B5",
+"y@	c #E7B2B1",
+"z@	c #E7B2B2",
+"A@	c #E8B1B1",
+"B@	c #DD8C8D",
+"C@	c #DDA090",
+"D@	c #FAEDAE",
+"E@	c #E2B378",
+"F@	c #A04F1B",
+"G@	c #8D3E0D",
+"H@	c #783308",
+"I@	c #5D2601",
+"J@	c #484757",
+"K@	c #707880",
+"L@	c #AAA086",
+"M@	c #B4A97B",
+"N@	c #C8B54D",
+"O@	c #DBC86C",
+"P@	c #EEDD9B",
+"Q@	c #E9D464",
+"R@	c #FAEDBD",
+"S@	c #FFF2CA",
+"T@	c #FFF1C5",
+"U@	c #FFF2C4",
+"V@	c #B6B2A2",
+"W@	c #F0D1B9",
+"X@	c #E7B0B2",
+"Y@	c #E09E8F",
+"Z@	c #F6DFA2",
+"`@	c #FFEDAD",
+" #	c #E2C2A4",
+".#	c #B57D5D",
+"+#	c #955128",
+"@#	c #803607",
+"##	c #672B05",
+"$#	c #482D23",
+"%#	c #425374",
+"&#	c #717A85",
+"*#	c #B0A689",
+"=#	c #C2B790",
+"-#	c #D3C165",
+";#	c #E7CF4D",
+">#	c #EFD755",
+",#	c #EDE0B7",
+"'#	c #FFF2C6",
+")#	c #FEF0C3",
+"!#	c #FFF1C2",
+"~#	c #B7B3A3",
+"{#	c #F4DDBC",
+"]#	c #E9B7B3",
+"^#	c #EAB9B2",
+"/#	c #ECC5B5",
+"(#	c #F3D5B8",
+"_#	c #FDE8A3",
+":#	c #FFEAA6",
+"<#	c #FBE6A7",
+"[#	c #E3C9B0",
+"}#	c #D7BAAE",
+"|#	c #CFAD9D",
+"1#	c #996647",
+"2#	c #5B2909",
+"3#	c #32374F",
+"4#	c #496798",
+"5#	c #8897AA",
+"6#	c #E3D6AB",
+"7#	c #F4E6BC",
+"8#	c #FBEDC2",
+"9#	c #F4E189",
+"0#	c #F2DF89",
+"a#	c #FFF1C6",
+"b#	c #FCEEC3",
+"c#	c #FBECBE",
+"d#	c #FDEEBF",
+"e#	c #D0CABA",
+"f#	c #EBE0C2",
+"g#	c #EFD0B5",
+"h#	c #F9E2BB",
+"i#	c #FFF5C1",
+"j#	c #FFF3BF",
+"k#	c #F9E5A2",
+"l#	c #D3CD9F",
+"m#	c #E0D29F",
+"n#	c #E1C4AB",
+"o#	c #D1B1A3",
+"p#	c #CDA999",
+"q#	c #C29C8B",
+"r#	c #635253",
+"s#	c #294D8C",
+"t#	c #6995E2",
+"u#	c #8EB1EA",
+"v#	c #FFF2C1",
+"w#	c #FFF2C3",
+"x#	c #F4E6C0",
+"y#	c #F4E7BE",
+"z#	c #F0E4BC",
+"A#	c #F1E4BC",
+"B#	c #FAEBBC",
+"C#	c #FFEFBE",
+"D#	c #CDC5B0",
+"E#	c #EFE2BC",
+"F#	c #F7EABA",
+"G#	c #F1E7BD",
+"H#	c #E8E2BD",
+"I#	c #DFDDBD",
+"J#	c #D7D7BC",
+"K#	c #97AC9D",
+"L#	c #72979D",
+"M#	c #D1CBA1",
+"N#	c #E1C1A6",
+"O#	c #D1AE9F",
+"P#	c #BE9A8B",
+"Q#	c #766A6E",
+"R#	c #385892",
+"S#	c #336ED2",
+"T#	c #6F9FF1",
+"U#	c #77A4F3",
+"V#	c #B2C5DB",
+"W#	c #F8EBC0",
+"X#	c #F3E2B5",
+"Y#	c #EDE0B8",
+"Z#	c #F3E5BB",
+"`#	c #FAEBBD",
+" $	c #FFF1BF",
+".$	c #FAEABA",
+"+$	c #FDEEBB",
+"@$	c #C3BBA5",
+"#$	c #EFE1B5",
+"$$	c #BCC7B9",
+"%$	c #A0B8BD",
+"&$	c #9DB7BC",
+"*$	c #99B5BC",
+"=$	c #93B1BB",
+"-$	c #56879E",
+";$	c #6D959E",
+">$	c #CAC59C",
+",$	c #C6AB96",
+"'$	c #AB8E7F",
+")$	c #968464",
+"!$	c #758697",
+"~$	c #3071DE",
+"{$	c #387AE9",
+"]$	c #6D9DF0",
+"^$	c #78A4F1",
+"/$	c #79A5F1",
+"($	c #9AB7E4",
+"_$	c #C4C5BD",
+":$	c #EFDFB2",
+"<$	c #FEEEBD",
+"[$	c #FBEBB9",
+"}$	c #FFEFBA",
+"|$	c #C0B9A3",
+"1$	c #F3E4B5",
+"2$	c #AEC0BB",
+"3$	c #8BADBD",
+"4$	c #8FAFBD",
+"5$	c #8CAEBC",
+"6$	c #57889E",
+"7$	c #75989C",
+"8$	c #B6B090",
+"9$	c #827A67",
+"0$	c #BDAA76",
+"a$	c #E6D18C",
+"b$	c #B3BAAF",
+"c$	c #2D74EF",
+"d$	c #3779E9",
+"e$	c #6C9CEF",
+"f$	c #77A4F0",
+"g$	c #77A4F1",
+"h$	c #7CA4E9",
+"i$	c #87A6D8",
+"j$	c #B6C5D3",
+"k$	c #FFEFBB",
+"l$	c #FCEBB7",
+"m$	c #FFEEB8",
+"n$	c #BCB6A0",
+"o$	c #F7E6B4",
+"p$	c #AFC0BA",
+"q$	c #8EAEBD",
+"r$	c #91B0BD",
+"s$	c #8DADBC",
+"t$	c #8FA495",
+"u$	c #B4A980",
+"v$	c #948F83",
+"w$	c #E3D098",
+"x$	c #F9E195",
+"y$	c #FAE196",
+"z$	c #E4D8A3",
+"A$	c #3E7CE4",
+"B$	c #3377E8",
+"C$	c #6B9BEE",
+"D$	c #76A3EF",
+"E$	c #78A3EC",
+"F$	c #87A5D7",
+"G$	c #79A3EC",
+"H$	c #71A0F1",
+"I$	c #9DB8DF",
+"J$	c #FDEDBA",
+"K$	c #F8E8B3",
+"L$	c #FBE9B3",
+"M$	c #B8B3A1",
+"N$	c #EFE1B3",
+"O$	c #CDC8AB",
+"P$	c #D0CEB1",
+"Q$	c #D5CFAE",
+"R$	c #D7CEAA",
+"S$	c #D9CCA6",
+"T$	c #9F9270",
+"U$	c #9D9373",
+"V$	c #F7DE91",
+"W$	c #FFE997",
+"X$	c #FFE697",
+"Y$	c #F8E299",
+"Z$	c #92A9C0",
+"`$	c #3375E6",
+" %	c #6999EE",
+".%	c #78A2EC",
+"+%	c #87A4D7",
+"@%	c #79A2E9",
+"#%	c #75A2F0",
+"$%	c #76A2EF",
+"%%	c #719FF1",
+"&%	c #A1B9DB",
+"*%	c #FFEEB7",
+"=%	c #F9E8B5",
+"-%	c #DBCFAB",
+";%	c #C0BDB4",
+">%	c #C2BDAE",
+",%	c #B0AA9A",
+"'%	c #B1AA99",
+")%	c #B0A999",
+"!%	c #B2AD9C",
+"~%	c #B4AE9C",
+"{%	c #CDB97E",
+"]%	c #FFEB94",
+"^%	c #FFE794",
+"/%	c #FFE593",
+"(%	c #FFE693",
+"_%	c #F3DE97",
+":%	c #9EAEB8",
+"<%	c #84A3D7",
+"[%	c #7AA2E6",
+"}%	c #74A2EF",
+"|%	c #75A2EE",
+"1%	c #72A0EF",
+"2%	c #C7CECA",
+"3%	c #FFF2B1",
+"4%	c #C1BAA4",
+"5%	c #E9DCB6",
+"6%	c #F0E0B1",
+"7%	c #F1E1AE",
+"8%	c #CCCEC1",
+"9%	c #D4D3C1",
+"0%	c #F9E8B4",
+"a%	c #FFEEAD",
+"b%	c #C5C1A0",
+"c%	c #CDC49A",
+"d%	c #F3D889",
+"e%	c #FEE38F",
+"f%	c #FFE691",
+"g%	c #FFE591",
+"h%	c #FFE790",
+"i%	c #FFE38A",
+"j%	c #D2CDB2",
+"k%	c #7CA2E4",
+"l%	c #73A0EE",
+"m%	c #74A0EC",
+"n%	c #8EAEE1",
+"o%	c #F6E7B5",
+"p%	c #D3C7A3",
+"q%	c #FFECAE",
+"r%	c #FFF2AE",
+"s%	c #FFF1AE",
+"t%	c #B1C1D1",
+"u%	c #7CA5E9",
+"v%	c #80A7E7",
+"w%	c #8FAFDF",
+"x%	c #96B2DA",
+"y%	c #477ED9",
+"z%	c #4A7FD7",
+"A%	c #819BBC",
+"B%	c #E1CE8F",
+"C%	c #EBD389",
+"D%	c #E8D289",
+"E%	c #E9D28A",
+"F%	c #E7CF89",
+"G%	c #EED68A",
+"H%	c #FFEDAA",
+"I%	c #9FB8D9",
+"J%	c #719FED",
+"K%	c #73A0EC",
+"L%	c #7FA7E7",
+"M%	c #BBC7CC",
+"N%	c #E4D9B0",
+"O%	c #A9BACD",
+"P%	c #88A8DC",
+"Q%	c #8CACDF",
+"R%	c #73A0EB",
+"S%	c #729FEB",
+"T%	c #6F9CEA",
+"U%	c #2F71E2",
+"V%	c #3173E2",
+"W%	c #3173E3",
+"X%	c #5C89CE",
+"Y%	c #EED890",
+"Z%	c #FEE28A",
+"`%	c #FADE88",
+" &	c #F4D984",
+".&	c #D0B970",
+"+&	c #C3B27D",
+"@&	c #BBBFBA",
+"#&	c #709EED",
+"$&	c #739FEB",
+"%&	c #77A1E9",
+"&&	c #8EADDD",
+"*&	c #7097DB",
+"=&	c #719BE2",
+"-&	c #719CE5",
+";&	c #719CE6",
+">&	c #729EEA",
+",&	c #2E70E1",
+"'&	c #3172E0",
+")&	c #2B6BDC",
+"!&	c #5983C1",
+"~&	c #DCC375",
+"{&	c #978651",
+"]&	c #3C5072",
+"^&	c #5979AE",
+"/&	c #6D95D9",
+"(&	c #729EE9",
+"_&	c #759FE7",
+":&	c #729BE3",
+"<&	c #729BE2",
+"[&	c #6F9AE7",
+"}&	c #2E70DE",
+"|&	c #2E6BD1",
+"1&	c #2D64C2",
+"2&	c #265097",
+"3&	c #5F80B7",
+"4&	c #7099E0",
+"5&	c #719CE4",
+"6&	c #729CE4",
+"                                                . + @           ",
+"                                              # $ % & *         ",
+"    = =                             - ; > , ' ) ! ~ { ]         ",
+"    ^ ^ ^ / ( _             : < [ } | 1 2 3 4 5 6 7 8 9         ",
+"    0 0 0 0 0 a b c d e f g h i } j k l m n o p q r s t u       ",
+"    v v v v v w x 2 y z A B C D E F G H I J K L M N O P Q 2     ",
+"    R R R R R S T U V W X Y Z `  ...+. at .#.$.%.&.*.=.-.;.>.,.    ",
+"    '.'.'.'.'.).!.> ~.{.].^./.(._.:.<.[.}.|.1.2.3.4.5.6.7.8.    ",
+"    9.9.9.0.a.b.c.d.U e.f.g.h.i.j.k.l.m.n.o.p.q.r.s.t.u.v.w.    ",
+"    x.y.y.z.A.B.C.D.E.F.G.H.I.J.K.L.M.N.O.P.Q.R.S.T.U.V.W.X.    ",
+"    Y.Z.`. +.+++ at +#+$+%+&+*+=+-+;+>+,+'+o.)+!+~+{+]+^+/+(+_+    ",
+"    :+<+:+[+}+|+1+2+3+4+5+6+7+8+9+0+a+b+c+d+e+f+g+h+i+j+k+$+    ",
+"    f l+m+n+o+p+q+r+s+t+u+v+w+x+y+z+A+~ B+C+D+E+F+i+G+H+I+J+    ",
+"    K+L+M+N+O+o+P+Q+R+S+T+U+V+W+X+Y+%.Z+`+ @. at +@@@#@$@%@&@*@    ",
+"    =@-@;@p+O+>@,@'@)@!@~@{@]@^@/@(@P._@:@<@[@}@|@1 at 2@3 at 4@5@    ",
+"    6 at 7@8 at 9@O+O+0 at a@b at c@d at e@f at g@$.h at i@j at k@l at m@n at o@p at q@r at s@t@    ",
+"    u at v@w at x@N+O+y at z@A at B@C at D@E at F@G at Z+H@I at J@K at L@M at N@O at P@Q at R@S@    ",
+"    T at U@V at W@X at O+O+O+A@Y at Z@`@ #.#+#@###$#%#&#*#=#-#;#>#,#'#T@    ",
+"    )#!#~#{#p+]#^#/#(#_#:#<#[#}#|#1#2#3#4#5#6#7#8#9#0#a#b#b#    ",
+"    c#d#e#f#g#h#%+i#j#k#l#m#n#o#p#q#r#s#t#u#!#v#w#'#x#y#z#A#    ",
+"    B#C#D#E#F#G#H#I#J#K#L#M#N#O#P#Q#R#S#T#U#V#W#X#Y#Z#`# $%+    ",
+"    .$+$@$#$$$%$&$*$=$-$;$>$,$'$)$!$~${$]$^$/$($_$:$<$5+5+5+    ",
+"    [$}$|$1$2$3$4$4$5$6$7$8$9$0$a$b$c$d$e$f$g$h$i$j$k$k$k$k$    ",
+"    l$m$n$o$p$q$r$r$s$t$u$v$w$x$y$z$A$B$C$D$E$F$G$H$I$J$t+t+    ",
+"    K$L$M$N$O$P$Q$R$S$T$U$V$W$X$X$Y$Z$`$ %.%+%@%#%$%%%&%*%*%    ",
+"    =%-%;%>%,%'%)%!%~%{%]%^%/%/%/%(%_%:%-+<%[%}%|%|%|%1%2%3%    ",
+"    |$4%5%6%7%8%9%0%a%b%c%d%e%f%g%g%h%i%j%k%l%m%m%m%m%m%n%o%    ",
+"    p%q%r%s%t%u%v%w%x%y%z%A%B%C%D%E%F%G%H%I%J%K%K%K%K%K%L%M%    ",
+"    N%O%P%Q%R%S%S%S%T%U%V%W%X%Y%Z%`% &.&+&@&#&$&S%S%S%S%%&&&    ",
+"        *&=&-&;&>&>&T%,&'&'&)&!&~&{&        ]&^&/&;&;&>&(&_&    ",
+"                :&<&[&}&|&1&2&                      3&4&5&6&    ",
+"                                                                "};
diff --git a/linux/latest/usr/share/pixmaps/josm-latest.png b/linux/latest/usr/share/pixmaps/josm-latest.png
index b85991b..93a3b45 100644
Binary files a/linux/latest/usr/share/pixmaps/josm-latest.png and b/linux/latest/usr/share/pixmaps/josm-latest.png differ
diff --git a/linux/tested/usr/share/appdata/josm.appdata.xml b/linux/tested/usr/share/appdata/josm.appdata.xml
index 22a0c2f..7005d77 100644
--- a/linux/tested/usr/share/appdata/josm.appdata.xml
+++ b/linux/tested/usr/share/appdata/josm.appdata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <application>
   <id type="desktop">josm.desktop</id>
-  <metadata_license>CC BY-SA-3.0</metadata_license>
+  <metadata_license>CC-BY-SA-3.0</metadata_license>
   <project_license>GPL-2.0+</project_license>
   <name>JOSM</name>
   <summary>Java OpenStreetMap Editor</summary>
diff --git a/linux/tested/usr/share/pixmaps/josm-16.xpm b/linux/tested/usr/share/pixmaps/josm-16.xpm
index 06c8e67..0e179ee 100644
--- a/linux/tested/usr/share/pixmaps/josm-16.xpm
+++ b/linux/tested/usr/share/pixmaps/josm-16.xpm
@@ -1,220 +1,213 @@
 /* XPM */
-static char *josm___[] = {
-/* columns rows colors chars-per-pixel */
-"16 16 198 2",
-"   c #513F11",
-".  c #513E12",
-"X  c #433426",
-"o  c #493A2A",
-"O  c #534113",
-"+  c #534014",
-"@  c #5C4711",
-"#  c #5C4713",
-"$  c #684D10",
-"%  c #694E11",
-"&  c #604C19",
-"*  c #644F19",
-"=  c #5E4921",
-"-  c #564F36",
-";  c #5D4933",
-":  c #604426",
-">  c #6D4B28",
-",  c #724D26",
-"<  c #605021",
-"1  c #655121",
-"2  c #655324",
-"3  c #685923",
-"4  c #785E27",
-"5  c #776731",
-"6  c #716136",
-"7  c #7A6636",
-"8  c #7C713D",
-"9  c #7F743D",
-"0  c #474647",
-"q  c #484946",
-"w  c #4F4A44",
-"e  c #4A494A",
-"r  c #4B4E4A",
-"t  c #4C4C4C",
-"y  c #515051",
-"u  c #575956",
-"i  c #595A5A",
-"p  c #5E5E5F",
-"a  c #5D605A",
-"s  c #5E635A",
-"d  c #636F5B",
-"f  c #646C5C",
-"g  c #69775D",
-"h  c #68785E",
-"j  c #616161",
-"k  c #6A6E65",
-"l  c #6A6D66",
-"z  c #6B6A6B",
-"x  c #6B6F68",
-"c  c #6B6F69",
-"v  c #6D6C6D",
-"b  c #6A7361",
-"n  c #6A7362",
-"m  c #6E7965",
-"M  c #787162",
-"N  c #747569",
-"B  c #71786C",
-"V  c #717372",
-"C  c #757A72",
-"Z  c #797F76",
-"A  c #7F7D7C",
-"S  c #80733F",
-"D  c #806E44",
-"F  c #827D7A",
-"G  c #699746",
-"H  c #678055",
-"J  c #6C9B56",
-"K  c #7A866D",
-"L  c #7C8675",
-"P  c #7C827B",
-"I  c #7AAE68",
-"U  c #75AA7B",
-"Y  c #8A8F68",
-"T  c #818F73",
-"R  c #82877B",
-"E  c #8F897A",
-"W  c #908172",
-"Q  c #8B9372",
-"!  c #88967B",
-"~  c #899B79",
-"^  c #8A9A78",
-"/  c #8E997B",
-"(  c #8F9D7F",
-")  c #8F9F7F",
-"_  c #9A9871",
-"`  c #86AA68",
-"'  c #8CBD60",
-"]  c #8FBD6C",
-"[  c #96B17E",
-"{  c #93C175",
-"}  c #9DC07D",
-"|  c #769683",
-" . c #6395B2",
-".. c #868D81",
-"X. c #8F9D83",
-"o. c #8F9D85",
-"O. c #919D88",
-"+. c #929291",
-"@. c #979A92",
-"#. c #AC9F84",
-"$. c #9CA282",
-"%. c #96A882",
-"&. c #9EAD8A",
-"*. c #9DAF8B",
-"=. c #9AA491",
-"-. c #9EA29C",
-";. c #AAAB87",
-":. c #ABAB89",
-">. c #BBAF85",
-",. c #A1BC85",
-"<. c #A1BD8D",
-"1. c #ADA49B",
-"2. c #ADA89A",
-"3. c #B5A697",
-"4. c #B6AA9F",
-"5. c #A9B593",
-"6. c #A5BD90",
-"7. c #A6BC93",
-"8. c #A9B892",
-"9. c #ACBD96",
-"0. c #87B0AB",
-"q. c #88AFB1",
-"w. c #A6A6A6",
-"e. c #A7A8A6",
-"r. c #AEAEAE",
-"t. c #B0BDA7",
-"y. c #B3B3B3",
-"u. c #B5B5B5",
-"i. c #BCB7B1",
-"p. c #BBBBBB",
-"a. c #BEBEBF",
-"s. c #C2BFAD",
-"d. c #A2C184",
-"f. c #ACCB8F",
-"g. c #A8C292",
-"h. c #ABC893",
-"j. c #AAC098",
-"k. c #ADC19A",
-"l. c #AEC699",
-"z. c #AFC19E",
-"x. c #ADC99A",
-"c. c #B0C798",
-"v. c #B1C59F",
-"b. c #B4CF9A",
-"n. c #B3CA9C",
-"m. c #BBDF98",
-"M. c #B5E78A",
-"N. c #ADC4A0",
-"B. c #B0C2A0",
-"V. c #B4C8A3",
-"C. c #B7CEA2",
-"Z. c #B6CBA4",
-"A. c #BED4A5",
-"S. c #B9D1AA",
-"D. c #CFC296",
-"F. c #C5D5A2",
-"G. c #C8D7AC",
-"H. c #C3D9A9",
-"J. c #DED8A7",
-"K. c #DFDFAC",
-"L. c #C3D3BA",
-"P. c #D5D9B0",
-"I. c #E2DCAA",
-"U. c #D1E0A6",
-"Y. c #DEE0AE",
-"T. c #D4E9B7",
-"R. c #DCE9B4",
-"E. c #DEE9B7",
-"W. c #DFEDB9",
-"Q. c #DFEEB9",
-"!. c #DCF0B6",
-"~. c #D8F4BA",
-"^. c #DCF7BF",
-"/. c #DEF9BF",
-"(. c #E5E2AF",
-"). c #E5E3B2",
-"_. c #E3E6B3",
-"`. c #E3EFB9",
-"'. c #E0F5BD",
-"]. c #C1C1C1",
-"[. c #CFCDC2",
-"{. c #C8C8C8",
-"}. c #CFD1C8",
-"|. c #D1D4CA",
-" X c #D1D0CF",
-".X c #D1D1D1",
-"XX c #D3D3D3",
-"oX c #D9D9D9",
-"OX c #D1E3C4",
-"+X c #DAF4C3",
-"@X c #E2F8C1",
-"#X c #E0FBC2",
-"$X c #E3FAC2",
-"%X c #E2E2E2",
-"&X c #E6E5E4",
-"*X c #EAEAEA",
-"=X c #FBFBFC",
-"-X c None",
-/* pixels */
-"-X-X-X-X-X-X-X-X-X-X0 e -X-X-X-X",
-"-X&.:./ ~ [ } T u n f b a t -X-X",
-"-X9.).E.^.M.` c %.L.h.,.*.B i -X",
-"-X) Q._.+Xm.h H h.OXS.j.C.7.c -X",
-"-X) (.Q.^.l.n G I { ] <.N.l.s p ",
-"-X5.I.'.+X<.m J  .U ' g.Z.%.q z ",
-"-XA.'.I.!.b.P | q.0.d.B.Z.h t v ",
-"-XH.'.I.E.T.E L n.x.B.t.z.d j -X",
-"-Xk.$XK.D.#.C V K Q / X.=.l y -X",
-"-Xo.+XU.S = M Z N F @. at .e.E -X-X",
-"-X! F.8   @ 2 5.L.1.3.3.i.XXR -X",
-"-XY 9   @ % 5 G.1.> , : X A s.-X",
-"-X< + # % 4 >.P.[.W ; o t +..XXX",
-"7 + # % 3 _ ;.$.}.=X&X.X{.u.p.{.",
-"D & % * - -X-X-X-X%X*XoX].r.-X-X",
-"-X6 1 -X-X-X-X-X-X-Xy.w.-X-X-X-X"
-};
+static char * josm16DG2_xpm[] = {
+"16 16 194 2",
+"  	c None",
+". 	c #9B4B19",
+"+ 	c #873B0C",
+"@ 	c #5FD15E",
+"# 	c #5FD15F",
+"$ 	c #5492FE",
+"% 	c #92B6ED",
+"& 	c #F8F5E1",
+"* 	c #C89066",
+"= 	c #924510",
+"- 	c #753207",
+"; 	c #7A5033",
+"> 	c #5DCD5D",
+", 	c #5DCE5D",
+"' 	c #55CB57",
+") 	c #BCE5A6",
+"! 	c #CCE5D1",
+"~ 	c #9ED8C7",
+"{ 	c #83B8C7",
+"] 	c #5A95FF",
+"^ 	c #CAD8E2",
+"/ 	c #F4D5AB",
+"( 	c #A45C2D",
+"_ 	c #864107",
+": 	c #794B2A",
+"< 	c #F9F0D9",
+"[ 	c #59C559",
+"} 	c #57C558",
+"| 	c #4DC150",
+"1 	c #CCE7B0",
+"2 	c #BADDCB",
+"3 	c #A5D9C2",
+"4 	c #75A8DA",
+"5 	c #669CF9",
+"6 	c #EEE4C7",
+"7 	c #C58C5C",
+"8 	c #8C3D0B",
+"9 	c #672A02",
+"0 	c #D3AB93",
+"a 	c #FFE9D1",
+"b 	c #48BA4B",
+"c 	c #55BD55",
+"d 	c #97D387",
+"e 	c #EEF0CA",
+"f 	c #F8F1CF",
+"g 	c #FFF1C4",
+"h 	c #C7D1D5",
+"i 	c #5292FB",
+"j 	c #B3A6A2",
+"k 	c #A0501A",
+"l 	c #742C00",
+"m 	c #987554",
+"n 	c #F9CDB6",
+"o 	c #FED2BB",
+"p 	c #EBEAC3",
+"q 	c #F2EDC9",
+"r 	c #F7E8CB",
+"s 	c #FAECCF",
+"t 	c #FFF2C9",
+"u 	c #FFF0BF",
+"v 	c #EDE4BD",
+"w 	c #628CDE",
+"x 	c #865E5B",
+"y 	c #8A3904",
+"z 	c #6C340F",
+"A 	c #E9D9B8",
+"B 	c #FDF2D2",
+"C 	c #F8E7CB",
+"D 	c #FAEFCE",
+"E 	c #DFC2B9",
+"F 	c #E6ABAE",
+"G 	c #F6DCC6",
+"H 	c #FFF0C5",
+"I 	c #F9E6B4",
+"J 	c #D5E8AB",
+"K 	c #A49698",
+"L 	c #933E09",
+"M 	c #6E2A00",
+"N 	c #AB8C6A",
+"O 	c #EBE0C0",
+"P 	c #E7D79A",
+"Q 	c #F3DF74",
+"R 	c #F4E9C4",
+"S 	c #D9C1B1",
+"T 	c #E8AFB1",
+"U 	c #F0CDBC",
+"V 	c #F0C9B1",
+"W 	c #EDC9A3",
+"X 	c #F8DFA5",
+"Y 	c #AF632C",
+"Z 	c #7F3304",
+"` 	c #66381D",
+" .	c #988C78",
+"..	c #BEB28A",
+"+.	c #DECC6C",
+"@.	c #F2DF7C",
+"#.	c #F7EBC2",
+"$.	c #DAC5B1",
+"%.	c #EAB5B3",
+"&.	c #E5AEB0",
+"*.	c #E5A6A3",
+"=.	c #F3CD9F",
+"-.	c #E7C695",
+";.	c #995027",
+">.	c #6C2E07",
+",.	c #53494B",
+"'.	c #9D9B8F",
+").	c #CFC079",
+"!.	c #EAD56C",
+"~.	c #F5E59F",
+"{.	c #F8EBC0",
+"].	c #E1D2B8",
+"^.	c #F5D4BA",
+"/.	c #FCDDBC",
+"(.	c #FFE2B0",
+"_.	c #DDD4A1",
+":.	c #E6CAAA",
+"<.	c #C19884",
+"[.	c #6F5654",
+"}.	c #4D6CA3",
+"|.	c #D0CFBE",
+"1.	c #FCEBB3",
+"2.	c #F5E4A0",
+"3.	c #F7EAC3",
+"4.	c #F5E5B9",
+"5.	c #DED3B2",
+"6.	c #D2D2BA",
+"7.	c #BBC9BE",
+"8.	c #95B0B0",
+"9.	c #8AA59F",
+"0.	c #D5B89B",
+"a.	c #9D8980",
+"b.	c #476EB0",
+"c.	c #598FEB",
+"d.	c #95B6EB",
+"e.	c #D0CEC0",
+"f.	c #FBEBBB",
+"g.	c #FEEEBE",
+"h.	c #F6E6B6",
+"i.	c #D9D0AE",
+"j.	c #B2C2BB",
+"k.	c #8DAFBF",
+"l.	c #7FA4B1",
+"m.	c #97A08C",
+"n.	c #B5A883",
+"o.	c #E0D097",
+"p.	c #6B95D2",
+"q.	c #568FF0",
+"r.	c #7CA5EC",
+"s.	c #7DA3E4",
+"t.	c #B9C8D5",
+"u.	c #FFF0B8",
+"v.	c #F0E1B1",
+"w.	c #D1C7AA",
+"x.	c #C6C0A8",
+"y.	c #C1BCA6",
+"z.	c #BCB08F",
+"A.	c #D5C186",
+"B.	c #FFEB97",
+"C.	c #FFE796",
+"D.	c #BEC1AD",
+"E.	c #6C97E0",
+"F.	c #7EA4E4",
+"G.	c #76A2EE",
+"H.	c #72A0F0",
+"I.	c #B8C7D2",
+"J.	c #CDC5A9",
+"K.	c #D8D2B8",
+"L.	c #C4CAC5",
+"M.	c #C1CACC",
+"N.	c #BBC3BD",
+"O.	c #A7B1AF",
+"P.	c #DFD099",
+"Q.	c #FFE38E",
+"R.	c #FFE288",
+"S.	c #D5CDA7",
+"T.	c #81A7E6",
+"U.	c #73A1EE",
+"V.	c #74A1ED",
+"W.	c #77A2EB",
+"X.	c #D9D3B5",
+"Y.	c #A3B8D4",
+"Z.	c #7AA2E6",
+"`.	c #6D9CEC",
+" +	c #4F88EA",
+".+	c #286DE4",
+"++	c #5D84BE",
+"@+	c #CFBD7F",
+"#+	c #CAB36D",
+"$+	c #BBAC7D",
+"%+	c #7692BF",
+"&+	c #6991D5",
+"*+	c #6E98E0",
+"=+	c #739FEA",
+"                        . +     ",
+"  @ #           $ % & * = - ;   ",
+"  > , ' ) ! ~ { ] ^ / ( _ : <   ",
+"  [ } | 1 2 3 4 5 6 7 8 9 0 a   ",
+"  b c d e f g h i j k l m n o   ",
+"  p q r s t u v w x y z A B C   ",
+"  D E F G H I J K L M N O P Q   ",
+"  R S T U V W X Y Z `  ...+. at .  ",
+"  #.$.%.&.*.=.-.;.>.,.'.).!.~.  ",
+"  {.].^./.(._.:.<.[.}.|.1.2.3.  ",
+"  4.5.6.7.8.9.0.a.b.c.d.e.f.g.  ",
+"  h.i.j.k.l.m.n.o.p.q.r.s.t.u.  ",
+"  v.w.x.y.z.A.B.C.D.E.F.G.H.I.  ",
+"  J.K.L.M.N.O.P.Q.R.S.T.U.V.W.  ",
+"  X.Y.Z.`. +.+++ at +#+$+%+&+*+=+  ",
+"                                "};
diff --git a/linux/tested/usr/share/pixmaps/josm-32.xpm b/linux/tested/usr/share/pixmaps/josm-32.xpm
index 2f4db3f..641838a 100644
--- a/linux/tested/usr/share/pixmaps/josm-32.xpm
+++ b/linux/tested/usr/share/pixmaps/josm-32.xpm
@@ -1,294 +1,714 @@
 /* XPM */
-static char *josm___[] = {
-/* columns rows colors chars-per-pixel */
-"32 32 256 2",
-"   c #0F0F0F",
-".  c #14100D",
-"X  c #190D01",
-"o  c #2C1A08",
-"O  c #3E2205",
-"+  c #21251E",
-"@  c #362412",
-"#  c #222322",
-"$  c #262A25",
-"%  c #333433",
-"&  c #363932",
-"*  c #393A37",
-"=  c #3D3D3E",
-"-  c #383638",
-";  c #333A2E",
-":  c #44280B",
-">  c #50300E",
-",  c #4E3B12",
-"<  c #4B3B1B",
-"1  c #503E15",
-"2  c #5D3710",
-"3  c #532E08",
-"4  c #613A12",
-"5  c #4B3F38",
-"6  c #30422C",
-"7  c #3E413B",
-"8  c #554412",
-"9  c #5D4813",
-"0  c #5E4B18",
-"q  c #5C4613",
-"w  c #6D550F",
-"e  c #70540F",
-"r  c #634B13",
-"t  c #6B4F12",
-"y  c #614A18",
-"u  c #6D5A1D",
-"i  c #6B5010",
-"p  c #715311",
-"a  c #5C4B29",
-"s  c #5C522F",
-"d  c #41433C",
-"f  c #444A3C",
-"g  c #4B453B",
-"h  c #574A3A",
-"j  c #465D38",
-"k  c #625120",
-"l  c #6D5823",
-"z  c #715D22",
-"x  c #634F3B",
-"c  c #635338",
-"v  c #795A3A",
-"b  c #6F603A",
-"n  c #736029",
-"m  c #454546",
-"M  c #464A42",
-"N  c #4A4A4A",
-"B  c #504E4F",
-"V  c #5A4642",
-"C  c #4D514E",
-"Z  c #525A4C",
-"A  c #53584D",
-"S  c #4F4D50",
-"D  c #535253",
-"F  c #555D52",
-"G  c #595D55",
-"H  c #5C5C5A",
-"J  c #5C5653",
-"K  c #635940",
-"L  c #645D55",
-"P  c #53614D",
-"I  c #5A6453",
-"U  c #5D625D",
-"Y  c #5B6A50",
-"T  c #587840",
-"R  c #776B44",
-"E  c #626B5B",
-"W  c #646559",
-"Q  c #796C59",
-"!  c #6D7B5F",
-"~  c #5C5D60",
-"^  c #5F6560",
-"/  c #616261",
-"(  c #69696A",
-")  c #686A65",
-"_  c #6E7962",
-"`  c #6C7266",
-"'  c #737C66",
-"]  c #73766D",
-"[  c #6F6E70",
-"{  c #60767F",
-"}  c #727473",
-"|  c #7B7B7B",
-" . c #777878",
-".. c #736D69",
-"X. c #84592C",
-"o. c #8D6339",
-"O. c #876A48",
-"+. c #877A5B",
-"@. c #806867",
-"#. c #689844",
-"$. c #6B8555",
-"%. c #75A74A",
-"&. c #7AAB53",
-"*. c #7EB551",
-"=. c #6FA358",
-"-. c #7A856D",
-";. c #78876A",
-":. c #7B9566",
-">. c #7C8B75",
-",. c #709279",
-"<. c #6B8F73",
-"1. c #77AE7F",
-"2. c #71A971",
-"3. c #848357",
-"4. c #928054",
-"5. c #84B55B",
-"6. c #808163",
-"7. c #988666",
-"8. c #82877D",
-"9. c #998876",
-"0. c #8B9B7B",
-"q. c #869578",
-"w. c #8B9872",
-"e. c #AE977E",
-"r. c #A7856A",
-"t. c #86B764",
-"y. c #92B96D",
-"u. c #8DA07E",
-"i. c #90A17F",
-"p. c #94B977",
-"a. c #87A76D",
-"s. c #B1AA76",
-"d. c #B8BA7D",
-"f. c #8AC657",
-"g. c #91C467",
-"h. c #99C276",
-"j. c #96D663",
-"k. c #A1DC6C",
-"l. c #A0CD73",
-"z. c #BFC27E",
-"x. c #A6DD7A",
-"c. c #7E7E81",
-"v. c #6091BB",
-"b. c #709BB9",
-"n. c #669AA1",
-"m. c #70A0B6",
-"M. c #6BA0B7",
-"N. c #5B8ACE",
-"B. c #6091CB",
-"V. c #848384",
-"C. c #8B8B8B",
-"Z. c #898685",
-"A. c #99978C",
-"S. c #929294",
-"D. c #9B9B9B",
-"F. c #969398",
-"G. c #A79A8E",
-"H. c #91A281",
-"J. c #95AC82",
-"K. c #98AA86",
-"L. c #9BAB8A",
-"P. c #97A389",
-"I. c #9CB28C",
-"U. c #98B382",
-"Y. c #A4A68C",
-"T. c #A5BA8D",
-"R. c #A2AF9B",
-"E. c #A3B396",
-"W. c #A6BA98",
-"Q. c #BCBE96",
-"!. c #8FAFA3",
-"~. c #96B8A3",
-"^. c #ABABAB",
-"/. c #A5A5A5",
-"(. c #B1BEA6",
-"). c #B8B6A7",
-"_. c #B2B2B2",
-"`. c #BCBCBC",
-"'. c #BFBAB5",
-"]. c #B0B4A4",
-"[. c #D6B994",
-"{. c #E0BB91",
-"}. c #A7C78B",
-"|. c #ACC395",
-" X c #AEC29A",
-".X c #B1C59C",
-"XX c #B4C99D",
-"oX c #B5C899",
-"OX c #B2D192",
-"+X c #B1E286",
-"@X c #9FC0AB",
-"#X c #A7C6A8",
-"$X c #B2C5A3",
-"%X c #B5CBA3",
-"&X c #B9CDA2",
-"*X c #B7C8AA",
-"=X c #BDD4A4",
-"-X c #B8D5AA",
-";X c #BDCBB5",
-":X c #DBCD9D",
-">X c #D6C497",
-",X c #CAC69A",
-"<X c #E3CC9D",
-"1X c #D9C6A0",
-"2X c #C2DBAB",
-"3X c #C4D7AB",
-"4X c #DDD2A3",
-"5X c #DFDCA8",
-"6X c #C9C5BA",
-"7X c #C3D3B6",
-"8X c #C9DBB8",
-"9X c #C8CBA8",
-"0X c #E3CEA2",
-"qX c #E1D3A3",
-"wX c #E3DAAA",
-"eX c #E8D6A5",
-"rX c #C2E7A4",
-"tX c #D9E0AE",
-"yX c #CEF1AB",
-"uX c #D1F3AE",
-"iX c #CDE4B6",
-"pX c #D3EBBB",
-"aX c #DBECBB",
-"sX c #D5E8B6",
-"dX c #D3F3B2",
-"fX c #DBF5BD",
-"gX c #DCF8BC",
-"hX c #D9F3B8",
-"jX c #E0E4AF",
-"kX c #E4EAB7",
-"lX c #E5F5BE",
-"zX c #E2FABE",
-"xX c #C3C3C3",
-"cX c #CCCCCC",
-"vX c #C9C9C5",
-"bX c #CDD7C6",
-"nX c #D1DEC3",
-"mX c #D3D3D3",
-"MX c #DCDCDC",
-"NX c #DAD8D6",
-"BX c #D5EAC7",
-"VX c #DCF5C2",
-"CX c #DFFAC2",
-"ZX c #D3E0D2",
-"AX c #CDE1C5",
-"SX c #E3FBC4",
-"DX c #E4FFC9",
-"FX c #E7FBC8",
-"GX c #E0EADB",
-"HX c #E4E5E4",
-"JX c #ECECEC",
-"KX c #E8E8E7",
-"LX c #F4F5F5",
-"PX c #FEFEFE",
-"IX c #E7F2E1",
-"UX c None",
-/* pixels */
-"UXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUX",
-"UX& ; UXUXUXUXUXUXUXUXUXUX6 f M UXUX* m N C N m % UX& UXUXUXUXUX",
-"UX* 0.A._ g d UXUX7 Z ;.:.t.oX6.% H ( / D B H ^ ( B f & UXUXUXUX",
-"UXUXK.FXlX[..XH.u. XrXrX+XyXL.U } G E -.I ;.;.;.A / ( = UXUXUXUX",
-"UXUX' SXwX0XFXDXCXgX+Xj.k.U.U ] D q.;X8X|.h.y.}.W.;.F  .N UXUXUX",
-"UXUXZ sXSX0X0XSXgXCXdXk.*.P  .Z T.;XZXBX-X}.T.}.&X%X0.I  .= UXUX",
-"UXUXM XXDXlX<XSXgXCXhXx.T  .P :.=XiXGXIXAX;XXXoX|.2XXXu.( ( UXUX",
-"UXUXUXH.DXlX<XFXCXgXgXOXI  .7 %.t.}.8XAX&X|.#XI.$X8X-X-XI c.5 UX",
-"UXUXUXH.zX4XqXCXVXhXgXa.` W #.#.%.5.h.}.p.t.U.$XI.#XT.2XZ ` H UX",
-"UXUXd &XkX<XSXgXhXpXVX:.8.Z %.%.*.n.f.g.t.f.p.XXW.&X=X2X; D } UX",
-"UXUXI pXeXkXDXDXVXVXdX;.C.Z %.#.M.B.2.*.5.h.U.&XW.iX.XL.# S c.UX",
-"UXUX' CXeXwXSXzXgXVXyX$.C.Y =.=.v.N.n.5.*.g.|.(. X%X=X! # D V.UX",
-"UXUXi.SXlX:X<XjXVXhXyX:.C.` ,.2.M.B.B.#Xy.5.}.(.$X.XXXf # [  .UX",
-"UX7 oXFXSXSXkX{.tXuXyXXXV.c.{ !.-X~.m. at X|.XX*X*XW.2XJ.+   S./ UX",
-"UXM 3XgXgXzXwX<XaXzXSXpX] F.P  X=X-X}.OX$X$X6X(.$X Xu.$ m D.m UX",
-"UX7 W.SXfXaX>XsXpXtXhXFXL.} ( _ =X}.&X&X|.-XR.(.R.$X0.& | / UXUX",
-"UXUXw.DXSXzX4X:X1X[.1X9XP.C C.C w.T.U.I.w.I.0.E.(.$X] / ( - UXUX",
-"UXUXE pXSXFXSX:X1X[.r...C } V.| G E 6.+.;.u.;.L.A.8. .~ - UXUXUX",
-"UXUXC *XVXSXzXSXQ.z y k  .S.C.G U ( J V ` 8.) } V.S.] h 5 UXUXUX",
-"UXUX7 E.BXVXFXz.u , 1 9 b Z.^ >.0.L F.^._.`.xXxXcX_.Y.,XW UXUXUX",
-"UXUXUX0.VXiXT.u , , 8 8 r a >.8X4X).xX`.`.xXcXcXNXKXHXnX_ UXUXUX",
-"UXUXUXL.gXd.u , 8 8 9 r i 0 Y.VX6XxXD.r.r.e.G.+.9.].KXKX| UXUXUX",
-"UXUXd &Xz.u , , 8 0 r i p y |.aXvXS.v X.o.O.o.v x 5 ) mX`.UXUXUX",
-"UXUXI s.l , 8 8 q r i w r 3.aXsXvXO.3 2 4 2 > : @ o . C.`.UXUXUX",
-"UXUXs u 1 1 8 q r t p r O.9XpXAXcX'.c : : O o o X   N _.mXmXcXUX",
-"UX4.0 , 1 1 q r i e r O.>X:X>X>X6XLXNXA.L h 5 g H C.^.`.cXMXKXxX",
-"s.z , 1 8 q r t w 9 3.<X5XiXoXtX8XLXPXPXJXMXmXmXmXvX`.^.`.`.mXUX",
-"7.r 1 8 q r p p r R W.0.Q Z M F 8.HXPXPXPXLXHXMXmXxX`.^._.xX`.UX",
-"UXl 8 9 r t i r < M f UXUXUXUXUXUXvXJXPXPXLXJXHXNXcX_./._.UXUXUX",
-"UX7.y r p p 0 s UXUXUXUXUXUXUXUXUXUX`.NXHXHXMXmX`./.^.UXUXUXUXUX",
-"UXUX+.y t y a UXUXUXUXUXUXUXUXUXUXUXUX_._.^.D.D.D.UXUXUXUXUXUXUX",
-"UXUXUXUXc K UXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUX"
-};
+static char * josm32DG2_xpm[] = {
+"32 32 679 2",
+"  	c None",
+". 	c #9F4D1B",
+"+ 	c #904211",
+"@ 	c #873C0B",
+"# 	c #A95522",
+"$ 	c #964614",
+"% 	c #883B0C",
+"& 	c #853909",
+"* 	c #6A2F08",
+"= 	c #5FD15F",
+"- 	c #659BF8",
+"; 	c #DADFD9",
+"> 	c #FFF8DC",
+", 	c #FFFBE4",
+"' 	c #CB9168",
+") 	c #9D4916",
+"! 	c #8D3E0E",
+"~ 	c #873A0A",
+"{ 	c #76340A",
+"] 	c #5D2604",
+"^ 	c #5ED15E",
+"/ 	c #5FD15E",
+"( 	c #5FD25F",
+"_ 	c #5DD15E",
+": 	c #FFF2D6",
+"< 	c #6FA1F6",
+"[ 	c #5291FF",
+"} 	c #5191FF",
+"| 	c #8FB4EC",
+"1 	c #FAF1D1",
+"2 	c #FFF8DE",
+"3 	c #F8E8CE",
+"4 	c #AD5F2E",
+"5 	c #934310",
+"6 	c #8D450A",
+"7 	c #823C09",
+"8 	c #652B05",
+"9 	c #70472A",
+"0 	c #5DCF5D",
+"a 	c #58CE59",
+"b 	c #A3DE95",
+"c 	c #FBF5DC",
+"d 	c #FFF9E0",
+"e 	c #FFF7D1",
+"f 	c #FFF5D1",
+"g 	c #DBE8C9",
+"h 	c #89BFB7",
+"i 	c #5494F7",
+"j 	c #629AFA",
+"k 	c #E6E5D5",
+"l 	c #FFF6CF",
+"m 	c #FFFFE8",
+"n 	c #CB8E64",
+"o 	c #974411",
+"p 	c #90460F",
+"q 	c #8E4C09",
+"r 	c #733508",
+"s 	c #592404",
+"t 	c #E6D9C1",
+"u 	c #FCF2DF",
+"v 	c #5BCB5B",
+"w 	c #55CA56",
+"x 	c #A9DF99",
+"y 	c #D4DFCE",
+"z 	c #9DD3C1",
+"A 	c #5AC2BE",
+"B 	c #45BCBC",
+"C 	c #459EA5",
+"D 	c #4F90F4",
+"E 	c #5190FE",
+"F 	c #94B5E9",
+"G 	c #FFF8CC",
+"H 	c #FFF7D2",
+"I 	c #EED2AF",
+"J 	c #A45422",
+"K 	c #944412",
+"L 	c #8A450C",
+"M 	c #81410C",
+"N 	c #5F2300",
+"O 	c #A4876B",
+"P 	c #FFF8E0",
+"Q 	c #FCF1DB",
+"R 	c #5AC75A",
+"S 	c #54C556",
+"T 	c #9CD88E",
+"U 	c #FFF7D8",
+"V 	c #A5DAD1",
+"W 	c #3BBEBF",
+"X 	c #49C2C0",
+"Y 	c #64B7AF",
+"Z 	c #5B95E6",
+"` 	c #4F8FFE",
+" .	c #5090FC",
+"..	c #C0CEDA",
+"+.	c #FFF7CB",
+"@.	c #FFF5CE",
+"#.	c #C07D4D",
+"$.	c #974613",
+"%.	c #8A3D0D",
+"&.	c #833809",
+"*.	c #6E2F06",
+"=.	c #673719",
+"-.	c #F3E5CA",
+";.	c #FFF5DA",
+">.	c #FCF0D9",
+",.	c #FFF7DC",
+"'.	c #57C357",
+").	c #55C255",
+"!.	c #B8DFA2",
+"~.	c #C1DBCB",
+"{.	c #9DD4BE",
+"].	c #E0E6C2",
+"^.	c #FFF4C8",
+"/.	c #80A9EE",
+"(.	c #4C8DFC",
+"_.	c #4F8EFB",
+":.	c #C3CFD7",
+"<.	c #FFF9CB",
+"[.	c #E3BC8F",
+"}.	c #A35522",
+"|.	c #914311",
+"1.	c #843808",
+"2.	c #7B3508",
+"3.	c #5C2704",
+"4.	c #B88970",
+"5.	c #FBCCB8",
+"6.	c #FDD9C2",
+"7.	c #F4E1CA",
+"8.	c #FBF0D8",
+"9.	c #55BF55",
+"0.	c #51BE52",
+"a.	c #4EBD4F",
+"b.	c #75C86E",
+"c.	c #E7EDC6",
+"d.	c #FFF6DA",
+"e.	c #FFF4C6",
+"f.	c #FFF3C6",
+"g.	c #FFF6C3",
+"h.	c #98B6E1",
+"i.	c #4E8DFA",
+"j.	c #4D8DFA",
+"k.	c #9AB8E2",
+"l.	c #FFEDB7",
+"m.	c #BD7B4A",
+"n.	c #974412",
+"o.	c #873B0A",
+"p.	c #833909",
+"q.	c #672A03",
+"r.	c #7F5837",
+"s.	c #EDC8B0",
+"t.	c #FFCFB9",
+"u.	c #FFCDB7",
+"v.	c #FDDBC3",
+"w.	c #FCF2D9",
+"x.	c #48B74B",
+"y.	c #47B74A",
+"z.	c #7EC973",
+"A.	c #A4D690",
+"B.	c #DBE9BA",
+"C.	c #FFF6D7",
+"D.	c #FFF5D6",
+"E.	c #FFF5D4",
+"F.	c #FFF0C2",
+"G.	c #FFF0C3",
+"H.	c #FFF2C2",
+"I.	c #E4E1C8",
+"J.	c #5892F4",
+"K.	c #4A8BF9",
+"L.	c #669AF0",
+"M.	c #CEAC89",
+"N.	c #A24F1A",
+"O.	c #8D3F0E",
+"P.	c #863909",
+"Q.	c #773309",
+"R.	c #64310F",
+"S.	c #BCA787",
+"T.	c #F8E0C5",
+"U.	c #FCCCB5",
+"V.	c #FFCAB4",
+"W.	c #FEDCC2",
+"X.	c #FCF2D6",
+"Y.	c #CDE1AD",
+"Z.	c #D0E3B0",
+"`.	c #D5E5B4",
+" +	c #F1EEC9",
+".+	c #F8EDCF",
+"++	c #FEF1D4",
+"@+	c #FBEED1",
+"#+	c #FEF3D3",
+"$+	c #FFF4D2",
+"%+	c #FFF0BF",
+"&+	c #FFF0C0",
+"*+	c #FFF1C0",
+"=+	c #FFF2BC",
+"-+	c #7FA4E0",
+";+	c #4989F9",
+">+	c #5487E7",
+",+	c #A06242",
+"'+	c #95430E",
+")+	c #84390A",
+"!+	c #642B06",
+"~+	c #7F5839",
+"{+	c #FAF0CF",
+"]+	c #FEF3D2",
+"^+	c #FFF0D0",
+"/+	c #FDE7C8",
+"(+	c #F1DAC0",
+"_+	c #FAEED2",
+":+	c #FCEED0",
+"<+	c #FAECCE",
+"[+	c #FEF2D1",
+"}+	c #F8E8CA",
+"|+	c #EED4BF",
+"1+	c #F2E0C7",
+"2+	c #FFF3D2",
+"3+	c #FFF4D1",
+"4+	c #FFEFBC",
+"5+	c #FFEFBD",
+"6+	c #FFEBBC",
+"7+	c #EFEAAF",
+"8+	c #B0BCCB",
+"9+	c #4787F7",
+"0+	c #75749C",
+"a+	c #A24A0F",
+"b+	c #8C3E0D",
+"c+	c #873A09",
+"d+	c #6F3108",
+"e+	c #65320F",
+"f+	c #CAB695",
+"g+	c #FFFAD8",
+"h+	c #FFF5D2",
+"i+	c #F8EBCE",
+"j+	c #F8EACE",
+"k+	c #FEF1D1",
+"l+	c #F4EED6",
+"m+	c #E7D1BD",
+"n+	c #E6B3B0",
+"o+	c #E7AFB1",
+"p+	c #E7B1B1",
+"q+	c #F4D7C2",
+"r+	c #FFF3D0",
+"s+	c #FFF3CE",
+"t+	c #FFEEB9",
+"u+	c #FDEAB9",
+"v+	c #E7E5AF",
+"w+	c #D0ECA7",
+"x+	c #D7DBB4",
+"y+	c #4E83E7",
+"z+	c #A65729",
+"A+	c #92410E",
+"B+	c #7D3609",
+"C+	c #632A05",
+"D+	c #825E3F",
+"E+	c #FFFEDA",
+"F+	c #FCF1CC",
+"G+	c #EEDE9E",
+"H+	c #ECD76B",
+"I+	c #FBEDBE",
+"J+	c #FEF2CD",
+"K+	c #FFF5D0",
+"L+	c #C4C2B6",
+"M+	c #EAD6BF",
+"N+	c #E8B1B2",
+"O+	c #E8B2B2",
+"P+	c #F2D1BE",
+"Q+	c #FDEFCC",
+"R+	c #FEF1CC",
+"S+	c #FDEAB5",
+"T+	c #F4DFAF",
+"U+	c #E6EDAE",
+"V+	c #E6ECAD",
+"W+	c #FFF5BA",
+"X+	c #917172",
+"Y+	c #9C460E",
+"Z+	c #843909",
+"`+	c #6C2F07",
+" @	c #5C2B0B",
+".@	c #CFC1A1",
+"+@	c #E1D8B7",
+"@@	c #DBD1B4",
+"#@	c #D3C8A9",
+"$@	c #E0CE74",
+"%@	c #F1DA57",
+"&@	c #F2DA53",
+"*@	c #F3E185",
+"=@	c #FCF0C9",
+"-@	c #CFC8B1",
+";@	c #E5D9BB",
+">@	c #E7B0B1",
+",@	c #EFC9BA",
+"'@	c #FBEDC9",
+")@	c #FBECC7",
+"!@	c #EDC3A1",
+"~@	c #E9C69F",
+"{@	c #FEF0B4",
+"]@	c #FFF0B7",
+"^@	c #F0D098",
+"/@	c #A8531C",
+"(@	c #90410F",
+"_@	c #783409",
+":@	c #5F2501",
+"<@	c #735942",
+"[@	c #AFA992",
+"}@	c #B5AB93",
+"|@	c #C3B899",
+"1@	c #CDBC64",
+"2@	c #E6D47A",
+"3@	c #F1DF87",
+"4@	c #F4DF75",
+"5@	c #ECD66A",
+"6@	c #FEF1C8",
+"7@	c #E2D8B9",
+"8@	c #D7D1B5",
+"9@	c #E7B6B1",
+"0@	c #E4B6B1",
+"a@	c #EAC4B6",
+"b@	c #EDC1B6",
+"c@	c #DD928E",
+"d@	c #E6AD98",
+"e@	c #FFF3B4",
+"f@	c #FFEFB4",
+"g@	c #BF7A45",
+"h@	c #873B0B",
+"i@	c #813709",
+"j@	c #6C2D05",
+"k@	c #512B19",
+"l@	c #777773",
+"m@	c #A49B83",
+"n@	c #B6AD91",
+"o@	c #C2B78E",
+"p@	c #D6C676",
+"q@	c #E9D14A",
+"r@	c #F4DD61",
+"s@	c #EADA91",
+"t@	c #FAEDC2",
+"u@	c #FDEFC6",
+"v@	c #F3E6C0",
+"w@	c #C6C1AB",
+"x@	c #EBC3B5",
+"y@	c #E7B2B1",
+"z@	c #E7B2B2",
+"A@	c #E8B1B1",
+"B@	c #DD8C8D",
+"C@	c #DDA090",
+"D@	c #FAEDAE",
+"E@	c #E2B378",
+"F@	c #A04F1B",
+"G@	c #8D3E0D",
+"H@	c #783308",
+"I@	c #5D2601",
+"J@	c #484757",
+"K@	c #707880",
+"L@	c #AAA086",
+"M@	c #B4A97B",
+"N@	c #C8B54D",
+"O@	c #DBC86C",
+"P@	c #EEDD9B",
+"Q@	c #E9D464",
+"R@	c #FAEDBD",
+"S@	c #FFF2CA",
+"T@	c #FFF1C5",
+"U@	c #FFF2C4",
+"V@	c #B6B2A2",
+"W@	c #F0D1B9",
+"X@	c #E7B0B2",
+"Y@	c #E09E8F",
+"Z@	c #F6DFA2",
+"`@	c #FFEDAD",
+" #	c #E2C2A4",
+".#	c #B57D5D",
+"+#	c #955128",
+"@#	c #803607",
+"##	c #672B05",
+"$#	c #482D23",
+"%#	c #425374",
+"&#	c #717A85",
+"*#	c #B0A689",
+"=#	c #C2B790",
+"-#	c #D3C165",
+";#	c #E7CF4D",
+">#	c #EFD755",
+",#	c #EDE0B7",
+"'#	c #FFF2C6",
+")#	c #FEF0C3",
+"!#	c #FFF1C2",
+"~#	c #B7B3A3",
+"{#	c #F4DDBC",
+"]#	c #E9B7B3",
+"^#	c #EAB9B2",
+"/#	c #ECC5B5",
+"(#	c #F3D5B8",
+"_#	c #FDE8A3",
+":#	c #FFEAA6",
+"<#	c #FBE6A7",
+"[#	c #E3C9B0",
+"}#	c #D7BAAE",
+"|#	c #CFAD9D",
+"1#	c #996647",
+"2#	c #5B2909",
+"3#	c #32374F",
+"4#	c #496798",
+"5#	c #8897AA",
+"6#	c #E3D6AB",
+"7#	c #F4E6BC",
+"8#	c #FBEDC2",
+"9#	c #F4E189",
+"0#	c #F2DF89",
+"a#	c #FFF1C6",
+"b#	c #FCEEC3",
+"c#	c #FBECBE",
+"d#	c #FDEEBF",
+"e#	c #D0CABA",
+"f#	c #EBE0C2",
+"g#	c #EFD0B5",
+"h#	c #F9E2BB",
+"i#	c #FFF5C1",
+"j#	c #FFF3BF",
+"k#	c #F9E5A2",
+"l#	c #D3CD9F",
+"m#	c #E0D29F",
+"n#	c #E1C4AB",
+"o#	c #D1B1A3",
+"p#	c #CDA999",
+"q#	c #C29C8B",
+"r#	c #635253",
+"s#	c #294D8C",
+"t#	c #6995E2",
+"u#	c #8EB1EA",
+"v#	c #FFF2C1",
+"w#	c #FFF2C3",
+"x#	c #F4E6C0",
+"y#	c #F4E7BE",
+"z#	c #F0E4BC",
+"A#	c #F1E4BC",
+"B#	c #FAEBBC",
+"C#	c #FFEFBE",
+"D#	c #CDC5B0",
+"E#	c #EFE2BC",
+"F#	c #F7EABA",
+"G#	c #F1E7BD",
+"H#	c #E8E2BD",
+"I#	c #DFDDBD",
+"J#	c #D7D7BC",
+"K#	c #97AC9D",
+"L#	c #72979D",
+"M#	c #D1CBA1",
+"N#	c #E1C1A6",
+"O#	c #D1AE9F",
+"P#	c #BE9A8B",
+"Q#	c #766A6E",
+"R#	c #385892",
+"S#	c #336ED2",
+"T#	c #6F9FF1",
+"U#	c #77A4F3",
+"V#	c #B2C5DB",
+"W#	c #F8EBC0",
+"X#	c #F3E2B5",
+"Y#	c #EDE0B8",
+"Z#	c #F3E5BB",
+"`#	c #FAEBBD",
+" $	c #FFF1BF",
+".$	c #FAEABA",
+"+$	c #FDEEBB",
+"@$	c #C3BBA5",
+"#$	c #EFE1B5",
+"$$	c #BCC7B9",
+"%$	c #A0B8BD",
+"&$	c #9DB7BC",
+"*$	c #99B5BC",
+"=$	c #93B1BB",
+"-$	c #56879E",
+";$	c #6D959E",
+">$	c #CAC59C",
+",$	c #C6AB96",
+"'$	c #AB8E7F",
+")$	c #968464",
+"!$	c #758697",
+"~$	c #3071DE",
+"{$	c #387AE9",
+"]$	c #6D9DF0",
+"^$	c #78A4F1",
+"/$	c #79A5F1",
+"($	c #9AB7E4",
+"_$	c #C4C5BD",
+":$	c #EFDFB2",
+"<$	c #FEEEBD",
+"[$	c #FBEBB9",
+"}$	c #FFEFBA",
+"|$	c #C0B9A3",
+"1$	c #F3E4B5",
+"2$	c #AEC0BB",
+"3$	c #8BADBD",
+"4$	c #8FAFBD",
+"5$	c #8CAEBC",
+"6$	c #57889E",
+"7$	c #75989C",
+"8$	c #B6B090",
+"9$	c #827A67",
+"0$	c #BDAA76",
+"a$	c #E6D18C",
+"b$	c #B3BAAF",
+"c$	c #2D74EF",
+"d$	c #3779E9",
+"e$	c #6C9CEF",
+"f$	c #77A4F0",
+"g$	c #77A4F1",
+"h$	c #7CA4E9",
+"i$	c #87A6D8",
+"j$	c #B6C5D3",
+"k$	c #FFEFBB",
+"l$	c #FCEBB7",
+"m$	c #FFEEB8",
+"n$	c #BCB6A0",
+"o$	c #F7E6B4",
+"p$	c #AFC0BA",
+"q$	c #8EAEBD",
+"r$	c #91B0BD",
+"s$	c #8DADBC",
+"t$	c #8FA495",
+"u$	c #B4A980",
+"v$	c #948F83",
+"w$	c #E3D098",
+"x$	c #F9E195",
+"y$	c #FAE196",
+"z$	c #E4D8A3",
+"A$	c #3E7CE4",
+"B$	c #3377E8",
+"C$	c #6B9BEE",
+"D$	c #76A3EF",
+"E$	c #78A3EC",
+"F$	c #87A5D7",
+"G$	c #79A3EC",
+"H$	c #71A0F1",
+"I$	c #9DB8DF",
+"J$	c #FDEDBA",
+"K$	c #F8E8B3",
+"L$	c #FBE9B3",
+"M$	c #B8B3A1",
+"N$	c #EFE1B3",
+"O$	c #CDC8AB",
+"P$	c #D0CEB1",
+"Q$	c #D5CFAE",
+"R$	c #D7CEAA",
+"S$	c #D9CCA6",
+"T$	c #9F9270",
+"U$	c #9D9373",
+"V$	c #F7DE91",
+"W$	c #FFE997",
+"X$	c #FFE697",
+"Y$	c #F8E299",
+"Z$	c #92A9C0",
+"`$	c #3375E6",
+" %	c #6999EE",
+".%	c #78A2EC",
+"+%	c #87A4D7",
+"@%	c #79A2E9",
+"#%	c #75A2F0",
+"$%	c #76A2EF",
+"%%	c #719FF1",
+"&%	c #A1B9DB",
+"*%	c #FFEEB7",
+"=%	c #F9E8B5",
+"-%	c #DBCFAB",
+";%	c #C0BDB4",
+">%	c #C2BDAE",
+",%	c #B0AA9A",
+"'%	c #B1AA99",
+")%	c #B0A999",
+"!%	c #B2AD9C",
+"~%	c #B4AE9C",
+"{%	c #CDB97E",
+"]%	c #FFEB94",
+"^%	c #FFE794",
+"/%	c #FFE593",
+"(%	c #FFE693",
+"_%	c #F3DE97",
+":%	c #9EAEB8",
+"<%	c #84A3D7",
+"[%	c #7AA2E6",
+"}%	c #74A2EF",
+"|%	c #75A2EE",
+"1%	c #72A0EF",
+"2%	c #C7CECA",
+"3%	c #FFF2B1",
+"4%	c #C1BAA4",
+"5%	c #E9DCB6",
+"6%	c #F0E0B1",
+"7%	c #F1E1AE",
+"8%	c #CCCEC1",
+"9%	c #D4D3C1",
+"0%	c #F9E8B4",
+"a%	c #FFEEAD",
+"b%	c #C5C1A0",
+"c%	c #CDC49A",
+"d%	c #F3D889",
+"e%	c #FEE38F",
+"f%	c #FFE691",
+"g%	c #FFE591",
+"h%	c #FFE790",
+"i%	c #FFE38A",
+"j%	c #D2CDB2",
+"k%	c #7CA2E4",
+"l%	c #73A0EE",
+"m%	c #74A0EC",
+"n%	c #8EAEE1",
+"o%	c #F6E7B5",
+"p%	c #D3C7A3",
+"q%	c #FFECAE",
+"r%	c #FFF2AE",
+"s%	c #FFF1AE",
+"t%	c #B1C1D1",
+"u%	c #7CA5E9",
+"v%	c #80A7E7",
+"w%	c #8FAFDF",
+"x%	c #96B2DA",
+"y%	c #477ED9",
+"z%	c #4A7FD7",
+"A%	c #819BBC",
+"B%	c #E1CE8F",
+"C%	c #EBD389",
+"D%	c #E8D289",
+"E%	c #E9D28A",
+"F%	c #E7CF89",
+"G%	c #EED68A",
+"H%	c #FFEDAA",
+"I%	c #9FB8D9",
+"J%	c #719FED",
+"K%	c #73A0EC",
+"L%	c #7FA7E7",
+"M%	c #BBC7CC",
+"N%	c #E4D9B0",
+"O%	c #A9BACD",
+"P%	c #88A8DC",
+"Q%	c #8CACDF",
+"R%	c #73A0EB",
+"S%	c #729FEB",
+"T%	c #6F9CEA",
+"U%	c #2F71E2",
+"V%	c #3173E2",
+"W%	c #3173E3",
+"X%	c #5C89CE",
+"Y%	c #EED890",
+"Z%	c #FEE28A",
+"`%	c #FADE88",
+" &	c #F4D984",
+".&	c #D0B970",
+"+&	c #C3B27D",
+"@&	c #BBBFBA",
+"#&	c #709EED",
+"$&	c #739FEB",
+"%&	c #77A1E9",
+"&&	c #8EADDD",
+"*&	c #7097DB",
+"=&	c #719BE2",
+"-&	c #719CE5",
+";&	c #719CE6",
+">&	c #729EEA",
+",&	c #2E70E1",
+"'&	c #3172E0",
+")&	c #2B6BDC",
+"!&	c #5983C1",
+"~&	c #DCC375",
+"{&	c #978651",
+"]&	c #3C5072",
+"^&	c #5979AE",
+"/&	c #6D95D9",
+"(&	c #729EE9",
+"_&	c #759FE7",
+":&	c #729BE3",
+"<&	c #729BE2",
+"[&	c #6F9AE7",
+"}&	c #2E70DE",
+"|&	c #2E6BD1",
+"1&	c #2D64C2",
+"2&	c #265097",
+"3&	c #5F80B7",
+"4&	c #7099E0",
+"5&	c #719CE4",
+"6&	c #729CE4",
+"                                                . + @           ",
+"                                              # $ % & *         ",
+"    = =                             - ; > , ' ) ! ~ { ]         ",
+"    ^ ^ ^ / ( _             : < [ } | 1 2 3 4 5 6 7 8 9         ",
+"    0 0 0 0 0 a b c d e f g h i } j k l m n o p q r s t u       ",
+"    v v v v v w x 2 y z A B C D E F G H I J K L M N O P Q 2     ",
+"    R R R R R S T U V W X Y Z `  ...+. at .#.$.%.&.*.=.-.;.>.,.    ",
+"    '.'.'.'.'.).!.> ~.{.].^./.(._.:.<.[.}.|.1.2.3.4.5.6.7.8.    ",
+"    9.9.9.0.a.b.c.d.U e.f.g.h.i.j.k.l.m.n.o.p.q.r.s.t.u.v.w.    ",
+"    x.y.y.z.A.B.C.D.E.F.G.H.I.J.K.L.M.N.O.P.Q.R.S.T.U.V.W.X.    ",
+"    Y.Z.`. +.+++ at +#+$+%+&+*+=+-+;+>+,+'+o.)+!+~+{+]+^+/+(+_+    ",
+"    :+<+:+[+}+|+1+2+3+4+5+6+7+8+9+0+a+b+c+d+e+f+g+h+i+j+k+$+    ",
+"    f l+m+n+o+p+q+r+s+t+u+v+w+x+y+z+A+~ B+C+D+E+F+i+G+H+I+J+    ",
+"    K+L+M+N+O+o+P+Q+R+S+T+U+V+W+X+Y+%.Z+`+ @. at +@@@#@$@%@&@*@    ",
+"    =@-@;@p+O+>@,@'@)@!@~@{@]@^@/@(@P._@:@<@[@}@|@1 at 2@3 at 4@5@    ",
+"    6 at 7@8 at 9@O+O+0 at a@b at c@d at e@f at g@$.h at i@j at k@l at m@n at o@p at q@r at s@t@    ",
+"    u at v@w at x@N+O+y at z@A at B@C at D@E at F@G at Z+H@I at J@K at L@M at N@O at P@Q at R@S@    ",
+"    T at U@V at W@X at O+O+O+A@Y at Z@`@ #.#+#@###$#%#&#*#=#-#;#>#,#'#T@    ",
+"    )#!#~#{#p+]#^#/#(#_#:#<#[#}#|#1#2#3#4#5#6#7#8#9#0#a#b#b#    ",
+"    c#d#e#f#g#h#%+i#j#k#l#m#n#o#p#q#r#s#t#u#!#v#w#'#x#y#z#A#    ",
+"    B#C#D#E#F#G#H#I#J#K#L#M#N#O#P#Q#R#S#T#U#V#W#X#Y#Z#`# $%+    ",
+"    .$+$@$#$$$%$&$*$=$-$;$>$,$'$)$!$~${$]$^$/$($_$:$<$5+5+5+    ",
+"    [$}$|$1$2$3$4$4$5$6$7$8$9$0$a$b$c$d$e$f$g$h$i$j$k$k$k$k$    ",
+"    l$m$n$o$p$q$r$r$s$t$u$v$w$x$y$z$A$B$C$D$E$F$G$H$I$J$t+t+    ",
+"    K$L$M$N$O$P$Q$R$S$T$U$V$W$X$X$Y$Z$`$ %.%+%@%#%$%%%&%*%*%    ",
+"    =%-%;%>%,%'%)%!%~%{%]%^%/%/%/%(%_%:%-+<%[%}%|%|%|%1%2%3%    ",
+"    |$4%5%6%7%8%9%0%a%b%c%d%e%f%g%g%h%i%j%k%l%m%m%m%m%m%n%o%    ",
+"    p%q%r%s%t%u%v%w%x%y%z%A%B%C%D%E%F%G%H%I%J%K%K%K%K%K%L%M%    ",
+"    N%O%P%Q%R%S%S%S%T%U%V%W%X%Y%Z%`% &.&+&@&#&$&S%S%S%S%%&&&    ",
+"        *&=&-&;&>&>&T%,&'&'&)&!&~&{&        ]&^&/&;&;&>&(&_&    ",
+"                :&<&[&}&|&1&2&                      3&4&5&6&    ",
+"                                                                "};
diff --git a/linux/tested/usr/share/pixmaps/josm.png b/linux/tested/usr/share/pixmaps/josm.png
index b85991b..93a3b45 100644
Binary files a/linux/tested/usr/share/pixmaps/josm.png and b/linux/tested/usr/share/pixmaps/josm.png differ
diff --git a/macosx/JOSM.app/Contents/Resources/JOSM.icns b/macosx/JOSM.app/Contents/Resources/JOSM.icns
index 313d911..cd12d2a 100644
Binary files a/macosx/JOSM.app/Contents/Resources/JOSM.icns and b/macosx/JOSM.app/Contents/Resources/JOSM.icns differ
diff --git a/patches/10trim_svgsalamander.patch b/patches/10trim_svgsalamander.patch
index 1749ca8..1834962 100644
--- a/patches/10trim_svgsalamander.patch
+++ b/patches/10trim_svgsalamander.patch
@@ -1,5948 +1,301 @@
-Patch against rev 98 of https://svn.java.net/svn/svgsalamander~svn/trunk. It strips some classes, that aren't needed (basically animation and gui) and removes dependencies. The only purpose of this patch is to reduce binary download size for JOSM users.
-Index: core/src/com/kitfox/svg/animation/Animate.java
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ core/src/com/kitfox/svg/animation/Animate.java	2012-06-17 23:56:57.664545050 +0200
-@@ -0,0 +1,419 @@
-+/*
-+ * Animate.java
-+ *
-+ *  The Salamander Project - 2D and 3D graphics libraries in Java
-+ *  Copyright (C) 2004 Mark McKay
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License as published by the Free Software Foundation; either
-+ *  version 2.1 of the License, or (at your option) any later version.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-+ *
-+ *  Mark McKay can be contacted at mark at kitfox.com.  Salamander and other
-+ *  projects can be found at http://www.kitfox.com
-+ *
-+ * Created on August 15, 2004, 2:51 AM
-+ */
-+
-+package com.kitfox.svg.animation;
-+
-+import com.kitfox.svg.SVGElement;
-+import com.kitfox.svg.SVGException;
-+import com.kitfox.svg.SVGLoaderHelper;
-+import com.kitfox.svg.animation.parser.AnimTimeParser;
-+import com.kitfox.svg.xml.ColorTable;
-+import com.kitfox.svg.xml.StyleAttribute;
-+import com.kitfox.svg.xml.XMLParseUtil;
-+import java.awt.Color;
-+import java.awt.geom.AffineTransform;
-+import java.awt.geom.GeneralPath;
-+import java.awt.geom.PathIterator;
-+import org.xml.sax.Attributes;
-+import org.xml.sax.SAXException;
-+
-+
-+/**
-+ * Animate is a really annoying morphic tag that could represent a real value,
-+ * a color or a path
-+ *
-+ * @author Mark McKay
-+ * @author <a href="mailto:mark at kitfox.com">Mark McKay</a>
-+ */
-+public class Animate extends AnimateBase implements AnimateColorIface
-+{
-+//    StyleAttribute retAttrib = new StyleAttribute
-+    public static final int DT_REAL = 0;
-+    public static final int DT_COLOR = 1;
-+    public static final int DT_PATH = 2;
-+    int dataType = DT_REAL;
-+    
-+    protected double fromValue = Double.NaN;
-+    protected double toValue = Double.NaN;
-+    protected double byValue = Double.NaN;
-+    protected double[] valuesValue;
-+    
-+    protected Color fromColor = null;
-+    protected Color toColor = null;
-+
-+    protected GeneralPath fromPath = null;
-+    protected GeneralPath toPath = null;
-+
-+    /** Creates a new instance of Animate */
-+    public Animate()
-+    {
-+    }
-+    
-+    public int getDataType()
-+    {
-+        return dataType;
-+    }
-+    
-+    public void loaderStartElement(SVGLoaderHelper helper, Attributes attrs, SVGElement parent) throws SAXException
-+    {
-+		//Load style string
-+        super.loaderStartElement(helper, attrs, parent);
-+
-+        String strn = attrs.getValue("from");
-+        if (strn != null)
-+        {
-+            if (XMLParseUtil.isDouble(strn))
-+            {
-+                fromValue = XMLParseUtil.parseDouble(strn); 
-+            } 
-+//            else if (attrs.getValue("attributeName").equals("d"))
-+//            {
-+//                fromPath = this.buildPath(strn, GeneralPath.WIND_EVEN_ODD);
-+//                dataType = DT_PATH;
-+//            }
-+            else
-+            {
-+                fromColor = ColorTable.parseColor(strn); 
-+                if (fromColor == null)
-+                {
-+                    //Try path
-+                    fromPath = this.buildPath(strn, GeneralPath.WIND_EVEN_ODD);
-+                    dataType = DT_PATH;
-+                }
-+                else dataType = DT_COLOR;
-+            }
-+        }
-+
-+        strn = attrs.getValue("to");
-+        if (strn != null)
-+        {
-+            if (XMLParseUtil.isDouble(strn))
-+            {
-+                toValue = XMLParseUtil.parseDouble(strn); 
-+            } 
-+            else
-+            {
-+                toColor = ColorTable.parseColor(strn); 
-+                if (toColor == null)
-+                {
-+                    //Try path
-+                    toPath = this.buildPath(strn, GeneralPath.WIND_EVEN_ODD);
-+                    dataType = DT_PATH;
-+                }
-+                else dataType = DT_COLOR;
-+            }
-+        }
-+
-+        strn = attrs.getValue("by");
-+        try 
-+        {
-+            if (strn != null) byValue = XMLParseUtil.parseDouble(strn); 
-+        } catch (Exception e) {}
-+
-+        strn = attrs.getValue("values");
-+        try 
-+        {
-+            if (strn != null) valuesValue = XMLParseUtil.parseDoubleList(strn); 
-+        } catch (Exception e) {}
-+    }
-+    
-+    /**
-+     * Evaluates this animation element for the passed interpolation time.  Interp
-+     * must be on [0..1].
-+     */
-+    public double eval(double interp)
-+    {
-+        boolean fromExists = !Double.isNaN(fromValue);
-+        boolean toExists = !Double.isNaN(toValue);
-+        boolean byExists = !Double.isNaN(byValue);
-+        boolean valuesExists = valuesValue != null;
-+        
-+        if (valuesExists)
-+        {
-+            double sp = interp * valuesValue.length;
-+            int ip = (int)sp;
-+            double fp = sp - ip;
-+            
-+            int i0 = ip;
-+            int i1 = ip + 1;
-+            
-+            if (i0 < 0) return valuesValue[0];
-+            if (i1 >= valuesValue.length) return valuesValue[valuesValue.length - 1];
-+            return valuesValue[i0] * (1 - fp) + valuesValue[i1] * fp;
-+        }
-+        else if (fromExists && toExists)
-+        {
-+            return toValue * interp + fromValue * (1.0 - interp);
-+        }
-+        else if (fromExists && byExists)
-+        {
-+            return fromValue + byValue * interp;
-+        }
-+        else if (toExists && byExists)
-+        {
-+            return toValue - byValue * (1.0 - interp);
-+        }
-+        else if (byExists)
-+        {
-+            return byValue * interp;
-+        }
-+  
-+        //Should not reach this line
-+        throw new RuntimeException("Animate tag could not be evalutated - insufficient arguements");
-+    }
-+
-+    public Color evalColor(double interp)
-+    {
-+        if (fromColor == null && toColor != null)
-+        {
-+            float[] toCol = new float[3];
-+            toColor.getColorComponents(toCol);
-+            return new Color(toCol[0] * (float)interp, 
-+                toCol[1] * (float)interp, 
-+                toCol[2] * (float)interp);
-+        }
-+        else if (fromColor != null && toColor != null)
-+        {
-+            float nInterp = 1 - (float)interp;
-+            
-+            float[] fromCol = new float[3];
-+            float[] toCol = new float[3];
-+            fromColor.getColorComponents(fromCol);
-+            toColor.getColorComponents(toCol);
-+            return new Color(fromCol[0] * nInterp + toCol[0] * (float)interp, 
-+                fromCol[1] * nInterp + toCol[1] * (float)interp, 
-+                fromCol[2] * nInterp + toCol[2] * (float)interp);
-+        }
-+        
-+        throw new RuntimeException("Animate tag could not be evalutated - insufficient arguements");
-+    }
-+
-+    public GeneralPath evalPath(double interp)
-+    {
-+        if (fromPath == null && toPath != null)
-+        {
-+            PathIterator itTo = toPath.getPathIterator(new AffineTransform());
-+            
-+            GeneralPath midPath = new GeneralPath();
-+            float[] coordsTo = new float[6];
-+            
-+            for (; !itTo.isDone(); itTo.next())
-+            {
-+                int segTo = itTo.currentSegment(coordsTo);
-+                
-+                switch (segTo)
-+                {
-+                    case PathIterator.SEG_CLOSE:
-+                        midPath.closePath();
-+                        break;
-+                    case PathIterator.SEG_CUBICTO:
-+                        midPath.curveTo(
-+                                (float)(coordsTo[0] * interp), 
-+                                (float)(coordsTo[1] * interp), 
-+                                (float)(coordsTo[2] * interp), 
-+                                (float)(coordsTo[3] * interp), 
-+                                (float)(coordsTo[4] * interp), 
-+                                (float)(coordsTo[5] * interp)
-+                                );
-+                        break;
-+                    case PathIterator.SEG_LINETO:
-+                        midPath.lineTo(
-+                                (float)(coordsTo[0] * interp), 
-+                                (float)(coordsTo[1] * interp)
-+                                );
-+                        break;
-+                    case PathIterator.SEG_MOVETO:
-+                        midPath.moveTo(
-+                                (float)(coordsTo[0] * interp), 
-+                                (float)(coordsTo[1] * interp)
-+                                );
-+                        break;
-+                    case PathIterator.SEG_QUADTO:
-+                        midPath.quadTo(
-+                                (float)(coordsTo[0] * interp), 
-+                                (float)(coordsTo[1] * interp), 
-+                                (float)(coordsTo[2] * interp), 
-+                                (float)(coordsTo[3] * interp)
-+                                );
-+                        break;
-+                }
-+            }
-+            
-+            return midPath;
-+        }
-+        else if (toPath != null)
-+        {
-+            PathIterator itFrom = fromPath.getPathIterator(new AffineTransform());
-+            PathIterator itTo = toPath.getPathIterator(new AffineTransform());
-+            
-+            GeneralPath midPath = new GeneralPath();
-+            float[] coordsFrom = new float[6];
-+            float[] coordsTo = new float[6];
-+            
-+            for (; !itFrom.isDone(); itFrom.next())
-+            {
-+                int segFrom = itFrom.currentSegment(coordsFrom);
-+                int segTo = itTo.currentSegment(coordsTo);
-+                
-+                if (segFrom != segTo)
-+                {
-+                    throw new RuntimeException("Path shape mismatch");
-+                }
-+                
-+                switch (segFrom)
-+                {
-+                    case PathIterator.SEG_CLOSE:
-+                        midPath.closePath();
-+                        break;
-+                    case PathIterator.SEG_CUBICTO:
-+                        midPath.curveTo(
-+                                (float)(coordsFrom[0] * (1 - interp) + coordsTo[0] * interp), 
-+                                (float)(coordsFrom[1] * (1 - interp) + coordsTo[1] * interp), 
-+                                (float)(coordsFrom[2] * (1 - interp) + coordsTo[2] * interp), 
-+                                (float)(coordsFrom[3] * (1 - interp) + coordsTo[3] * interp), 
-+                                (float)(coordsFrom[4] * (1 - interp) + coordsTo[4] * interp), 
-+                                (float)(coordsFrom[5] * (1 - interp) + coordsTo[5] * interp)
-+                                );
-+                        break;
-+                    case PathIterator.SEG_LINETO:
-+                        midPath.lineTo(
-+                                (float)(coordsFrom[0] * (1 - interp) + coordsTo[0] * interp), 
-+                                (float)(coordsFrom[1] * (1 - interp) + coordsTo[1] * interp)
-+                                );
-+                        break;
-+                    case PathIterator.SEG_MOVETO:
-+                        midPath.moveTo(
-+                                (float)(coordsFrom[0] * (1 - interp) + coordsTo[0] * interp), 
-+                                (float)(coordsFrom[1] * (1 - interp) + coordsTo[1] * interp)
-+                                );
-+                        break;
-+                    case PathIterator.SEG_QUADTO:
-+                        midPath.quadTo(
-+                                (float)(coordsFrom[0] * (1 - interp) + coordsTo[0] * interp), 
-+                                (float)(coordsFrom[1] * (1 - interp) + coordsTo[1] * interp), 
-+                                (float)(coordsFrom[2] * (1 - interp) + coordsTo[2] * interp), 
-+                                (float)(coordsFrom[3] * (1 - interp) + coordsTo[3] * interp)
-+                                );
-+                        break;
-+                }
-+            }
-+            
-+            return midPath;
-+        }
-+        
-+        throw new RuntimeException("Animate tag could not be evalutated - insufficient arguements");
-+    }
-+    
-+    /**
-+     * If this element is being accumulated, detemine the delta to accumulate by
-+     */
-+    public double repeatSkipSize(int reps)
-+    {
-+        boolean fromExists = !Double.isNaN(fromValue);
-+        boolean toExists = !Double.isNaN(toValue);
-+        boolean byExists = !Double.isNaN(byValue);
-+        
-+        if (fromExists && toExists)
-+        {
-+            return (toValue - fromValue) * reps;
-+        }
-+        else if (fromExists && byExists)
-+        {
-+            return (fromValue + byValue) * reps;
-+        }
-+        else if (toExists && byExists)
-+        {
-+            return toValue * reps;
-+        }
-+        else if (byExists)
-+        {
-+            return byValue * reps;
-+        }
-+
-+        //Should not reach this line
-+        return 0;
-+    }
-+
-+    protected void rebuild(AnimTimeParser animTimeParser) throws SVGException
-+    {
-+        super.rebuild(animTimeParser);
-+
-+        StyleAttribute sty = new StyleAttribute();
-+
-+        if (getPres(sty.setName("from")))
-+        {
-+            String strn = sty.getStringValue();
-+            if (XMLParseUtil.isDouble(strn))
-+            {
-+                fromValue = XMLParseUtil.parseDouble(strn);
-+            }
-+            else
-+            {
-+                fromColor = ColorTable.parseColor(strn);
-+                if (fromColor == null)
-+                {
-+                    //Try path
-+                    fromPath = this.buildPath(strn, GeneralPath.WIND_EVEN_ODD);
-+                    dataType = DT_PATH;
-+                }
-+                else dataType = DT_COLOR;
-+            }
-+        }
-+
-+        if (getPres(sty.setName("to")))
-+        {
-+            String strn = sty.getStringValue();
-+            if (XMLParseUtil.isDouble(strn))
-+            {
-+                toValue = XMLParseUtil.parseDouble(strn);
-+            }
-+            else
-+            {
-+                toColor = ColorTable.parseColor(strn);
-+                if (toColor == null)
-+                {
-+                    //Try path
-+                    toPath = this.buildPath(strn, GeneralPath.WIND_EVEN_ODD);
-+                    dataType = DT_PATH;
-+                }
-+                else dataType = DT_COLOR;
-+            }
-+        }
-+
-+        if (getPres(sty.setName("by")))
-+        {
-+            String strn = sty.getStringValue();
-+            if (strn != null) byValue = XMLParseUtil.parseDouble(strn);
-+        }
-+
-+        if (getPres(sty.setName("values")))
-+        {
-+            String strn = sty.getStringValue();
-+            if (strn != null) valuesValue = XMLParseUtil.parseDoubleList(strn);
-+        }
-+    }
-+    
-+}
-Index: core/src/com/kitfox/svg/animation/AnimateBase.java
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ core/src/com/kitfox/svg/animation/AnimateBase.java	2012-06-17 23:56:57.664545050 +0200
-@@ -0,0 +1,133 @@
-+/*
-+ * Animate.java
-+ *
-+ *  The Salamander Project - 2D and 3D graphics libraries in Java
-+ *  Copyright (C) 2004 Mark McKay
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License as published by the Free Software Foundation; either
-+ *  version 2.1 of the License, or (at your option) any later version.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-+ *
-+ *  Mark McKay can be contacted at mark at kitfox.com.  Salamander and other
-+ *  projects can be found at http://www.kitfox.com
-+ *
-+ * Created on August 15, 2004, 2:51 AM
-+ */
-+
-+package com.kitfox.svg.animation;
-+
-+import com.kitfox.svg.SVGElement;
-+import com.kitfox.svg.SVGException;
-+import com.kitfox.svg.SVGLoaderHelper;
-+import com.kitfox.svg.animation.parser.AnimTimeParser;
-+import com.kitfox.svg.animation.parser.ParseException;
-+import com.kitfox.svg.xml.StyleAttribute;
-+import java.io.StringReader;
-+import org.xml.sax.Attributes;
-+import org.xml.sax.SAXException;
-+
-+/**
-+ * @author Mark McKay
-+ * @author <a href="mailto:mark at kitfox.com">Mark McKay</a>
-+ */
-+abstract public class AnimateBase extends AnimationElement
-+{
-+    protected double repeatCount = Double.NaN;
-+    protected TimeBase repeatDur;
-+    
-+    /** Creates a new instance of Animate */
-+    public AnimateBase()
-+    {
-+    }
-+    
-+    public void evalParametric(AnimationTimeEval state, double curTime)
-+    {
-+        evalParametric(state, curTime, repeatCount, repeatDur == null ? Double.NaN : repeatDur.evalTime());
-+    }
-+    
-+    public void loaderStartElement(SVGLoaderHelper helper, Attributes attrs, SVGElement parent) throws SAXException
-+    {
-+		//Load style string
-+        super.loaderStartElement(helper, attrs, parent);
-+
-+        String repeatDurTime = attrs.getValue("repeatDur");
-+
-+        try
-+        {
-+            if (repeatDurTime != null)
-+            {
-+                helper.animTimeParser.ReInit(new StringReader(repeatDurTime));
-+                this.repeatDur = helper.animTimeParser.Expr();
-+                this.repeatDur.setParentElement(this);
-+            }
-+        }
-+        catch (Exception e)
-+        {
-+            throw new SAXException(e);
-+        }
-+        
-+        String strn = attrs.getValue("repeatCount");
-+        if (strn == null)
-+        {
-+            repeatCount = 1;
-+        }
-+        else if ("indefinite".equals(strn))
-+        {
-+            repeatCount = Double.POSITIVE_INFINITY;
-+        }
-+        else
-+        {
-+            try { repeatCount = Double.parseDouble(strn); } 
-+            catch (Exception e) { repeatCount = Double.NaN; }
-+        }
-+    }
-+
-+    protected void rebuild(AnimTimeParser animTimeParser) throws SVGException
-+    {
-+        super.rebuild(animTimeParser);
-+
-+        StyleAttribute sty = new StyleAttribute();
-+
-+        if (getPres(sty.setName("repeatDur")))
-+        {
-+            String strn = sty.getStringValue();
-+            if (strn != null)
-+            {
-+                animTimeParser.ReInit(new StringReader(strn));
-+                try {
-+                    this.repeatDur = animTimeParser.Expr();
-+                } catch (ParseException ex) {
-+                    ex.printStackTrace();
-+                }
-+            }
-+        }
-+
-+        if (getPres(sty.setName("repeatCount")))
-+        {
-+            String strn = sty.getStringValue();
-+            if (strn == null)
-+            {
-+                repeatCount = 1;
-+            }
-+            else if ("indefinite".equals(strn))
-+            {
-+                repeatCount = Double.POSITIVE_INFINITY;
-+            }
-+            else
-+            {
-+                try { repeatCount = Double.parseDouble(strn); }
-+                catch (Exception e) { repeatCount = Double.NaN; }
-+            }
-+        }
-+    }
-+}
-Index: core/src/com/kitfox/svg/animation/AnimateColor.java
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ core/src/com/kitfox/svg/animation/AnimateColor.java	2012-06-17 23:56:57.672545050 +0200
-@@ -0,0 +1,105 @@
-+/*
-+ * Animate.java
-+ *
-+ *  The Salamander Project - 2D and 3D graphics libraries in Java
-+ *  Copyright (C) 2004 Mark McKay
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License as published by the Free Software Foundation; either
-+ *  version 2.1 of the License, or (at your option) any later version.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-+ *
-+ *  Mark McKay can be contacted at mark at kitfox.com.  Salamander and other
-+ *  projects can be found at http://www.kitfox.com
-+ *
-+ * Created on August 15, 2004, 2:51 AM
-+ */
-+
-+package com.kitfox.svg.animation;
-+
-+import com.kitfox.svg.SVGElement;
-+import com.kitfox.svg.SVGException;
-+import com.kitfox.svg.SVGLoaderHelper;
-+import com.kitfox.svg.animation.parser.AnimTimeParser;
-+import com.kitfox.svg.xml.ColorTable;
-+import com.kitfox.svg.xml.StyleAttribute;
-+import java.awt.Color;
-+import org.xml.sax.Attributes;
-+import org.xml.sax.SAXException;
-+
-+
-+/**
-+ * @author Mark McKay
-+ * @author <a href="mailto:mark at kitfox.com">Mark McKay</a>
-+ */
-+public class AnimateColor extends AnimateBase implements AnimateColorIface
-+{
-+    
-+    protected Color fromValue;
-+    protected Color toValue;
-+    
-+    /** Creates a new instance of Animate */
-+    public AnimateColor()
-+    {
-+    }
-+    
-+    public void loaderStartElement(SVGLoaderHelper helper, Attributes attrs, SVGElement parent) throws SAXException
-+    {
-+		//Load style string
-+        super.loaderStartElement(helper, attrs, parent);
-+
-+        String strn = attrs.getValue("from");
-+        fromValue = ColorTable.parseColor(strn);
-+
-+        strn = attrs.getValue("to");
-+        toValue = ColorTable.parseColor(strn);
-+    }
-+
-+    
-+    /**
-+     * Evaluates this animation element for the passed interpolation time.  Interp
-+     * must be on [0..1].
-+     */
-+    public Color evalColor(double interp)
-+    {
-+        int r1 = fromValue.getRed();
-+        int g1 = fromValue.getGreen();
-+        int b1 = fromValue.getBlue();
-+        int r2 = toValue.getRed();
-+        int g2 = toValue.getGreen();
-+        int b2 = toValue.getBlue();
-+        double invInterp = 1.0 - interp;
-+        
-+        return new Color((int)(r1 * invInterp + r2 * interp), 
-+            (int)(g1 * invInterp + g2 * interp), 
-+            (int)(b1 * invInterp + b2 * interp));
-+    }
-+
-+    protected void rebuild(AnimTimeParser animTimeParser) throws SVGException
-+    {
-+        super.rebuild(animTimeParser);
-+
-+        StyleAttribute sty = new StyleAttribute();
-+
-+        if (getPres(sty.setName("from")))
-+        {
-+            String strn = sty.getStringValue();
-+            fromValue = ColorTable.parseColor(strn);
-+        }
-+
-+        if (getPres(sty.setName("to")))
-+        {
-+            String strn = sty.getStringValue();
-+            toValue = ColorTable.parseColor(strn);
-+        }
-+    }
-+}
-Index: core/src/com/kitfox/svg/animation/AnimateColorIface.java
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ core/src/com/kitfox/svg/animation/AnimateColorIface.java	2012-06-17 23:56:57.672545050 +0200
-@@ -0,0 +1,38 @@
-+/*
-+ * AnimateColorIface.java
-+ *
-+ *  The Salamander Project - 2D and 3D graphics libraries in Java
-+ *  Copyright (C) 2004 Mark McKay
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License as published by the Free Software Foundation; either
-+ *  version 2.1 of the License, or (at your option) any later version.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-+ *
-+ *  Mark McKay can be contacted at mark at kitfox.com.  Salamander and other
-+ *  projects can be found at http://www.kitfox.com
-+ *
-+ * Created on January 16, 2005, 6:24 AM
-+ */
-+
-+package com.kitfox.svg.animation;
-+
-+import java.awt.*;
-+
-+/**
-+ *
-+ * @author kitfox
-+ */
-+public interface AnimateColorIface
-+{
-+    public Color evalColor(double interp);
-+}
-Index: core/src/com/kitfox/svg/animation/AnimateMotion.java
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ core/src/com/kitfox/svg/animation/AnimateMotion.java	2012-06-17 23:56:57.672545050 +0200
-@@ -0,0 +1,282 @@
-+/*
-+ * Animate.java
-+ *
-+ *  The Salamander Project - 2D and 3D graphics libraries in Java
-+ *  Copyright (C) 2004 Mark McKay
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License as published by the Free Software Foundation; either
-+ *  version 2.1 of the License, or (at your option) any later version.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-+ *
-+ *  Mark McKay can be contacted at mark at kitfox.com.  Salamander and other
-+ *  projects can be found at http://www.kitfox.com
-+ *
-+ * Created on August 15, 2004, 2:51 AM
-+ */
-+
-+package com.kitfox.svg.animation;
-+
-+import com.kitfox.svg.SVGElement;
-+import com.kitfox.svg.SVGException;
-+import com.kitfox.svg.SVGLoaderHelper;
-+import com.kitfox.svg.animation.parser.AnimTimeParser;
-+import com.kitfox.svg.xml.StyleAttribute;
-+import java.awt.geom.AffineTransform;
-+import java.awt.geom.GeneralPath;
-+import java.awt.geom.PathIterator;
-+import java.awt.geom.Point2D;
-+import java.util.ArrayList;
-+import java.util.Iterator;
-+import java.util.regex.Matcher;
-+import java.util.regex.Pattern;
-+import org.xml.sax.Attributes;
-+import org.xml.sax.SAXException;
-+
-+
-+/**
-+ * @author Mark McKay
-+ * @author <a href="mailto:mark at kitfox.com">Mark McKay</a>
-+ */
-+public class AnimateMotion extends AnimateXform
-+{
-+    static final Matcher matchPoint = Pattern.compile("\\s*(\\d+)[^\\d]+(\\d+)\\s*").matcher("");
-+    
-+//    protected double fromValue;
-+//    protected double toValue;
-+    GeneralPath path;
-+    int rotateType = RT_ANGLE;
-+    double rotate;  //Static angle to rotate by
-+    
-+    public static final int RT_ANGLE = 0;  //Rotate by constant 'rotate' degrees
-+    public static final int RT_AUTO = 1;  //Rotate to reflect tangent of position on path
-+    
-+    final ArrayList bezierSegs = new ArrayList();
-+    double curveLength;
-+    
-+    /** Creates a new instance of Animate */
-+    public AnimateMotion()
-+    {
-+    }
-+    
-+    public void loaderStartElement(SVGLoaderHelper helper, Attributes attrs, SVGElement parent) throws SAXException
-+    {
-+		//Load style string
-+        super.loaderStartElement(helper, attrs, parent);
-+        
-+        //Motion element implies animating the transform element
-+        if (attribName == null) 
-+        {
-+            attribName = "transform";
-+            attribType = AT_AUTO;
-+            additiveType = AD_SUM;
-+        }
-+        
-+
-+        String path = attrs.getValue("path");
-+        if (path != null)
-+        {
-+            this.path = buildPath(path, GeneralPath.WIND_NON_ZERO);
-+        }
-+        
-+        //Now parse rotation style
-+        String rotate = attrs.getValue("rotate");
-+        if (rotate != null)
-+        {
-+            if (rotate.equals("auto"))
-+            {
-+                this.rotateType = RT_AUTO;
-+            }
-+            else
-+            {
-+                try { this.rotate = Math.toRadians(Float.parseFloat(rotate)); } catch (Exception e) {}
-+            }
-+        }
-+
-+        //Determine path
-+        String from = attrs.getValue("from");
-+        String to = attrs.getValue("to");
-+
-+        buildPath(from, to);
-+    }
-+    
-+    protected static void setPoint(Point2D.Float pt, String x, String y)
-+    {
-+        try { pt.x = Float.parseFloat(x); } catch (Exception e) {};
-+        
-+        try { pt.y = Float.parseFloat(y); } catch (Exception e) {};
-+    }
-+
-+    private void buildPath(String from, String to)
-+    {
-+        if (from != null && to != null)
-+        {
-+            Point2D.Float ptFrom = new Point2D.Float(), ptTo = new Point2D.Float();
-+
-+            matchPoint.reset(from);
-+            if (matchPoint.matches())
-+            {
-+                setPoint(ptFrom, matchPoint.group(1), matchPoint.group(2));
-+            }
-+
-+            matchPoint.reset(to);
-+            if (matchPoint.matches())
-+            {
-+                setPoint(ptFrom, matchPoint.group(1), matchPoint.group(2));
-+            }
-+
-+            if (ptFrom != null && ptTo != null)
-+            {
-+                path = new GeneralPath();
-+                path.moveTo(ptFrom.x, ptFrom.y);
-+                path.lineTo(ptTo.x, ptTo.y);
-+            }
-+        }
-+
-+        paramaterizePath();
-+    }
-+    
-+    private void paramaterizePath()
-+    {
-+        bezierSegs.clear();
-+        curveLength = 0;
-+        
-+        double[] coords = new double[6];
-+        double sx = 0, sy = 0;
-+        
-+        for (PathIterator pathIt = path.getPathIterator(new AffineTransform()); !pathIt.isDone(); pathIt.next())
-+        {
-+            Bezier bezier = null;
-+                    
-+            int segType = pathIt.currentSegment(coords);
-+            
-+            switch (segType)
-+            {
-+                case PathIterator.SEG_LINETO: 
-+                {
-+                    bezier = new Bezier(sx, sy, coords, 1);
-+                    sx = coords[0];
-+                    sy = coords[1];
-+                    break;
-+                }
-+                case PathIterator.SEG_QUADTO:
-+                {
-+                    bezier = new Bezier(sx, sy, coords, 2);
-+                    sx = coords[2];
-+                    sy = coords[3];
-+                    break;
-+                }
-+                case PathIterator.SEG_CUBICTO:
-+                {
-+                    bezier = new Bezier(sx, sy, coords, 3);
-+                    sx = coords[4];
-+                    sy = coords[5];
-+                    break;
-+                }
-+                case PathIterator.SEG_MOVETO:
-+                {
-+                    sx = coords[0];
-+                    sy = coords[1];
-+                    break;
-+                }
-+                case PathIterator.SEG_CLOSE:
-+                    //Do nothing
-+                    break;
-+                
-+            }
-+
-+            if (bezier != null)
-+            {
-+                bezierSegs.add(bezier);
-+                curveLength += bezier.getLength();
-+            }
-+        }
-+    }
-+    
-+    /**
-+     * Evaluates this animation element for the passed interpolation time.  Interp
-+     * must be on [0..1].
-+     */
-+    public AffineTransform eval(AffineTransform xform, double interp)
-+    {
-+        Point2D.Double point = new Point2D.Double();
-+        
-+        if (interp >= 1)
-+        {
-+            Bezier last = (Bezier)bezierSegs.get(bezierSegs.size() - 1);
-+            last.getFinalPoint(point);
-+            xform.setToTranslation(point.x, point.y);
-+            return xform;
-+        }
-+        
-+        double curLength = curveLength * interp;
-+        for (Iterator it = bezierSegs.iterator(); it.hasNext();)
-+        {
-+            Bezier bez = (Bezier)it.next();
-+            
-+            double bezLength = bez.getLength();
-+            if (curLength < bezLength)
-+            {
-+                double param = curLength / bezLength;
-+                bez.eval(param, point);
-+                break;
-+            }
-+            
-+            curLength -= bezLength;
-+        }
-+        
-+        xform.setToTranslation(point.x, point.y);
-+        
-+        return xform;
-+    }
-+    
-+
-+    protected void rebuild(AnimTimeParser animTimeParser) throws SVGException
-+    {
-+        super.rebuild(animTimeParser);
-+
-+        StyleAttribute sty = new StyleAttribute();
-+
-+        if (getPres(sty.setName("path")))
-+        {
-+            String strn = sty.getStringValue();
-+            this.path = buildPath(strn, GeneralPath.WIND_NON_ZERO);
-+        }
-+
-+        if (getPres(sty.setName("rotate")))
-+        {
-+            String strn = sty.getStringValue();
-+            if (strn.equals("auto"))
-+            {
-+                this.rotateType = RT_AUTO;
-+            }
-+            else
-+            {
-+                try { this.rotate = Math.toRadians(Float.parseFloat(strn)); } catch (Exception e) {}
-+            }
-+        }
-+
-+        String from = null;
-+        if (getPres(sty.setName("from")))
-+        {
-+            from = sty.getStringValue();
-+        }
-+
-+        String to = null;
-+        if (getPres(sty.setName("to")))
-+        {
-+            to = sty.getStringValue();
-+        }
-+        
-+        buildPath(from, to);
-+    }
-+}
-Index: core/src/com/kitfox/svg/animation/AnimateTransform.java
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ core/src/com/kitfox/svg/animation/AnimateTransform.java	2012-06-17 23:56:57.676545050 +0200
-@@ -0,0 +1,302 @@
-+/*
-+ * Animate.java
-+ *
-+ *  The Salamander Project - 2D and 3D graphics libraries in Java
-+ *  Copyright (C) 2004 Mark McKay
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License as published by the Free Software Foundation; either
-+ *  version 2.1 of the License, or (at your option) any later version.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-+ *
-+ *  Mark McKay can be contacted at mark at kitfox.com.  Salamander and other
-+ *  projects can be found at http://www.kitfox.com
-+ *
-+ * Created on August 15, 2004, 2:51 AM
-+ */
-+
-+package com.kitfox.svg.animation;
-+
-+import com.kitfox.svg.SVGElement;
-+import com.kitfox.svg.SVGException;
-+import com.kitfox.svg.SVGLoaderHelper;
-+import com.kitfox.svg.animation.parser.AnimTimeParser;
-+import com.kitfox.svg.xml.StyleAttribute;
-+import com.kitfox.svg.xml.XMLParseUtil;
-+import java.awt.geom.AffineTransform;
-+import java.util.regex.Pattern;
-+import org.xml.sax.Attributes;
-+import org.xml.sax.SAXException;
-+
-+
-+/**
-+ * @author Mark McKay
-+ * @author <a href="mailto:mark at kitfox.com">Mark McKay</a>
-+ */
-+public class AnimateTransform extends AnimateXform
-+{
-+//    protected AffineTransform fromValue;
-+//    protected AffineTransform toValue;
-+//    protected double[] fromValue;  //Transform parameters
-+//    protected double[] toValue;
-+    protected double[][] values;
-+    protected double[] keyTimes;
-+
-+    public static final int AT_REPLACE = 0;
-+    public static final int AT_SUM = 1;
-+
-+    protected int additive = AT_REPLACE;
-+
-+    public static final int TR_TRANSLATE = 0;
-+    public static final int TR_ROTATE = 1;
-+    public static final int TR_SCALE = 2;
-+    public static final int TR_SKEWY = 3;
-+    public static final int TR_SKEWX = 4;
-+    public static final int TR_INVALID = 5;
-+
-+    protected int xformType = TR_INVALID;
-+
-+    /** Creates a new instance of Animate */
-+    public AnimateTransform()
-+    {
-+    }
-+
-+    public void loaderStartElement(SVGLoaderHelper helper, Attributes attrs, SVGElement parent) throws SAXException
-+    {
-+		//Load style string
-+        super.loaderStartElement(helper, attrs, parent);
-+
-+        //Type of matrix of transform.  Should be one of the known names used to
-+        // define matrix transforms
-+        // valid types: translate, scale, rotate, skewX, skewY
-+        // 'matrix' not valid for animation
-+        String type = attrs.getValue("type").toLowerCase();
-+        if (type.equals("translate")) xformType = TR_TRANSLATE;
-+        if (type.equals("rotate")) xformType = TR_ROTATE;
-+        if (type.equals("scale")) xformType = TR_SCALE;
-+        if (type.equals("skewx")) xformType = TR_SKEWX;
-+        if (type.equals("skewy")) xformType = TR_SKEWY;
-+
-+        String fromStrn = attrs.getValue("from");
-+        String toStrn = attrs.getValue("to");
-+        if (fromStrn != null && toStrn != null)
-+        {
-+            //fromValue = parseSingleTransform(type + "(" + strn + ")");
-+            double[] fromValue = XMLParseUtil.parseDoubleList(fromStrn);
-+            fromValue = validate(fromValue);
-+
-+    //        toValue = parseSingleTransform(type + "(" + strn + ")");
-+            double[] toValue = XMLParseUtil.parseDoubleList(toStrn);
-+            toValue = validate(toValue);
-+            
-+            values = new double[][]{fromValue, toValue};
-+            keyTimes = new double[]{0, 1};
-+        }
-+
-+        String keyTimeStrn = attrs.getValue("keyTimes");
-+        String valuesStrn = attrs.getValue("values");
-+        if (keyTimeStrn != null && valuesStrn != null)
-+        {
-+            keyTimes = XMLParseUtil.parseDoubleList(keyTimeStrn);
-+            
-+            String[] valueList = Pattern.compile(";").split(valuesStrn);
-+            values = new double[valueList.length][];
-+            for (int i = 0; i < valueList.length; i++)
-+            {
-+                double[] list = XMLParseUtil.parseDoubleList(valueList[i]);
-+                values[i] = validate(list);
-+            }
-+        }
-+        
-+        //Check our additive state
-+        String additive = attrs.getValue("additive");
-+        if (additive != null)
-+        {
-+            if (additive.equals("sum")) this.additive = AT_SUM;
-+        }
-+    }
-+
-+    /**
-+     * Check list size against current xform type and ensure list
-+     * is expanded to a standard list size
-+     */
-+    private double[] validate(double[] paramList)
-+    {
-+        switch (xformType)
-+        {
-+            case TR_SCALE:
-+            {
-+                if (paramList == null)
-+                {
-+                    paramList = new double[]{1, 1};
-+                }
-+                else if (paramList.length == 1)
-+                {
-+                    paramList = new double[]{paramList[0], paramList[0]};
-+                    
-+//                    double[] tmp = paramList;
-+//                    paramList = new double[2];
-+//                    paramList[0] = paramList[1] = tmp[0];
-+                }
-+            }
-+        }
-+
-+        return paramList;
-+    }
-+
-+    /**
-+     * Evaluates this animation element for the passed interpolation time.  Interp
-+     * must be on [0..1].
-+     */
-+    public AffineTransform eval(AffineTransform xform, double interp)
-+    {
-+        int idx = 0;
-+        for (; idx < keyTimes.length - 1; idx++)
-+        {
-+            if (interp >= keyTimes[idx])
-+            {
-+                idx--;
-+                if (idx < 0) idx = 0;
-+                break;
-+            }
-+        }
-+        
-+        double spanStartTime = keyTimes[idx];
-+        double spanEndTime = keyTimes[idx + 1];
-+//        double span = spanStartTime - spanEndTime;
-+        
-+        interp = (interp - spanStartTime) / (spanEndTime - spanStartTime);
-+        double[] fromValue = values[idx];
-+        double[] toValue = values[idx + 1];
-+        
-+        switch (xformType)
-+        {
-+            case TR_TRANSLATE:
-+            {
-+                double x = (1.0 - interp) * fromValue[0] + interp * toValue[0];
-+                double y = (1.0 - interp) * fromValue[1] + interp * toValue[1];
-+                xform.setToTranslation(x, y);
-+                break;
-+            }
-+            case TR_ROTATE:
-+            {
-+                double x1 = fromValue.length == 3 ? fromValue[1] : 0;
-+                double y1 = fromValue.length == 3 ? fromValue[2] : 0;
-+                double x2 = toValue.length == 3 ? toValue[1] : 0;
-+                double y2 = toValue.length == 3 ? toValue[2] : 0;
-+                
-+                double theta = (1.0 - interp) * fromValue[0] + interp * toValue[0];
-+                double x = (1.0 - interp) * x1 + interp * x2;
-+                double y = (1.0 - interp) * y1 + interp * y2;
-+                xform.setToRotation(Math.toRadians(theta), x, y);
-+                break;
-+            }
-+            case TR_SCALE:
-+            {
-+                double x = (1.0 - interp) * fromValue[0] + interp * toValue[0];
-+                double y = (1.0 - interp) * fromValue[1] + interp * toValue[1];
-+                xform.setToScale(x, y);
-+                break;
-+            }
-+            case TR_SKEWX:
-+            {
-+                double x = (1.0 - interp) * fromValue[0] + interp * toValue[0];
-+                xform.setToShear(Math.toRadians(x), 0.0);
-+                break;
-+            }
-+            case TR_SKEWY:
-+            {
-+                double y = (1.0 - interp) * fromValue[0] + interp * toValue[0];
-+                xform.setToShear(0.0, Math.toRadians(y));
-+                break;
-+            }
-+            default:
-+                xform.setToIdentity();
-+                break;
-+        }
-+
-+        return xform;
-+    }
-+
-+    protected void rebuild(AnimTimeParser animTimeParser) throws SVGException
-+    {
-+        super.rebuild(animTimeParser);
-+
-+        StyleAttribute sty = new StyleAttribute();
-+
-+        if (getPres(sty.setName("type")))
-+        {
-+            String strn = sty.getStringValue().toLowerCase();
-+            if (strn.equals("translate")) xformType = TR_TRANSLATE;
-+            if (strn.equals("rotate")) xformType = TR_ROTATE;
-+            if (strn.equals("scale")) xformType = TR_SCALE;
-+            if (strn.equals("skewx")) xformType = TR_SKEWX;
-+            if (strn.equals("skewy")) xformType = TR_SKEWY;
-+        }
-+
-+        String fromStrn = null;
-+        if (getPres(sty.setName("from")))
-+        {
-+            fromStrn = sty.getStringValue();
-+        }
-+
-+        String toStrn = null;
-+        if (getPres(sty.setName("to")))
-+        {
-+            toStrn = sty.getStringValue();
-+        }
-+
-+        if (fromStrn != null && toStrn != null)
-+        {
-+            double[] fromValue = XMLParseUtil.parseDoubleList(fromStrn);
-+            fromValue = validate(fromValue);
-+
-+            double[] toValue = XMLParseUtil.parseDoubleList(toStrn);
-+            toValue = validate(toValue);
-+
-+            values = new double[][]{fromValue, toValue};
-+        }
-+
-+        String keyTimeStrn = null;
-+        if (getPres(sty.setName("keyTimes")))
-+        {
-+            keyTimeStrn = sty.getStringValue();
-+        }
-+
-+        String valuesStrn = null;
-+        if (getPres(sty.setName("values")))
-+        {
-+            valuesStrn = sty.getStringValue();
-+        }
-+
-+        if (keyTimeStrn != null && valuesStrn != null)
-+        {
-+            keyTimes = XMLParseUtil.parseDoubleList(keyTimeStrn);
-+
-+            String[] valueList = Pattern.compile(";").split(valuesStrn);
-+            values = new double[valueList.length][];
-+            for (int i = 0; i < valueList.length; i++)
-+            {
-+                double[] list = XMLParseUtil.parseDoubleList(valueList[i]);
-+                values[i] = validate(list);
-+            }
-+        }
-+
-+        //Check our additive state
-+
-+        if (getPres(sty.setName("additive")))
-+        {
-+            String strn = sty.getStringValue().toLowerCase();
-+            if (strn.equals("sum")) this.additive = AT_SUM;
-+        }
-+    }
-+}
-Index: core/src/com/kitfox/svg/animation/AnimateXform.java
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ core/src/com/kitfox/svg/animation/AnimateXform.java	2012-06-17 23:56:57.676545050 +0200
-@@ -0,0 +1,54 @@
-+/*
-+ * AnimateXform.java
-+ *
-+ *  The Salamander Project - 2D and 3D graphics libraries in Java
-+ *  Copyright (C) 2004 Mark McKay
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License as published by the Free Software Foundation; either
-+ *  version 2.1 of the License, or (at your option) any later version.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-+ *
-+ *  Mark McKay can be contacted at mark at kitfox.com.  Salamander and other
-+ *  projects can be found at http://www.kitfox.com
-+ *
-+ * Created on January 14, 2005, 6:46 AM
-+ */
-+
-+package com.kitfox.svg.animation;
-+
-+import com.kitfox.svg.SVGElement;
-+import com.kitfox.svg.SVGLoaderHelper;
-+import java.awt.geom.AffineTransform;
-+import org.xml.sax.Attributes;
-+import org.xml.sax.SAXException;
-+
-+
-+
-+/**
-+ *
-+ * @author kitfox
-+ */
-+abstract public class AnimateXform extends AnimateBase
-+{
-+    public AnimateXform()
-+    {
-+    }
-+    
-+    public void loaderStartElement(SVGLoaderHelper helper, Attributes attrs, SVGElement parent) throws SAXException
-+    {
-+        super.loaderStartElement(helper, attrs, parent);
-+    }
-+    
-+    abstract public AffineTransform eval(AffineTransform xform, double interp);
-+    
-+}
-Index: core/src/com/kitfox/svg/animation/AnimationElement.java
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ core/src/com/kitfox/svg/animation/AnimationElement.java	2012-06-17 23:56:57.676545050 +0200
-@@ -0,0 +1,414 @@
-+/*
-+ * AnimateEle.java
-+ *
-+ *  The Salamander Project - 2D and 3D graphics libraries in Java
-+ *  Copyright (C) 2004 Mark McKay
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License as published by the Free Software Foundation; either
-+ *  version 2.1 of the License, or (at your option) any later version.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-+ *
-+ *  Mark McKay can be contacted at mark at kitfox.com.  Salamander and other
-+ *  projects can be found at http://www.kitfox.com
-+ *
-+ * Created on August 15, 2004, 2:52 AM
-+ */
-+
-+package com.kitfox.svg.animation;
-+
-+import com.kitfox.svg.SVGElement;
-+import com.kitfox.svg.SVGException;
-+import com.kitfox.svg.SVGLoaderHelper;
-+import com.kitfox.svg.animation.parser.AnimTimeParser;
-+import com.kitfox.svg.animation.parser.ParseException;
-+import com.kitfox.svg.xml.StyleAttribute;
-+import java.io.StringReader;
-+import org.xml.sax.Attributes;
-+import org.xml.sax.SAXException;
-+
-+
-+/**
-+ * @author Mark McKay
-+ * @author <a href="mailto:mark at kitfox.com">Mark McKay</a>
-+ */
-+public abstract class AnimationElement extends SVGElement
-+{
-+    protected String attribName;
-+//    protected String attribType;
-+    protected int attribType = AT_AUTO;
-+
-+    public static final int AT_CSS = 0;
-+    public static final int AT_XML = 1;
-+    public static final int AT_AUTO = 2;  //Check CSS first, then XML
-+
-+    protected TimeBase beginTime;
-+    protected TimeBase durTime;
-+    protected TimeBase endTime;
-+    protected int fillType = FT_AUTO;
-+
-+    /** <a href="http://www.w3.org/TR/smil20/smil-timing.html#adef-fill">More about the <b>fill</b> attribute</a> */
-+    public static final int FT_REMOVE = 0;
-+    public static final int FT_FREEZE = 1;
-+    public static final int FT_HOLD = 2;
-+    public static final int FT_TRANSITION = 3;
-+    public static final int FT_AUTO = 4;
-+    public static final int FT_DEFAULT = 5;
-+
-+    /** Additive state of track */
-+    public static final int AD_REPLACE = 0;
-+    public static final int AD_SUM = 1;
-+
-+    int additiveType = AD_REPLACE;
-+    
-+    /** Accumlative state */
-+    public static final int AC_REPLACE = 0;
-+    public static final int AC_SUM = 1;
-+
-+    int accumulateType = AC_REPLACE;
-+
-+    /** Creates a new instance of AnimateEle */
-+    public AnimationElement()
-+    {
-+    }
-+
-+    public static String animationElementToString(int attrValue)
-+    {
-+        switch (attrValue)
-+        {
-+            case AT_CSS:
-+                return "CSS";
-+            case AT_XML:
-+                return "XML";
-+            case AT_AUTO:
-+                return "AUTO";
-+            default:
-+                throw new RuntimeException("Unknown element type");
-+        }
-+    }
-+    
-+    public void loaderStartElement(SVGLoaderHelper helper, Attributes attrs, SVGElement parent) throws SAXException
-+    {
-+		//Load style string
-+        super.loaderStartElement(helper, attrs, parent);
-+
-+        attribName = attrs.getValue("attributeName");
-+        String attribType = attrs.getValue("attributeType");
-+        if (attribType != null)
-+        {
-+            attribType = attribType.toLowerCase();
-+            if (attribType.equals("css")) this.attribType = AT_CSS;
-+            else if (attribType.equals("xml")) this.attribType = AT_XML;
-+        }
-+
-+        String beginTime = attrs.getValue("begin");
-+        String durTime = attrs.getValue("dur");
-+        String endTime = attrs.getValue("end");
-+
-+        try
-+        {
-+            if (beginTime != null)
-+            {
-+                helper.animTimeParser.ReInit(new StringReader(beginTime));
-+                this.beginTime = helper.animTimeParser.Expr();
-+                this.beginTime.setParentElement(this);
-+            }
-+
-+            if (durTime != null)
-+            {
-+                helper.animTimeParser.ReInit(new StringReader(durTime));
-+                this.durTime = helper.animTimeParser.Expr();
-+                this.durTime.setParentElement(this);
-+            }
-+
-+            if (endTime != null)
-+            {
-+                helper.animTimeParser.ReInit(new StringReader(endTime));
-+                this.endTime = helper.animTimeParser.Expr();
-+                this.endTime.setParentElement(this);
-+            }
-+        }
-+        catch (Exception e)
-+        {
-+            throw new SAXException(e);
-+        }
-+        
-+//        this.beginTime = TimeBase.parseTime(beginTime);
-+//        this.durTime = TimeBase.parseTime(durTime);
-+//        this.endTime = TimeBase.parseTime(endTime);
-+
-+        String fill = attrs.getValue("fill");
-+
-+        if (fill != null)
-+        {
-+            if (fill.equals("remove")) this.fillType = FT_REMOVE;
-+            if (fill.equals("freeze")) this.fillType = FT_FREEZE;
-+            if (fill.equals("hold")) this.fillType = FT_HOLD;
-+            if (fill.equals("transiton")) this.fillType = FT_TRANSITION;
-+            if (fill.equals("auto")) this.fillType = FT_AUTO;
-+            if (fill.equals("default")) this.fillType = FT_DEFAULT;
-+        }
-+        
-+        String additiveStrn = attrs.getValue("additive");
-+        
-+        if (additiveStrn != null)
-+        {
-+            if (additiveStrn.equals("replace")) this.additiveType = AD_REPLACE;
-+            if (additiveStrn.equals("sum")) this.additiveType = AD_SUM;
-+        }
-+        
-+        String accumulateStrn = attrs.getValue("accumulate");
-+        
-+        if (accumulateStrn != null)
-+        {
-+            if (accumulateStrn.equals("replace")) this.accumulateType = AC_REPLACE;
-+            if (accumulateStrn.equals("sum")) this.accumulateType = AC_SUM;
-+        }
-+    }
-+
-+    public String getAttribName() { return attribName; }
-+    public int getAttribType() { return attribType; }
-+    public int getAdditiveType() { return additiveType; }
-+    public int getAccumulateType() { return accumulateType; }
-+
-+    public void evalParametric(AnimationTimeEval state, double curTime)
-+    {
-+        evalParametric(state, curTime, Double.NaN, Double.NaN);
-+    }
-+
-+    /**
-+     * Compares current time to start and end times and determines what degree
-+     * of time interpolation this track currently represents.  Returns
-+     * Float.NaN if this track cannot be evaluated at the passed time (ie,
-+     * it is before or past the end of the track, or it depends upon
-+     * an unknown event)
-+     * @param state - A structure that will be filled with information
-+     * regarding the applicability of this animatoin element at the passed
-+     * time.
-+     * @param curTime - Current time in seconds
-+     * @param repeatCount - Optional number of repetitions of length 'dur' to
-+     * do.  Set to Double.NaN to not consider this in the calculation.
-+     * @param repeatDur - Optional amoun tof time to repeat the animaiton.
-+     * Set to Double.NaN to not consider this in the calculation.
-+     */
-+    protected void evalParametric(AnimationTimeEval state, double curTime, double repeatCount, double repeatDur)
-+    {
-+        double begin = (beginTime == null) ? 0 : beginTime.evalTime();
-+        if (Double.isNaN(begin) || begin > curTime)
-+        {
-+            state.set(Double.NaN, 0);
-+            return;
-+        }
-+
-+        double dur = (durTime == null) ? Double.NaN : durTime.evalTime();
-+        if (Double.isNaN(dur))
-+        {
-+            state.set(Double.NaN, 0);
-+            return;
-+        }
-+
-+        //Determine end point of this animation
-+        double end = (endTime == null) ? Double.NaN : endTime.evalTime();
-+        double repeat;
-+//        if (Double.isNaN(repeatDur))
-+//        {
-+//            repeatDur = dur;
-+//        }
-+        if (Double.isNaN(repeatCount) && Double.isNaN(repeatDur))
-+        {
-+            repeat = Double.NaN;
-+        }
-+        else
-+        {
-+            repeat = Math.min(
-+                Double.isNaN(repeatCount) ? Double.POSITIVE_INFINITY : dur * repeatCount,
-+                Double.isNaN(repeatDur) ? Double.POSITIVE_INFINITY : repeatDur);
-+        }
-+        if (Double.isNaN(repeat) && Double.isNaN(end))
-+        {
-+            //If neither and end point nor a repeat is specified, end point is 
-+            // implied by duration.
-+            end = begin + dur;
-+        }
-+
-+        double finishTime;
-+        if (Double.isNaN(end))
-+        {
-+            finishTime = begin + repeat;
-+        }
-+        else if (Double.isNaN(repeat))
-+        {
-+            finishTime = end;
-+        }
-+        else
-+        {
-+            finishTime = Math.min(end, repeat);
-+        }
-+        
-+        double evalTime = Math.min(curTime, finishTime);
-+//        if (curTime > finishTime) evalTime = finishTime;
-+        
-+        
-+//        double evalTime = curTime;
-+
-+//        boolean pastEnd = curTime > evalTime;
-+        
-+//        if (!Double.isNaN(end) && curTime > end) { pastEnd = true; evalTime = Math.min(evalTime, end); }
-+//        if (!Double.isNaN(repeat) && curTime > repeat) { pastEnd = true; evalTime = Math.min(evalTime, repeat); }
-+        
-+        double ratio = (evalTime - begin) / dur;
-+        int rep = (int)ratio;
-+        double interp = ratio - rep;
-+        
-+        //Adjust for roundoff
-+        if (interp < 0.00001) interp = 0;
-+
-+//        state.set(interp, rep);
-+//        if (!pastEnd)
-+//        {
-+//            state.set(interp, rep, false);
-+//            return;
-+//        }
-+
-+        //If we are still within the clip, return value
-+        if (curTime == evalTime)
-+        {
-+            state.set(interp, rep);
-+            return;
-+        }
-+        
-+        //We are past end of clip.  Determine to clamp or ignore.
-+        switch (fillType)
-+        {
-+            default:
-+            case FT_REMOVE:
-+            case FT_AUTO:
-+            case FT_DEFAULT:
-+                state.set(Double.NaN, rep);
-+                return;
-+            case FT_FREEZE:
-+            case FT_HOLD:
-+            case FT_TRANSITION:
-+                state.set(interp == 0 ? 1 : interp, rep);
-+                return;
-+        }
-+
-+    }
-+
-+    double evalStartTime()
-+    {
-+        return beginTime == null ? Double.NaN : beginTime.evalTime();
-+    }
-+
-+    double evalDurTime()
-+    {
-+        return durTime == null ? Double.NaN : durTime.evalTime();
-+    }
-+
-+    /**
-+     * Evaluates the ending time of this element.  Returns 0 if not specified.
-+     *
-+     * @see hasEndTime
-+     */
-+    double evalEndTime()
-+    {
-+        return endTime == null ? Double.NaN : endTime.evalTime();
-+    }
-+
-+    /**
-+     * Checks to see if an end time has been specified for this element.
-+     */
-+    boolean hasEndTime() { return endTime != null; }
-+
-+    /**
-+     * Updates all attributes in this diagram associated with a time event.
-+     * Ie, all attributes with track information.
-+     * @return - true if this node has changed state as a result of the time
-+     * update
-+     */
-+    public boolean updateTime(double curTime)
-+    {
-+        //Animation elements to not change with time
-+        return false;
-+    }
-+
-+    public void rebuild() throws SVGException
-+    {
-+        AnimTimeParser animTimeParser = new AnimTimeParser(new StringReader(""));
-+
-+        rebuild(animTimeParser);
-+    }
-+
-+    protected void rebuild(AnimTimeParser animTimeParser) throws SVGException
-+    {
-+        StyleAttribute sty = new StyleAttribute();
-+
-+        if (getPres(sty.setName("begin")))
-+        {
-+            String newVal = sty.getStringValue();
-+            animTimeParser.ReInit(new StringReader(newVal));
-+            try {
-+                this.beginTime = animTimeParser.Expr();
-+            } catch (ParseException ex) {
-+                ex.printStackTrace();
-+            }
-+        }
-+
-+        if (getPres(sty.setName("dur")))
-+        {
-+            String newVal = sty.getStringValue();
-+            animTimeParser.ReInit(new StringReader(newVal));
-+            try {
-+                this.durTime = animTimeParser.Expr();
-+            } catch (ParseException ex) {
-+                ex.printStackTrace();
-+            }
-+        }
-+
-+        if (getPres(sty.setName("end")))
-+        {
-+            String newVal = sty.getStringValue();
-+            animTimeParser.ReInit(new StringReader(newVal));
-+            try {
-+                this.endTime = animTimeParser.Expr();
-+            } catch (ParseException ex) {
-+                ex.printStackTrace();
-+            }
-+        }
-+
-+        if (getPres(sty.setName("fill")))
-+        {
-+            String newVal = sty.getStringValue();
-+            if (newVal.equals("remove")) this.fillType = FT_REMOVE;
-+            if (newVal.equals("freeze")) this.fillType = FT_FREEZE;
-+            if (newVal.equals("hold")) this.fillType = FT_HOLD;
-+            if (newVal.equals("transiton")) this.fillType = FT_TRANSITION;
-+            if (newVal.equals("auto")) this.fillType = FT_AUTO;
-+            if (newVal.equals("default")) this.fillType = FT_DEFAULT;
-+        }
-+
-+        if (getPres(sty.setName("additive")))
-+        {
-+            String newVal = sty.getStringValue();
-+            if (newVal.equals("replace")) this.additiveType = AD_REPLACE;
-+            if (newVal.equals("sum")) this.additiveType = AD_SUM;
-+        }
-+
-+        if (getPres(sty.setName("accumulate")))
-+        {
-+            String newVal = sty.getStringValue();
-+            if (newVal.equals("replace")) this.accumulateType = AC_REPLACE;
-+            if (newVal.equals("sum")) this.accumulateType = AC_SUM;
-+        }
-+
-+    }
-+}
-Index: core/src/com/kitfox/svg/animation/AnimationTimeEval.java
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ core/src/com/kitfox/svg/animation/AnimationTimeEval.java	2012-06-17 23:56:57.676545050 +0200
-@@ -0,0 +1,65 @@
-+/*
-+ * AnimateTimeEval.java
-+ *
-+ *  The Salamander Project - 2D and 3D graphics libraries in Java
-+ *  Copyright (C) 2004 Mark McKay
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License as published by the Free Software Foundation; either
-+ *  version 2.1 of the License, or (at your option) any later version.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-+ *
-+ *  Mark McKay can be contacted at mark at kitfox.com.  Salamander and other
-+ *  projects can be found at http://www.kitfox.com
-+ *
-+ *
-+ * Created on September 21, 2004, 1:31 PM
-+ */
-+
-+package com.kitfox.svg.animation;
-+
-+/**
-+ *
-+ * @author  kitfox
-+ */
-+public class AnimationTimeEval
-+{
-+    /**
-+     * Value on [0..1] representing the interpolation value of queried animation
-+     * element, or Double.NaN if element does not provide a valid evalutaion
-+     */
-+    public double interp;
-+    
-+    /**
-+     * Number of completed repetitions
-+     */
-+    public int rep;
-+    
-+    /**
-+     * True if this evaluation is in a frozen state; ie, past the end of the
-+     * track and held in the "freeze" state.
-+     */
-+//    public boolean pastEnd;
-+    
-+    /** Creates a new instance of AnimateTimeEval */
-+    public AnimationTimeEval()
-+    {
-+    }
-+    
-+//    public void set(double interp, int rep, boolean pastEnd)
-+    public void set(double interp, int rep)
-+    {
-+        this.interp = interp;
-+        this.rep = rep;
-+//        this.pastEnd = pastEnd;
-+    }
-+}
-Index: core/src/com/kitfox/svg/animation/Bezier.java
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ core/src/com/kitfox/svg/animation/Bezier.java	2012-06-17 23:56:57.680545050 +0200
-@@ -0,0 +1,201 @@
-+/*
-+ * Bezier.java
-+ *
-+
-+ *  The Salamander Project - 2D and 3D graphics libraries in Java
-+ *  Copyright (C) 2004 Mark McKay
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License as published by the Free Software Foundation; either
-+ *  version 2.1 of the License, or (at your option) any later version.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-+ *
-+ *  Mark McKay can be contacted at mark at kitfox.com.  Salamander and other
-+ *  projects can be found at http://www.kitfox.com
-+ *
-+ * Created on January 14, 2005, 4:08 AM
-+ */
-+
-+package com.kitfox.svg.animation;
-+
-+import java.awt.geom.*;
-+
-+/**
-+ * http://mathworld.wolfram.com/BezierCurve.html
-+ * @author kitfox
-+ */
-+public class Bezier
-+{
-+    double length;
-+    double[] coord;
-+
-+    public Bezier(double sx, double sy, double[] coords, int numCoords)
-+    {
-+        setCoords(sx, sy, coords, numCoords);
-+    }
-+    
-+    public void setCoords(double sx, double sy, double[] coords, int numCoords)
-+    {
-+        coord = new double[numCoords * 2 + 2];
-+        coord[0] = sx;
-+        coord[1] = sy;
-+        for (int i = 0; i < numCoords; i++)
-+        {
-+            coord[i * 2 + 2] = coords[i * 2];
-+            coord[i * 2 + 3] = coords[i * 2 + 1];
-+        }
-+        
-+        calcLength();        
-+    }
-+    
-+    /**
-+     * Retuns aproximation of the length of the bezier
-+     */
-+    public double getLength()
-+    {
-+        return length;
-+    }
-+    
-+    private void calcLength()
-+    {
-+        length = 0;
-+        for (int i = 2; i < coord.length; i += 2)
-+        {
-+            length += lineLength(coord[i - 2], coord[i - 1], coord[i], coord[i + 1]);
-+        }
-+    }
-+    
-+    private double lineLength(double x1, double y1, double x2, double y2)
-+    {
-+        double dx = x2 - x1, dy = y2 - y1;
-+        return Math.sqrt(dx * dx + dy * dy);
-+    }
-+    
-+    public Point2D.Double getFinalPoint(Point2D.Double point)
-+    {
-+        point.x = coord[coord.length - 2];
-+        point.y = coord[coord.length - 1];
-+        return point;
-+    }
-+    
-+    public Point2D.Double eval(double param, Point2D.Double point)
-+    {
-+        point.x = 0;
-+        point.y = 0;
-+        int numKnots = coord.length / 2;
-+        
-+        for (int i = 0; i < numKnots; i++)
-+        {
-+            double scale = bernstein(numKnots - 1, i, param);
-+            point.x += coord[i * 2] * scale;
-+            point.y += coord[i * 2 + 1] * scale;
-+        }
-+        
-+        return point;
-+    }
-+    
-+    /**
-+     * Calculates the bernstein polynomial for evaluating parametric bezier
-+     * @param numKnots - one less than number of knots in this curve hull
-+     * @param knotNo - knot we are evaluating Bernstein for
-+     * @param param - Parametric value we are evaluating at
-+     */
-+    private double bernstein(int numKnots, int knotNo, double param)
-+    {
-+        double iParam = 1 - param;
-+        //Faster evaluation for easy cases:
-+        switch (numKnots)
-+        {
-+            case 0:
-+                return 1;
-+            case 1:
-+            {
-+                switch (knotNo)
-+                {
-+                    case 0:
-+                        return iParam;
-+                    case 1:
-+                        return param;
-+                }
-+                break;
-+            }
-+            case 2:
-+            {
-+                switch (knotNo)
-+                {
-+                    case 0:
-+                        return iParam * iParam;
-+                    case 1:
-+                        return 2 * iParam * param;
-+                    case 2:
-+                        return param * param;
-+                }
-+                break;
-+            }
-+            case 3:
-+            {
-+                switch (knotNo)
-+                {
-+                    case 0:
-+                        return iParam * iParam * iParam;
-+                    case 1:
-+                        return 3 * iParam * iParam * param;
-+                    case 2:
-+                        return 3 * iParam * param * param;
-+                    case 3:
-+                        return param * param * param;
-+                }
-+                break;
-+            }
-+        }
-+        
-+        //If this bezier has more than four points, calculate bernstein the hard way
-+        double retVal = 1;
-+        for (int i = 0; i < knotNo; i++)
-+        {
-+            retVal *= param;
-+        }
-+        for (int i = 0; i < numKnots - knotNo; i++)
-+        {
-+            retVal *= iParam;
-+        }
-+        retVal *= choose(numKnots, knotNo);
-+        
-+        return retVal;
-+    }
-+    
-+    
-+    
-+    private int choose(int num, int denom)
-+    {
-+        int denom2 = num - denom;
-+        if (denom < denom2)
-+        {
-+            int tmp = denom;
-+            denom = denom2;
-+            denom2 = tmp;
-+        }
-+        
-+        int prod = 1;
-+        for (int i = num; i > denom; i--)
-+        {
-+            prod *= num;
-+        }
-+        
-+        for (int i = 2; i <= denom2; i++)
-+        {
-+            prod /= i;
-+        }
-+        
-+        return prod;
-+    }
-+}
-Index: core/src/com/kitfox/svg/animation/SetSmil.java
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ core/src/com/kitfox/svg/animation/SetSmil.java	2012-06-17 23:56:57.680545050 +0200
-@@ -0,0 +1,73 @@
-+/*
-+ * Set.java
-+ *
-+ *  The Salamander Project - 2D and 3D graphics libraries in Java
-+ *  Copyright (C) 2004 Mark McKay
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License as published by the Free Software Foundation; either
-+ *  version 2.1 of the License, or (at your option) any later version.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-+ *
-+ *  Mark McKay can be contacted at mark at kitfox.com.  Salamander and other
-+ *  projects can be found at http://www.kitfox.com
-+ *
-+ * Created on August 15, 2004, 2:51 AM
-+ */
-+
-+package com.kitfox.svg.animation;
-+
-+import com.kitfox.svg.SVGElement;
-+import com.kitfox.svg.SVGException;
-+import com.kitfox.svg.SVGLoaderHelper;
-+import com.kitfox.svg.animation.parser.AnimTimeParser;
-+import com.kitfox.svg.xml.StyleAttribute;
-+import org.xml.sax.Attributes;
-+import org.xml.sax.SAXException;
-+
-+
-+/**
-+ * Set is used to set a textual value; most likely for a style element.
-+ *
-+ * @author Mark McKay
-+ * @author <a href="mailto:mark at kitfox.com">Mark McKay</a>
-+ */
-+public class SetSmil extends AnimationElement
-+{
-+    String toValue;
-+    
-+    /** Creates a new instance of Set */
-+    public SetSmil()
-+    {
-+    }
-+    
-+    public void loaderStartElement(SVGLoaderHelper helper, Attributes attrs, SVGElement parent) throws SAXException
-+    {
-+		//Load style string
-+        super.loaderStartElement(helper, attrs, parent);
-+
-+        toValue = attrs.getValue("to");
-+    }
-+
-+    protected void rebuild(AnimTimeParser animTimeParser) throws SVGException
-+    {
-+        super.rebuild(animTimeParser);
-+
-+        StyleAttribute sty = new StyleAttribute();
-+
-+        if (getPres(sty.setName("to")))
-+        {
-+            String newVal = sty.getStringValue();
-+            toValue = newVal;
-+        }
-+    }
-+}
-Index: core/src/com/kitfox/svg/animation/TimeBase.java
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ core/src/com/kitfox/svg/animation/TimeBase.java	2012-06-17 23:56:57.680545050 +0200
-@@ -0,0 +1,99 @@
-+/*
-+ * TimeBase.java
-+ *
-+ *  The Salamander Project - 2D and 3D graphics libraries in Java
-+ *  Copyright (C) 2004 Mark McKay
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License as published by the Free Software Foundation; either
-+ *  version 2.1 of the License, or (at your option) any later version.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-+ *
-+ *  Mark McKay can be contacted at mark at kitfox.com.  Salamander and other
-+ *  projects can be found at http://www.kitfox.com
-+ *
-+ * Created on August 15, 2004, 3:31 AM
-+ */
-+
-+package com.kitfox.svg.animation;
-+
-+import java.util.regex.*;
-+
-+/**
-+ * SVG has a complicated way of specifying time.  Potentially, a time could
-+ * be represened as a summation of discrete times and times of other animation
-+ * events.  This provides a root for the many elements we will need to define
-+ * time.
-+ *
-+ * @author Mark McKay
-+ * @author <a href="mailto:mark at kitfox.com">Mark McKay</a>
-+ */
-+abstract public class TimeBase
-+{
-+    static final Matcher matchIndefinite = Pattern.compile("\\s*indefinite\\s*").matcher("");
-+    static final Matcher matchUnitTime = Pattern.compile("\\s*([-+]?((\\d*\\.\\d+)|(\\d+))([-+]?[eE]\\d+)?)\\s*(h|min|s|ms)?\\s*").matcher("");
-+    
-+    /*
-+    public static TimeBase parseTime(String text) 
-+    { 
-+        if (text == null) return null;
-+        
-+        if (text.indexOf('+') == -1)
-+        {
-+            return parseTimeComponent(text);
-+        }
-+        
-+        return new TimeCompound(text);
-+    }
-+     */
-+    
-+    protected static TimeBase parseTimeComponent(String text)
-+    {
-+        matchIndefinite.reset(text);
-+        if (matchIndefinite.matches()) return new TimeIndefinite();
-+        
-+        matchUnitTime.reset(text);
-+        if (matchUnitTime.matches())
-+        {
-+            String val = matchUnitTime.group(1);
-+            String units = matchUnitTime.group(6);
-+            
-+            double time = 0;
-+            try { time = Double.parseDouble(val); }
-+            catch (Exception e) {}
-+            
-+            if (units.equals("ms")) time *= .001;
-+            else if (units.equals("min")) time *= 60;
-+            else if (units.equals("h")) time *= 3600;
-+            
-+            return new TimeDiscrete(time);
-+        }
-+        
-+        return null;
-+    }
-+    
-+    /**
-+     * Calculates the (greater than or equal to 0) time in seconds this 
-+     * time represents.  If the time cannot be determined, returns 
-+     * Double.NaN.  If this represents an infinte amount of time, returns 
-+     * Double.POSITIVE_INFINITY.
-+     */
-+    abstract public double evalTime();
-+    
-+    /**
-+     * Some time elements need to refer to the animation element that contains 
-+     * them to evaluate correctly
-+     */
-+    public void setParentElement(AnimationElement ele)
-+    {
-+    }
-+}
-Index: core/src/com/kitfox/svg/animation/TimeCompound.java
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ core/src/com/kitfox/svg/animation/TimeCompound.java	2012-06-17 23:56:57.680545050 +0200
-@@ -0,0 +1,84 @@
-+/*
-+ * TimeDiscrete.java
-+ *
-+ *  The Salamander Project - 2D and 3D graphics libraries in Java
-+ *  Copyright (C) 2004 Mark McKay
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License as published by the Free Software Foundation; either
-+ *  version 2.1 of the License, or (at your option) any later version.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-+ *
-+ *  Mark McKay can be contacted at mark at kitfox.com.  Salamander and other
-+ *  projects can be found at http://www.kitfox.com
-+ *
-+ * Created on August 15, 2004, 3:33 AM
-+ */
-+
-+package com.kitfox.svg.animation;
-+
-+import java.util.Collections;
-+import java.util.Iterator;
-+import java.util.List;
-+import java.util.regex.Pattern;
-+
-+
-+/**
-+ * This represents a summation of other time elements.  It is used for complex
-+ * timing events with offsets.
-+ *
-+ * @author Mark McKay
-+ * @author <a href="mailto:mark at kitfox.com">Mark McKay</a>
-+ */
-+public class TimeCompound extends TimeBase
-+{
-+    static final Pattern patPlus = Pattern.compile("\\+");
-+    
-+    /**
-+     * This is a list of times.  This element's time is calculated as the greatest
-+     * member that is less than the current time.
-+    */
-+    final List componentTimes;
-+
-+    private AnimationElement parent;
-+    
-+    /** Creates a new instance of TimeDiscrete */
-+    public TimeCompound(List timeBases)
-+    {
-+        componentTimes = Collections.unmodifiableList(timeBases);
-+    }
-+    
-+    public double evalTime()
-+    {
-+        double agg = 0.0;
-+        
-+        for (Iterator it = componentTimes.iterator(); it.hasNext();)
-+        {
-+            TimeBase timeEle = (TimeBase)it.next();
-+            double time = timeEle.evalTime();
-+            agg += time;
-+        }
-+        
-+        return agg;
-+    }
-+    
-+    public void setParentElement(AnimationElement ele)
-+    {
-+        this.parent = ele;
-+        
-+        for (Iterator it = componentTimes.iterator(); it.hasNext();)
-+        {
-+            TimeBase timeEle = (TimeBase)it.next();
-+            timeEle.setParentElement(ele);
-+        }
-+    }
-+}
-Index: core/src/com/kitfox/svg/animation/TimeDiscrete.java
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ core/src/com/kitfox/svg/animation/TimeDiscrete.java	2012-06-17 23:56:57.680545050 +0200
-@@ -0,0 +1,51 @@
-+/*
-+ * TimeDiscrete.java
-+ *
-+ *  The Salamander Project - 2D and 3D graphics libraries in Java
-+ *  Copyright (C) 2004 Mark McKay
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License as published by the Free Software Foundation; either
-+ *  version 2.1 of the License, or (at your option) any later version.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-+ *
-+ *  Mark McKay can be contacted at mark at kitfox.com.  Salamander and other
-+ *  projects can be found at http://www.kitfox.com
-+ *
-+ * Created on August 15, 2004, 3:33 AM
-+ */
-+
-+package com.kitfox.svg.animation;
-+
-+/**
-+ * This is a time that represents a specific number of milliseconds
-+ *
-+ * @author Mark McKay
-+ * @author <a href="mailto:mark at kitfox.com">Mark McKay</a>
-+ */
-+public class TimeDiscrete extends TimeBase
-+{
-+    //Milliseconds of delay
-+    double secs;
-+    
-+    /** Creates a new instance of TimeDiscrete */
-+    public TimeDiscrete(double secs)
-+    {
-+        this.secs = secs;
-+    }
-+    
-+    public double evalTime()
-+    {
-+        return secs;
-+    }
-+    
-+}
-Index: core/src/com/kitfox/svg/animation/TimeIndefinite.java
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ core/src/com/kitfox/svg/animation/TimeIndefinite.java	2012-06-17 23:56:57.680545050 +0200
-@@ -0,0 +1,48 @@
-+/*
-+ * TimeDiscrete.java
-+ *
-+ *  The Salamander Project - 2D and 3D graphics libraries in Java
-+ *  Copyright (C) 2004 Mark McKay
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License as published by the Free Software Foundation; either
-+ *  version 2.1 of the License, or (at your option) any later version.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-+ *
-+ *  Mark McKay can be contacted at mark at kitfox.com.  Salamander and other
-+ *  projects can be found at http://www.kitfox.com
-+ *
-+ * Created on August 15, 2004, 3:33 AM
-+ */
-+
-+package com.kitfox.svg.animation;
-+
-+/**
-+ * This represents the indefinite (infinite) amount of time.
-+ *
-+ * @author Mark McKay
-+ * @author <a href="mailto:mark at kitfox.com">Mark McKay</a>
-+ */
-+public class TimeIndefinite extends TimeBase
-+{
-+    
-+    /** Creates a new instance of TimeDiscrete */
-+    public TimeIndefinite()
-+    {
-+    }
-+    
-+    public double evalTime()
-+    {
-+        return Double.POSITIVE_INFINITY;
-+    }
-+    
-+}
-Index: core/src/com/kitfox/svg/animation/TimeLookup.java
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ core/src/com/kitfox/svg/animation/TimeLookup.java	2012-06-17 23:56:57.684545050 +0200
-@@ -0,0 +1,75 @@
-+/*
-+ * TimeDiscrete.java
-+ *
-+ *  The Salamander Project - 2D and 3D graphics libraries in Java
-+ *  Copyright (C) 2004 Mark McKay
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License as published by the Free Software Foundation; either
-+ *  version 2.1 of the License, or (at your option) any later version.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-+ *
-+ *  Mark McKay can be contacted at mark at kitfox.com.  Salamander and other
-+ *  projects can be found at http://www.kitfox.com
-+ *
-+ * Created on August 15, 2004, 3:33 AM
-+ */
-+
-+package com.kitfox.svg.animation;
-+
-+/**
-+ * This is a time that represents a specific number of milliseconds
-+ *
-+ * @author Mark McKay
-+ * @author <a href="mailto:mark at kitfox.com">Mark McKay</a>
-+ */
-+public class TimeLookup extends TimeBase
-+{
-+    /** 
-+     * This time can only be resolved in relation to it's parent
-+     */
-+    private AnimationElement parent;
-+    
-+    /**
-+     * Node this lookup acts upon
-+     */
-+    String node;
-+    
-+    /**
-+     * Event to evalutae on this node
-+     */
-+    String event;
-+    
-+    /**
-+     * Optional parameter used by some events
-+     */
-+    String paramList;
-+    
-+    /** Creates a new instance of TimeDiscrete */
-+    public TimeLookup(AnimationElement parent, String node, String event, String paramList)
-+    {
-+        this.parent = parent;
-+        this.node = node;
-+        this.event = event;
-+        this.paramList = paramList;
-+    }
-+    
-+    public double evalTime()
-+    {
-+        return 0.0;
-+    }
-+    
-+    public void setParentElement(AnimationElement ele)
-+    {
-+        parent = ele;
-+    }
-+}
-Index: core/src/com/kitfox/svg/animation/TimeSum.java
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ core/src/com/kitfox/svg/animation/TimeSum.java	2012-06-17 23:56:57.684545050 +0200
-@@ -0,0 +1,60 @@
-+/*
-+ * TimeDiscrete.java
-+ *
-+ *  The Salamander Project - 2D and 3D graphics libraries in Java
-+ *  Copyright (C) 2004 Mark McKay
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License as published by the Free Software Foundation; either
-+ *  version 2.1 of the License, or (at your option) any later version.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-+ *
-+ *  Mark McKay can be contacted at mark at kitfox.com.  Salamander and other
-+ *  projects can be found at http://www.kitfox.com
-+ *
-+ * Created on August 15, 2004, 3:33 AM
-+ */
-+
-+package com.kitfox.svg.animation;
-+
-+/**
-+ * This is a time that represents a specific number of milliseconds
-+ *
-+ * @author Mark McKay
-+ * @author <a href="mailto:mark at kitfox.com">Mark McKay</a>
-+ */
-+public class TimeSum extends TimeBase
-+{
-+    //Milliseconds of delay
-+    TimeBase t1;
-+    TimeBase t2;
-+    boolean add;
-+    
-+    /** Creates a new instance of TimeDiscrete */
-+    public TimeSum(TimeBase t1, TimeBase t2, boolean add)
-+    {
-+        this.t1 = t1;
-+        this.t2 = t2;
-+        this.add = add;
-+    }
-+    
-+    public double evalTime()
-+    {
-+        return add ? t1.evalTime() + t2.evalTime() : t1.evalTime() - t2.evalTime();
-+    }
-+    
-+    public void setParentElement(AnimationElement ele)
-+    {
-+        t1.setParentElement(ele);
-+        t2.setParentElement(ele);
-+    }
-+}
-Index: core/src/com/kitfox/svg/animation/TrackBase.java
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ core/src/com/kitfox/svg/animation/TrackBase.java	2012-06-17 23:56:57.684545050 +0200
-@@ -0,0 +1,103 @@
-+/*
-+ * TrackManager.java
-+ *
-+ *  The Salamander Project - 2D and 3D graphics libraries in Java
-+ *  Copyright (C) 2004 Mark McKay
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License as published by the Free Software Foundation; either
-+ *  version 2.1 of the License, or (at your option) any later version.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-+ *
-+ *  Mark McKay can be contacted at mark at kitfox.com.  Salamander and other
-+ *  projects can be found at http://www.kitfox.com
-+ *
-+ * Created on August 15, 2004, 11:34 PM
-+ */
-+
-+package com.kitfox.svg.animation;
-+
-+import java.util.*;
-+
-+import com.kitfox.svg.xml.*;
-+import com.kitfox.svg.*;
-+
-+/**
-+ * A track holds the animation events for a single parameter of a single SVG 
-+ * element.  It also contains the default value for the element, should the
-+ * user want to see the 'unanimated' value.
-+ *
-+ * @author Mark McKay
-+ * @author <a href="mailto:mark at kitfox.com">Mark McKay</a>
-+ */
-+abstract public class TrackBase
-+{
-+    protected final String attribName;
-+    protected final int attribType;  //AnimationElement.AT_*
-+ 
-+    /** Element we're animating */
-+    protected final SVGElement parent;
-+    
-+    //It doesn't make sense to sort this, since some events will depend on
-+    // other events - in many cases, there will be no meaningful sorted order.
-+    final ArrayList animEvents = new ArrayList();
-+    
-+    /** Creates a new instance of TrackManager */
-+//    public TrackBase(SVGElement parent)
-+//    {
-+//        this(parent, "", AnimationElement.AT_AUTO);
-+//    }
-+    
-+    /**
-+     * Creates a track that would be valid for the name and type of element
-+     * passed in.  Does not actually add this elemnt to the track.
-+     */
-+    public TrackBase(SVGElement parent, AnimationElement ele) throws SVGElementException
-+    {
-+        this(parent, ele.getAttribName(), ele.getAttribType());
-+    }
-+    
-+    public TrackBase(SVGElement parent, String attribName, int attribType) throws SVGElementException
-+    {
-+        this.parent = parent;
-+        this.attribName = attribName;
-+        this.attribType = attribType;
-+        
-+        //Make sure parent has an attribute we will write to
-+        if (attribType == AnimationElement.AT_AUTO 
-+            && !parent.hasAttribute(attribName, AnimationElement.AT_CSS)
-+            && !parent.hasAttribute(attribName, AnimationElement.AT_XML))
-+        {
-+            parent.addAttribute(attribName, AnimationElement.AT_CSS, "");
-+        }
-+        else if (!parent.hasAttribute(attribName, attribType))
-+        {
-+            parent.addAttribute(attribName, attribType, "");
-+        }
-+    }
-+    
-+    public String getAttribName() { return attribName; }
-+    public int getAttribType() { return attribType; }
-+    
-+    public void addElement(AnimationElement ele)
-+    {
-+        animEvents.add(ele);
-+    }
-+    
-+    /**
-+     * Returns a StyleAttribute representing the value of this track at the
-+     * passed time.  If this track does not apply, returns null.
-+     * @return - True if successful, false if a value could not be obtained
-+     */
-+    abstract public boolean getValue(StyleAttribute attrib, double curTime) throws SVGException;
-+    
-+}
-Index: core/src/com/kitfox/svg/animation/TrackColor.java
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ core/src/com/kitfox/svg/animation/TrackColor.java	2012-06-17 23:56:57.684545050 +0200
-@@ -0,0 +1,95 @@
-+/*
-+ * TrackManager.java
-+ *
-+ *  The Salamander Project - 2D and 3D graphics libraries in Java
-+ *  Copyright (C) 2004 Mark McKay
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License as published by the Free Software Foundation; either
-+ *  version 2.1 of the License, or (at your option) any later version.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-+ *
-+ *  Mark McKay can be contacted at mark at kitfox.com.  Salamander and other
-+ *  projects can be found at http://www.kitfox.com
-+ *
-+ * Created on September 21, 2004, 11:34 PM
-+ */
-+
-+package com.kitfox.svg.animation;
-+
-+import com.kitfox.svg.xml.StyleAttribute;
-+import java.awt.*;
-+import java.util.*;
-+
-+import com.kitfox.svg.*;
-+import com.kitfox.svg.xml.*;
-+
-+/**
-+ * A track holds the animation events for a single parameter of a single SVG
-+ * element.  It also contains the default value for the element, should the
-+ * user want to see the 'unanimated' value.
-+ *
-+ * @author Mark McKay
-+ * @author <a href="mailto:mark at kitfox.com">Mark McKay</a>
-+ */
-+public class TrackColor extends TrackBase
-+{
-+
-+    public TrackColor(AnimationElement ele) throws SVGElementException
-+    {
-+        super(ele.getParent(), ele);
-+    }
-+
-+    public boolean getValue(StyleAttribute attrib, double curTime)
-+    {
-+        Color col = getValue(curTime);
-+        if (col == null) return false;
-+
-+        attrib.setStringValue("#" + Integer.toHexString(col.getRGB()));
-+        return true;
-+    }
-+
-+    public Color getValue(double curTime)
-+    {
-+        Color retVal = null;
-+        AnimationTimeEval state = new AnimationTimeEval();
-+
-+        for (Iterator it = animEvents.iterator(); it.hasNext();)
-+        {
-+            AnimateBase ele = (AnimateBase)it.next();
-+            AnimateColorIface eleColor = (AnimateColorIface)ele;
-+            ele.evalParametric(state, curTime);
-+
-+            //Reject value if it is in the invalid state
-+            if (Double.isNaN(state.interp)) continue;
-+
-+            if (retVal == null)
-+            {
-+                retVal = eleColor.evalColor(state.interp);
-+                continue;
-+            }
-+            
-+            Color curCol = eleColor.evalColor(state.interp);
-+            switch (ele.getAdditiveType())
-+            {
-+                case AnimationElement.AD_REPLACE:
-+                    retVal = curCol;
-+                    break;
-+                case AnimationElement.AD_SUM:
-+                    retVal = new Color(curCol.getRed() + retVal.getRed(), curCol.getGreen() + retVal.getGreen(), curCol.getBlue() + retVal.getBlue());
-+                    break;
-+            }
-+        }
-+
-+        return retVal;
-+    }
-+}
-Index: core/src/com/kitfox/svg/animation/TrackDouble.java
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ core/src/com/kitfox/svg/animation/TrackDouble.java	2012-06-17 23:56:57.684545050 +0200
-@@ -0,0 +1,119 @@
-+/*
-+ * TrackManager.java
-+ *
-+ *  The Salamander Project - 2D and 3D graphics libraries in Java
-+ *  Copyright (C) 2004 Mark McKay
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License as published by the Free Software Foundation; either
-+ *  version 2.1 of the License, or (at your option) any later version.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-+ *
-+ *  Mark McKay can be contacted at mark at kitfox.com.  Salamander and other
-+ *  projects can be found at http://www.kitfox.com
-+ *
-+ * Created on August 15, 2004, 11:34 PM
-+ */
-+
-+package com.kitfox.svg.animation;
-+
-+import com.kitfox.svg.xml.StyleAttribute;
-+import java.util.*;
-+
-+import com.kitfox.svg.*;
-+import com.kitfox.svg.xml.*;
-+
-+/**
-+ * A track holds the animation events for a single parameter of a single SVG
-+ * element.  It also contains the default value for the element, should the
-+ * user want to see the 'unanimated' value.
-+ *
-+ * @author Mark McKay
-+ * @author <a href="mailto:mark at kitfox.com">Mark McKay</a>
-+ */
-+public class TrackDouble extends TrackBase
-+{
-+    public TrackDouble(AnimationElement ele) throws SVGElementException
-+    {
-+        super(ele.getParent(), ele);
-+    }
-+
-+    public boolean getValue(StyleAttribute attrib, double curTime)
-+    {
-+        double val = getValue(curTime);
-+        if (Double.isNaN(val)) return false;
-+
-+        attrib.setStringValue("" + val);
-+        return true;
-+    }
-+
-+    public double getValue(double curTime)
-+    {
-+        double retVal = Double.NaN;
-+        
-+        StyleAttribute attr = null;
-+        switch (attribType)
-+        {
-+            case AnimationElement.AT_CSS:
-+                attr = parent.getStyleAbsolute(attribName);
-+                retVal = attr.getDoubleValue();
-+                break;
-+            case AnimationElement.AT_XML:
-+                attr = parent.getPresAbsolute(attribName);
-+                retVal = attr.getDoubleValue();
-+                break;
-+            case AnimationElement.AT_AUTO:
-+                attr = parent.getStyleAbsolute(attribName);
-+                if (attr == null) attr = parent.getPresAbsolute(attribName);
-+                retVal = attr.getDoubleValue();
-+                break;
-+        }
-+        
-+        
-+        
-+        AnimationTimeEval state = new AnimationTimeEval();
-+//        boolean pastEnd = true;
-+
-+        for (Iterator it = animEvents.iterator(); it.hasNext();)
-+        {
-+            Animate ele = (Animate)it.next();
-+            ele.evalParametric(state, curTime);
-+
-+            //Go to next element if this one does not affect processing
-+            if (Double.isNaN(state.interp)) continue;
-+
-+            switch (ele.getAdditiveType())
-+            {
-+                case AnimationElement.AD_SUM:
-+                    retVal += ele.eval(state.interp);
-+                    break;
-+                case AnimationElement.AD_REPLACE:
-+                    retVal = ele.eval(state.interp);
-+                    break;
-+            }
-+            
-+            //Evalutae accumulation if applicable
-+            if (state.rep > 0)
-+            {
-+                switch (ele.getAccumulateType())
-+                {
-+                    case AnimationElement.AC_SUM:
-+                        retVal += ele.repeatSkipSize(state.rep);
-+                        break;
-+                }
-+                
-+            }
-+        }
-+
-+        return retVal;
-+    }
-+}
-Index: core/src/com/kitfox/svg/animation/TrackManager.java
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ core/src/com/kitfox/svg/animation/TrackManager.java	2012-06-17 23:56:57.684545050 +0200
-@@ -0,0 +1,153 @@
-+/*
-+ * TrackManager.java
-+ *
-+ *  The Salamander Project - 2D and 3D graphics libraries in Java
-+ *  Copyright (C) 2004 Mark McKay
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License as published by the Free Software Foundation; either
-+ *  version 2.1 of the License, or (at your option) any later version.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-+ *
-+ *  Mark McKay can be contacted at mark at kitfox.com.  Salamander and other
-+ *  projects can be found at http://www.kitfox.com
-+ *
-+ * Created on August 15, 2004, 11:34 PM
-+ */
-+
-+package com.kitfox.svg.animation;
-+
-+import java.util.*;
-+
-+import com.kitfox.svg.*;
-+import java.io.Serializable;
-+
-+/**
-+ * Every element contains tracks, which manage the animation.  There is one track
-+ * for every parameter with animation, and each track in turn is composed of
-+ * many events.
-+ *
-+ * @author Mark McKay
-+ * @author <a href="mailto:mark at kitfox.com">Mark McKay</a>
-+ */
-+public class TrackManager implements Serializable
-+{
-+    public static final long serialVersionUID = 0;
-+    
-+    static class TrackKey
-+    {
-+        String name;
-+        int type;
-+        
-+        TrackKey(AnimationElement base)
-+        {
-+            this(base.getAttribName(), base.getAttribType());
-+        }
-+        
-+        TrackKey(String name, int type)
-+        {
-+            this.name = name;
-+            this.type = type;
-+        }
-+        
-+        public int hashCode() { return name.hashCode() ^ type; } 
-+        public boolean equals(Object obj) 
-+        {
-+            if (!(obj instanceof TrackKey)) return false;
-+            TrackKey key = (TrackKey)obj;
-+            return key.type == type && key.name.equals(name);
-+        }
-+    }
-+    
-+    HashMap tracks = new HashMap();
-+    
-+    /** Creates a new instance of TrackManager */
-+    public TrackManager()
-+    {
-+    }
-+    
-+    /**
-+     * Adds a new animation element to this track
-+     */
-+    public void addTrackElement(AnimationElement element) throws SVGElementException
-+    {
-+        TrackKey key = new TrackKey(element);
-+        
-+        TrackBase track = (TrackBase)tracks.get(key);
-+        
-+        if (track == null)
-+        {
-+            //Create a track for this element
-+            if (element instanceof Animate)
-+            {
-+                switch (((Animate)element).getDataType())
-+                {
-+                    case Animate.DT_REAL:
-+                        track = new TrackDouble(element);
-+                        break;
-+                    case Animate.DT_COLOR:
-+                        track = new TrackColor(element);
-+                        break;
-+                    case Animate.DT_PATH:
-+                        track = new TrackPath(element);
-+                        break;
-+                    default:
-+                        throw new RuntimeException("");
-+                }
-+            }
-+            else if (element instanceof AnimateColor)
-+            {
-+                track = new TrackColor(element);
-+            }
-+            else if (element instanceof AnimateTransform || element instanceof AnimateMotion)
-+            {
-+                track = new TrackTransform(element);
-+            }
-+            
-+            tracks.put(key, track);
-+        }
-+  
-+        track.addElement(element);
-+    }
-+    
-+    public TrackBase getTrack(String name, int type)
-+    {
-+        //Handle AUTO, which will match either CSS or XML (in that order)
-+        if (type == AnimationElement.AT_AUTO)
-+        {
-+            TrackBase t = getTrack(name, AnimationElement.AT_CSS);
-+            if (t != null) return t;
-+            t = getTrack(name, AnimationElement.AT_XML);
-+            if (t != null) return t;
-+            return null;
-+        }
-+        
-+        //Get requested attribute
-+        TrackKey key = new TrackKey(name, type);
-+        TrackBase t = (TrackBase)tracks.get(key);
-+        if (t != null) return t;
-+        
-+        //If that didn't exist, see if one exists of type AUTO
-+        key = new TrackKey(name, AnimationElement.AT_AUTO);
-+        return (TrackBase)tracks.get(key);
-+    }
-+    
-+    public int getNumTracks()
-+    {
-+        return tracks.size();
-+    }
-+    
-+    public Iterator iterator()
-+    {
-+        return tracks.values().iterator();
-+    }
-+}
-Index: core/src/com/kitfox/svg/animation/TrackMotion.java
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ core/src/com/kitfox/svg/animation/TrackMotion.java	2012-06-17 23:56:57.684545050 +0200
-@@ -0,0 +1,128 @@
-+/*
-+ * TrackManager.java
-+ *
-+ *  The Salamander Project - 2D and 3D graphics libraries in Java
-+ *  Copyright (C) 2004 Mark McKay
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License as published by the Free Software Foundation; either
-+ *  version 2.1 of the License, or (at your option) any later version.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-+ *
-+ *  Mark McKay can be contacted at mark at kitfox.com.  Salamander and other
-+ *  projects can be found at http://www.kitfox.com
-+ *
-+ * Created on September 21, 2004, 11:34 PM
-+ */
-+
-+package com.kitfox.svg.animation;
-+
-+import com.kitfox.svg.xml.StyleAttribute;
-+import java.awt.geom.*;
-+import java.util.*;
-+
-+import com.kitfox.svg.*;
-+import com.kitfox.svg.xml.*;
-+
-+/**
-+ * A track holds the animation events for a single parameter of a single SVG
-+ * element.  It also contains the default value for the element, should the
-+ * user want to see the 'unanimated' value.
-+ *
-+ * @author Mark McKay
-+ * @author <a href="mailto:mark at kitfox.com">Mark McKay</a>
-+ */
-+public class TrackMotion extends TrackBase
-+{
-+    public TrackMotion(AnimationElement ele) throws SVGElementException
-+    {
-+        //The motion element implies a CSS attribute of transform
-+//        super(ele.getParent(), "transform", AnimationElement.AT_CSS);
-+        super(ele.getParent(), ele);
-+    }
-+
-+    public boolean getValue(StyleAttribute attrib, double curTime) throws SVGException
-+    {
-+        AffineTransform retVal = new AffineTransform();
-+        retVal = getValue(retVal, curTime);
-+//        AffineTransform val = getValue(curTime);
-+//        if (val == null) return false;
-+
-+        double[] mat = new double[6];
-+        retVal.getMatrix(mat);
-+        attrib.setStringValue("matrix(" + mat[0] + " " + mat[1] + " " + mat[2] + " " + mat[3] + " " + mat[4] + " " + mat[5] + ")");
-+        return true;
-+    }
-+
-+    public AffineTransform getValue(AffineTransform retVal, double curTime) throws SVGException
-+    {
-+        //Init transform with default state
-+        StyleAttribute attr = null;
-+        switch (attribType)
-+        {
-+            case AnimationElement.AT_CSS:
-+                attr = parent.getStyleAbsolute(attribName);
-+                retVal.setTransform(SVGElement.parseSingleTransform(attr.getStringValue()));
-+                break;
-+            case AnimationElement.AT_XML:
-+                attr = parent.getPresAbsolute(attribName);
-+                retVal.setTransform(SVGElement.parseSingleTransform(attr.getStringValue()));
-+                break;
-+            case AnimationElement.AT_AUTO:
-+                attr = parent.getStyleAbsolute(attribName);
-+                if (attr == null) attr = parent.getPresAbsolute(attribName);
-+                retVal.setTransform(SVGElement.parseSingleTransform(attr.getStringValue()));
-+                break;
-+        }
-+
-+
-+        //Update transform with time based information
-+        AnimationTimeEval state = new AnimationTimeEval();
-+        AffineTransform xform = new AffineTransform();
-+//        boolean pastEnd = true;
-+
-+        for (Iterator it = animEvents.iterator(); it.hasNext();)
-+        {
-+            AnimateMotion ele = (AnimateMotion)it.next();
-+            ele.evalParametric(state, curTime);
-+
-+            //Go to next element if this one does not affect processing
-+            if (Double.isNaN(state.interp)) continue;
-+
-+            switch (ele.getAdditiveType())
-+            {
-+                case AnimationElement.AD_SUM:
-+                    retVal.concatenate(ele.eval(xform, state.interp));
-+                    break;
-+                case AnimationElement.AD_REPLACE:
-+                    retVal.setTransform(ele.eval(xform, state.interp));
-+                    break;
-+            }
-+
-+            //Evaluate accumulation if applicable
-+/*
-+            if (state.rep > 0)
-+            {
-+                switch (ele.getAccumulateType())
-+                {
-+                    case AnimationElement.AC_SUM:
-+                        retVal += ele.repeatSkipSize(state.rep);
-+                        break;
-+                }
-+
-+            }
-+*/
-+        }
-+
-+        return retVal;
-+    }
-+}
-Index: core/src/com/kitfox/svg/animation/TrackPath.java
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ core/src/com/kitfox/svg/animation/TrackPath.java	2012-06-17 23:56:57.684545050 +0200
-@@ -0,0 +1,100 @@
-+/*
-+ * TrackManager.java
-+ *
-+ *  The Salamander Project - 2D and 3D graphics libraries in Java
-+ *  Copyright (C) 2004 Mark McKay
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License as published by the Free Software Foundation; either
-+ *  version 2.1 of the License, or (at your option) any later version.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-+ *
-+ *  Mark McKay can be contacted at mark at kitfox.com.  Salamander and other
-+ *  projects can be found at http://www.kitfox.com
-+ *
-+ * Created on September 21, 2004, 11:34 PM
-+ */
-+
-+package com.kitfox.svg.animation;
-+
-+import com.kitfox.svg.xml.StyleAttribute;
-+import java.awt.*;
-+import java.awt.geom.*;
-+import java.util.*;
-+
-+import com.kitfox.svg.pathcmd.*;
-+import com.kitfox.svg.*;
-+import com.kitfox.svg.xml.*;
-+
-+/**
-+ * A track holds the animation events for a single parameter of a single SVG
-+ * element.  It also contains the default value for the element, should the
-+ * user want to see the 'unanimated' value.
-+ *
-+ * @author Mark McKay
-+ * @author <a href="mailto:mark at kitfox.com">Mark McKay</a>
-+ */
-+public class TrackPath extends TrackBase
-+{
-+
-+    public TrackPath(AnimationElement ele) throws SVGElementException
-+    {
-+        super(ele.getParent(), ele);
-+    }
-+
-+    public boolean getValue(StyleAttribute attrib, double curTime)
-+    {
-+        GeneralPath path = getValue(curTime);
-+        if (path == null) return false;
-+
-+        attrib.setStringValue(PathUtil.buildPathString(path));
-+        return true;
-+    }
-+
-+    public GeneralPath getValue(double curTime)
-+    {
-+        GeneralPath retVal = null;
-+        AnimationTimeEval state = new AnimationTimeEval();
-+
-+        for (Iterator it = animEvents.iterator(); it.hasNext();)
-+        {
-+            AnimateBase ele = (AnimateBase)it.next();
-+            Animate eleAnim = (Animate)ele;
-+            ele.evalParametric(state, curTime);
-+
-+            //Reject value if it is in the invalid state
-+            if (Double.isNaN(state.interp)) continue;
-+
-+            if (retVal == null)
-+            {
-+                retVal = eleAnim.evalPath(state.interp);
-+                continue;
-+            }
-+            
-+            GeneralPath curPath = eleAnim.evalPath(state.interp);
-+            switch (ele.getAdditiveType())
-+            {
-+                case AnimationElement.AD_REPLACE:
-+                    retVal = curPath;
-+                    break;
-+                case AnimationElement.AD_SUM:
-+                    throw new RuntimeException("Not implemented");
-+//                    retVal = new Color(curCol.getRed() + retVal.getRed(), curCol.getGreen() + retVal.getGreen(), curCol.getBlue() + retVal.getBlue());
-+//                    break;
-+                default:
-+                    throw new RuntimeException();
-+            }
-+        }
-+
-+        return retVal;
-+    }
-+}
-Index: core/src/com/kitfox/svg/animation/TrackTransform.java
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ core/src/com/kitfox/svg/animation/TrackTransform.java	2012-06-17 23:56:57.684545050 +0200
-@@ -0,0 +1,112 @@
-+/*
-+ * TrackManager.java
-+ *
-+ *  The Salamander Project - 2D and 3D graphics libraries in Java
-+ *  Copyright (C) 2004 Mark McKay
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License as published by the Free Software Foundation; either
-+ *  version 2.1 of the License, or (at your option) any later version.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-+ *
-+ *  Mark McKay can be contacted at mark at kitfox.com.  Salamander and other
-+ *  projects can be found at http://www.kitfox.com
-+ *
-+ * Created on September 21, 2004, 11:34 PM
-+ */
-+
-+package com.kitfox.svg.animation;
-+
-+import com.kitfox.svg.xml.StyleAttribute;
-+import java.awt.geom.*;
-+import java.util.*;
-+
-+import com.kitfox.svg.*;
-+import com.kitfox.svg.xml.*;
-+
-+/**
-+ * A track holds the animation events for a single parameter of a single SVG
-+ * element.  It also contains the default value for the element, should the
-+ * user want to see the 'unanimated' value.
-+ *
-+ * @author Mark McKay
-+ * @author <a href="mailto:mark at kitfox.com">Mark McKay</a>
-+ */
-+public class TrackTransform extends TrackBase
-+{
-+    public TrackTransform(AnimationElement ele) throws SVGElementException
-+    {
-+        super(ele.getParent(), ele);
-+    }
-+
-+    public boolean getValue(StyleAttribute attrib, double curTime) throws SVGException
-+    {
-+        AffineTransform retVal = new AffineTransform();
-+        retVal = getValue(retVal, curTime);
-+//        AffineTransform val = getValue(curTime);
-+//        if (val == null) return false;
-+
-+        double[] mat = new double[6];
-+        retVal.getMatrix(mat);
-+        attrib.setStringValue("matrix(" + mat[0] + " " + mat[1] + " " + mat[2] + " " + mat[3] + " " + mat[4] + " " + mat[5] + ")");
-+        return true;
-+    }
-+
-+    public AffineTransform getValue(AffineTransform retVal, double curTime) throws SVGException
-+    {
-+        //Init transform with default state
-+        StyleAttribute attr = null;
-+        switch (attribType)
-+        {
-+            case AnimationElement.AT_CSS:
-+                attr = parent.getStyleAbsolute(attribName);
-+                retVal.setTransform(SVGElement.parseSingleTransform(attr.getStringValue()));
-+                break;
-+            case AnimationElement.AT_XML:
-+                attr = parent.getPresAbsolute(attribName);
-+                retVal.setTransform(SVGElement.parseSingleTransform(attr.getStringValue()));
-+                break;
-+            case AnimationElement.AT_AUTO:
-+                attr = parent.getStyleAbsolute(attribName);
-+                if (attr == null) attr = parent.getPresAbsolute(attribName);
-+                retVal.setTransform(SVGElement.parseSingleTransform(attr.getStringValue()));
-+                break;
-+        }
-+
-+
-+        //Update transform with time based information
-+        AnimationTimeEval state = new AnimationTimeEval();
-+        AffineTransform xform = new AffineTransform();
-+
-+        for (Iterator it = animEvents.iterator(); it.hasNext();)
-+        {
-+            AnimateXform ele = (AnimateXform)it.next();
-+            ele.evalParametric(state, curTime);
-+
-+            //Go to next element if this one does not affect processing
-+            if (Double.isNaN(state.interp)) continue;
-+
-+            switch (ele.getAdditiveType())
-+            {
-+                case AnimationElement.AD_SUM:
-+                    retVal.concatenate(ele.eval(xform, state.interp));
-+                    break;
-+                case AnimationElement.AD_REPLACE:
-+                    retVal.setTransform(ele.eval(xform, state.interp));
-+                    break;
-+            }
-+
-+        }
-+
-+        return retVal;
-+    }
-+}
-Index: core/src/com/kitfox/svg/SVGElement.java
-===================================================================
---- core.orig/src/com/kitfox/svg/SVGElement.java	2012-05-11 17:03:52.404311564 +0200
-+++ core/src/com/kitfox/svg/SVGElement.java	2012-06-17 23:56:57.732545052 +0200
-@@ -33,6 +33,7 @@
- import java.awt.geom.*;
- 
- import org.xml.sax.*;
-+import com.kitfox.svg.animation.*;
- import com.kitfox.svg.pathcmd.*;
- import com.kitfox.svg.xml.*;
- import java.io.Serializable;
-@@ -100,6 +101,8 @@
-      */
- //    protected SVGUniverse universe;
-     
-+    protected final TrackManager trackManager = new TrackManager();
-+
-     boolean dirty = true;
- 
- //    public static final Matcher adobeId = Pattern.compile("(.*)_1_").matcher("");
-@@ -265,6 +268,46 @@
-         }
-     }
-     
-+    public void addAttribute(String name, int attribType, String value) throws SVGElementException
-+    {
-+        if (hasAttribute(name, attribType)) throw new SVGElementException(this, "Attribute " + name + "(" + AnimationElement.animationElementToString(attribType) + ") already exists");
-+        
-+        //Alter layout for id attribute
-+        if ("id".equals(name) && diagram != null)
-+        {
-+            diagram.removeElement(this.id);
-+            this.id = name;
-+            diagram.setElement(this.id, this);
-+        }
-+        
-+        switch (attribType)
-+        {
-+            case AnimationElement.AT_CSS:
-+                inlineStyles.put(name, new StyleAttribute(name, value));
-+                return;
-+            case AnimationElement.AT_XML:
-+                presAttribs.put(name, new StyleAttribute(name, value));
-+                return;
-+        }
-+        
-+        throw new SVGElementException(this, "Invalid attribute type " + attribType);
-+    }
-+    
-+    public boolean hasAttribute(String name, int attribType) throws SVGElementException
-+    {
-+        switch (attribType)
-+        {
-+            case AnimationElement.AT_CSS:
-+                return inlineStyles.containsKey(name);
-+            case AnimationElement.AT_XML:
-+                return presAttribs.containsKey(name);
-+            case AnimationElement.AT_AUTO:
-+                return inlineStyles.containsKey(name) || presAttribs.containsKey(name);
-+        }
-+        
-+        throw new SVGElementException(this, "Invalid attribute type " + attribType);
-+    }
-+    
-     /**
-      * @return a set of Strings that corespond to CSS attributes on this element
-      */
-@@ -290,6 +333,12 @@
-         children.add(child);
-         child.parent = this;
-         child.setDiagram(diagram);
-+        
-+        //Add info to track if we've scanned animation element
-+        if (child instanceof AnimationElement)
-+        {
-+            trackManager.addTrackElement((AnimationElement)child);
-+        }
-     }
-     
-     private void setDiagram(SVGDiagram diagram)
-@@ -408,6 +457,54 @@
-         return getStyle(attrib, true);
-     }
-     
-+    
-+    public void setAttribute(String name, int attribType, String value) throws SVGElementException
-+    {
-+        StyleAttribute styAttr;
-+        
-+        
-+        switch (attribType)
-+        {
-+            case AnimationElement.AT_CSS:
-+            {
-+                styAttr = (StyleAttribute)inlineStyles.get(name);
-+                break;
-+            }
-+            case AnimationElement.AT_XML:
-+            {
-+                styAttr = (StyleAttribute)presAttribs.get(name);
-+                break;
-+            }
-+            case AnimationElement.AT_AUTO:
-+            {
-+                styAttr = (StyleAttribute)inlineStyles.get(name);
-+                
-+                if (styAttr == null)
-+                {
-+                    styAttr = (StyleAttribute)presAttribs.get(name);
-+                }
-+                break;
-+            }
-+            default:
-+                throw new SVGElementException(this, "Invalid attribute type " + attribType);
-+        }
-+        
-+        if (styAttr == null)
-+        {
-+            throw new SVGElementException(this, "Could not find attribute " + name + "(" + AnimationElement.animationElementToString(attribType) + ").  Make sure to create attribute before setting it.");
-+        }
-+        
-+        //Alter layout for relevant attributes
-+        if ("id".equals(styAttr.getName()))
-+        {
-+            diagram.removeElement(this.id);
-+            this.id = name;
-+            diagram.setElement(this.id, this);
-+        }
-+        
-+        styAttr.setStringValue(value);
-+    }
-+    
-     /**
-      * Copies the current style into the passed style attribute.  Checks for
-      * inline styles first, then internal and extranal style sheets, and
-@@ -427,6 +524,14 @@
-         
-         attrib.setStringValue(styAttr == null ? "" : styAttr.getStringValue());
-         
-+        //Evalutate coresponding track, if one exists
-+        TrackBase track = trackManager.getTrack(styName, AnimationElement.AT_CSS);
-+        if (track != null)
-+        {
-+            track.getValue(attrib, diagram.getUniverse().getCurTime());
-+            return true;
-+        }
-+        
-         //Return if we've found a non animated style
-         if (styAttr != null) return true;
-         
-@@ -439,6 +544,14 @@
-         
-         attrib.setStringValue(presAttr == null ? "" : presAttr.getStringValue());
-         
-+        //Evalutate coresponding track, if one exists
-+        track = trackManager.getTrack(styName, AnimationElement.AT_XML);
-+        if (track != null)
-+        {
-+            track.getValue(attrib, diagram.getUniverse().getCurTime());
-+            return true;
-+        }
-+        
-         //Return if we've found a presentation attribute instead
-         if (presAttr != null) return true;
-         
-@@ -480,6 +593,14 @@
-         //Copy presentation value directly
-         attrib.setStringValue(presAttr == null ? "" : presAttr.getStringValue());
-         
-+        //Evalutate coresponding track, if one exists
-+        TrackBase track = trackManager.getTrack(presName, AnimationElement.AT_XML);
-+        if (track != null)
-+        {
-+            track.getValue(attrib, diagram.getUniverse().getCurTime());
-+            return true;
-+        }
-+        
-         //Return if we found presentation attribute
-         if (presAttr != null) return true;
-         
-Index: core/src/com/kitfox/svg/SVGLoader.java
-===================================================================
---- core.orig/src/com/kitfox/svg/SVGLoader.java	2012-05-11 17:03:52.404311564 +0200
-+++ core/src/com/kitfox/svg/SVGLoader.java	2012-06-17 23:56:57.732545052 +0200
-@@ -33,6 +33,8 @@
- import org.xml.sax.*;
- import org.xml.sax.helpers.DefaultHandler;
- 
-+import com.kitfox.svg.animation.*;
-+
- /**
-  * @author Mark McKay
-  * @author <a href="mailto:mark at kitfox.com">Mark McKay</a>
-@@ -75,6 +77,10 @@
- 
-         //Compile a list of important builder classes
-         nodeClasses.put("a", A.class);
-+        nodeClasses.put("animate", Animate.class);
-+        nodeClasses.put("animatecolor", AnimateColor.class);
-+        nodeClasses.put("animatemotion", AnimateMotion.class);
-+        nodeClasses.put("animatetransform", AnimateTransform.class);
-         nodeClasses.put("circle", Circle.class);
-         nodeClasses.put("clippath", ClipPath.class);
-         nodeClasses.put("defs", Defs.class);
-@@ -98,6 +104,7 @@
-         nodeClasses.put("polyline", Polyline.class);
-         nodeClasses.put("radialgradient", RadialGradient.class);
-         nodeClasses.put("rect", Rect.class);
-+        nodeClasses.put("set", SetSmil.class);
-         nodeClasses.put("shape", ShapeElement.class);
-         nodeClasses.put("stop", Stop.class);
-         nodeClasses.put("style", Style.class);
-Index: core/src/com/kitfox/svg/SVGLoaderHelper.java
-===================================================================
---- core.orig/src/com/kitfox/svg/SVGLoaderHelper.java	2012-05-11 17:03:52.404311564 +0200
-+++ core/src/com/kitfox/svg/SVGLoaderHelper.java	2012-06-17 23:56:57.740545051 +0200
-@@ -28,6 +28,9 @@
- package com.kitfox.svg;
- 
- import java.net.*;
-+import java.io.*;
-+
-+import com.kitfox.svg.animation.parser.*;
- 
- /**
-  * @author Mark McKay
-@@ -47,6 +50,11 @@
- 
-     public final URI xmlBase;
- 
-+    /**
-+     * Animate nodes use this to parse their time strings
-+     */
-+    public final AnimTimeParser animTimeParser = new AnimTimeParser(new StringReader(""));
-+    
-     /** Creates a new instance of SVGLoaderHelper */
-     public SVGLoaderHelper(URI xmlBase, SVGUniverse universe, SVGDiagram diagram)
-     {
-Index: core/src/com/kitfox/svg/app/MainFrame.java
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ core/src/com/kitfox/svg/app/MainFrame.java	2012-06-17 23:56:57.748545052 +0200
-@@ -0,0 +1,134 @@
-+/*
-+ * MainFrame.java
-+ *
-+ * Created on September 6, 2004, 1:19 AM
-+ */
-+
-+package com.kitfox.svg.app;
-+
-+/**
-+ *
-+ * @author  kitfox
-+ */
-+public class MainFrame extends javax.swing.JFrame
-+{
-+    public static final long serialVersionUID = 1;
-+    
-+    /** Creates new form MainFrame */
-+    public MainFrame()
-+    {
-+        initComponents();
-+    }
-+    
-+    /** This method is called from within the constructor to
-+     * initialize the form.
-+     * WARNING: Do NOT modify this code. The content of this method is
-+     * always regenerated by the Form Editor.
-+     */
-+    private void initComponents()//GEN-BEGIN:initComponents
-+    {
-+        jPanel1 = new javax.swing.JPanel();
-+        bn_svgViewer = new javax.swing.JButton();
-+        bn_svgViewer1 = new javax.swing.JButton();
-+        jPanel2 = new javax.swing.JPanel();
-+        bn_quit = new javax.swing.JButton();
-+
-+        setTitle("SVG Salamander - Application Launcher");
-+        addWindowListener(new java.awt.event.WindowAdapter()
-+        {
-+            public void windowClosing(java.awt.event.WindowEvent evt)
-+            {
-+                exitForm(evt);
-+            }
-+        });
-+
-+        jPanel1.setLayout(new javax.swing.BoxLayout(jPanel1, javax.swing.BoxLayout.Y_AXIS));
-+
-+        bn_svgViewer.setText("SVG Viewer (No animation)");
-+        bn_svgViewer.addActionListener(new java.awt.event.ActionListener()
-+        {
-+            public void actionPerformed(java.awt.event.ActionEvent evt)
-+            {
-+                bn_svgViewerActionPerformed(evt);
-+            }
-+        });
-+
-+        jPanel1.add(bn_svgViewer);
-+
-+        bn_svgViewer1.setText("SVG Player (Animation)");
-+        bn_svgViewer1.addActionListener(new java.awt.event.ActionListener()
-+        {
-+            public void actionPerformed(java.awt.event.ActionEvent evt)
-+            {
-+                bn_svgViewer1ActionPerformed(evt);
-+            }
-+        });
-+
-+        jPanel1.add(bn_svgViewer1);
-+
-+        getContentPane().add(jPanel1, java.awt.BorderLayout.CENTER);
-+
-+        bn_quit.setText("Quit");
-+        bn_quit.addActionListener(new java.awt.event.ActionListener()
-+        {
-+            public void actionPerformed(java.awt.event.ActionEvent evt)
-+            {
-+                bn_quitActionPerformed(evt);
-+            }
-+        });
-+
-+        jPanel2.add(bn_quit);
-+
-+        getContentPane().add(jPanel2, java.awt.BorderLayout.SOUTH);
-+
-+        pack();
-+    }//GEN-END:initComponents
-+
-+    private void bn_svgViewer1ActionPerformed(java.awt.event.ActionEvent evt)//GEN-FIRST:event_bn_svgViewer1ActionPerformed
-+    {//GEN-HEADEREND:event_bn_svgViewer1ActionPerformed
-+        SVGPlayer.main(null);
-+
-+        close();
-+    }//GEN-LAST:event_bn_svgViewer1ActionPerformed
-+
-+    private void bn_svgViewerActionPerformed(java.awt.event.ActionEvent evt)//GEN-FIRST:event_bn_svgViewerActionPerformed
-+    {//GEN-HEADEREND:event_bn_svgViewerActionPerformed
-+        SVGViewer.main(null);
-+
-+        close();
-+    }//GEN-LAST:event_bn_svgViewerActionPerformed
-+
-+    private void bn_quitActionPerformed(java.awt.event.ActionEvent evt)//GEN-FIRST:event_bn_quitActionPerformed
-+    {//GEN-HEADEREND:event_bn_quitActionPerformed
-+        exitForm(null);
-+    }//GEN-LAST:event_bn_quitActionPerformed
-+    
-+    /** Exit the Application */
-+    private void exitForm(java.awt.event.WindowEvent evt)//GEN-FIRST:event_exitForm
-+    {
-+        System.exit(0);
-+    }//GEN-LAST:event_exitForm
-+    
-+    private void close()
-+    {
-+        this.setVisible(false);
-+        this.dispose();
-+    }
-+    
-+    /**
-+     * @param args the command line arguments
-+     */
-+    public static void main(String args[])
-+    {
-+        new MainFrame().setVisible(true);
-+    }
-+    
-+    // Variables declaration - do not modify//GEN-BEGIN:variables
-+    private javax.swing.JButton bn_quit;
-+    private javax.swing.JButton bn_svgViewer;
-+    private javax.swing.JButton bn_svgViewer1;
-+    private javax.swing.JPanel jPanel1;
-+    private javax.swing.JPanel jPanel2;
-+    // End of variables declaration//GEN-END:variables
-+    
-+}
-Index: core/src/com/kitfox/svg/app/PlayerDialog.java
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ core/src/com/kitfox/svg/app/PlayerDialog.java	2012-06-17 23:56:57.748545052 +0200
-@@ -0,0 +1,289 @@
-+/*
-+ * PlayerDialog.java
-+ *
-+ *
-+ *  The Salamander Project - 2D and 3D graphics libraries in Java
-+ *  Copyright (C) 2004 Mark McKay
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License as published by the Free Software Foundation; either
-+ *  version 2.1 of the License, or (at your option) any later version.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-+ *
-+ *  Mark McKay can be contacted at mark at kitfox.com.  Salamander and other
-+ *  projects can be found at http://www.kitfox.com
-+ *
-+ * Created on September 28, 2004, 9:56 PM
-+ */
-+
-+package com.kitfox.svg.app;
-+
-+/**
-+ *
-+ * @author  kitfox
-+ */
-+public class PlayerDialog extends javax.swing.JDialog implements PlayerThreadListener
-+{
-+    public static final long serialVersionUID = 1;
-+    
-+    PlayerThread thread;
-+    
-+    final SVGPlayer parent;
-+    
-+    /** Creates new form PlayerDialog */
-+    public PlayerDialog(SVGPlayer parent)
-+    {
-+        super(parent, false);
-+        initComponents();
-+        
-+        this.parent = parent;
-+        
-+        thread = new PlayerThread();
-+        thread.addListener(this);
-+        
-+        text_timeStepActionPerformed(null);
-+    }
-+    
-+    public void updateTime(double curTime, double timeStep, int playState)
-+    {
-+        if (playState == PlayerThread.PS_STOP) return;
-+        
-+        text_curTime.setText("" + (float)curTime);
-+        parent.updateTime(curTime);
-+//        text_timeStep.setText("" + (int)(1.0 / timeStep));
-+    }
-+    
-+    /** This method is called from within the constructor to
-+     * initialize the form.
-+     * WARNING: Do NOT modify this code. The content of this method is
-+     * always regenerated by the Form Editor.
-+     */
-+    // <editor-fold defaultstate="collapsed" desc=" Generated Code ">//GEN-BEGIN:initComponents
-+    private void initComponents()
-+    {
-+        jPanel1 = new javax.swing.JPanel();
-+        bn_playBack = new javax.swing.JButton();
-+        bn_stop = new javax.swing.JButton();
-+        bn_playFwd = new javax.swing.JButton();
-+        jPanel2 = new javax.swing.JPanel();
-+        jPanel3 = new javax.swing.JPanel();
-+        jLabel1 = new javax.swing.JLabel();
-+        text_curTime = new javax.swing.JTextField();
-+        bn_time0 = new javax.swing.JButton();
-+        jPanel4 = new javax.swing.JPanel();
-+        jLabel2 = new javax.swing.JLabel();
-+        text_timeStep = new javax.swing.JTextField();
-+
-+        setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE);
-+        setTitle("Player");
-+        addWindowListener(new java.awt.event.WindowAdapter()
-+        {
-+            public void windowClosed(java.awt.event.WindowEvent evt)
-+            {
-+                formWindowClosed(evt);
-+            }
-+        });
-+
-+        bn_playBack.setText("<");
-+        bn_playBack.setToolTipText("Play backwards");
-+        bn_playBack.addActionListener(new java.awt.event.ActionListener()
-+        {
-+            public void actionPerformed(java.awt.event.ActionEvent evt)
-+            {
-+                bn_playBackActionPerformed(evt);
-+            }
-+        });
-+
-+        jPanel1.add(bn_playBack);
-+
-+        bn_stop.setText("||");
-+        bn_stop.setToolTipText("Stop playback");
-+        bn_stop.addActionListener(new java.awt.event.ActionListener()
-+        {
-+            public void actionPerformed(java.awt.event.ActionEvent evt)
-+            {
-+                bn_stopActionPerformed(evt);
-+            }
-+        });
-+
-+        jPanel1.add(bn_stop);
-+
-+        bn_playFwd.setText(">");
-+        bn_playFwd.setToolTipText("Play Forwards");
-+        bn_playFwd.addActionListener(new java.awt.event.ActionListener()
-+        {
-+            public void actionPerformed(java.awt.event.ActionEvent evt)
-+            {
-+                bn_playFwdActionPerformed(evt);
-+            }
-+        });
-+
-+        jPanel1.add(bn_playFwd);
-+
-+        getContentPane().add(jPanel1, java.awt.BorderLayout.NORTH);
-+
-+        jPanel2.setLayout(new javax.swing.BoxLayout(jPanel2, javax.swing.BoxLayout.Y_AXIS));
-+
-+        jLabel1.setText("Cur Time");
-+        jPanel3.add(jLabel1);
-+
-+        text_curTime.setHorizontalAlignment(javax.swing.JTextField.LEFT);
-+        text_curTime.setText("0");
-+        text_curTime.setPreferredSize(new java.awt.Dimension(100, 21));
-+        text_curTime.addActionListener(new java.awt.event.ActionListener()
-+        {
-+            public void actionPerformed(java.awt.event.ActionEvent evt)
-+            {
-+                text_curTimeActionPerformed(evt);
-+            }
-+        });
-+        text_curTime.addFocusListener(new java.awt.event.FocusAdapter()
-+        {
-+            public void focusLost(java.awt.event.FocusEvent evt)
-+            {
-+                text_curTimeFocusLost(evt);
-+            }
-+        });
-+
-+        jPanel3.add(text_curTime);
-+
-+        bn_time0.setText("Time 0");
-+        bn_time0.setToolTipText("Reset time to first frame");
-+        bn_time0.addActionListener(new java.awt.event.ActionListener()
-+        {
-+            public void actionPerformed(java.awt.event.ActionEvent evt)
-+            {
-+                bn_time0ActionPerformed(evt);
-+            }
-+        });
-+
-+        jPanel3.add(bn_time0);
-+
-+        jPanel2.add(jPanel3);
-+
-+        jLabel2.setText("Frames Per Second");
-+        jPanel4.add(jLabel2);
-+
-+        text_timeStep.setHorizontalAlignment(javax.swing.JTextField.RIGHT);
-+        text_timeStep.setText("60");
-+        text_timeStep.setPreferredSize(new java.awt.Dimension(100, 21));
-+        text_timeStep.addActionListener(new java.awt.event.ActionListener()
-+        {
-+            public void actionPerformed(java.awt.event.ActionEvent evt)
-+            {
-+                text_timeStepActionPerformed(evt);
-+            }
-+        });
-+        text_timeStep.addFocusListener(new java.awt.event.FocusAdapter()
-+        {
-+            public void focusLost(java.awt.event.FocusEvent evt)
-+            {
-+                text_timeStepFocusLost(evt);
-+            }
-+        });
-+
-+        jPanel4.add(text_timeStep);
-+
-+        jPanel2.add(jPanel4);
-+
-+        getContentPane().add(jPanel2, java.awt.BorderLayout.CENTER);
-+
-+        pack();
-+    }// </editor-fold>//GEN-END:initComponents
-+
-+    private void bn_time0ActionPerformed(java.awt.event.ActionEvent evt)//GEN-FIRST:event_bn_time0ActionPerformed
-+    {//GEN-HEADEREND:event_bn_time0ActionPerformed
-+        thread.setCurTime(0);
-+    }//GEN-LAST:event_bn_time0ActionPerformed
-+
-+    private void bn_playFwdActionPerformed(java.awt.event.ActionEvent evt)//GEN-FIRST:event_bn_playFwdActionPerformed
-+    {//GEN-HEADEREND:event_bn_playFwdActionPerformed
-+        thread.setPlayState(PlayerThread.PS_PLAY_FWD);
-+    }//GEN-LAST:event_bn_playFwdActionPerformed
-+
-+    private void bn_stopActionPerformed(java.awt.event.ActionEvent evt)//GEN-FIRST:event_bn_stopActionPerformed
-+    {//GEN-HEADEREND:event_bn_stopActionPerformed
-+        thread.setPlayState(PlayerThread.PS_STOP);
-+    }//GEN-LAST:event_bn_stopActionPerformed
-+
-+    private void bn_playBackActionPerformed(java.awt.event.ActionEvent evt)//GEN-FIRST:event_bn_playBackActionPerformed
-+    {//GEN-HEADEREND:event_bn_playBackActionPerformed
-+        thread.setPlayState(PlayerThread.PS_PLAY_BACK);
-+    }//GEN-LAST:event_bn_playBackActionPerformed
-+
-+    private void formWindowClosed(java.awt.event.WindowEvent evt)//GEN-FIRST:event_formWindowClosed
-+    {//GEN-HEADEREND:event_formWindowClosed
-+//        thread.exit();
-+    }//GEN-LAST:event_formWindowClosed
-+
-+    private void text_timeStepFocusLost(java.awt.event.FocusEvent evt)//GEN-FIRST:event_text_timeStepFocusLost
-+    {//GEN-HEADEREND:event_text_timeStepFocusLost
-+        text_timeStepActionPerformed(null);
-+    }//GEN-LAST:event_text_timeStepFocusLost
-+
-+    private void text_timeStepActionPerformed(java.awt.event.ActionEvent evt)//GEN-FIRST:event_text_timeStepActionPerformed
-+    {//GEN-HEADEREND:event_text_timeStepActionPerformed
-+        try
-+        {
-+            int val = Integer.parseInt(text_timeStep.getText());
-+            thread.setTimeStep(1.0 / val);
-+        }
-+        catch (Exception e)
-+        {
-+        }
-+        
-+        double d = thread.getTimeStep();
-+        String newStrn = "" + (int)(1f / d);
-+        if (newStrn.equals(text_timeStep.getText())) return;
-+        text_timeStep.setText(newStrn);
-+        
-+//        text_timeStepActionPerformed(null);
-+    }//GEN-LAST:event_text_timeStepActionPerformed
-+
-+    private void text_curTimeActionPerformed(java.awt.event.ActionEvent evt)//GEN-FIRST:event_text_curTimeActionPerformed
-+    {//GEN-HEADEREND:event_text_curTimeActionPerformed
-+        try
-+        {
-+            double val = Double.parseDouble(text_curTime.getText());
-+            thread.setCurTime(val);
-+        }
-+        catch (Exception e)
-+        {
-+        }
-+        
-+        double d = thread.getCurTime();
-+        text_curTime.setText("" + (float)d);
-+        
-+        text_timeStepActionPerformed(null);
-+    }//GEN-LAST:event_text_curTimeActionPerformed
-+
-+    private void text_curTimeFocusLost(java.awt.event.FocusEvent evt)//GEN-FIRST:event_text_curTimeFocusLost
-+    {//GEN-HEADEREND:event_text_curTimeFocusLost
-+        text_curTimeActionPerformed(null);
-+    }//GEN-LAST:event_text_curTimeFocusLost
-+    
-+    // Variables declaration - do not modify//GEN-BEGIN:variables
-+    private javax.swing.JButton bn_playBack;
-+    private javax.swing.JButton bn_playFwd;
-+    private javax.swing.JButton bn_stop;
-+    private javax.swing.JButton bn_time0;
-+    private javax.swing.JLabel jLabel1;
-+    private javax.swing.JLabel jLabel2;
-+    private javax.swing.JPanel jPanel1;
-+    private javax.swing.JPanel jPanel2;
-+    private javax.swing.JPanel jPanel3;
-+    private javax.swing.JPanel jPanel4;
-+    private javax.swing.JTextField text_curTime;
-+    private javax.swing.JTextField text_timeStep;
-+    // End of variables declaration//GEN-END:variables
-+    
-+}
-Index: core/src/com/kitfox/svg/app/PlayerThread.java
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ core/src/com/kitfox/svg/app/PlayerThread.java	2012-06-17 23:56:57.748545052 +0200
-@@ -0,0 +1,129 @@
-+/*
-+ * PlayerThread.java
-+ *
-+ *
-+ *  The Salamander Project - 2D and 3D graphics libraries in Java
-+ *  Copyright (C) 2004 Mark McKay
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License as published by the Free Software Foundation; either
-+ *  version 2.1 of the License, or (at your option) any later version.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-+ *
-+ *  Mark McKay can be contacted at mark at kitfox.com.  Salamander and other
-+ *  projects can be found at http://www.kitfox.com
-+ *
-+ * Created on September 28, 2004, 10:07 PM
-+ */
-+
-+
-+package com.kitfox.svg.app;
-+
-+import java.util.*;
-+
-+/**
-+ *
-+ * @author  kitfox
-+ */
-+public class PlayerThread implements Runnable
-+{
-+    HashSet listeners = new HashSet();
-+    
-+    double curTime = 0;
-+    double timeStep = .2;
-+    
-+    public static final int PS_STOP = 0;
-+    public static final int PS_PLAY_FWD = 1;
-+    public static final int PS_PLAY_BACK = 2;
-+    
-+    int playState = PS_STOP;
-+    
-+    Thread thread;
-+    
-+    /** Creates a new instance of PlayerThread */
-+    public PlayerThread()
-+    {
-+        thread = new Thread(this);
-+        thread.start();
-+    }
-+    
-+    public void run()
-+    {
-+        while (thread != null)
-+        {
-+            synchronized (this)
-+            {
-+                switch (playState)
-+                {
-+                    case PS_PLAY_FWD:
-+                        curTime += timeStep;
-+                        break;
-+                    case PS_PLAY_BACK:
-+                        curTime -= timeStep;
-+                        if (curTime < 0) curTime = 0;
-+                        break;
-+                    default:
-+                    case PS_STOP:
-+                        break;
-+                }
-+                
-+                fireTimeUpdateEvent();
-+            }
-+            
-+            try
-+            {
-+                Thread.sleep((long)(timeStep * 1000));
-+            }
-+            catch (Exception e) 
-+            { 
-+                throw new RuntimeException(e); 
-+            }
-+        }
-+    }
-+    
-+    public void exit() { thread = null; }
-+    public synchronized void addListener(PlayerThreadListener listener) 
-+    {
-+        listeners.add(listener); 
-+    }
-+    
-+    public synchronized double getCurTime() { return curTime; }
-+    
-+    public synchronized void setCurTime(double time)
-+    {
-+        curTime = time;
-+    }
-+    
-+    public synchronized double getTimeStep() { return timeStep; }
-+    
-+    public synchronized void setTimeStep(double time)
-+    {
-+        timeStep = time;
-+        if (timeStep < .01) timeStep = .01;
-+    }
-+    
-+    public synchronized int getPlayState() { return playState; }
-+    
-+    public synchronized void setPlayState(int playState)
-+    {
-+        this.playState = playState;
-+    }
-+    
-+    private void fireTimeUpdateEvent()
-+    {
-+        for (Iterator it = listeners.iterator(); it.hasNext();)
-+        {
-+            PlayerThreadListener listener = (PlayerThreadListener)it.next();
-+            listener.updateTime(curTime, timeStep, playState);
-+        }
-+    }
-+}
-Index: core/src/com/kitfox/svg/app/PlayerThreadListener.java
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ core/src/com/kitfox/svg/app/PlayerThreadListener.java	2012-06-17 23:56:57.748545052 +0200
-@@ -0,0 +1,37 @@
-+/*
-+ * PlayerThreadListener.java
-+ *
-+ *
-+ *  The Salamander Project - 2D and 3D graphics libraries in Java
-+ *  Copyright (C) 2004 Mark McKay
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License as published by the Free Software Foundation; either
-+ *  version 2.1 of the License, or (at your option) any later version.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-+ *
-+ *  Mark McKay can be contacted at mark at kitfox.com.  Salamander and other
-+ *  projects can be found at http://www.kitfox.com
-+ *
-+ * Created on September 28, 2004, 10:15 PM
-+ */
-+
-+package com.kitfox.svg.app;
-+
-+/**
-+ *
-+ * @author  kitfox
-+ */
-+public interface PlayerThreadListener
-+{
-+    public void updateTime(double curTime, double timeStep, int playState);
-+}
-Index: core/src/com/kitfox/svg/app/SVGPlayer.java
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ core/src/com/kitfox/svg/app/SVGPlayer.java	2012-06-17 23:56:57.748545052 +0200
-@@ -0,0 +1,436 @@
-+/*
-+ * SVGViewer.java
-+ *
-+ *
-+ *  The Salamander Project - 2D and 3D graphics libraries in Java
-+ *  Copyright (C) 2004 Mark McKay
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License as published by the Free Software Foundation; either
-+ *  version 2.1 of the License, or (at your option) any later version.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-+ *
-+ *  Mark McKay can be contacted at mark at kitfox.com.  Salamander and other
-+ *  projects can be found at http://www.kitfox.com
-+ *
-+ * Created on April 3, 2004, 5:28 PM
-+ */
-+
-+package com.kitfox.svg.app;
-+
-+
-+import com.kitfox.svg.SVGDiagram;
-+import com.kitfox.svg.SVGDisplayPanel;
-+import com.kitfox.svg.SVGElement;
-+import com.kitfox.svg.SVGException;
-+import com.kitfox.svg.SVGUniverse;
-+import java.awt.Color;
-+import java.awt.event.MouseAdapter;
-+import java.awt.event.MouseEvent;
-+import java.awt.geom.Point2D;
-+import java.io.File;
-+import java.io.InputStream;
-+import java.net.URI;
-+import java.net.URL;
-+import java.net.URLEncoder;
-+import java.security.AccessControlException;
-+import java.util.ArrayList;
-+import java.util.List;
-+import java.util.Vector;
-+import java.util.regex.Matcher;
-+import java.util.regex.Pattern;
-+import javax.swing.JFileChooser;
-+import javax.swing.JOptionPane;
-+
-+/**
-+ * @author Mark McKay
-+ * @author <a href="mailto:mark at kitfox.com">Mark McKay</a>
-+ */
-+public class SVGPlayer extends javax.swing.JFrame
-+{
-+    public static final long serialVersionUID = 1;
-+
-+    SVGDisplayPanel svgDisplayPanel = new SVGDisplayPanel();
-+
-+    final PlayerDialog playerDialog;
-+    
-+    SVGUniverse universe;
-+    
-+    /** FileChooser for running in trusted environments */
-+    final JFileChooser fileChooser;
-+    {
-+//        fileChooser = new JFileChooser(new File("."));
-+        JFileChooser fc = null;
-+        try
-+        {
-+            fc = new JFileChooser();
-+            fc.setFileFilter(
-+                new javax.swing.filechooser.FileFilter() {
-+                    final Matcher matchLevelFile = Pattern.compile(".*\\.svg[z]?").matcher("");
-+
-+                    public boolean accept(File file)
-+                    {
-+                        if (file.isDirectory()) return true;
-+
-+                        matchLevelFile.reset(file.getName());
-+                        return matchLevelFile.matches();
-+                    }
-+
-+                    public String getDescription() { return "SVG file (*.svg, *.svgz)"; }
-+                }
-+            );
-+        }
-+        catch (AccessControlException ex)
-+        {
-+            //Do not create file chooser if webstart refuses permissions
-+        }
-+        fileChooser = fc;
-+    }
-+
-+    /** Backup file service for opening files in WebStart situations */
-+    /*
-+    final FileOpenService fileOpenService;
-+    {
-+        try 
-+        { 
-+            fileOpenService = (FileOpenService)ServiceManager.lookup("javax.jnlp.FileOpenService"); 
-+        } 
-+        catch (UnavailableServiceException e) 
-+        { 
-+            fileOpenService = null; 
-+        } 
-+    }
-+     */
-+    
-+    /** Creates new form SVGViewer */
-+    public SVGPlayer() {
-+        initComponents();
-+
-+        setSize(800, 600);
-+
-+        svgDisplayPanel.setBgColor(Color.white);
-+        svgDisplayPanel.addMouseListener(new MouseAdapter()
-+        {
-+            public void mouseClicked(MouseEvent evt)
-+            {
-+                SVGDiagram diagram = svgDisplayPanel.getDiagram();
-+                if (diagram == null) return;
-+                
-+                System.out.println("Picking at cursor (" + evt.getX() + ", " + evt.getY() + ")");
-+                try
-+                {
-+                    List paths = diagram.pick(new Point2D.Float(evt.getX(), evt.getY()), null);
-+                    for (int i = 0; i < paths.size(); i++)
-+                    {
-+                        ArrayList path = (ArrayList)paths.get(i);
-+                        System.out.println(pathToString(path));
-+                    }
-+                }
-+                catch (SVGException ex)
-+                {
-+                    ex.printStackTrace();
-+                }
-+            }
-+        }
-+        );
-+        
-+        svgDisplayPanel.setPreferredSize(getSize());
-+        scrollPane_svgArea.setViewportView(svgDisplayPanel);
-+        
-+        playerDialog = new PlayerDialog(this);
-+    }
-+    
-+    private String pathToString(List path)
-+    {
-+        if (path.size() == 0) return "";
-+        
-+        StringBuffer sb = new StringBuffer();
-+        sb.append(path.get(0));
-+        for (int i = 1; i < path.size(); i++)
-+        {
-+            sb.append("/");
-+            sb.append(((SVGElement)path.get(i)).getId());
-+        }
-+        return sb.toString();
-+    }
-+    
-+    public void updateTime(double curTime)
-+    {
-+        try
-+        {
-+            if (universe != null)
-+            {
-+                universe.setCurTime(curTime);
-+                universe.updateTime();
-+    //            svgDisplayPanel.updateTime(curTime);
-+                repaint();
-+            }
-+        }
-+        catch (Exception e)
-+        {
-+            e.printStackTrace();
-+        }
-+    }
-+
-+    private void loadURL(URL url)
-+    {
-+        boolean verbose = cmCheck_verbose.isSelected();
-+
-+        universe = new SVGUniverse();
-+        universe.setVerbose(verbose);
-+        SVGDiagram diagram = null;
-+
-+        if (!CheckBoxMenuItem_anonInputStream.isSelected())
-+        {
-+            //Load from a disk with a valid URL
-+            URI uri = universe.loadSVG(url);
-+
-+            if (verbose) System.err.println(uri.toString());
-+
-+            diagram = universe.getDiagram(uri);
-+        }
-+        else
-+        {
-+            //Load from a stream with no particular valid URL
-+            try
-+            {
-+                InputStream is = url.openStream();
-+                URI uri = universe.loadSVG(is, "defaultName");
-+
-+                if (verbose) System.err.println(uri.toString());
-+
-+                diagram = universe.getDiagram(uri);
-+            }
-+            catch (Exception e)
-+            {
-+                e.printStackTrace();
-+            }
-+        }
-+
-+        svgDisplayPanel.setDiagram(diagram);
-+        repaint();
-+    }
-+    
-+    /** This method is called from within the constructor to
-+     * initialize the form.
-+     * WARNING: Do NOT modify this code. The content of this method is
-+     * always regenerated by the Form Editor.
-+     */
-+    // <editor-fold defaultstate="collapsed" desc=" Generated Code ">//GEN-BEGIN:initComponents
-+    private void initComponents()
-+    {
-+        scrollPane_svgArea = new javax.swing.JScrollPane();
-+        jMenuBar1 = new javax.swing.JMenuBar();
-+        menu_file = new javax.swing.JMenu();
-+        cm_loadFile = new javax.swing.JMenuItem();
-+        cm_loadUrl = new javax.swing.JMenuItem();
-+        menu_window = new javax.swing.JMenu();
-+        cm_player = new javax.swing.JMenuItem();
-+        jSeparator2 = new javax.swing.JSeparator();
-+        cm_800x600 = new javax.swing.JMenuItem();
-+        CheckBoxMenuItem_anonInputStream = new javax.swing.JCheckBoxMenuItem();
-+        cmCheck_verbose = new javax.swing.JCheckBoxMenuItem();
-+        menu_help = new javax.swing.JMenu();
-+        cm_about = new javax.swing.JMenuItem();
-+
-+        setTitle("SVG Player - Salamander Project");
-+        addWindowListener(new java.awt.event.WindowAdapter()
-+        {
-+            public void windowClosing(java.awt.event.WindowEvent evt)
-+            {
-+                exitForm(evt);
-+            }
-+        });
-+
-+        getContentPane().add(scrollPane_svgArea, java.awt.BorderLayout.CENTER);
-+
-+        menu_file.setMnemonic('f');
-+        menu_file.setText("File");
-+        cm_loadFile.setMnemonic('l');
-+        cm_loadFile.setText("Load File...");
-+        cm_loadFile.addActionListener(new java.awt.event.ActionListener()
-+        {
-+            public void actionPerformed(java.awt.event.ActionEvent evt)
-+            {
-+                cm_loadFileActionPerformed(evt);
-+            }
-+        });
-+
-+        menu_file.add(cm_loadFile);
-+
-+        cm_loadUrl.setText("Load URL...");
-+        cm_loadUrl.addActionListener(new java.awt.event.ActionListener()
-+        {
-+            public void actionPerformed(java.awt.event.ActionEvent evt)
-+            {
-+                cm_loadUrlActionPerformed(evt);
-+            }
-+        });
-+
-+        menu_file.add(cm_loadUrl);
-+
-+        jMenuBar1.add(menu_file);
-+
-+        menu_window.setText("Window");
-+        cm_player.setText("Player");
-+        cm_player.addActionListener(new java.awt.event.ActionListener()
-+        {
-+            public void actionPerformed(java.awt.event.ActionEvent evt)
-+            {
-+                cm_playerActionPerformed(evt);
-+            }
-+        });
-+
-+        menu_window.add(cm_player);
-+
-+        menu_window.add(jSeparator2);
-+
-+        cm_800x600.setText("800 x 600");
-+        cm_800x600.addActionListener(new java.awt.event.ActionListener()
-+        {
-+            public void actionPerformed(java.awt.event.ActionEvent evt)
-+            {
-+                cm_800x600ActionPerformed(evt);
-+            }
-+        });
-+
-+        menu_window.add(cm_800x600);
-+
-+        CheckBoxMenuItem_anonInputStream.setText("Anonymous Input Stream");
-+        menu_window.add(CheckBoxMenuItem_anonInputStream);
-+
-+        cmCheck_verbose.setText("Verbose");
-+        cmCheck_verbose.addActionListener(new java.awt.event.ActionListener()
-+        {
-+            public void actionPerformed(java.awt.event.ActionEvent evt)
-+            {
-+                cmCheck_verboseActionPerformed(evt);
-+            }
-+        });
-+
-+        menu_window.add(cmCheck_verbose);
-+
-+        jMenuBar1.add(menu_window);
-+
-+        menu_help.setText("Help");
-+        cm_about.setText("About...");
-+        cm_about.addActionListener(new java.awt.event.ActionListener()
-+        {
-+            public void actionPerformed(java.awt.event.ActionEvent evt)
-+            {
-+                cm_aboutActionPerformed(evt);
-+            }
-+        });
-+
-+        menu_help.add(cm_about);
-+
-+        jMenuBar1.add(menu_help);
-+
-+        setJMenuBar(jMenuBar1);
-+
-+        pack();
-+    }// </editor-fold>//GEN-END:initComponents
-+
-+    private void cm_loadUrlActionPerformed(java.awt.event.ActionEvent evt)//GEN-FIRST:event_cm_loadUrlActionPerformed
-+    {//GEN-HEADEREND:event_cm_loadUrlActionPerformed
-+        String urlStrn = JOptionPane.showInputDialog(this, "Enter URL of SVG file");
-+        if (urlStrn == null) return;
-+        
-+        try
-+        {
-+            URL url = new URL(URLEncoder.encode(urlStrn, "UTF-8"));
-+            loadURL(url);
-+        }
-+        catch (Exception e)
-+        {
-+            e.printStackTrace();
-+        }
-+
-+    }//GEN-LAST:event_cm_loadUrlActionPerformed
-+
-+    private void cmCheck_verboseActionPerformed(java.awt.event.ActionEvent evt)//GEN-FIRST:event_cmCheck_verboseActionPerformed
-+    {//GEN-HEADEREND:event_cmCheck_verboseActionPerformed
-+// TODO add your handling code here:
-+    }//GEN-LAST:event_cmCheck_verboseActionPerformed
-+
-+    private void cm_playerActionPerformed(java.awt.event.ActionEvent evt)//GEN-FIRST:event_cm_playerActionPerformed
-+    {//GEN-HEADEREND:event_cm_playerActionPerformed
-+        playerDialog.setVisible(true);
-+    }//GEN-LAST:event_cm_playerActionPerformed
-+
-+    private void cm_aboutActionPerformed(java.awt.event.ActionEvent evt)//GEN-FIRST:event_cm_aboutActionPerformed
-+    {//GEN-HEADEREND:event_cm_aboutActionPerformed
-+        VersionDialog dia = new VersionDialog(this, true, cmCheck_verbose.isSelected());
-+        dia.setVisible(true);
-+//        JOptionPane.showMessageDialog(this, "Salamander SVG - Created by Mark McKay\nhttp://www.kitfox.com");
-+    }//GEN-LAST:event_cm_aboutActionPerformed
-+
-+    private void cm_800x600ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_cm_800x600ActionPerformed
-+        setSize(800, 600);
-+    }//GEN-LAST:event_cm_800x600ActionPerformed
-+    
-+    private void cm_loadFileActionPerformed(java.awt.event.ActionEvent evt)//GEN-FIRST:event_cm_loadFileActionPerformed
-+    {//GEN-HEADEREND:event_cm_loadFileActionPerformed
-+        boolean verbose = cmCheck_verbose.isSelected();
-+        
-+        try
-+        {
-+            int retVal = fileChooser.showOpenDialog(this);
-+            if (retVal == JFileChooser.APPROVE_OPTION)
-+            {
-+                File chosenFile = fileChooser.getSelectedFile();
-+
-+                URL url = chosenFile.toURI().toURL();
-+
-+                loadURL(url);
-+            }
-+        }
-+        catch (Exception e)
-+        {
-+            e.printStackTrace();
-+        }
-+
-+    }//GEN-LAST:event_cm_loadFileActionPerformed
-+
-+    /** Exit the Application */
-+    private void exitForm(java.awt.event.WindowEvent evt) {//GEN-FIRST:event_exitForm
-+        System.exit(0);
-+    }//GEN-LAST:event_exitForm
-+
-+    /**
-+     * @param args the command line arguments
-+     */
-+    public static void main(String args[]) {
-+        new SVGPlayer().setVisible(true);
-+    }
-+
-+    public void updateTime(double curTime, double timeStep, int playState)
-+    {
-+    }
-+    
-+    // Variables declaration - do not modify//GEN-BEGIN:variables
-+    private javax.swing.JCheckBoxMenuItem CheckBoxMenuItem_anonInputStream;
-+    private javax.swing.JCheckBoxMenuItem cmCheck_verbose;
-+    private javax.swing.JMenuItem cm_800x600;
-+    private javax.swing.JMenuItem cm_about;
-+    private javax.swing.JMenuItem cm_loadFile;
-+    private javax.swing.JMenuItem cm_loadUrl;
-+    private javax.swing.JMenuItem cm_player;
-+    private javax.swing.JMenuBar jMenuBar1;
-+    private javax.swing.JSeparator jSeparator2;
-+    private javax.swing.JMenu menu_file;
-+    private javax.swing.JMenu menu_help;
-+    private javax.swing.JMenu menu_window;
-+    private javax.swing.JScrollPane scrollPane_svgArea;
-+    // End of variables declaration//GEN-END:variables
-+
-+}
-Index: core/src/com/kitfox/svg/app/SVGViewer.java
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ core/src/com/kitfox/svg/app/SVGViewer.java	2012-06-17 23:56:57.752545052 +0200
-@@ -0,0 +1,432 @@
-+/*
-+ * SVGViewer.java
-+ *
-+ *
-+ *  The Salamander Project - 2D and 3D graphics libraries in Java
-+ *  Copyright (C) 2004 Mark McKay
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License as published by the Free Software Foundation; either
-+ *  version 2.1 of the License, or (at your option) any later version.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-+ *
-+ *  Mark McKay can be contacted at mark at kitfox.com.  Salamander and other
-+ *  projects can be found at http://www.kitfox.com
-+ *
-+ * Created on April 3, 2004, 5:28 PM
-+ */
-+
-+package com.kitfox.svg.app;
-+
-+import com.kitfox.svg.SVGCache;
-+import com.kitfox.svg.SVGDiagram;
-+import com.kitfox.svg.SVGDisplayPanel;
-+import com.kitfox.svg.SVGElement;
-+import com.kitfox.svg.SVGException;
-+import com.kitfox.svg.SVGUniverse;
-+import java.awt.BorderLayout;
-+import java.awt.Color;
-+import java.awt.Point;
-+import java.io.File;
-+import java.io.InputStream;
-+import java.net.URI;
-+import java.net.URL;
-+import java.net.URLEncoder;
-+import java.security.AccessControlException;
-+import java.util.ArrayList;
-+import java.util.Iterator;
-+import java.util.List;
-+import java.util.regex.Matcher;
-+import java.util.regex.Pattern;
-+import javax.swing.JFileChooser;
-+import javax.swing.JOptionPane;
-+
-+
-+/**
-+ * @author Mark McKay
-+ * @author <a href="mailto:mark at kitfox.com">Mark McKay</a>
-+ */
-+public class SVGViewer extends javax.swing.JFrame 
-+{
-+    public static final long serialVersionUID = 1;
-+
-+    SVGDisplayPanel svgDisplayPanel = new SVGDisplayPanel();
-+
-+    /** FileChooser for running in trusted environments */
-+    final JFileChooser fileChooser;
-+    {
-+//        fileChooser = new JFileChooser(new File("."));
-+        JFileChooser fc = null;
-+        try
-+        {
-+            fc = new JFileChooser();
-+            fc.setFileFilter(
-+                new javax.swing.filechooser.FileFilter() {
-+                    final Matcher matchLevelFile = Pattern.compile(".*\\.svg[z]?").matcher("");
-+
-+                    public boolean accept(File file)
-+                    {
-+                        if (file.isDirectory()) return true;
-+
-+                        matchLevelFile.reset(file.getName());
-+                        return matchLevelFile.matches();
-+                    }
-+
-+                    public String getDescription() { return "SVG file (*.svg, *.svgz)"; }
-+                }
-+            );
-+        }
-+        catch (AccessControlException ex)
-+        {
-+            //Do not create file chooser if webstart refuses permissions
-+        }
-+        fileChooser = fc;
-+    }
-+
-+    /** Backup file service for opening files in WebStart situations */
-+    /*
-+    final FileOpenService fileOpenService;
-+    {
-+        try 
-+        { 
-+            fileOpenService = (FileOpenService)ServiceManager.lookup("javax.jnlp.FileOpenService"); 
-+        } 
-+        catch (UnavailableServiceException e) 
-+        { 
-+            fileOpenService = null; 
-+        } 
-+    }
-+     */
-+    
-+    /** Creates new form SVGViewer */
-+    public SVGViewer() {
-+        initComponents();
-+
-+        setSize(800, 600);
-+
-+        svgDisplayPanel.setBgColor(Color.white);
-+
-+        svgDisplayPanel.setPreferredSize(getSize());
-+        panel_svgArea.add(svgDisplayPanel, BorderLayout.CENTER);
-+//        scrollPane_svgArea.setViewportView(svgDisplayPanel);
-+    }
-+
-+    private void loadURL(URL url)
-+    {
-+        boolean verbose = cmCheck_verbose.isSelected();
-+        
-+//                SVGUniverse universe = new SVGUniverse();
-+        SVGUniverse universe = SVGCache.getSVGUniverse();
-+        SVGDiagram diagram = null;
-+        URI uri;
-+
-+        if (!CheckBoxMenuItem_anonInputStream.isSelected())
-+        {
-+            //Load from a disk with a valid URL
-+            uri = universe.loadSVG(url);
-+
-+            if (verbose) System.err.println("Loading document " + uri.toString());
-+
-+            diagram = universe.getDiagram(uri);
-+        }
-+        else
-+        {
-+            //Load from a stream with no particular valid URL
-+            try
-+            {
-+                InputStream is = url.openStream();
-+                uri = universe.loadSVG(is, "defaultName");
-+
-+                if (verbose) System.err.println("Loading document " + uri.toString());
-+            }
-+            catch (Exception e)
-+            {
-+                e.printStackTrace();
-+                return;
-+            }
-+        }
-+/*
-+ByteArrayOutputStream bs = new ByteArrayOutputStream();
-+ObjectOutputStream os = new ObjectOutputStream(bs);
-+os.writeObject(universe);
-+os.close();
-+
-+ByteArrayInputStream bin = new ByteArrayInputStream(bs.toByteArray());
-+ObjectInputStream is = new ObjectInputStream(bin);
-+universe = (SVGUniverse)is.readObject();
-+is.close();
-+*/
-+
-+        diagram = universe.getDiagram(uri);
-+
-+        svgDisplayPanel.setDiagram(diagram);
-+        repaint();
-+    }
-+    
-+    /** This method is called from within the constructor to
-+     * initialize the form.
-+     * WARNING: Do NOT modify this code. The content of this method is
-+     * always regenerated by the Form Editor.
-+     */
-+    // <editor-fold defaultstate="collapsed" desc=" Generated Code ">//GEN-BEGIN:initComponents
-+    private void initComponents()
-+    {
-+        scrollPane_svgArea = new javax.swing.JScrollPane();
-+        panel_svgArea = new javax.swing.JPanel();
-+        jMenuBar1 = new javax.swing.JMenuBar();
-+        menu_file = new javax.swing.JMenu();
-+        cm_loadFile = new javax.swing.JMenuItem();
-+        cm_loadUrl = new javax.swing.JMenuItem();
-+        menu_window = new javax.swing.JMenu();
-+        cm_800x600 = new javax.swing.JMenuItem();
-+        CheckBoxMenuItem_anonInputStream = new javax.swing.JCheckBoxMenuItem();
-+        cmCheck_verbose = new javax.swing.JCheckBoxMenuItem();
-+        menu_help = new javax.swing.JMenu();
-+        cm_about = new javax.swing.JMenuItem();
-+
-+        setTitle("SVG Viewer - Salamander Project");
-+        addWindowListener(new java.awt.event.WindowAdapter()
-+        {
-+            public void windowClosing(java.awt.event.WindowEvent evt)
-+            {
-+                exitForm(evt);
-+            }
-+        });
-+
-+        panel_svgArea.setLayout(new java.awt.BorderLayout());
-+
-+        panel_svgArea.addMouseListener(new java.awt.event.MouseAdapter()
-+        {
-+            public void mousePressed(java.awt.event.MouseEvent evt)
-+            {
-+                panel_svgAreaMousePressed(evt);
-+            }
-+            public void mouseReleased(java.awt.event.MouseEvent evt)
-+            {
-+                panel_svgAreaMouseReleased(evt);
-+            }
-+        });
-+
-+        scrollPane_svgArea.setViewportView(panel_svgArea);
-+
-+        getContentPane().add(scrollPane_svgArea, java.awt.BorderLayout.CENTER);
-+
-+        menu_file.setMnemonic('f');
-+        menu_file.setText("File");
-+        cm_loadFile.setMnemonic('l');
-+        cm_loadFile.setText("Load File...");
-+        cm_loadFile.addActionListener(new java.awt.event.ActionListener()
-+        {
-+            public void actionPerformed(java.awt.event.ActionEvent evt)
-+            {
-+                cm_loadFileActionPerformed(evt);
-+            }
-+        });
-+
-+        menu_file.add(cm_loadFile);
-+
-+        cm_loadUrl.setText("Load URL...");
-+        cm_loadUrl.addActionListener(new java.awt.event.ActionListener()
-+        {
-+            public void actionPerformed(java.awt.event.ActionEvent evt)
-+            {
-+                cm_loadUrlActionPerformed(evt);
-+            }
-+        });
-+
-+        menu_file.add(cm_loadUrl);
-+
-+        jMenuBar1.add(menu_file);
-+
-+        menu_window.setText("Window");
-+        cm_800x600.setText("800 x 600");
-+        cm_800x600.addActionListener(new java.awt.event.ActionListener()
-+        {
-+            public void actionPerformed(java.awt.event.ActionEvent evt)
-+            {
-+                cm_800x600ActionPerformed(evt);
-+            }
-+        });
-+
-+        menu_window.add(cm_800x600);
-+
-+        CheckBoxMenuItem_anonInputStream.setText("Anonymous Input Stream");
-+        menu_window.add(CheckBoxMenuItem_anonInputStream);
-+
-+        cmCheck_verbose.setText("Verbose");
-+        cmCheck_verbose.addActionListener(new java.awt.event.ActionListener()
-+        {
-+            public void actionPerformed(java.awt.event.ActionEvent evt)
-+            {
-+                cmCheck_verboseActionPerformed(evt);
-+            }
-+        });
-+
-+        menu_window.add(cmCheck_verbose);
-+
-+        jMenuBar1.add(menu_window);
-+
-+        menu_help.setText("Help");
-+        cm_about.setText("About...");
-+        cm_about.addActionListener(new java.awt.event.ActionListener()
-+        {
-+            public void actionPerformed(java.awt.event.ActionEvent evt)
-+            {
-+                cm_aboutActionPerformed(evt);
-+            }
-+        });
-+
-+        menu_help.add(cm_about);
-+
-+        jMenuBar1.add(menu_help);
-+
-+        setJMenuBar(jMenuBar1);
-+
-+        pack();
-+    }// </editor-fold>//GEN-END:initComponents
-+
-+    private void cm_loadUrlActionPerformed(java.awt.event.ActionEvent evt)//GEN-FIRST:event_cm_loadUrlActionPerformed
-+    {//GEN-HEADEREND:event_cm_loadUrlActionPerformed
-+        String urlStrn = JOptionPane.showInputDialog(this, "Enter URL of SVG file");
-+        if (urlStrn == null) return;
-+        
-+        try
-+        {
-+            URL url = new URL(URLEncoder.encode(urlStrn, "UTF-8"));
-+            loadURL(url);
-+        }
-+        catch (Exception e)
-+        {
-+            e.printStackTrace();
-+        }
-+
-+    }//GEN-LAST:event_cm_loadUrlActionPerformed
-+
-+    private void panel_svgAreaMouseReleased(java.awt.event.MouseEvent evt)//GEN-FIRST:event_panel_svgAreaMouseReleased
-+    {//GEN-HEADEREND:event_panel_svgAreaMouseReleased
-+        SVGDiagram diagram = svgDisplayPanel.getDiagram();
-+        List pickedElements;
-+        try
-+        {
-+            pickedElements = diagram.pick(new Point(evt.getX(), evt.getY()), null);
-+        } 
-+        catch (SVGException ex)
-+        {
-+            ex.printStackTrace();
-+            return;
-+        }
-+        
-+        System.out.println("Pick results:");
-+        for (Iterator it = pickedElements.iterator(); it.hasNext();)
-+        {
-+            ArrayList path = (ArrayList)it.next();
-+            
-+            System.out.print("  Path: ");
-+            
-+            for (Iterator it2 = path.iterator(); it2.hasNext();)
-+            {
-+                SVGElement ele = (SVGElement)it2.next();
-+
-+                System.out.print("" + ele.getId() + "(" + ele.getClass().getName() + ") ");
-+            }
-+            System.out.println();
-+        }
-+    }//GEN-LAST:event_panel_svgAreaMouseReleased
-+
-+    private void panel_svgAreaMousePressed(java.awt.event.MouseEvent evt)//GEN-FIRST:event_panel_svgAreaMousePressed
-+    {//GEN-HEADEREND:event_panel_svgAreaMousePressed
-+
-+    }//GEN-LAST:event_panel_svgAreaMousePressed
-+
-+    private void cmCheck_verboseActionPerformed(java.awt.event.ActionEvent evt)//GEN-FIRST:event_cmCheck_verboseActionPerformed
-+    {//GEN-HEADEREND:event_cmCheck_verboseActionPerformed
-+        SVGCache.getSVGUniverse().setVerbose(cmCheck_verbose.isSelected());
-+    }//GEN-LAST:event_cmCheck_verboseActionPerformed
-+
-+    private void cm_aboutActionPerformed(java.awt.event.ActionEvent evt)//GEN-FIRST:event_cm_aboutActionPerformed
-+    {//GEN-HEADEREND:event_cm_aboutActionPerformed
-+        //JOptionPane.showMessageDialog(this, "Salamander SVG - Created by Mark McKay\nhttp://www.kitfox.com");
-+        VersionDialog dlg = new VersionDialog(this, true, cmCheck_verbose.isSelected());
-+        dlg.setVisible(true);
-+    }//GEN-LAST:event_cm_aboutActionPerformed
-+
-+    private void cm_800x600ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_cm_800x600ActionPerformed
-+        setSize(800, 600);
-+    }//GEN-LAST:event_cm_800x600ActionPerformed
-+    
-+    private void cm_loadFileActionPerformed(java.awt.event.ActionEvent evt)//GEN-FIRST:event_cm_loadFileActionPerformed
-+    {//GEN-HEADEREND:event_cm_loadFileActionPerformed
-+        try
-+        {
-+            int retVal = fileChooser.showOpenDialog(this);
-+            if (retVal == JFileChooser.APPROVE_OPTION)
-+            {
-+                File chosenFile = fileChooser.getSelectedFile();
-+
-+                URL url = chosenFile.toURI().toURL();
-+
-+                loadURL(url);
-+            }
-+        }
-+        /*
-+        catch (IOException ioe)
-+        {
-+            try
-+            {
-+                //We may be in a WebStart app.  Try again with a FileOpenService
-+                FileContents fc = fileOpenService.openFileDialog(null, new String[]{"svg"});
-+                InputStream is = fc.getInputStream();
-+                String name = fc.getName();
-+            }
-+            catch (Exception e)
-+            {
-+                e.printStackTrace();
-+            }
-+        }
-+         */
-+        catch (Exception e)
-+        {
-+            e.printStackTrace();
-+        }
-+
-+    }//GEN-LAST:event_cm_loadFileActionPerformed
-+
-+    /** Exit the Application */
-+    private void exitForm(java.awt.event.WindowEvent evt) {//GEN-FIRST:event_exitForm
-+//        setVisible(false);
-+//        dispose();
-+        System.exit(0);
-+    }//GEN-LAST:event_exitForm
-+
-+    /**
-+     * @param args the command line arguments
-+     */
-+    public static void main(String args[]) {
-+        new SVGViewer().setVisible(true);
-+    }
-+
-+    // Variables declaration - do not modify//GEN-BEGIN:variables
-+    private javax.swing.JCheckBoxMenuItem CheckBoxMenuItem_anonInputStream;
-+    private javax.swing.JCheckBoxMenuItem cmCheck_verbose;
-+    private javax.swing.JMenuItem cm_800x600;
-+    private javax.swing.JMenuItem cm_about;
-+    private javax.swing.JMenuItem cm_loadFile;
-+    private javax.swing.JMenuItem cm_loadUrl;
-+    private javax.swing.JMenuBar jMenuBar1;
-+    private javax.swing.JMenu menu_file;
-+    private javax.swing.JMenu menu_help;
-+    private javax.swing.JMenu menu_window;
-+    private javax.swing.JPanel panel_svgArea;
-+    private javax.swing.JScrollPane scrollPane_svgArea;
-+    // End of variables declaration//GEN-END:variables
-+
-+}
-Index: core/src/com/kitfox/svg/app/VersionDialog.java
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ core/src/com/kitfox/svg/app/VersionDialog.java	2012-06-17 23:56:57.752545052 +0200
-@@ -0,0 +1,151 @@
-+/*
-+ * VersionDialog.java
-+ *
-+ *
-+ *  The Salamander Project - 2D and 3D graphics libraries in Java
-+ *  Copyright (C) 2004 Mark McKay
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License as published by the Free Software Foundation; either
-+ *  version 2.1 of the License, or (at your option) any later version.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-+ *
-+ *  Mark McKay can be contacted at mark at kitfox.com.  Salamander and other
-+ *  projects can be found at http://www.kitfox.com
-+ *
-+ * Created on January 13, 2005, 7:23 AM
-+ */
-+
-+package com.kitfox.svg.app;
-+
-+import java.net.*;
-+import java.io.*;
-+import java.util.*;
-+import javax.swing.event.*;
-+import javax.swing.*;
-+import javax.swing.text.html.*;
-+
-+
-+/**
-+ *
-+ * @author  kitfox
-+ */
-+public class VersionDialog extends javax.swing.JDialog
-+{
-+    public static final long serialVersionUID = 1;
-+    
-+    final boolean verbose;
-+    
-+    /** Creates new form VersionDialog */
-+    public VersionDialog(java.awt.Frame parent, boolean modal, boolean verbose)
-+    {
-+        super(parent, modal);
-+        initComponents();
-+        
-+        this.verbose = verbose;
-+        
-+        textpane_text.setContentType("text/html");
-+        
-+        StringBuffer sb = new StringBuffer();
-+        try
-+        {
-+            URL url = getClass().getResource("/res/help/about/about.html");
-+            if (verbose)
-+            {
-+                System.err.println("" + getClass() + " trying to load about html " + url);
-+            }
-+            
-+            BufferedReader reader = new BufferedReader(new InputStreamReader(url.openStream()));
-+            while (true)
-+            {
-+                String line = reader.readLine();
-+                if (line == null) break;
-+                sb.append(line);
-+            }
-+            
-+            textpane_text.setText(sb.toString());
-+        }
-+        catch (Exception e)
-+        {
-+            e.printStackTrace();
-+        }
-+        
-+    }
-+    
-+    /** This method is called from within the constructor to
-+     * initialize the form.
-+     * WARNING: Do NOT modify this code. The content of this method is
-+     * always regenerated by the Form Editor.
-+     */
-+    // <editor-fold defaultstate="collapsed" desc=" Generated Code ">//GEN-BEGIN:initComponents
-+    private void initComponents()
-+    {
-+        jPanel1 = new javax.swing.JPanel();
-+        textpane_text = new javax.swing.JTextPane();
-+        jPanel2 = new javax.swing.JPanel();
-+        bn_close = new javax.swing.JButton();
-+
-+        setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE);
-+        setTitle("About SVG Salamander");
-+        jPanel1.setLayout(new java.awt.BorderLayout());
-+
-+        textpane_text.setEditable(false);
-+        textpane_text.setPreferredSize(new java.awt.Dimension(400, 300));
-+        jPanel1.add(textpane_text, java.awt.BorderLayout.CENTER);
-+
-+        getContentPane().add(jPanel1, java.awt.BorderLayout.CENTER);
-+
-+        bn_close.setText("Close");
-+        bn_close.addActionListener(new java.awt.event.ActionListener()
-+        {
-+            public void actionPerformed(java.awt.event.ActionEvent evt)
-+            {
-+                bn_closeActionPerformed(evt);
-+            }
-+        });
-+
-+        jPanel2.add(bn_close);
-+
-+        getContentPane().add(jPanel2, java.awt.BorderLayout.SOUTH);
-+
-+        pack();
-+    }
-+    // </editor-fold>//GEN-END:initComponents
-+
-+    private void bn_closeActionPerformed(java.awt.event.ActionEvent evt)//GEN-FIRST:event_bn_closeActionPerformed
-+    {//GEN-HEADEREND:event_bn_closeActionPerformed
-+        setVisible(false);
-+        dispose();
-+    }//GEN-LAST:event_bn_closeActionPerformed
-+    
-+    /**
-+     * @param args the command line arguments
-+     */
-+    public static void main(String args[])
-+    {
-+        java.awt.EventQueue.invokeLater(new Runnable()
-+        {
-+            public void run()
-+            {
-+                new VersionDialog(new javax.swing.JFrame(), true, true).setVisible(true);
-+            }
-+        });
-+    }
-+    
-+    // Variables declaration - do not modify//GEN-BEGIN:variables
-+    private javax.swing.JButton bn_close;
-+    private javax.swing.JPanel jPanel1;
-+    private javax.swing.JPanel jPanel2;
-+    private javax.swing.JTextPane textpane_text;
-+    // End of variables declaration//GEN-END:variables
-+    
-+}
-Index: core/src/com/kitfox/svg/app/ant/SVGToImageAntTask.java
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ core/src/com/kitfox/svg/app/ant/SVGToImageAntTask.java	2012-06-17 23:56:57.752545052 +0200
-@@ -0,0 +1,251 @@
-+/*
-+ * IndexLoadObjectsAntTask.java
-+ *
-+ * Created on January 22, 2005, 10:30 AM
-+ */
-+
-+package com.kitfox.svg.app.ant;
-+
-+import java.awt.*;
-+import java.awt.image.*;
-+import java.util.*;
-+import java.util.regex.*;
-+import java.io.*;
-+import javax.imageio.*;
-+
-+//import com.kitfox.util.*;
-+//import com.kitfox.util.indexedObject.*;
-+
-+import org.apache.tools.ant.*;
-+import org.apache.tools.ant.types.*;
-+
-+import com.kitfox.svg.app.beans.*;
-+import com.kitfox.svg.*;
-+import com.kitfox.svg.xml.ColorTable;
-+
-+/**
-+ * <p>Translates a group of SVG files into images.</p>
-+ * 
-+ * <p>Parameters:</p>
-+ * <p><ul>
-+ * <li/>destDir - If present, specifices a directory to write SVG files to.  Otherwise
-+ * writes images to directory SVG file was found in
-+ * verbose - If true, prints processing information to the console
-+ * <li/>format - File format for output images.  The java core javax.imageio.ImageIO
-+ * class is used for creating images, so format strings will depend on what
-+ * files your system is configured to handle.  By default, "gif", "jpg" and "png"
-+ * files are guaranteed to be present.  If omitted, "png" is used by default.
-+ * <li/>backgroundColor - Optional background color.  Color can be specified as a standard 
-+ * HTML color.  That is, as the name of a standard color such as "blue" or 
-+ * "limegreen", using the # notaion as in #ff00ff for magenta, or in rgb format
-+ * listing the components as in rgb(255, 192, 192) for pink.  If omitted,
-+ * background is transparent.
-+ * <li/>antiAlias - If set, shapes are drawn using antialiasing.  Defaults to true.
-+ * <li/>interpolation - String describing image interpolation alrogithm.  Can
-+ * be one of "nearest neighbor", "bilinear" or "bicubic".  Defaults to "bicubic".
-+ * <li/>width - If greater than 0, determines the width of the written image.  Otherwise,
-+ * the width is obtained from the SVG document.  Defaults to -1;
-+ * <li/>height - If greater than 0, determines the height of the written image.  Otherwise,
-+ * the height is obtained from the SVG document.  Defaults to -1.
-+ * <li/>sizeToFit - If true and the width and height of the output image differ
-+ * from that of the SVG image, the valid area of the SVG image will be resized 
-+ * to fit the specified size.
-+ * <li/>verbose - IF true, prints out diagnostic infromation about processing.  
-+ * Defaults to false.
-+ * </ul></p>
-+ * 
-+ * Example:
-+ * <SVGToImage destDir="${index.java}" format="jpg" verbose="true">
-+ *    <fileset dir="${dir1}">
-+ *        <include name="*.svg"/>
-+ *    </fileset>
-+ *    <fileset dir="${dir2}">
-+ *        <include name="*.svg"/>
-+ *    </fileset>
-+ * </SVGToImage>
-+ * 
-+ * 
-+ * 
-+ * @author kitfox
-+ */
-+public class SVGToImageAntTask extends Task
-+{
-+    private ArrayList filesets = new ArrayList();
-+    boolean verbose = false;
-+    File destDir;
-+    private String format = "png";
-+    Color backgroundColor = null;
-+    int width = -1;
-+    int height = -1;
-+    boolean antiAlias = true;
-+    String interpolation = "bicubic";
-+    boolean clipToViewBox = false;
-+    boolean sizeToFit = true;
-+    
-+    /** Creates a new instance of IndexLoadObjectsAntTask */
-+    public SVGToImageAntTask()
-+    {
-+    }
-+    
-+    
-+    public String getFormat()
-+    {
-+        return format;
-+    }
-+    
-+    public void setFormat(String format)
-+    {
-+        this.format = format;
-+    }
-+    
-+    public void setBackgroundColor(String bgColor)
-+    {
-+        this.backgroundColor = ColorTable.parseColor(bgColor);
-+    }
-+    
-+    public void setHeight(int height)
-+    {
-+        this.height = height;
-+    }
-+    
-+    public void setWidth(int width)
-+    {
-+        this.width = width;
-+    }
-+    
-+    public void setAntiAlias(boolean antiAlias)
-+    {
-+        this.antiAlias = antiAlias;
-+    }
-+    
-+    public void setInterpolation(String interpolation)
-+    {
-+        this.interpolation = interpolation;
-+    }
-+    
-+    public void setSizeToFit(boolean sizeToFit)
-+    {
-+        this.sizeToFit = sizeToFit;
-+    }
-+    
-+    public void setClipToViewBox(boolean clipToViewBox)
-+    {
-+        this.clipToViewBox = clipToViewBox;
-+    }
-+    
-+    public void setVerbose(boolean verbose)
-+    {
-+        this.verbose = verbose;
-+    }
-+    
-+    public void setDestDir(File destDir)
-+    {
-+        this.destDir = destDir;
-+    }
-+    
-+    /**
-+     * Adds a set of files.
-+     */
-+    public void addFileset(FileSet set)
-+    {
-+        filesets.add(set);
-+    }
-+    
-+    
-+    
-+    public void execute()
-+    {
-+        if (verbose) log("Building SVG images");
-+        
-+        for (Iterator it = filesets.iterator(); it.hasNext();)
-+        {
-+            FileSet fs = (FileSet)it.next();
-+            FileScanner scanner = fs.getDirectoryScanner(getProject());
-+            String[] files = scanner.getIncludedFiles();
-+            
-+            try
-+            {
-+                File basedir = scanner.getBasedir();
-+                
-+                if (verbose) log("Scaning " + basedir);
-+                
-+                for (int i = 0; i < files.length; i++)
-+                {
-+//System.out.println("File " + files[i]);
-+//System.out.println("BaseDir " + basedir);
-+                    translate(basedir, files[i]);
-+                }
-+            }
-+            catch (Exception e)
-+            {
-+                throw new BuildException(e);
-+            }
-+        }
-+    }
-+    
-+    private void translate(File baseDir, String shortName) throws BuildException
-+    {
-+        File source = new File(baseDir, shortName);
-+        
-+        if (verbose) log("Reading file: " + source);
-+        
-+        Matcher matchName = Pattern.compile("(.*)\\.svg", Pattern.CASE_INSENSITIVE).matcher(shortName);
-+        if (matchName.matches())
-+        {
-+            shortName = matchName.group(1);
-+        }
-+        shortName += "." + format;
-+        
-+        SVGIcon icon = new SVGIcon();
-+        icon.setSvgURI(source.toURI());
-+        icon.setAntiAlias(antiAlias);
-+        if (interpolation.equals("nearest neighbor"))
-+        {
-+            icon.setInterpolation(SVGIcon.INTERP_NEAREST_NEIGHBOR);
-+        }
-+        else if (interpolation.equals("bilinear"))
-+        {
-+            icon.setInterpolation(SVGIcon.INTERP_BILINEAR);
-+        }
-+        else if (interpolation.equals("bicubic"))
-+        {
-+            icon.setInterpolation(SVGIcon.INTERP_BICUBIC);
-+        }
-+        
-+        int iconWidth = width > 0 ? width : icon.getIconWidth();
-+        int iconHeight = height > 0 ? height : icon.getIconHeight();
-+        icon.setClipToViewbox(clipToViewBox);
-+        icon.setPreferredSize(new Dimension(iconWidth, iconHeight));
-+        icon.setScaleToFit(sizeToFit);
-+        BufferedImage image = new BufferedImage(iconWidth, iconHeight, BufferedImage.TYPE_INT_ARGB);
-+        Graphics2D g = image.createGraphics();
-+        
-+        if (backgroundColor != null)
-+        {
-+            g.setColor(backgroundColor);
-+            g.fillRect(0, 0, iconWidth, iconHeight);
-+        }
-+        
-+        g.setClip(0, 0, iconWidth, iconHeight);
-+//        g.fillRect(10, 10, 100, 100);
-+        icon.paintIcon(null, g, 0, 0);
-+        g.dispose();
-+        
-+        File outFile = destDir == null ? new File(baseDir, shortName) : new File(destDir, shortName);
-+        if (verbose) log("Writing file: " + outFile);
-+        
-+        try
-+        {
-+            ImageIO.write(image, format, outFile);
-+        }
-+        catch (IOException e)
-+        {
-+            log("Error writing image: " + e.getMessage());
-+            throw new BuildException(e);
-+        }
-+        
-+        
-+        SVGCache.getSVGUniverse().clear();
-+    }
-+    
-+}
-Index: core/src/com/kitfox/svg/app/beans/ProportionalLayoutPanel.java
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ core/src/com/kitfox/svg/app/beans/ProportionalLayoutPanel.java	2012-06-17 23:56:57.784545052 +0200
-@@ -0,0 +1,91 @@
-+/*
-+ * ProportionalLayoutPanel.java
-+ *
-+ * Created on May 7, 2005, 4:15 AM
-+ */
-+
-+package com.kitfox.svg.app.beans;
-+
-+import java.awt.*;
-+import java.util.*;
-+import javax.swing.*;
-+
-+/**
-+ * Panel based on the null layout.  Allows editing with absolute layout.  When
-+ * instanced, records layout dimensions of all subcomponents.  Then, if the
-+ * panel is ever resized, scales all children to fit new size.
-+ *
-+ * @author  kitfox
-+ */
-+public class ProportionalLayoutPanel extends javax.swing.JPanel
-+{
-+    public static final long serialVersionUID = 1;
-+
-+    //Margins to leave on sides of panel, expressed in fractions [0 1]
-+    float topMargin;
-+    float bottomMargin;
-+    float leftMargin;
-+    float rightMargin;
-+    
-+    /** Creates new form ProportionalLayoutPanel */
-+    public ProportionalLayoutPanel()
-+    {
-+        initComponents();
-+    }
-+    
-+    public void addNotify()
-+    {
-+        super.addNotify();
-+        
-+        Rectangle rect = this.getBounds();
-+        JOptionPane.showMessageDialog(this, "" + rect);
-+    }
-+    
-+    
-+    /** This method is called from within the constructor to
-+     * initialize the form.
-+     * WARNING: Do NOT modify this code. The content of this method is
-+     * always regenerated by the Form Editor.
-+     */
-+    // <editor-fold defaultstate="collapsed" desc=" Generated Code ">//GEN-BEGIN:initComponents
-+    private void initComponents()
-+    {
-+        jPanel1 = new javax.swing.JPanel();
-+
-+        setLayout(null);
-+
-+        addComponentListener(new java.awt.event.ComponentAdapter()
-+        {
-+            public void componentResized(java.awt.event.ComponentEvent evt)
-+            {
-+                formComponentResized(evt);
-+            }
-+            public void componentShown(java.awt.event.ComponentEvent evt)
-+            {
-+                formComponentShown(evt);
-+            }
-+        });
-+
-+        add(jPanel1);
-+        jPanel1.setBounds(80, 90, 280, 160);
-+
-+    }
-+    // </editor-fold>//GEN-END:initComponents
-+
-+    private void formComponentShown(java.awt.event.ComponentEvent evt)//GEN-FIRST:event_formComponentShown
-+    {//GEN-HEADEREND:event_formComponentShown
-+        JOptionPane.showMessageDialog(this, "" + getWidth() + ", " + getHeight());
-+
-+    }//GEN-LAST:event_formComponentShown
-+
-+    private void formComponentResized(java.awt.event.ComponentEvent evt)//GEN-FIRST:event_formComponentResized
-+    {//GEN-HEADEREND:event_formComponentResized
-+// TODO add your handling code here:
-+    }//GEN-LAST:event_formComponentResized
-+    
-+    
-+    // Variables declaration - do not modify//GEN-BEGIN:variables
-+    private javax.swing.JPanel jPanel1;
-+    // End of variables declaration//GEN-END:variables
-+    
-+}
-Index: core/src/com/kitfox/svg/app/beans/SVGPanel.java
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ core/src/com/kitfox/svg/app/beans/SVGPanel.java	2012-06-17 23:56:57.784545052 +0200
-@@ -0,0 +1,243 @@
-+/*
-+ * SVGIcon.java
-+ *
-+ * Created on April 21, 2005, 10:43 AM
-+ */
-+
-+package com.kitfox.svg.app.beans;
-+
-+import javax.swing.*;
-+import java.awt.*;
-+import java.awt.geom.*;
-+import java.net.*;
-+import java.beans.*;
-+
-+import com.kitfox.svg.*;
-+
-+/**
-+ *
-+ * @author  kitfox
-+ */
-+public class SVGPanel extends JPanel
-+{
-+    public static final long serialVersionUID = 1;
-+
-+
-+    SVGUniverse svgUniverse = SVGCache.getSVGUniverse();
-+    
-+    private boolean antiAlias;
-+    
-+//    private String svgPath;
-+    URI svgURI;
-+
-+    private boolean scaleToFit;
-+    AffineTransform scaleXform = new AffineTransform();
-+    
-+    /** Creates new form SVGIcon */
-+    public SVGPanel()
-+    {
-+        initComponents();
-+    }
-+        
-+    public int getSVGHeight()
-+    {
-+        if (scaleToFit) return getPreferredSize().height;
-+        
-+        SVGDiagram diagram = svgUniverse.getDiagram(svgURI);
-+        if (diagram == null) return 0;
-+        return (int)diagram.getHeight();
-+    }
-+    
-+    public int getSVGWidth()
-+    {
-+        if (scaleToFit) return getPreferredSize().width;
-+        
-+        SVGDiagram diagram = svgUniverse.getDiagram(svgURI);
-+        if (diagram == null) return 0;
-+        return (int)diagram.getWidth();
-+    }
-+    
-+//          Draw the icon at the specified location.
-+    public void paintComponent(Graphics gg)
-+    {
-+        super.paintComponent(gg);
-+        
-+        Graphics2D g = (Graphics2D)gg;
-+        
-+        Object oldAliasHint = g.getRenderingHint(RenderingHints.KEY_ANTIALIASING);
-+        g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, antiAlias ? RenderingHints.VALUE_ANTIALIAS_ON : RenderingHints.VALUE_ANTIALIAS_OFF);
-+
-+        
-+        SVGDiagram diagram = svgUniverse.getDiagram(svgURI);
-+        if (diagram == null) return;
-+        
-+        if (!scaleToFit)
-+        {
-+            try
-+            {
-+                diagram.render(g);
-+                g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, oldAliasHint);
-+            }
-+            catch (SVGException e)
-+            {
-+                throw new RuntimeException(e);
-+            }
-+            return;
-+        }
-+        
-+        Dimension dim = getSize();
-+        final int width = dim.width;
-+        final int height = dim.height;
-+//        int width = getWidth();
-+//        int height = getHeight();
-+        
-+//        if (width == 0 || height == 0)
-+//        {
-+//           //Chances are we're rendering offscreen
-+//            Dimension dim = getSize();
-+//            width = dim.width;
-+//            height = dim.height;
-+//            return;
-+//        }
-+        
-+//        g.setClip(0, 0, dim.width, dim.height);
-+
-+            
-+        final Rectangle2D.Double rect = new Rectangle2D.Double();
-+        diagram.getViewRect(rect);
-+        
-+        scaleXform.setToScale(width / rect.width, height / rect.height);
-+        
-+        AffineTransform oldXform = g.getTransform();
-+        g.transform(scaleXform);
-+
-+        try
-+        {
-+            diagram.render(g);
-+        }
-+        catch (SVGException e)
-+        {
-+            throw new RuntimeException(e);
-+        }
-+        
-+        g.setTransform(oldXform);
-+        
-+        g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, oldAliasHint);
-+    }
-+    
-+    public SVGUniverse getSvgUniverse()
-+    {
-+        return svgUniverse;
-+    }
-+
-+    public void setSvgUniverse(SVGUniverse svgUniverse)
-+    {
-+        SVGUniverse old = this.svgUniverse;
-+        this.svgUniverse = svgUniverse;
-+        firePropertyChange("svgUniverse", old, svgUniverse);
-+    }
-+
-+    public URI getSvgURI()
-+    {
-+        return svgURI;
-+    }
-+
-+    public void setSvgURI(URI svgURI)
-+    {
-+        URI old = this.svgURI;
-+        this.svgURI = svgURI;
-+        firePropertyChange("svgURI", old, svgURI);
-+    }
-+    
-+    /**
-+     * Most resources your component will want to access will be resources on your classpath.  
-+     * This method will interpret the passed string as a path in the classpath and use
-+     * Class.getResource() to determine the URI of the SVG.
-+     */
-+    public void setSvgResourcePath(String resourcePath) throws SVGException
-+    {
-+        URI old = this.svgURI;
-+        
-+        try
-+        {
-+            svgURI = new URI(getClass().getResource(resourcePath).toString());
-+//System.err.println("SVGPanel: new URI " + svgURI + " from path " + resourcePath);
-+            
-+            firePropertyChange("svgURI", old, svgURI);
-+            
-+            repaint();
-+        }
-+        catch (Exception e)
-+        {
-+            throw new SVGException("Could not resolve path " + resourcePath, e);
-+//            svgURI = old;
-+        }
-+    }
-+    
-+    public boolean isScaleToFit()
-+    {
-+        return scaleToFit;
-+    }
-+
-+    public void setScaleToFit(boolean scaleToFit)
-+    {
-+        boolean old = this.scaleToFit;
-+        this.scaleToFit = scaleToFit;
-+        firePropertyChange("scaleToFit", old, scaleToFit);
-+    }
-+    
-+    /**
-+     * @return true if antiAliasing is turned on.
-+     * @deprecated
-+     */
-+    public boolean getUseAntiAlias()
-+    {
-+        return getAntiAlias();
-+    }
-+
-+    /**
-+     * @param antiAlias true to use antiAliasing.
-+     * @deprecated
-+     */
-+    public void setUseAntiAlias(boolean antiAlias)
-+    {
-+        setAntiAlias(antiAlias);
-+    }
-+    
-+    /**
-+     * @return true if antiAliasing is turned on.
-+     */
-+    public boolean getAntiAlias()
-+    {
-+        return antiAlias;
-+    }
-+
-+    /**
-+     * @param antiAlias true to use antiAliasing.
-+     */
-+    public void setAntiAlias(boolean antiAlias)
-+    {
-+        boolean old = this.antiAlias;
-+        this.antiAlias = antiAlias;
-+        firePropertyChange("antiAlias", old, antiAlias);
-+    }
-+    
-+    /** This method is called from within the constructor to
-+     * initialize the form.
-+     * WARNING: Do NOT modify this code. The content of this method is
-+     * always regenerated by the Form Editor.
-+     */
-+    // <editor-fold defaultstate="collapsed" desc=" Generated Code ">//GEN-BEGIN:initComponents
-+    private void initComponents()
-+    {
-+
-+        setLayout(new java.awt.BorderLayout());
-+
-+    }
-+    // </editor-fold>//GEN-END:initComponents
-+    
-+    
-+    // Variables declaration - do not modify//GEN-BEGIN:variables
-+    // End of variables declaration//GEN-END:variables
-+    
-+}
-Index: core/src/com/kitfox/svg/app/data/HandlerFactory.java
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ core/src/com/kitfox/svg/app/data/HandlerFactory.java	2012-06-17 23:56:57.784545052 +0200
-@@ -0,0 +1,27 @@
-+/*
-+ * To change this template, choose Tools | Templates
-+ * and open the template in the editor.
-+ */
-+
-+package com.kitfox.svg.app.data;
-+
-+import java.net.URLStreamHandler;
-+import java.net.URLStreamHandlerFactory;
-+
-+/**
-+ *
-+ * @author kitfox
-+ */
-+public class HandlerFactory implements URLStreamHandlerFactory
-+{
-+    static Handler handler = new Handler();
-+
-+    public URLStreamHandler createURLStreamHandler(String protocol)
-+    {
-+        if ("data".equals(protocol))
-+        {
-+            return handler;
-+        }
-+        return null;
-+    }
-+}
+Only in kitfox/svg: animation
+Only in kitfox/svg/app/ant: SVGToImageAntTask.java
+Only in kitfox/svg/app/beans: ProportionalLayoutPanel.form
+Only in kitfox/svg/app/beans: ProportionalLayoutPanel.java
+Only in kitfox/svg/app/beans: SVGPanel.form
+Only in kitfox/svg/app/beans: SVGPanel.java
+Only in kitfox/svg/app/data: HandlerFactory.java
+Only in kitfox/svg/app: MainFrame.form
+Only in kitfox/svg/app: MainFrame.java
+Only in kitfox/svg/app: PlayerDialog.form
+Only in kitfox/svg/app: PlayerDialog.java
+Only in kitfox/svg/app: PlayerThread.java
+Only in kitfox/svg/app: PlayerThreadListener.java
+Only in kitfox/svg/app: SVGPlayer.form
+Only in kitfox/svg/app: SVGPlayer.java
+Only in kitfox/svg/app: SVGViewer.form
+Only in kitfox/svg/app: SVGViewer.java
+Only in kitfox/svg/app: VersionDialog.form
+Only in kitfox/svg/app: VersionDialog.java
+Only in kitfox/svg: SVGDisplayPanel.form
+diff -ur kitfox/svg/SVGElement.java src/com/kitfox/svg/SVGElement.java
+--- kitfox/svg/SVGElement.java	2014-10-30 11:31:46.229650244 +0100
++++ src/com/kitfox/svg/SVGElement.java	2014-10-29 23:30:19.882171106 +0100
+@@ -35,9 +35,6 @@
+  */
+ package com.kitfox.svg;
+ 
+-import com.kitfox.svg.animation.AnimationElement;
+-import com.kitfox.svg.animation.TrackBase;
+-import com.kitfox.svg.animation.TrackManager;
+ import com.kitfox.svg.pathcmd.Arc;
+ import com.kitfox.svg.pathcmd.BuildHistory;
+ import com.kitfox.svg.pathcmd.Cubic;
+@@ -122,10 +119,6 @@
+      * The diagram this element belongs to
+      */
+     protected SVGDiagram diagram;
+-    /**
+-     * Link to the universe we reside in
+-     */
+-    protected final TrackManager trackManager = new TrackManager();
+     boolean dirty = true;
+ 
+     /**
+@@ -305,65 +298,6 @@
+         }
+     }
+ 
+-    public void removeAttribute(String name, int attribType)
+-    {
+-        switch (attribType)
+-        {
+-            case AnimationElement.AT_CSS:
+-                inlineStyles.remove(name);
+-                return;
+-            case AnimationElement.AT_XML:
+-                presAttribs.remove(name);
+-                return;
+-        }
+-    }
+-
+-    public void addAttribute(String name, int attribType, String value) throws SVGElementException
+-    {
+-        if (hasAttribute(name, attribType))
+-        {
+-            throw new SVGElementException(this, "Attribute " + name + "(" + AnimationElement.animationElementToString(attribType) + ") already exists");
+-        }
+-
+-        //Alter layout for id attribute
+-        if ("id".equals(name))
+-        {
+-            if (diagram != null)
+-            {
+-                diagram.removeElement(id);
+-                diagram.setElement(value, this);
+-            }
+-            this.id = value;
+-        }
+-
+-        switch (attribType)
+-        {
+-            case AnimationElement.AT_CSS:
+-                inlineStyles.put(name, new StyleAttribute(name, value));
+-                return;
+-            case AnimationElement.AT_XML:
+-                presAttribs.put(name, new StyleAttribute(name, value));
+-                return;
+-        }
+-
+-        throw new SVGElementException(this, "Invalid attribute type " + attribType);
+-    }
+-
+-    public boolean hasAttribute(String name, int attribType) throws SVGElementException
+-    {
+-        switch (attribType)
+-        {
+-            case AnimationElement.AT_CSS:
+-                return inlineStyles.containsKey(name);
+-            case AnimationElement.AT_XML:
+-                return presAttribs.containsKey(name);
+-            case AnimationElement.AT_AUTO:
+-                return inlineStyles.containsKey(name) || presAttribs.containsKey(name);
+-        }
+-
+-        throw new SVGElementException(this, "Invalid attribute type " + attribType);
+-    }
+-
+     /**
+      * @return a set of Strings that corespond to CSS attributes on this element
+      */
+@@ -389,12 +323,6 @@
+         children.add(child);
+         child.parent = this;
+         child.setDiagram(diagram);
+-
+-        //Add info to track if we've scanned animation element
+-        if (child instanceof AnimationElement)
+-        {
+-            trackManager.addTrackElement((AnimationElement) child);
+-        }
+     }
+ 
+     protected void setDiagram(SVGDiagram diagram)
+@@ -529,61 +457,6 @@
+         return getStyle(attrib, true);
+     }
+ 
+-    public void setAttribute(String name, int attribType, String value) throws SVGElementException
+-    {
+-        StyleAttribute styAttr;
+-
+-
+-        switch (attribType)
+-        {
+-            case AnimationElement.AT_CSS:
+-            {
+-                styAttr = (StyleAttribute) inlineStyles.get(name);
+-                break;
+-            }
+-            case AnimationElement.AT_XML:
+-            {
+-                styAttr = (StyleAttribute) presAttribs.get(name);
+-                break;
+-            }
+-            case AnimationElement.AT_AUTO:
+-            {
+-                styAttr = (StyleAttribute) inlineStyles.get(name);
+-
+-                if (styAttr == null)
+-                {
+-                    styAttr = (StyleAttribute) presAttribs.get(name);
+-                }
+-                break;
+-            }
+-            default:
+-                throw new SVGElementException(this, "Invalid attribute type " + attribType);
+-        }
+-
+-        if (styAttr == null)
+-        {
+-            throw new SVGElementException(this, "Could not find attribute " + name + "(" + AnimationElement.animationElementToString(attribType) + ").  Make sure to create attribute before setting it.");
+-        }
+-
+-        //Alter layout for relevant attributes
+-        if ("id".equals(styAttr.getName()))
+-        {
+-            if (diagram != null)
+-            {
+-                diagram.removeElement(this.id);
+-                diagram.setElement(value, this);
+-            }
+-            this.id = value;
+-        }
+-
+-        styAttr.setStringValue(value);
+-    }
+-
+-    public boolean getStyle(StyleAttribute attrib, boolean recursive) throws SVGException
+-    {
+-        return getStyle(attrib, recursive, true);
+-    }
+-    
+     /**
+      * Copies the current style into the passed style attribute. Checks for
+      * inline styles first, then internal and extranal style sheets, and finally
+@@ -595,8 +468,7 @@
+      * style attribute, checks attributes of parents back to root until one
+      * found.
+      */
+-    public boolean getStyle(StyleAttribute attrib, boolean recursive, boolean evalAnimation)
+-            throws SVGException
++    public boolean getStyle(StyleAttribute attrib, boolean recursive) throws SVGException
+     {
+         String styName = attrib.getName();
+ 
+@@ -605,17 +477,6 @@
+ 
+         attrib.setStringValue(styAttr == null ? "" : styAttr.getStringValue());
+ 
+-        //Evalutate coresponding track, if one exists
+-        if (evalAnimation)
+-        {
+-            TrackBase track = trackManager.getTrack(styName, AnimationElement.AT_CSS);
+-            if (track != null)
+-            {
+-                track.getValue(attrib, diagram.getUniverse().getCurTime());
+-                return true;
+-            }
+-        }
+-
+         //Return if we've found a non animated style
+         if (styAttr != null)
+         {
+@@ -628,17 +489,6 @@
+ 
+         attrib.setStringValue(presAttr == null ? "" : presAttr.getStringValue());
+ 
+-        //Evalutate coresponding track, if one exists
+-        if (evalAnimation)
+-        {
+-            TrackBase track = trackManager.getTrack(styName, AnimationElement.AT_XML);
+-            if (track != null)
+-            {
+-                track.getValue(attrib, diagram.getUniverse().getCurTime());
+-                return true;
+-            }
+-        }
+-
+         //Return if we've found a presentation attribute instead
+         if (presAttr != null)
+         {
+@@ -700,14 +550,6 @@
+         //Copy presentation value directly
+         attrib.setStringValue(presAttr == null ? "" : presAttr.getStringValue());
+ 
+-        //Evalutate coresponding track, if one exists
+-        TrackBase track = trackManager.getTrack(presName, AnimationElement.AT_XML);
+-        if (track != null)
+-        {
+-            track.getValue(attrib, diagram.getUniverse().getCurTime());
+-            return true;
+-        }
+-
+         //Return if we found presentation attribute
+         if (presAttr != null)
+         {
+diff -ur kitfox/svg/SVGLoaderHelper.java src/com/kitfox/svg/SVGLoaderHelper.java
+--- kitfox/svg/SVGLoaderHelper.java	2014-10-29 22:49:38.193473772 +0100
++++ src/com/kitfox/svg/SVGLoaderHelper.java	2014-10-29 22:54:17.671385584 +0100
+@@ -37,9 +37,6 @@
+ package com.kitfox.svg;
+ 
+ import java.net.*;
+-import java.io.*;
+-
+-import com.kitfox.svg.animation.parser.*;
+ 
+ /**
+  * @author Mark McKay
+@@ -58,11 +55,6 @@
+     public final SVGDiagram diagram;
+ 
+     public final URI xmlBase;
+-
+-    /**
+-     * Animate nodes use this to parse their time strings
+-     */
+-    public final AnimTimeParser animTimeParser = new AnimTimeParser(new StringReader(""));
+     
+     /** Creates a new instance of SVGLoaderHelper */
+     public SVGLoaderHelper(URI xmlBase, SVGUniverse universe, SVGDiagram diagram)
+diff -ur kitfox/svg/SVGLoader.java src/com/kitfox/svg/SVGLoader.java
+--- kitfox/svg/SVGLoader.java	2014-10-29 22:49:38.193473772 +0100
++++ src/com/kitfox/svg/SVGLoader.java	2014-10-29 22:53:56.462392128 +0100
+@@ -42,7 +42,6 @@
+ import org.xml.sax.*;
+ import org.xml.sax.helpers.DefaultHandler;
+ 
+-import com.kitfox.svg.animation.*;
+ import java.util.logging.Level;
+ import java.util.logging.Logger;
+ 
+@@ -88,10 +87,6 @@
+ 
+         //Compile a list of important builder classes
+         nodeClasses.put("a", A.class);
+-        nodeClasses.put("animate", Animate.class);
+-        nodeClasses.put("animatecolor", AnimateColor.class);
+-        nodeClasses.put("animatemotion", AnimateMotion.class);
+-        nodeClasses.put("animatetransform", AnimateTransform.class);
+         nodeClasses.put("circle", Circle.class);
+         nodeClasses.put("clippath", ClipPath.class);
+         nodeClasses.put("defs", Defs.class);
+@@ -115,7 +110,6 @@
+         nodeClasses.put("polyline", Polyline.class);
+         nodeClasses.put("radialgradient", RadialGradient.class);
+         nodeClasses.put("rect", Rect.class);
+-        nodeClasses.put("set", SetSmil.class);
+         nodeClasses.put("shape", ShapeElement.class);
+         nodeClasses.put("stop", Stop.class);
+         nodeClasses.put("style", Style.class);
diff --git a/scripts/sync_editor-imagery-index.groovy b/scripts/sync_editor-imagery-index.groovy
new file mode 100644
index 0000000..8181d9d
--- /dev/null
+++ b/scripts/sync_editor-imagery-index.groovy
@@ -0,0 +1,267 @@
+// License: GPL. For details, see LICENSE file.
+/**
+ * Compare and analyse the differences of the editor imagery index and the JOSM imagery list.
+ * The goal is to keep both lists in sync.
+ *
+ * The editor imagery index project (https://github.com/osmlab/editor-imagery-index)
+ * provides also a version in the JOSM format, but the JSON is the original source
+ * format, so we read that.
+ *
+ * How to run:
+ * -----------
+ *
+ * Main JOSM binary needs to be in classpath, e.g.
+ *
+ * $ groovy -cp ../dist/josm-custom.jar sync_editor-imagery-index.groovy
+ * 
+ * Add option "-h" to show the available command line flags.
+ */
+import java.io.FileReader
+import java.util.List
+
+import javax.json.Json
+import javax.json.JsonArray
+import javax.json.JsonObject
+import javax.json.JsonReader
+
+import org.openstreetmap.josm.io.imagery.ImageryReader
+import org.openstreetmap.josm.data.imagery.ImageryInfo
+import org.openstreetmap.josm.tools.Utils
+
+class sync_editor_imagery_index {
+
+    List<ImageryInfo> josmEntries;
+    JsonArray eiiEntries;
+    
+    final static def EII_KNOWN_DUPLICATES = ["http://geolittoral.application.equipement.gouv.fr/wms/metropole?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=ortholittorale&SRS={proj}&WIDTH={width}&HEIGHT={height}&BBOX={bbox}"]
+    final static def JOSM_KNOWN_DUPLICATES = ["http://geolittoral.application.equipement.gouv.fr/wms/metropole?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=ortholittorale&SRS={proj}&WIDTH={width}&HEIGHT={height}&BBOX={bbox}"]
+
+    def eiiUrls = new HashMap<String, JsonObject>()
+    def josmUrls = new HashMap<String, ImageryInfo>()
+    
+    static String eiiInputFile = 'imagery.json'
+    static String josmInputFile = 'maps.xml'
+    
+    static def options
+    
+    /**
+     * Main method.
+     */
+    static main(def args) {
+        parse_command_line_arguments(args)
+        def script = new sync_editor_imagery_index()
+        script.loadJosmEntries()
+        println "*** Loaded ${script.josmEntries.size()} entries (JOSM). ***"
+        script.loadEIIEntries()
+        println "*** Loaded ${script.eiiEntries.size()} entries (EII). ***"
+        script.checkInOneButNotTheOther()
+        script.checkCommonEntries()
+    }
+    
+    /**
+     * Parse command line arguments.
+     */
+    static void parse_command_line_arguments(args) {
+        def cli = new CliBuilder()
+        cli._(longOpt:'eii_input', args:1, argName:"eii_input", "Input file for the editor imagery index (json). Default is $eiiInputFile (current directory).")
+        cli._(longOpt:'josm_input', args:1, argName:"josm_input", "Input file for the JOSM imagery list (xml). Default is $josmInputFile (current directory).")
+        cli.s(longOpt:'shorten', "shorten the output, so it is easier to read in a console window")
+        cli.h(longOpt:'help', "show this help")
+        options = cli.parse(args)
+
+        if (options.h) {
+            cli.usage()
+            System.exit(0)
+        }
+        if (options.eii_input) {
+            eiiInputFile = options.eii_input
+        }
+        if (options.josm_input) {
+            josmInputFile = options.josm_input
+        }
+    }
+
+    void loadEIIEntries() {
+        FileReader fr = new FileReader(eiiInputFile)
+        JsonReader jr = Json.createReader(fr)
+        eiiEntries = jr.readArray()
+        jr.close()
+        
+        for (def e : eiiEntries) {
+            def url = getUrl(e)
+            if (eiiUrls.containsKey(url) && !EII_KNOWN_DUPLICATES.contains(url))
+                throw new Exception("URL is not unique: "+url)
+            eiiUrls.put(url, e)
+        }
+    }
+
+    void loadJosmEntries() {
+        def reader = new ImageryReader(josmInputFile)
+        josmEntries = reader.parse()
+        
+        for (def e : josmEntries) {
+            def url = getUrl(e)
+            if (josmUrls.containsKey(url) && !JOSM_KNOWN_DUPLICATES.contains(url)) {
+                throw new Exception("URL is not unique: "+url)
+            }
+            josmUrls.put(url, e)
+        }
+    }
+
+    List inOneButNotTheOther(Map m1, Map m2) {
+        def l = []
+        for (def url : m1.keySet()) {
+            if (!m2.containsKey(url)) {
+                def name = getName(m1.get(url))
+                l += "  "+getDescription(m1.get(url))
+            }
+        }
+        l.sort()
+    }
+    
+    void checkInOneButNotTheOther() {
+        def l1 = inOneButNotTheOther(eiiUrls, josmUrls)
+        println "*** URLs found in EII but not in JOSM (${l1.size()}): ***"
+        if (l1.isEmpty()) {
+            println "  -"
+        } else {
+            println Utils.join("\n", l1)
+        }
+
+        def l2 = inOneButNotTheOther(josmUrls, eiiUrls)
+        println "*** URLs found in JOSM but not in EII (${l2.size()}): ***"
+        if (l2.isEmpty()) {
+            println "  -"
+        } else {
+            println Utils.join("\n", l2)
+        }
+    }
+    
+    void checkCommonEntries() {
+        println "*** Same URL, but different name: ***"
+        for (def url : eiiUrls.keySet()) {
+            def e = eiiUrls.get(url)
+            if (!josmUrls.containsKey(url)) continue
+            def j = josmUrls.get(url)
+            if (!getName(e).equals(getName(j))) {
+                println "  name differs: $url"
+                println "     (IEE):     ${getName(e)}"
+                println "     (JOSM):    ${getName(j)}"
+            }
+        }
+        
+        println "*** Same URL, but different type: ***"
+        for (def url : eiiUrls.keySet()) {
+            def e = eiiUrls.get(url)
+            if (!josmUrls.containsKey(url)) continue
+            def j = josmUrls.get(url)
+            if (!getType(e).equals(getType(j))) {
+                println "  type differs: ${getName(j)} - $url"
+                println "     (IEE):     ${getType(e)}"
+                println "     (JOSM):    ${getType(j)}"
+            }
+        }
+        
+        println "*** Same URL, but different zoom bounds: ***"
+        for (def url : eiiUrls.keySet()) {
+            def e = eiiUrls.get(url)
+            if (!josmUrls.containsKey(url)) continue
+            def j = josmUrls.get(url)
+
+            Integer eMinZoom = getMinZoom(e)
+            Integer jMinZoom = getMinZoom(j)
+            if (eMinZoom != jMinZoom) {
+                println "  minzoom differs: ${getDescription(j)}"
+                println "     (IEE):     ${eMinZoom}"
+                println "     (JOSM):    ${jMinZoom}"
+            }
+            Integer eMaxZoom = getMaxZoom(e)
+            Integer jMaxZoom = getMaxZoom(j)
+            if (eMaxZoom != jMaxZoom) {
+                println "  maxzoom differs: ${getDescription(j)}"
+                println "     (IEE):     ${eMaxZoom}"
+                println "     (JOSM):    ${jMaxZoom}"
+            }
+        }
+        
+        println "*** Same URL, but different country code: ***"
+        for (def url : eiiUrls.keySet()) {
+            def e = eiiUrls.get(url)
+            if (!josmUrls.containsKey(url)) continue
+            def j = josmUrls.get(url)
+            if (!getCountryCode(e).equals(getCountryCode(j))) {
+                println "  country code differs: ${getDescription(j)}"
+                println "     (IEE):     ${getCountryCode(e)}"
+                println "     (JOSM):    ${getCountryCode(j)}"
+            }
+        }
+    }
+    
+    /**
+     * Utility functions that allow uniform access for both ImageryInfo and JsonObject.
+     */
+    static String getUrl(Object e) {
+        if (e instanceof ImageryInfo) return e.url
+        return e.getString("url")
+    }
+    static String getName(Object e) {
+        if (e instanceof ImageryInfo) return e.name
+        return e.getString("name")
+    }
+    static String getType(Object e) {
+        if (e instanceof ImageryInfo) return e.getImageryType().getTypeString()
+        return e.getString("type")
+    }
+    static Integer getMinZoom(Object e) {
+        if (e instanceof ImageryInfo) {
+            int mz = e.getMinZoom()
+            return mz == 0 ? null : mz
+        } else {
+            def ext = e.getJsonObject("extent")
+            if (ext == null) return null
+            def num = ext.getJsonNumber("min_zoom")
+            if (num == null) return null
+            return num.intValue()
+        }
+    }
+    static Integer getMaxZoom(Object e) {
+        if (e instanceof ImageryInfo) {
+            int mz = e.getMaxZoom()
+            return mz == 0 ? null : mz
+        } else {
+            def ext = e.getJsonObject("extent")
+            if (ext == null) return null
+            def num = ext.getJsonNumber("max_zoom")
+            if (num == null) return null
+            return num.intValue()
+        }
+    }
+    static String getCountryCode(Object e) {
+        if (e instanceof ImageryInfo) return "".equals(e.getCountryCode()) ? null : e.getCountryCode()
+        return e.getString("country_code", null)
+    }
+    String getDescription(Object o) {
+        def url = getUrl(o)
+        def cc = getCountryCode(o)
+        if (cc == null) {
+            def j = josmUrls.get(url)
+            if (j != null) cc = getCountryCode(j)
+            if (cc == null) {
+                def e = eiiUrls.get(url)
+                if (e != null) cc = getCountryCode(e)
+            }
+        }
+        if (cc == null) {
+            cc = ''
+        } else {
+            cc = "[$cc] "
+        }
+        def d = cc + getName(o) + " - " + getUrl(o)
+        if (options.shorten) {
+            def MAXLEN = 140
+            if (d.length() > MAXLEN) d = d.substring(0, MAXLEN-1) + "..."
+        }
+        return d
+    }
+
+}
diff --git a/src/org/openstreetmap/josm/Main.java b/src/org/openstreetmap/josm/Main.java
index ba2d43c..040ce67 100644
--- a/src/org/openstreetmap/josm/Main.java
+++ b/src/org/openstreetmap/josm/Main.java
@@ -1561,6 +1561,28 @@ public abstract class Main {
     }
 
     /**
+     * Replies the base URL for browsing information about a primitive.
+     * @return the base URL, i.e. https://www.openstreetmap.org
+     * @since 7678
+     */
+    public static String getBaseBrowseUrl() {
+        if (Main.pref != null)
+            return Main.pref.get("osm-browse.url", getOSMWebsite());
+        return getOSMWebsite();
+    }
+
+    /**
+     * Replies the base URL for browsing information about a user.
+     * @return the base URL, i.e. https://www.openstreetmap.org/user
+     * @since 7678
+     */
+    public static String getBaseUserUrl() {
+        if (Main.pref != null)
+            return Main.pref.get("osm-user.url", getOSMWebsite() + "/user");
+        return getOSMWebsite() + "/user";
+    }
+
+    /**
      * Determines if we are currently running on OSX.
      * @return {@code true} if we are currently running on OSX
      * @since 6957
diff --git a/src/org/openstreetmap/josm/actions/AboutAction.java b/src/org/openstreetmap/josm/actions/AboutAction.java
index af9087a..6f81b94 100644
--- a/src/org/openstreetmap/josm/actions/AboutAction.java
+++ b/src/org/openstreetmap/josm/actions/AboutAction.java
@@ -42,7 +42,7 @@ public class AboutAction extends JosmAction {
      * Constructs a new {@code AboutAction}.
      */
     public AboutAction() {
-        super(tr("About"), "about", tr("Display the about screen."),
+        super(tr("About"), "logo", tr("Display the about screen."),
             Shortcut.registerShortcut("system:about", tr("About"),
             KeyEvent.VK_F1, Shortcut.SHIFT), true);
     }
diff --git a/src/org/openstreetmap/josm/actions/AbstractInfoAction.java b/src/org/openstreetmap/josm/actions/AbstractInfoAction.java
index 46a134c..f128387 100644
--- a/src/org/openstreetmap/josm/actions/AbstractInfoAction.java
+++ b/src/org/openstreetmap/josm/actions/AbstractInfoAction.java
@@ -9,7 +9,6 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.List;
-import java.util.regex.Pattern;
 
 import javax.swing.JOptionPane;
 
@@ -18,7 +17,6 @@ import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.gui.HelpAwareOptionPane;
 import org.openstreetmap.josm.gui.HelpAwareOptionPane.ButtonSpec;
 import org.openstreetmap.josm.gui.help.HelpUtil;
-import org.openstreetmap.josm.io.OsmApi;
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.OpenBrowser;
 import org.openstreetmap.josm.tools.Shortcut;
@@ -33,48 +31,6 @@ public abstract class AbstractInfoAction extends JosmAction {
         super(name, iconName, tooltip, shortcut, register, toolbarId, installAdapters);
     }
 
-    /**
-     * Replies the base URL for browsing information about about a primitive.
-     *
-     * @return the base URL, i.e. https://www.openstreetmap.org
-     */
-    public static String getBaseBrowseUrl() {
-        String baseUrl = Main.pref.get("osm-server.url", OsmApi.DEFAULT_API_URL);
-        Pattern pattern = Pattern.compile("/api/?$");
-        String ret = pattern.matcher(baseUrl).replaceAll("");
-        if (ret.equals(baseUrl)) {
-            Main.warn(tr("Unexpected format of API base URL. Redirection to info or history page for OSM object will probably fail. API base URL is: ''{0}''",baseUrl));
-        }
-        for (String prefix : new String[]{"http://api.openstreetmap.org/", "https://api.openstreetmap.org/"}) {
-            if (ret.startsWith(prefix)) {
-                ret = Main.getOSMWebsite() + "/" + ret.substring(prefix.length());
-                break;
-            }
-        }
-        return ret;
-    }
-
-    /**
-     * Replies the base URL for browsing information about a user.
-     *
-     * @return the base URL, i.e. https://www.openstreetmap.org/user
-     */
-    public static String getBaseUserUrl() {
-        String baseUrl = Main.pref.get("osm-server.url", OsmApi.DEFAULT_API_URL);
-        Pattern pattern = Pattern.compile("/api/?$");
-        String ret =  pattern.matcher(baseUrl).replaceAll("/user");
-        if (ret.equals(baseUrl)) {
-            Main.warn(tr("Unexpected format of API base URL. Redirection to user page for OSM user will probably fail. API base URL is: ''{0}''",baseUrl));
-        }
-        for (String prefix : new String[]{"http://api.openstreetmap.org/", "https://api.openstreetmap.org/"}) {
-            if (ret.startsWith(prefix)) {
-                ret = Main.getOSMWebsite() + "/" + ret.substring(prefix.length());
-                break;
-            }
-        }
-        return ret;
-    }
-
     public static boolean confirmLaunchMultiple(int numBrowsers) {
         String msg  = /* for correct i18n of plural forms - see #9110 */ trn(
                 "You are about to launch {0} browser window.<br>"
diff --git a/src/org/openstreetmap/josm/actions/AddImageryLayerAction.java b/src/org/openstreetmap/josm/actions/AddImageryLayerAction.java
index c3cb2a1..82956aa 100644
--- a/src/org/openstreetmap/josm/actions/AddImageryLayerAction.java
+++ b/src/org/openstreetmap/josm/actions/AddImageryLayerAction.java
@@ -1,6 +1,7 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.actions;
 
+import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
 import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.awt.Dimension;
@@ -10,7 +11,6 @@ import java.io.IOException;
 import java.net.MalformedURLException;
 
 import javax.swing.Action;
-import javax.swing.ImageIcon;
 import javax.swing.JComboBox;
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
@@ -27,15 +27,14 @@ import org.openstreetmap.josm.gui.util.GuiHelper;
 import org.openstreetmap.josm.io.imagery.WMSImagery;
 import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.ImageProvider;
-import org.openstreetmap.josm.tools.ImageProvider.ImageCallback;
+import org.openstreetmap.josm.tools.ImageProvider.ImageResourceCallback;
+import org.openstreetmap.josm.tools.ImageResource;
 
 /**
  * Action displayed in imagery menu to add a new imagery layer.
  * @since 3715
  */
 public class AddImageryLayerAction extends JosmAction implements AdaptableAction {
-
-    private static final int MAX_ICON_SIZE = 24;
     private final ImageryInfo info;
 
     /**
@@ -46,21 +45,22 @@ public class AddImageryLayerAction extends JosmAction implements AdaptableAction
     public AddImageryLayerAction(ImageryInfo info) {
         super(info.getMenuName(), /* ICON */"imagery_menu", tr("Add imagery layer {0}",info.getName()), null, false, false);
         putValue("toolbar", "imagery_" + info.getToolbarName());
+        putValue("help", ht("/Preferences/Imagery"));
         this.info = info;
         installAdapters();
 
         // change toolbar icon from if specified
         try {
-            if (info.getIcon() != null) {
-                new ImageProvider(info.getIcon()).setOptional(true).
-                        setMaxHeight(MAX_ICON_SIZE).setMaxWidth(MAX_ICON_SIZE).getInBackground(new ImageCallback() {
+            String icon = info.getIcon();
+            if (icon != null) {
+                new ImageProvider(icon).setOptional(true).getInBackground(new ImageResourceCallback() {
                             @Override
-                            public void finished(final ImageIcon result) {
+                            public void finished(final ImageResource result) {
                                 if (result != null) {
                                     GuiHelper.runInEDT(new Runnable() {
                                         @Override
                                         public void run() {
-                                            putValue(Action.SMALL_ICON, result);
+                                            result.getImageIcon(AddImageryLayerAction.this);
                                         }
                                     });
                                 }
diff --git a/src/org/openstreetmap/josm/actions/AutoScaleAction.java b/src/org/openstreetmap/josm/actions/AutoScaleAction.java
index 7addba5..1f538d0 100644
--- a/src/org/openstreetmap/josm/actions/AutoScaleAction.java
+++ b/src/org/openstreetmap/josm/actions/AutoScaleAction.java
@@ -41,14 +41,14 @@ import org.openstreetmap.josm.tools.Shortcut;
 public class AutoScaleAction extends JosmAction {
 
     public static final Collection<String> MODES = Collections.unmodifiableList(Arrays.asList(
-        marktr("data"),
-        marktr("layer"),
-        marktr("selection"),
-        marktr("conflict"),
-        marktr("download"),
-        marktr("problem"),
-        marktr("previous"),
-        marktr("next")));
+        marktr(/* ICON(dialogs/autoscale/) */ "data"),
+        marktr(/* ICON(dialogs/autoscale/) */ "layer"),
+        marktr(/* ICON(dialogs/autoscale/) */ "selection"),
+        marktr(/* ICON(dialogs/autoscale/) */ "conflict"),
+        marktr(/* ICON(dialogs/autoscale/) */ "download"),
+        marktr(/* ICON(dialogs/autoscale/) */ "problem"),
+        marktr(/* ICON(dialogs/autoscale/) */ "previous"),
+        marktr(/* ICON(dialogs/autoscale/) */ "next")));
 
     private final String mode;
 
diff --git a/src/org/openstreetmap/josm/actions/CreateMultipolygonAction.java b/src/org/openstreetmap/josm/actions/CreateMultipolygonAction.java
index d4e19ec..948a7b5 100644
--- a/src/org/openstreetmap/josm/actions/CreateMultipolygonAction.java
+++ b/src/org/openstreetmap/josm/actions/CreateMultipolygonAction.java
@@ -63,9 +63,14 @@ public class CreateMultipolygonAction extends JosmAction {
      * @param update {@code true} if the multipolygon must be updated, {@code false} if it must be created
      */
     public CreateMultipolygonAction(final boolean update) {
-        super(getName(update), "multipoly_create", getName(update),
-                update  ? Shortcut.registerShortcut("tools:multipoly_update", tr("Tool: {0}", getName(true)), KeyEvent.VK_B, Shortcut.CTRL_SHIFT)
-                        : Shortcut.registerShortcut("tools:multipoly_create", tr("Tool: {0}", getName(false)), KeyEvent.VK_B, Shortcut.CTRL),
+        super(getName(update), /* ICON */ "multipoly_create", getName(update),
+                /* atleast three lines for each shortcut or the server extractor fails */
+                update  ? Shortcut.registerShortcut("tools:multipoly_update",
+                            tr("Tool: {0}", getName(true)),
+                            KeyEvent.VK_B, Shortcut.CTRL_SHIFT)
+                        : Shortcut.registerShortcut("tools:multipoly_create",
+                            tr("Tool: {0}", getName(false)),
+                            KeyEvent.VK_B, Shortcut.CTRL),
                 true, update ? "multipoly_update" : "multipoly_create", true);
         this.update = update;
     }
diff --git a/src/org/openstreetmap/josm/actions/DialogsToggleAction.java b/src/org/openstreetmap/josm/actions/DialogsToggleAction.java
index 7050ff7..484d409 100644
--- a/src/org/openstreetmap/josm/actions/DialogsToggleAction.java
+++ b/src/org/openstreetmap/josm/actions/DialogsToggleAction.java
@@ -7,9 +7,8 @@ import static org.openstreetmap.josm.tools.I18n.tr;
 import java.awt.event.ActionEvent;
 import java.awt.event.KeyEvent;
 
-import javax.swing.Icon;
-
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.Shortcut;
 
 /**
@@ -24,7 +23,7 @@ public class DialogsToggleAction extends ToggleAction {
      */
     public DialogsToggleAction() {
         super(tr("Toggle dialogs panel"),
-              (Icon) null, /* no icon */
+              (ImageProvider) null, /* no icon */
               tr("Toggle dialogs panel, maximize mapview"),
               Shortcut.registerShortcut("menu:view:dialogspanel", tr("Toggle dialogs panel"),KeyEvent.VK_TAB, Shortcut.DIRECT),
               true, "dialogspanel", /* register in toolbar */
diff --git a/src/org/openstreetmap/josm/actions/DownloadAction.java b/src/org/openstreetmap/josm/actions/DownloadAction.java
index eb6df15..652effe 100644
--- a/src/org/openstreetmap/josm/actions/DownloadAction.java
+++ b/src/org/openstreetmap/josm/actions/DownloadAction.java
@@ -54,10 +54,7 @@ public class DownloadAction extends JosmAction {
                 Future<?> future = task.download(dialog.isNewLayerRequired(),area, null);
                 Main.worker.submit(new PostDownloadHandler(task, future));
             }
-
-            //TODO: This eventually needs to be a checkbox in the UI
-            //For now I'm adding it as a hidden feature since this is still a work in progress
-            if (Main.pref.getBoolean("osm.notes.enableDownload", false)) {
+            if (dialog.isDownloadNotes()) {
                 DownloadNotesTask task = new DownloadNotesTask();
                 Future<?> future = task.download(false, area, null);
                 Main.worker.submit(new PostDownloadHandler(task, future));
diff --git a/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java b/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java
index 0137cad..979fed3 100644
--- a/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java
+++ b/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java
@@ -96,7 +96,8 @@ public class ExtensionFileFilter extends FileFilter implements java.io.FileFilte
                 "org.openstreetmap.josm.io.OsmGzipExporter",
                 "org.openstreetmap.josm.io.OsmBzip2Exporter",
                 "org.openstreetmap.josm.io.GeoJSONExporter",
-                "org.openstreetmap.josm.io.WMSLayerExporter"
+                "org.openstreetmap.josm.io.WMSLayerExporter",
+                "org.openstreetmap.josm.io.NoteExporter"
         };
 
         for (String classname : exporterNames) {
diff --git a/src/org/openstreetmap/josm/actions/HelpAction.java b/src/org/openstreetmap/josm/actions/HelpAction.java
index a67c7cc..5c2ae6a 100644
--- a/src/org/openstreetmap/josm/actions/HelpAction.java
+++ b/src/org/openstreetmap/josm/actions/HelpAction.java
@@ -26,7 +26,8 @@ public class HelpAction extends AbstractAction {
      * Constructs a new {@code HelpAction}.
      */
     public HelpAction() {
-        super(tr("Help"), ImageProvider.get("help"));
+        super(tr("Help"));
+        new ImageProvider("help").getResource().getImageIcon(this);
         putValue("toolbar", "help");
         setEnabled(!Main.isOffline(OnlineResource.JOSM_WEBSITE));
     }
diff --git a/src/org/openstreetmap/josm/actions/HistoryInfoAction.java b/src/org/openstreetmap/josm/actions/HistoryInfoAction.java
index 364422e..c45cd6c 100644
--- a/src/org/openstreetmap/josm/actions/HistoryInfoAction.java
+++ b/src/org/openstreetmap/josm/actions/HistoryInfoAction.java
@@ -24,7 +24,7 @@ public class HistoryInfoAction extends JosmAction {
      * Constructs a new {@code HistoryInfoAction}.
      */
     public HistoryInfoAction() {
-        super(tr("History"), "about",
+        super(tr("History"), "dialogs/history",
                 tr("Display history information about OSM ways, nodes, or relations."),
                 Shortcut.registerShortcut("core:historyinfo",
                         tr("History"), KeyEvent.VK_H, Shortcut.CTRL), false);
diff --git a/src/org/openstreetmap/josm/actions/HistoryInfoWebAction.java b/src/org/openstreetmap/josm/actions/HistoryInfoWebAction.java
index 497f4a7..7527279 100644
--- a/src/org/openstreetmap/josm/actions/HistoryInfoWebAction.java
+++ b/src/org/openstreetmap/josm/actions/HistoryInfoWebAction.java
@@ -6,6 +6,7 @@ import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.awt.event.KeyEvent;
 
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
 import org.openstreetmap.josm.tools.Shortcut;
@@ -13,7 +14,7 @@ import org.openstreetmap.josm.tools.Shortcut;
 public class HistoryInfoWebAction extends AbstractInfoAction {
 
     public HistoryInfoWebAction() {
-        super(tr("History (web)"), "about",
+        super(tr("History (web)"), "dialogs/history",
                 tr("Display history information about OSM ways, nodes, or relations in web browser."),
                 Shortcut.registerShortcut("core:historyinfoweb",
                         tr("History (web)"), KeyEvent.VK_H, Shortcut.CTRL_SHIFT),
@@ -24,6 +25,6 @@ public class HistoryInfoWebAction extends AbstractInfoAction {
     @Override
     protected  String createInfoUrl(Object infoObject) {
         OsmPrimitive primitive = (OsmPrimitive) infoObject;
-        return getBaseBrowseUrl() + "/" + OsmPrimitiveType.from(primitive).getAPIName() + "/" + primitive.getId() + "/history";
+        return Main.getBaseBrowseUrl() + "/" + OsmPrimitiveType.from(primitive).getAPIName() + "/" + primitive.getId() + "/history";
     }
 }
diff --git a/src/org/openstreetmap/josm/actions/InfoAction.java b/src/org/openstreetmap/josm/actions/InfoAction.java
index a75aacd..c35c717 100644
--- a/src/org/openstreetmap/josm/actions/InfoAction.java
+++ b/src/org/openstreetmap/josm/actions/InfoAction.java
@@ -20,7 +20,7 @@ public class InfoAction extends JosmAction {
      * Constructs a new {@code InfoAction}.
      */
     public InfoAction() {
-        super(tr("Advanced info"), "about",
+        super(tr("Advanced info"), "info",
             tr("Display advanced object information about OSM nodes, ways, or relations."),
             Shortcut.registerShortcut("core:info",
                 tr("Advanced info"), KeyEvent.VK_I, Shortcut.CTRL),
diff --git a/src/org/openstreetmap/josm/actions/InfoWebAction.java b/src/org/openstreetmap/josm/actions/InfoWebAction.java
index d4cbe2a..70654e4 100644
--- a/src/org/openstreetmap/josm/actions/InfoWebAction.java
+++ b/src/org/openstreetmap/josm/actions/InfoWebAction.java
@@ -6,6 +6,7 @@ import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.awt.event.KeyEvent;
 
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
 import org.openstreetmap.josm.tools.Shortcut;
@@ -13,7 +14,7 @@ import org.openstreetmap.josm.tools.Shortcut;
 public class InfoWebAction extends AbstractInfoAction {
 
     public InfoWebAction() {
-        super(tr("Advanced info (web)"), "about",
+        super(tr("Advanced info (web)"), "info",
                 tr("Display object information about OSM nodes, ways, or relations in web browser."),
                 Shortcut.registerShortcut("core:infoweb",
                         tr("Advanced info (web)"), KeyEvent.VK_I, Shortcut.CTRL_SHIFT),
@@ -24,6 +25,6 @@ public class InfoWebAction extends AbstractInfoAction {
     @Override
     protected  String createInfoUrl(Object infoObject) {
         OsmPrimitive primitive = (OsmPrimitive)infoObject;
-        return getBaseBrowseUrl() + "/" + OsmPrimitiveType.from(primitive).getAPIName() + "/" + primitive.getId();
+        return Main.getBaseBrowseUrl() + "/" + OsmPrimitiveType.from(primitive).getAPIName() + "/" + primitive.getId();
     }
 }
diff --git a/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java b/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java
index 8ecfd4d..8b8fce5 100644
--- a/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java
+++ b/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java
@@ -53,7 +53,7 @@ public class JoinNodeWayAction extends JosmAction {
      */
     public static JoinNodeWayAction createJoinNodeToWayAction() {
         JoinNodeWayAction action = new JoinNodeWayAction(false,
-                tr("Join Node to Way"), "joinnodeway", tr("Include a node into the nearest way segments"),
+                tr("Join Node to Way"), /* ICON */ "joinnodeway", tr("Include a node into the nearest way segments"),
                 Shortcut.registerShortcut("tools:joinnodeway", tr("Tool: {0}", tr("Join Node to Way")), KeyEvent.VK_J, Shortcut.DIRECT), true);
         action.putValue("help", ht("/Action/JoinNodeWay"));
         return action;
@@ -65,7 +65,7 @@ public class JoinNodeWayAction extends JosmAction {
      */
     public static JoinNodeWayAction createMoveNodeOntoWayAction() {
         JoinNodeWayAction action = new JoinNodeWayAction(true,
-                tr("Move Node onto Way"), "movenodeontoway", tr("Move the node onto the nearest way segments and include it"),
+                tr("Move Node onto Way"), /* ICON*/ "movenodeontoway", tr("Move the node onto the nearest way segments and include it"),
                 Shortcut.registerShortcut("tools:movenodeontoway", tr("Tool: {0}", tr("Move Node onto Way")), KeyEvent.VK_N, Shortcut.DIRECT), true);
         return action;
     }
diff --git a/src/org/openstreetmap/josm/actions/JosmAction.java b/src/org/openstreetmap/josm/actions/JosmAction.java
index 1aa810c..91790af 100644
--- a/src/org/openstreetmap/josm/actions/JosmAction.java
+++ b/src/org/openstreetmap/josm/actions/JosmAction.java
@@ -71,7 +71,9 @@ public abstract class JosmAction extends AbstractAction implements Destroyable {
      * @param registerInToolbar register this action for the toolbar preferences?
      * @param toolbarId identifier for the toolbar preferences. The iconName is used, if this parameter is null
      * @param installAdapters false, if you don't want to install layer changed and selection changed adapters
+     * @deprecated do not pass Icon, pass ImageProvider instead
      */
+    @Deprecated
     public JosmAction(String name, Icon icon, String tooltip, Shortcut shortcut, boolean registerInToolbar, String toolbarId, boolean installAdapters) {
         super(name, icon);
         setHelpId();
@@ -92,6 +94,43 @@ public abstract class JosmAction extends AbstractAction implements Destroyable {
     }
 
     /**
+     * Constructs a {@code JosmAction}.
+     *
+     * @param name the action's text as displayed on the menu (if it is added to a menu)
+     * @param icon the icon to use
+     * @param tooltip  a longer description of the action that will be displayed in the tooltip. Please note
+     *           that html is not supported for menu actions on some platforms.
+     * @param shortcut a ready-created shortcut object or null if you don't want a shortcut. But you always
+     *            do want a shortcut, remember you can always register it with group=none, so you
+     *            won't be assigned a shortcut unless the user configures one. If you pass null here,
+     *            the user CANNOT configure a shortcut for your action.
+     * @param registerInToolbar register this action for the toolbar preferences?
+     * @param toolbarId identifier for the toolbar preferences. The iconName is used, if this parameter is null
+     * @param installAdapters false, if you don't want to install layer changed and selection changed adapters
+     * TODO: do not pass Icon, pass ImageProvider instead
+     */
+    public JosmAction(String name, ImageProvider icon, String tooltip, Shortcut shortcut, boolean registerInToolbar, String toolbarId, boolean installAdapters) {
+        super(name);
+        if(icon != null)
+            icon.getResource().getImageIcon(this);
+        setHelpId();
+        sc = shortcut;
+        if (sc != null) {
+            Main.registerActionShortcut(this, sc);
+        }
+        setTooltip(tooltip);
+        if (getValue("toolbar") == null) {
+            putValue("toolbar", toolbarId);
+        }
+        if (registerInToolbar && Main.toolbar != null) {
+            Main.toolbar.register(this);
+        }
+        if (installAdapters) {
+            installAdapters();
+        }
+    }
+
+    /**
      * The new super for all actions.
      *
      * Use this super constructor to setup your action.
@@ -109,7 +148,7 @@ public abstract class JosmAction extends AbstractAction implements Destroyable {
      * @param installAdapters false, if you don't want to install layer changed and selection changed adapters
      */
     public JosmAction(String name, String iconName, String tooltip, Shortcut shortcut, boolean registerInToolbar, String toolbarId, boolean installAdapters) {
-        this(name, iconName == null ? null : ImageProvider.get(iconName), tooltip, shortcut, registerInToolbar,
+        this(name, iconName == null ? null : new ImageProvider(iconName), tooltip, shortcut, registerInToolbar,
                 toolbarId == null ? iconName : toolbarId, installAdapters);
     }
 
diff --git a/src/org/openstreetmap/josm/actions/JumpToAction.java b/src/org/openstreetmap/josm/actions/JumpToAction.java
index 11aaec0..6978497 100644
--- a/src/org/openstreetmap/josm/actions/JumpToAction.java
+++ b/src/org/openstreetmap/josm/actions/JumpToAction.java
@@ -8,7 +8,6 @@ import java.awt.GridBagLayout;
 import java.awt.event.ActionEvent;
 import java.awt.event.KeyEvent;
 
-import javax.swing.Icon;
 import javax.swing.JLabel;
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
@@ -23,6 +22,7 @@ import org.openstreetmap.josm.gui.MapFrameListener;
 import org.openstreetmap.josm.gui.MapView;
 import org.openstreetmap.josm.gui.widgets.JosmTextField;
 import org.openstreetmap.josm.tools.GBC;
+import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.OsmUrlToBounds;
 import org.openstreetmap.josm.tools.Shortcut;
 
@@ -36,7 +36,7 @@ public class JumpToAction extends JosmAction {
      * Constructs a new {@code JumpToAction}.
      */
     public JumpToAction() {
-        super(tr("Jump To Position"), (Icon) null, tr("Opens a dialog that allows to jump to a specific location"),
+        super(tr("Jump To Position"), (ImageProvider) null, tr("Opens a dialog that allows to jump to a specific location"),
                 Shortcut.registerShortcut("tools:jumpto", tr("Tool: {0}", tr("Jump To Position")),
                         KeyEvent.VK_J, Shortcut.CTRL), true, "action/jumpto", true);
     }
diff --git a/src/org/openstreetmap/josm/actions/LassoModeAction.java b/src/org/openstreetmap/josm/actions/LassoModeAction.java
index f708832..b07f35d 100644
--- a/src/org/openstreetmap/josm/actions/LassoModeAction.java
+++ b/src/org/openstreetmap/josm/actions/LassoModeAction.java
@@ -12,7 +12,7 @@ public class LassoModeAction extends MapMode {
 
     public LassoModeAction() {
         super(tr("Lasso Mode"),
-                "rope",
+                /* ICON(mapmode/) */ "rope",
                 tr("Lasso selection mode: select objects within a hand-drawn region"),
                 null,
                 ImageProvider.getCursor("normal", "rope"));
diff --git a/src/org/openstreetmap/josm/actions/OpenLocationAction.java b/src/org/openstreetmap/josm/actions/OpenLocationAction.java
index 7fb55b3..5a7fecb 100644
--- a/src/org/openstreetmap/josm/actions/OpenLocationAction.java
+++ b/src/org/openstreetmap/josm/actions/OpenLocationAction.java
@@ -130,16 +130,17 @@ public class OpenLocationAction extends JosmAction {
     /**
      * Replies the list of download tasks accepting the given url.
      * @param url The URL to open
+     * @param isRemotecontrol True if download request comes from remotecontrol.
      * @return The list of download tasks accepting the given url.
      * @since 5691
      */
-    public Collection<DownloadTask> findDownloadTasks(final String url) {
+    public Collection<DownloadTask> findDownloadTasks(final String url, boolean isRemotecontrol) {
         List<DownloadTask> result = new ArrayList<>();
         for (Class<? extends DownloadTask> taskClass : downloadTasks) {
             if (taskClass != null) {
                 try {
                     DownloadTask task = taskClass.getConstructor().newInstance();
-                    if (task.acceptsUrl(url)) {
+                    if (task.acceptsUrl(url, isRemotecontrol)) {
                         result.add(task);
                     }
                 } catch (Exception e) {
@@ -178,7 +179,7 @@ public class OpenLocationAction extends JosmAction {
      */
     public void openUrl(boolean new_layer, final String url) {
         PleaseWaitProgressMonitor monitor = new PleaseWaitProgressMonitor(tr("Download Data"));
-        Collection<DownloadTask> tasks = findDownloadTasks(url);
+        Collection<DownloadTask> tasks = findDownloadTasks(url, false);
         DownloadTask task = null;
         Future<?> future = null;
         if (!tasks.isEmpty()) {
diff --git a/src/org/openstreetmap/josm/actions/RestartAction.java b/src/org/openstreetmap/josm/actions/RestartAction.java
index 7007500..de7b9e4 100644
--- a/src/org/openstreetmap/josm/actions/RestartAction.java
+++ b/src/org/openstreetmap/josm/actions/RestartAction.java
@@ -97,7 +97,14 @@ public class RestartAction extends JosmAction {
                 }
                 cmd.add(java);
                 // vm arguments
-                for (String arg : ManagementFactory.getRuntimeMXBean().getInputArguments()) {
+                List<String> arguments = ManagementFactory.getRuntimeMXBean().getInputArguments();
+                if (Main.isDebugEnabled()) {
+                    Main.debug("VM arguments: "+arguments.toString());
+                }
+                for (String arg : arguments) {
+                    // When run from jp2launcher.exe, jnlpx.remove is true, while it is not when run from javaws
+                    // Always set it to false to avoid error caused by a missing jnlp file on the second restart
+                    arg = arg.replace("-Djnlpx.remove=true", "-Djnlpx.remove=false");
                     // if it's the agent argument : we ignore it otherwise the
                     // address of the old application and the new one will be in conflict
                     if (!arg.contains("-agentlib")) {
@@ -122,8 +129,9 @@ public class RestartAction extends JosmAction {
                     cmd.add("\"" + System.getProperty("java.class.path") + "\"");
                     cmd.add(mainCommand[0]);
                 }
-                // if it's webstart add JNLP file
-                String jnlp = System.getProperty("jnlp.application.href");
+                // if it's webstart add JNLP file. Use jnlpx.origFilenameArg instead of jnlp.application.href,
+                // because only this one is present when run from j2plauncher.exe (see #10795)
+                String jnlp = System.getProperty("jnlpx.origFilenameArg");
                 if (jnlp != null) {
                     cmd.add(jnlp);
                 }
@@ -131,6 +139,10 @@ public class RestartAction extends JosmAction {
                 cmd.addAll(Arrays.asList(Main.commandLineArgs));
             }
             Main.info("Restart "+cmd);
+            if (Main.isDebugEnabled() && Main.pref.getBoolean("restart.debug.simulation")) {
+                Main.debug("Restart cancelled to get debug info");
+                return;
+            }
             // execute the command in a shutdown hook, to be sure that all the
             // resources have been disposed before restarting the application
             Runtime.getRuntime().addShutdownHook(new Thread() {
diff --git a/src/org/openstreetmap/josm/actions/ToggleAction.java b/src/org/openstreetmap/josm/actions/ToggleAction.java
index 3ddd0e6..608ff23 100644
--- a/src/org/openstreetmap/josm/actions/ToggleAction.java
+++ b/src/org/openstreetmap/josm/actions/ToggleAction.java
@@ -6,7 +6,6 @@ import java.util.ArrayList;
 import java.util.List;
 
 import javax.swing.ButtonModel;
-import javax.swing.Icon;
 import javax.swing.JCheckBox;
 import javax.swing.JCheckBoxMenuItem;
 import javax.swing.JRadioButton;
@@ -14,6 +13,7 @@ import javax.swing.JRadioButtonMenuItem;
 import javax.swing.JToggleButton;
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.Shortcut;
 
 /**
@@ -39,7 +39,7 @@ public abstract class ToggleAction extends JosmAction {
      * @param toolbarId identifier for the toolbar preferences. The iconName is used, if this parameter is null
      * @param installAdapters false, if you don't want to install layer changed and selection changed adapters
      */
-    public ToggleAction(String name, Icon icon, String tooltip, Shortcut shortcut, boolean registerInToolbar, String toolbarId, boolean installAdapters) {
+    public ToggleAction(String name, ImageProvider icon, String tooltip, Shortcut shortcut, boolean registerInToolbar, String toolbarId, boolean installAdapters) {
         super(name, icon, tooltip, shortcut, registerInToolbar, toolbarId, installAdapters);
         // It is required to set the SELECTED_KEY to a non-null value in order to let Swing components update it
         setSelected(false);
@@ -81,7 +81,7 @@ public abstract class ToggleAction extends JosmAction {
             return false;
         }
     }
-    
+
     /**
      * Adds a button model
      * @param model The button model to add
@@ -102,7 +102,7 @@ public abstract class ToggleAction extends JosmAction {
             buttonModels.remove(model);
         }
     }
-    
+
     protected void notifySelectedState() {
         boolean selected = isSelected();
         for (ButtonModel model: buttonModels) {
@@ -120,11 +120,11 @@ public abstract class ToggleAction extends JosmAction {
      * @see <a href="http://docs.oracle.com/javase/6/docs/api/javax/swing/Action.html">Interface Action</a>
      */
     protected final void toggleSelectedState(ActionEvent e) {
-        if (e == null || !(e.getSource() instanceof JToggleButton || 
-                           e.getSource() instanceof JCheckBox || 
-                           e.getSource() instanceof JRadioButton || 
-                           e.getSource() instanceof JCheckBoxMenuItem || 
-                           e.getSource() instanceof JRadioButtonMenuItem 
+        if (e == null || !(e.getSource() instanceof JToggleButton ||
+                           e.getSource() instanceof JCheckBox ||
+                           e.getSource() instanceof JRadioButton ||
+                           e.getSource() instanceof JCheckBoxMenuItem ||
+                           e.getSource() instanceof JRadioButtonMenuItem
                            )) {
             setSelected(!isSelected());
         }
diff --git a/src/org/openstreetmap/josm/actions/UploadNotesAction.java b/src/org/openstreetmap/josm/actions/UploadNotesAction.java
new file mode 100644
index 0000000..5de536e
--- /dev/null
+++ b/src/org/openstreetmap/josm/actions/UploadNotesAction.java
@@ -0,0 +1,58 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.actions;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.awt.event.ActionEvent;
+import java.util.List;
+
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.actions.upload.UploadNotesTask;
+import org.openstreetmap.josm.data.osm.NoteData;
+import org.openstreetmap.josm.gui.layer.NoteLayer;
+import org.openstreetmap.josm.gui.progress.PleaseWaitProgressMonitor;
+import org.openstreetmap.josm.tools.ImageProvider;
+
+/**
+ * Action to initiate uploading changed notes to the OSM server.
+ * On click, it finds the note layer and fires off an upload task
+ * with the note data contained in the layer.
+ *
+ */
+public class UploadNotesAction extends JosmAction {
+
+    /** Create a new action to upload notes */
+    public UploadNotesAction () {
+        putValue(SHORT_DESCRIPTION,tr("Upload note changes to server"));
+        putValue(NAME, tr("Upload notes"));
+        putValue(SMALL_ICON, ImageProvider.get("upload"));
+    }
+
+    @Override
+    public void actionPerformed(ActionEvent e) {
+        List<NoteLayer> noteLayers = null;
+        if (Main.map != null) {
+            noteLayers = Main.map.mapView.getLayersOfType(NoteLayer.class);
+        }
+        NoteLayer layer;
+        if (noteLayers != null && noteLayers.size() > 0) {
+            layer = noteLayers.get(0);
+        } else {
+            Main.error("No note layer found");
+            return;
+        }
+        if (Main.isDebugEnabled()) {
+            Main.debug("uploading note changes");
+        }
+        NoteData noteData = layer.getNoteData();
+
+        if(noteData == null || !noteData.isModified()) {
+            if (Main.isDebugEnabled()) {
+                Main.debug("No changed notes to upload");
+            }
+            return;
+        }
+        UploadNotesTask uploadTask = new UploadNotesTask();
+        uploadTask.uploadNotes(noteData, new PleaseWaitProgressMonitor(tr("Uploading notes to server")));
+    }
+}
diff --git a/src/org/openstreetmap/josm/actions/downloadtasks/AbstractDownloadTask.java b/src/org/openstreetmap/josm/actions/downloadtasks/AbstractDownloadTask.java
index 66b7517..391145f 100644
--- a/src/org/openstreetmap/josm/actions/downloadtasks/AbstractDownloadTask.java
+++ b/src/org/openstreetmap/josm/actions/downloadtasks/AbstractDownloadTask.java
@@ -67,7 +67,6 @@ public abstract class AbstractDownloadTask implements DownloadTask {
     }
 
     // Can be overridden for more complex checking logic
-    @Override
     public boolean acceptsUrl(String url) {
         if (url==null) return false;
         for (String p: getPatterns()) {
@@ -78,6 +77,30 @@ public abstract class AbstractDownloadTask implements DownloadTask {
         return false;
     }
 
+    /**
+     * Check / decide if the task is safe for remotecontrol.
+     * 
+     * Keep in mind that a potential attacker has full control over the content
+     * of the file that will be downloaded.
+     * If it is possible to run arbitrary code or write to the local file
+     * system, then the task is (obviously) not save for remote execution.
+     * 
+     * The default value is false = unsafe. Override in a subclass to
+     * allow running the task via remotecontol.
+     * 
+     * @return true if it is safe to download and open any file of the
+     * corresponding format, false otherwise
+     */
+    public boolean isSafeForRemotecontrolRequests() {
+        return false;
+    }
+
+    @Override
+    public boolean acceptsUrl(String url, boolean isRemotecontrol) {
+        if (isRemotecontrol && !isSafeForRemotecontrolRequests()) return false;
+        return acceptsUrl(url);
+    }
+
     // Default name to keep old plugins compatible
     @Override
     public String getTitle() {
diff --git a/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java b/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java
index f49eaf0..63c783e 100644
--- a/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java
+++ b/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java
@@ -197,6 +197,11 @@ public class DownloadGpsTask extends AbstractDownloadTask {
         return null;
     }
 
+    @Override
+    public boolean isSafeForRemotecontrolRequests() {
+        return true;
+    }
+
     /**
      * Determines if the given URL denotes an OSM gpx-related API call.
      * @param url The url to check
diff --git a/src/org/openstreetmap/josm/actions/downloadtasks/DownloadNotesTask.java b/src/org/openstreetmap/josm/actions/downloadtasks/DownloadNotesTask.java
index b1ed0fc..3d3f568 100644
--- a/src/org/openstreetmap/josm/actions/downloadtasks/DownloadNotesTask.java
+++ b/src/org/openstreetmap/josm/actions/downloadtasks/DownloadNotesTask.java
@@ -66,6 +66,11 @@ public class DownloadNotesTask extends AbstractDownloadTask {
         return new String[] {PATTERN_API_URL, PATTERN_DUMP_FILE};
     }
 
+    @Override
+    public boolean isSafeForRemotecontrolRequests() {
+        return true;
+    }
+
     abstract class DownloadTask extends PleaseWaitRunnable {
         protected OsmServerReader reader;
         protected List<Note> notesData;
diff --git a/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java b/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java
index 041f05b..675e85d 100644
--- a/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java
+++ b/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java
@@ -168,6 +168,11 @@ public class DownloadOsmTask extends AbstractDownloadTask {
         }
     }
 
+    @Override
+    public boolean isSafeForRemotecontrolRequests() {
+        return true;
+    }
+
     /**
      * Superclass of internal download task.
      * @since 7636
diff --git a/src/org/openstreetmap/josm/actions/downloadtasks/DownloadSessionTask.java b/src/org/openstreetmap/josm/actions/downloadtasks/DownloadSessionTask.java
index ee8a5d2..2bd533c 100644
--- a/src/org/openstreetmap/josm/actions/downloadtasks/DownloadSessionTask.java
+++ b/src/org/openstreetmap/josm/actions/downloadtasks/DownloadSessionTask.java
@@ -71,4 +71,16 @@ public class DownloadSessionTask extends AbstractDownloadTask {
         // TODO
         return null;
     }
+
+    /**
+     * Do not allow to load a session file via remotecontrol.
+     * 
+     * Session importers can be added by plugins and there is currently
+     * no way to ensure that these are safe for remotecontol.
+     * @return 
+     */
+    @Override
+    public boolean isSafeForRemotecontrolRequests() {
+        return Main.pref.getBoolean("remotecontrol.import.allow_session", false);
+    }
 }
diff --git a/src/org/openstreetmap/josm/actions/downloadtasks/DownloadTask.java b/src/org/openstreetmap/josm/actions/downloadtasks/DownloadTask.java
index ce5e62a..99f2578 100644
--- a/src/org/openstreetmap/josm/actions/downloadtasks/DownloadTask.java
+++ b/src/org/openstreetmap/josm/actions/downloadtasks/DownloadTask.java
@@ -74,9 +74,15 @@ public interface DownloadTask {
     /**
      * Returns true if the task is able to open the given URL, false otherwise.
      * @param url the url to download from
+     * @param isRemotecontrol True if download request comes from remotecontrol.
      * @return True if the task is able to open the given URL, false otherwise.
+     * Return false, if the request comes from remotecontrol, but the task is not
+     * safe for remotecontrol.
+     * A task is not safe for remotecontrol if it is possible to prepare a file
+     * for download which does something unintended, e.g. gain access to the
+     * local file system.
      */
-    boolean acceptsUrl(String url);
+    boolean acceptsUrl(String url, boolean isRemotecontrol);
 
     /**
      * Returns a short HTML documentation string, describing acceptable URLs.
diff --git a/src/org/openstreetmap/josm/actions/mapmode/AddNoteAction.java b/src/org/openstreetmap/josm/actions/mapmode/AddNoteAction.java
index 8bd07a7..ac9ed64 100644
--- a/src/org/openstreetmap/josm/actions/mapmode/AddNoteAction.java
+++ b/src/org/openstreetmap/josm/actions/mapmode/AddNoteAction.java
@@ -5,15 +5,13 @@ import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.awt.event.MouseEvent;
 
-import javax.swing.JLabel;
 import javax.swing.JOptionPane;
-import javax.swing.JScrollPane;
-import javax.swing.JTextArea;
 
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.NoteData;
 import org.openstreetmap.josm.gui.MapFrame;
+import org.openstreetmap.josm.gui.NoteInputDialog;
 import org.openstreetmap.josm.gui.Notification;
 import org.openstreetmap.josm.gui.dialogs.NoteDialog;
 import org.openstreetmap.josm.tools.ImageProvider;
@@ -62,29 +60,21 @@ public class AddNoteAction extends MapMode {
     public void mouseClicked(MouseEvent e) {
         Main.map.selectMapMode(Main.map.mapModeSelect);
         LatLon latlon = Main.map.mapView.getLatLon(e.getPoint().x, e.getPoint().y);
-        JLabel label = new JLabel(tr("Enter a comment for a new note"));
-        JTextArea textArea = new JTextArea();
-        textArea.setRows(6);
-        textArea.setColumns(30);
-        textArea.setLineWrap(true);
-        JScrollPane scrollPane = new JScrollPane(textArea);
 
-        Object[] components = new Object[]{label, scrollPane};
-        int option = JOptionPane.showConfirmDialog(Main.map,
-                components,
-                tr("Create new note"),
-                JOptionPane.OK_CANCEL_OPTION,
-                JOptionPane.PLAIN_MESSAGE,
-                NoteDialog.ICON_NEW);
-        if (option == JOptionPane.OK_OPTION) {
-            String input = textArea.getText();
-            if (input != null && !input.isEmpty()) {
-                noteData.createNote(latlon, input);
-            } else {
-                Notification notification = new Notification("You must enter a comment to create a new note");
-                notification.setIcon(JOptionPane.WARNING_MESSAGE);
-                notification.show();
-            }
+        NoteInputDialog dialog = new NoteInputDialog(Main.parent, tr("Create new note"), tr("Create note"));
+        dialog.showNoteDialog(tr("Enter a detailed comment to create a note"), NoteDialog.ICON_NEW);
+
+        if (dialog.getValue() != 1) {
+            Main.debug("User aborted note creation");
+            return;
+        }
+        String input = dialog.getInputText();
+        if (input != null && !input.isEmpty()) {
+            noteData.createNote(latlon, input);
+        } else {
+            Notification notification = new Notification(tr("You must enter a comment to create a new note"));
+            notification.setIcon(JOptionPane.WARNING_MESSAGE);
+            notification.show();
         }
     }
 }
diff --git a/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java b/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java
index 5f5ac01..91b1125 100644
--- a/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java
+++ b/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java
@@ -61,13 +61,13 @@ public class DeleteAction extends MapMode implements ModifierListener {
     private boolean drawTargetHighlight;
 
     private enum DeleteMode {
-        none("delete"),
-        segment("delete_segment"),
-        node("delete_node"),
-        node_with_references("delete_node"),
-        way("delete_way_only"),
-        way_with_references("delete_way_normal"),
-        way_with_nodes("delete_way_node_only");
+        none(/* ICON(cursor/modifier/) */ "delete"),
+        segment(/* ICON(cursor/modifier/) */ "delete_segment"),
+        node(/* ICON(cursor/modifier/) */ "delete_node"),
+        node_with_references(/* ICON(cursor/modifier/) */ "delete_node"),
+        way(/* ICON(cursor/modifier/) */ "delete_way_only"),
+        way_with_references(/* ICON(cursor/modifier/) */ "delete_way_normal"),
+        way_with_nodes(/* ICON(cursor/modifier/) */ "delete_way_node_only");
 
         private final Cursor c;
 
diff --git a/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java b/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java
index 689f1a8..f896f48 100644
--- a/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java
+++ b/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java
@@ -1739,7 +1739,7 @@ public class DrawAction extends MapMode implements MapViewPaintable, SelectionCh
 
     private class SnapChangeAction extends JosmAction {
         public SnapChangeAction() {
-            super(tr("Angle snapping"), "anglesnap",
+            super(tr("Angle snapping"), /* ICON() */ "anglesnap",
                     tr("Switch angle snapping mode while drawing"), null, false);
             putValue("help", ht("/Action/Draw/AngleSnap"));
         }
diff --git a/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java b/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java
index f22877e..b2b303f 100644
--- a/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java
+++ b/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java
@@ -187,7 +187,7 @@ public class ExtrudeAction extends MapMode implements MapViewPaintable, KeyPress
 
     private class DualAlignChangeAction extends JosmAction {
         public DualAlignChangeAction() {
-            super(tr("Dual alignment"), "mapmode/extrude/dualalign",
+            super(tr("Dual alignment"), /* ICON() */ "mapmode/extrude/dualalign",
                     tr("Switch dual alignment mode while extruding"), null, false);
             putValue("help", ht("/Action/Extrude#DualAlign"));
         }
@@ -203,7 +203,7 @@ public class ExtrudeAction extends MapMode implements MapViewPaintable, KeyPress
      * @param mapFrame The MapFrame this action belongs to.
      */
     public ExtrudeAction(MapFrame mapFrame) {
-        super(tr("Extrude"), "extrude/extrude", tr("Create areas"),
+        super(tr("Extrude"), /* ICON(mapmode/) */ "extrude/extrude", tr("Create areas"),
                 Shortcut.registerShortcut("mapmode:extrude", tr("Mode: {0}", tr("Extrude")), KeyEvent.VK_X, Shortcut.DIRECT),
                 mapFrame,
                 ImageProvider.getCursor("normal", "rectangle"));
diff --git a/src/org/openstreetmap/josm/actions/mapmode/ImproveWayAccuracyHelper.java b/src/org/openstreetmap/josm/actions/mapmode/ImproveWayAccuracyHelper.java
index 241bed3..ef33a27 100644
--- a/src/org/openstreetmap/josm/actions/mapmode/ImproveWayAccuracyHelper.java
+++ b/src/org/openstreetmap/josm/actions/mapmode/ImproveWayAccuracyHelper.java
@@ -142,27 +142,21 @@ final class ImproveWayAccuracyHelper {
         for (Pair<Node, Node> wpp : wpps) {
             ++i;
 
-            // Finding intersection of the segment with its altitude from p (c)
-            EastNorth altitudeIntersection = Geometry.getSegmentAltituteIntersection(wpp.a.getEastNorth(),
-                    wpp.b.getEastNorth(), pEN);
-
-            if (altitudeIntersection != null) {
-                // If the segment intersects with the altitude from p
-                currentDistance = pEN.distance(altitudeIntersection);
-
-                // Making an angle too big to let this candidate win any others
+            EastNorth a = wpp.a.getEastNorth();
+            EastNorth b = wpp.b.getEastNorth();
+            
+            // Finding intersection of the segment with its altitude from p
+            EastNorth altitudeIntersection = Geometry.closestPointToSegment(a, b, pEN);
+            currentDistance = pEN.distance(altitudeIntersection);
+            
+            if (!altitudeIntersection.equals(a) && !altitudeIntersection.equals(b)) {
+                // If the segment intersects with the altitude from p,
+                // make an angle too big to let this candidate win any others
                 // having the same distance.
                 currentAngle = Double.MAX_VALUE;
-
             } else {
-                // Otherwise: Distance is equal to the shortest distance from p
-                // to a or b
-                currentDistance = Math.min(pEN.distance(wpp.a.getEastNorth()),
-                        pEN.distance(wpp.b.getEastNorth()));
-
-                // Measuring the angle
-                currentAngle = Math.abs(Geometry.getCornerAngle(
-                        wpp.a.getEastNorth(), pEN, wpp.b.getEastNorth()));
+                // Otherwise measure the angle
+                currentAngle = Math.abs(Geometry.getCornerAngle(a, pEN, b));
             }
 
             if (currentDistance < bestDistance
diff --git a/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java b/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java
index a5c89a3..ea43f4e 100644
--- a/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java
+++ b/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java
@@ -84,21 +84,21 @@ public class SelectAction extends MapMode implements ModifierListener, KeyPressR
 
     // contains all possible cases the cursor can be in the SelectAction
     private static enum SelectActionCursor {
-        rect("normal", "selection"),
-        rect_add("normal", "select_add"),
-        rect_rm("normal", "select_remove"),
-        way("normal", "select_way"),
-        way_add("normal", "select_way_add"),
-        way_rm("normal", "select_way_remove"),
-        node("normal", "select_node"),
-        node_add("normal", "select_node_add"),
-        node_rm("normal", "select_node_remove"),
-        virtual_node("normal", "addnode"),
-        scale("scale", null),
-        rotate("rotate", null),
-        merge("crosshair", null),
-        lasso("normal", "rope"),
-        merge_to_node("crosshair", "joinnode"),
+        rect("normal", /* ICON(cursor/modifier/) */ "selection"),
+        rect_add("normal", /* ICON(cursor/modifier/) */ "select_add"),
+        rect_rm("normal", /* ICON(cursor/modifier/) */ "select_remove"),
+        way("normal", /* ICON(cursor/modifier/) */ "select_way"),
+        way_add("normal", /* ICON(cursor/modifier/) */ "select_way_add"),
+        way_rm("normal", /* ICON(cursor/modifier/) */ "select_way_remove"),
+        node("normal", /* ICON(cursor/modifier/) */ "select_node"),
+        node_add("normal", /* ICON(cursor/modifier/) */ "select_node_add"),
+        node_rm("normal", /* ICON(cursor/modifier/) */ "select_node_remove"),
+        virtual_node("normal", /* ICON(cursor/modifier/) */ "addnode"),
+        scale(/* ICON(cursor/) */ "scale", null),
+        rotate(/* ICON(cursor/) */ "rotate", null),
+        merge(/* ICON(cursor/) */ "crosshair", null),
+        lasso("normal", /* ICON(cursor/modifier/) */ "rope"),
+        merge_to_node("crosshair", /* ICON(cursor/modifier/) */ "joinnode"),
         move(Cursor.MOVE_CURSOR);
 
         private final Cursor c;
diff --git a/src/org/openstreetmap/josm/actions/relation/AddSelectionToRelations.java b/src/org/openstreetmap/josm/actions/relation/AddSelectionToRelations.java
index d7f9e56..56db047 100644
--- a/src/org/openstreetmap/josm/actions/relation/AddSelectionToRelations.java
+++ b/src/org/openstreetmap/josm/actions/relation/AddSelectionToRelations.java
@@ -18,7 +18,10 @@ import org.openstreetmap.josm.gui.dialogs.relation.GenericRelationEditor;
 import org.openstreetmap.josm.gui.util.GuiHelper;
 import org.openstreetmap.josm.tools.ImageProvider;
 
-
+/**
+ * Add all objects selected in the current dataset after the last member of relation(s).
+ * @since 5799
+ */
 public class AddSelectionToRelations extends AbstractRelationAction implements SelectionChangedListener {
     /**
     * Constructs a new <code>AddSelectionToRelation</code>.
diff --git a/src/org/openstreetmap/josm/actions/upload/UploadNotesTask.java b/src/org/openstreetmap/josm/actions/upload/UploadNotesTask.java
new file mode 100644
index 0000000..92e3c54
--- /dev/null
+++ b/src/org/openstreetmap/josm/actions/upload/UploadNotesTask.java
@@ -0,0 +1,144 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.actions.upload;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.swing.JOptionPane;
+
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.notes.Note;
+import org.openstreetmap.josm.data.notes.NoteComment;
+import org.openstreetmap.josm.data.osm.NoteData;
+import org.openstreetmap.josm.gui.PleaseWaitRunnable;
+import org.openstreetmap.josm.gui.progress.ProgressMonitor;
+import org.openstreetmap.josm.io.OsmApi;
+import org.openstreetmap.josm.io.OsmTransferException;
+import org.xml.sax.SAXException;
+
+/**
+ * Class for uploading note changes to the server
+ */
+public class UploadNotesTask {
+
+    private UploadTask uploadTask;
+    private NoteData noteData;
+
+    /**
+     * Upload notes with modifications to the server
+     * @param noteData Note dataset with changes to upload
+     * @param progressMonitor progress monitor for user feedback
+     */
+    public void uploadNotes(NoteData noteData, ProgressMonitor progressMonitor) {
+        this.noteData = noteData;
+        uploadTask = new UploadTask(tr("Uploading modified notes"), progressMonitor);
+        Main.worker.submit(uploadTask);
+    }
+
+    private class UploadTask extends PleaseWaitRunnable {
+
+        private boolean isCanceled = false;
+        Map<Note, Note> updatedNotes = new HashMap<>();
+        Map<Note, Exception> failedNotes = new HashMap<>();
+
+        /**
+         * Constructs a new {@code UploadTask}.
+         * @param title message for the user
+         * @param monitor progress monitor
+         */
+        public UploadTask(String title, ProgressMonitor monitor) {
+            super(title, monitor, false);
+        }
+
+        @Override
+        protected void cancel() {
+            if (Main.isDebugEnabled()) {
+                Main.debug("note upload canceled");
+            }
+            isCanceled = true;
+        }
+
+        @Override
+        protected void realRun() throws SAXException, IOException, OsmTransferException {
+            ProgressMonitor monitor = progressMonitor.createSubTaskMonitor(ProgressMonitor.ALL_TICKS, false);
+            OsmApi api = OsmApi.getOsmApi();
+            for (Note note : noteData.getNotes()) {
+                if(isCanceled) {
+                    Main.info("Note upload interrupted by user");
+                    break;
+                }
+                for (NoteComment comment : note.getComments()) {
+                    if (comment.getIsNew()) {
+                        if (Main.isDebugEnabled()) {
+                            Main.debug("found note change to upload");
+                        }
+                        processNoteComment(monitor, api, note, comment);
+                    }
+                }
+            }
+        }
+
+        private void processNoteComment(ProgressMonitor monitor, OsmApi api, Note note, NoteComment comment) {
+            try {
+                Note newNote;
+                switch (comment.getNoteAction()) {
+                case opened:
+                    if (Main.isDebugEnabled()) {
+                        Main.debug("opening new note");
+                    }
+                    newNote = api.createNote(note.getLatLon(), comment.getText(), monitor);
+                    note.setId(newNote.getId());
+                    break;
+                case closed:
+                    if (Main.isDebugEnabled()) {
+                        Main.debug("closing note " + note.getId());
+                    }
+                    newNote = api.closeNote(note, comment.getText(), monitor);
+                    break;
+                case commented:
+                    if (Main.isDebugEnabled()) {
+                        Main.debug("adding comment to note " + note.getId());
+                    }
+                    newNote = api.addCommentToNote(note, comment.getText(), monitor);
+                    break;
+                case reopened:
+                    if (Main.isDebugEnabled()) {
+                        Main.debug("reopening note " + note.getId());
+                    }
+                    newNote = api.reopenNote(note, comment.getText(), monitor);
+                    break;
+                default:
+                    newNote = null;
+                }
+                updatedNotes.put(note, newNote);
+            } catch (Exception e) {
+                Main.error("Failed to upload note to server: " + note.getId());
+                failedNotes.put(note, e);
+            }
+        }
+
+        /** Updates the note layer with uploaded notes and notifies the user of any upload failures */
+        @Override
+        protected void finish() {
+            if (Main.isDebugEnabled()) {
+                Main.debug("finish called in notes upload task. Notes to update: " + updatedNotes.size());
+            }
+            noteData.updateNotes(updatedNotes);
+            if (!failedNotes.isEmpty()) {
+                Main.error("Some notes failed to upload");
+                StringBuilder sb = new StringBuilder();
+                for (Map.Entry<Note, Exception> entry : failedNotes.entrySet()) {
+                    sb.append(tr("Note {0} failed: {1}", entry.getKey().getId(), entry.getValue().getMessage()));
+                    sb.append("\n");
+                }
+                Main.error("Notes failed to upload: " + sb.toString());
+                JOptionPane.showMessageDialog(Main.map, sb.toString(), tr("Notes failed to upload"), JOptionPane.ERROR_MESSAGE);
+            }
+        }
+
+    }
+
+}
diff --git a/src/org/openstreetmap/josm/command/DeleteCommand.java b/src/org/openstreetmap/josm/command/DeleteCommand.java
index 3ba8399..defa3b3 100644
--- a/src/org/openstreetmap/josm/command/DeleteCommand.java
+++ b/src/org/openstreetmap/josm/command/DeleteCommand.java
@@ -43,7 +43,7 @@ import org.openstreetmap.josm.tools.Utils;
 
 /**
  * A command to delete a number of primitives from the dataset.
- *
+ * @since 23
  */
 public class DeleteCommand extends Command {
     /**
@@ -59,11 +59,11 @@ public class DeleteCommand extends Command {
      * @throws IllegalArgumentException thrown if data is null or empty
      */
     public DeleteCommand(Collection<? extends OsmPrimitive> data) throws IllegalArgumentException {
-        if (data == null)
-            throw new IllegalArgumentException("Parameter 'data' must not be empty");
+        CheckParameterUtil.ensureParameterNotNull(data, "data");
         if (data.isEmpty())
             throw new IllegalArgumentException(tr("At least one object to delete required, got empty collection"));
         this.toDelete = data;
+        checkConsistency();
     }
 
     /**
@@ -73,8 +73,7 @@ public class DeleteCommand extends Command {
      * @throws IllegalArgumentException thrown if data is null
      */
     public DeleteCommand(OsmPrimitive data) throws IllegalArgumentException {
-        CheckParameterUtil.ensureParameterNotNull(data, "data");
-        this.toDelete = Collections.singleton(data);
+        this(Collections.singleton(data));
     }
 
     /**
@@ -87,9 +86,7 @@ public class DeleteCommand extends Command {
      * @throws IllegalArgumentException thrown if layer is null
      */
     public DeleteCommand(OsmDataLayer layer, OsmPrimitive data) throws IllegalArgumentException {
-        super(layer);
-        CheckParameterUtil.ensureParameterNotNull(data, "data");
-        this.toDelete = Collections.singleton(data);
+        this(layer, Collections.singleton(data));
     }
 
     /**
@@ -103,11 +100,21 @@ public class DeleteCommand extends Command {
      */
     public DeleteCommand(OsmDataLayer layer, Collection<? extends OsmPrimitive> data) throws IllegalArgumentException{
         super(layer);
-        if (data == null)
-            throw new IllegalArgumentException("Parameter 'data' must not be empty");
+        CheckParameterUtil.ensureParameterNotNull(data, "data");
         if (data.isEmpty())
             throw new IllegalArgumentException(tr("At least one object to delete required, got empty collection"));
         this.toDelete = data;
+        checkConsistency();
+    }
+
+    private void checkConsistency() {
+        for (OsmPrimitive p : toDelete) {
+            if (p == null) {
+                throw new IllegalArgumentException("Primitive to delete must not be null");
+            } else if (p.getDataSet() == null) {
+                throw new IllegalArgumentException("Primitive to delete must be in a dataset");
+            }
+        }
     }
 
     @Override
@@ -230,11 +237,8 @@ public class DeleteCommand extends Command {
     /**
      * Delete the primitives and everything they reference.
      *
-     * If a node is deleted, the node and all ways and relations the node is part of are deleted as
-     * well.
-     *
+     * If a node is deleted, the node and all ways and relations the node is part of are deleted as well.
      * If a way is deleted, all relations the way is member of are also deleted.
-     *
      * If a way is deleted, only the way and no nodes are deleted.
      *
      * @param layer the {@link OsmDataLayer} in whose context primitives are deleted. Must not be null.
@@ -256,10 +260,35 @@ public class DeleteCommand extends Command {
         return new DeleteCommand(layer,parents);
     }
 
+    /**
+     * Delete the primitives and everything they reference.
+     *
+     * If a node is deleted, the node and all ways and relations the node is part of are deleted as well.
+     * If a way is deleted, all relations the way is member of are also deleted.
+     * If a way is deleted, only the way and no nodes are deleted.
+     *
+     * @param layer the {@link OsmDataLayer} in whose context primitives are deleted. Must not be null.
+     * @param selection The list of all object to be deleted.
+     * @return command A command to perform the deletions, or null of there is nothing to delete.
+     * @throws IllegalArgumentException thrown if layer is null
+     */
     public static Command deleteWithReferences(OsmDataLayer layer, Collection<? extends OsmPrimitive> selection) {
         return deleteWithReferences(layer, selection, false);
     }
 
+    /**
+     * Try to delete all given primitives.
+     *
+     * If a node is used by a way, it's removed from that way. If a node or a way is used by a
+     * relation, inform the user and do not delete.
+     *
+     * If this would cause ways with less than 2 nodes to be created, delete these ways instead. If
+     * they are part of a relation, inform the user and do not delete.
+     *
+     * @param layer the {@link OsmDataLayer} in whose context the primitives are deleted
+     * @param selection the objects to delete.
+     * @return command a command to perform the deletions, or null if there is nothing to delete.
+     */
     public static Command delete(OsmDataLayer layer, Collection<? extends OsmPrimitive> selection) {
         return delete(layer, selection, true, false);
     }
diff --git a/src/org/openstreetmap/josm/data/Preferences.java b/src/org/openstreetmap/josm/data/Preferences.java
index 412147a..60e25dc 100644
--- a/src/org/openstreetmap/josm/data/Preferences.java
+++ b/src/org/openstreetmap/josm/data/Preferences.java
@@ -1384,7 +1384,7 @@ public class Preferences {
      * @return the collection of plugin site URLs
      */
     public Collection<String> getPluginSites() {
-        return getCollection("pluginmanager.sites", Collections.singleton(Main.getJOSMWebsite()+"/plugin%<?plugins=>"));
+        return getCollection("pluginmanager.sites", Collections.singleton(Main.getJOSMWebsite()+"/pluginicons%<?plugins=>"));
     }
 
     /**
diff --git a/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java b/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java
index fce96df..c4a95e8 100644
--- a/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java
+++ b/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java
@@ -300,6 +300,14 @@ public class ImageryInfo implements Comparable<ImageryInfo>, Attributed {
         this.eulaAcceptanceRequired = eulaAcceptanceRequired;
     }
 
+    /**
+     * Constructs a new {@code ImageryInfo} with given name, url, extended and EULA URLs.
+     * @param name The entry name
+     * @param url The entry URL
+     * @param type The entry imagery type. If null, WMS will be used as default
+     * @param eulaAcceptanceRequired The EULA URL
+     * @throws IllegalArgumentException if type refers to an unknown imagery type
+     */
     public ImageryInfo(String name, String url, String type, String eulaAcceptanceRequired, String cookies) {
         this.name=name;
         setExtendedUrl(url);
@@ -308,6 +316,8 @@ public class ImageryInfo implements Comparable<ImageryInfo>, Attributed {
         this.eulaAcceptanceRequired = eulaAcceptanceRequired;
         if (t != null) {
             this.imageryType = t;
+        } else if (type != null && !type.trim().isEmpty()) {
+            throw new IllegalArgumentException("unknown type: "+type);
         }
     }
 
diff --git a/src/org/openstreetmap/josm/data/osm/Changeset.java b/src/org/openstreetmap/josm/data/osm/Changeset.java
index 784c95e..79e2b88 100644
--- a/src/org/openstreetmap/josm/data/osm/Changeset.java
+++ b/src/org/openstreetmap/josm/data/osm/Changeset.java
@@ -1,9 +1,12 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.data.osm;
 
+import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 import org.openstreetmap.josm.data.Bounds;
@@ -34,14 +37,16 @@ public final class Changeset implements Tagged {
     private LatLon min;
     /** the max. coordinates of the bounding box of this changeset */
     private LatLon max;
+    /** the number of comments for this changeset */
+    private int commentsCount;
     /** the map of tags */
     private Map<String,String> tags;
-    /** indicates whether this changeset is incomplete. For an
-     * incomplete changeset we only know its id
-     */
+    /** indicates whether this changeset is incomplete. For an incomplete changeset we only know its id */
     private boolean incomplete;
     /** the changeset content */
     private ChangesetDataSet content = null;
+    /** the changeset discussion */
+    private List<ChangesetDiscussionComment> discussion = null;
 
     /**
      * Creates a new changeset with id 0.
@@ -160,6 +165,24 @@ public final class Changeset implements Tagged {
         this.max = max;
     }
 
+    /**
+     * Replies the number of comments for this changeset.
+     * @return the number of comments for this changeset
+     * @since 7700
+     */
+    public final int getCommentsCount() {
+        return commentsCount;
+    }
+
+    /**
+     * Sets the number of comments for this changeset.
+     * @param commentsCount the number of comments for this changeset
+     * @since 7700
+     */
+    public final void setCommentsCount(int commentsCount) {
+        this.commentsCount = commentsCount;
+    }
+
     @Override
     public Map<String, String> getKeys() {
         return tags;
@@ -235,6 +258,9 @@ public final class Changeset implements Tagged {
                 return false;
         } else if (!user.equals(other.user))
             return false;
+        if (commentsCount != other.commentsCount) {
+            return false;
+        }
         return true;
     }
 
@@ -285,8 +311,10 @@ public final class Changeset implements Tagged {
         this.open  = other.open;
         this.min = other.min;
         this.max = other.max;
+        this.commentsCount = other.commentsCount;
         this.tags = new HashMap<>(other.tags);
         this.incomplete = other.incomplete;
+        this.discussion = other.discussion != null ? new ArrayList<>(other.discussion) : null;
 
         // FIXME: merging of content required?
         this.content = other.content;
@@ -303,4 +331,31 @@ public final class Changeset implements Tagged {
     public void setContent(ChangesetDataSet content) {
         this.content = content;
     }
+
+    /**
+     * Replies the list of comments in the changeset discussion, if any.
+     * @return the list of comments in the changeset discussion. May be empty but never null
+     * @since 7704
+     */
+    public synchronized final List<ChangesetDiscussionComment> getDiscussion() {
+        if (discussion == null) {
+            return Collections.emptyList();
+        }
+        return new ArrayList<>(discussion);
+    }
+
+    /**
+     * Adds a comment to the changeset discussion.
+     * @param comment the comment to add. Ignored if null
+     * @since 7704
+     */
+    public synchronized final void addDiscussionComment(ChangesetDiscussionComment comment) {
+        if (comment == null) {
+            return;
+        }
+        if (discussion == null) {
+            discussion = new ArrayList<>();
+        }
+        discussion.add(comment);
+    }
 }
diff --git a/src/org/openstreetmap/josm/data/osm/ChangesetDiscussionComment.java b/src/org/openstreetmap/josm/data/osm/ChangesetDiscussionComment.java
new file mode 100644
index 0000000..c9f5a66
--- /dev/null
+++ b/src/org/openstreetmap/josm/data/osm/ChangesetDiscussionComment.java
@@ -0,0 +1,65 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.data.osm;
+
+import java.util.Date;
+
+/**
+ * A comment in a public changeset discussion.
+ * @since 7704
+ */
+public class ChangesetDiscussionComment {
+
+    /** date this comment was posted at */
+    private final Date date;
+    /** the user who posted the comment */
+    private final User user;
+    /** comment text */
+    private String text;
+
+    /**
+     * Constructs a new {@code ChangesetDiscussionComment}.
+     * @param date date this comment was posted at
+     * @param user the user who posted the comment
+     */
+    public ChangesetDiscussionComment(Date date, User user) {
+        this.date = date;
+        this.user = user;
+    }
+
+    /**
+     * Replies comment text.
+     * @return comment text
+     */
+    public final String getText() {
+        return text;
+    }
+
+    /**
+     * Sets comment text.
+     * @param text comment text
+     */
+    public final void setText(String text) {
+        this.text = text;
+    }
+
+    /**
+     * Replies date this comment was posted at.
+     * @return date this comment was posted at
+     */
+    public final Date getDate() {
+        return date;
+    }
+
+    /**
+     * Replies the user who posted the comment.
+     * @return the user who posted the comment
+     */
+    public final User getUser() {
+        return user;
+    }
+
+    @Override
+    public String toString() {
+        return "ChangesetDiscussionComment [date=" + date + ", user=" + user + ", text='" + text + "']";
+    }
+}
diff --git a/src/org/openstreetmap/josm/data/osm/DataSet.java b/src/org/openstreetmap/josm/data/osm/DataSet.java
index c895fa8..82b04a3 100644
--- a/src/org/openstreetmap/josm/data/osm/DataSet.java
+++ b/src/org/openstreetmap/josm/data/osm/DataSet.java
@@ -946,7 +946,7 @@ public final class DataSet implements Data, Cloneable, ProjectionChangeListener
      * @return the primitive
      */
     public OsmPrimitive getPrimitiveById(PrimitiveId primitiveId) {
-        return primitivesMap.get(primitiveId);
+        return primitiveId != null ? primitivesMap.get(primitiveId) : null;
     }
 
     /**
@@ -956,7 +956,7 @@ public final class DataSet implements Data, Cloneable, ProjectionChangeListener
      */
     private OsmPrimitive getPrimitiveByIdChecked(PrimitiveId primitiveId) {
         OsmPrimitive result = getPrimitiveById(primitiveId);
-        if (result == null) {
+        if (result == null && primitiveId != null) {
             Main.warn(tr("JOSM expected to find primitive [{0} {1}] in dataset but it is not there. Please report this "
                     + "at {2}. This is not a critical error, it should be safe to continue in your work.",
                     primitiveId.getType(), Long.toString(primitiveId.getUniqueId()), Main.getJOSMWebsite()));
diff --git a/src/org/openstreetmap/josm/data/osm/NoteData.java b/src/org/openstreetmap/josm/data/osm/NoteData.java
index 75fcf8a..034a229 100644
--- a/src/org/openstreetmap/josm/data/osm/NoteData.java
+++ b/src/org/openstreetmap/josm/data/osm/NoteData.java
@@ -4,6 +4,7 @@ package org.openstreetmap.josm.data.osm;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.coor.LatLon;
@@ -35,6 +36,11 @@ public class NoteData {
      */
     public NoteData(List<Note> notes) {
         noteList = notes;
+        for (Note note : notes) {
+            if (note.getId() <= newNoteId) {
+                newNoteId = note.getId() - 1;
+            }
+        }
     }
 
     /**
@@ -58,15 +64,36 @@ public class NoteData {
      */
     public void setSelectedNote(Note note) {
         selectedNote = note;
-        Main.map.noteDialog.selectionChanged();
-        Main.map.mapView.repaint();
+        if (Main.map != null) {
+            Main.map.noteDialog.selectionChanged();
+            Main.map.mapView.repaint();
+        }
+    }
+
+    /**
+     * Return whether or not there are any changes in the note data set.
+     * These changes may need to be either uploaded or saved.
+     * @return true if local modifications have been made to the note data set. False otherwise.
+     */
+    public synchronized boolean isModified() {
+        for (Note note : noteList) {
+            if (note.getId() < 0) { //notes with negative IDs are new
+                return true;
+            }
+            for (NoteComment comment : note.getComments()) {
+                if (comment.getIsNew()) {
+                    return true;
+                }
+            }
+        }
+        return false;
     }
 
     /**
      * Add notes to the data set. It only adds a note if the ID is not already present
      * @param newNotes A list of notes to add
      */
-    public void addNotes(List<Note> newNotes) {
+    public synchronized void addNotes(List<Note> newNotes) {
         for (Note newNote : newNotes) {
             if (!noteList.contains(newNote)) {
                 noteList.add(newNote);
@@ -76,7 +103,9 @@ public class NoteData {
             }
         }
         dataUpdated();
-        Main.debug("notes in current set: " + noteList.size());
+        if (Main.isDebugEnabled()) {
+            Main.debug("notes in current set: " + noteList.size());
+        }
     }
 
     /**
@@ -84,7 +113,7 @@ public class NoteData {
      * @param location Location of note
      * @param text Required comment with which to open the note
      */
-    public void createNote(LatLon location, String text) {
+    public synchronized void createNote(LatLon location, String text) {
         if(text == null || text.isEmpty()) {
             throw new IllegalArgumentException("Comment can not be blank when creating a note");
         }
@@ -94,7 +123,9 @@ public class NoteData {
         note.setId(newNoteId--);
         NoteComment comment = new NoteComment(new Date(), getCurrentUser(), text, NoteComment.Action.opened, true);
         note.addComment(comment);
-        Main.debug("Created note {0} with comment: {1}", note.getId(), text);
+        if (Main.isDebugEnabled()) {
+            Main.debug("Created note {0} with comment: {1}", note.getId(), text);
+        }
         noteList.add(note);
         dataUpdated();
     }
@@ -104,14 +135,16 @@ public class NoteData {
      * @param note Note to add comment to. Must already exist in the layer
      * @param text Comment to add
      */
-    public void addCommentToNote(Note note, String text) {
+    public synchronized void addCommentToNote(Note note, String text) {
         if (!noteList.contains(note)) {
             throw new IllegalArgumentException("Note to modify must be in layer");
         }
         if (note.getState() == State.closed) {
             throw new IllegalStateException("Cannot add a comment to a closed note");
         }
-        Main.debug("Adding comment to note {0}: {1}", note.getId(), text);
+        if (Main.isDebugEnabled()) {
+            Main.debug("Adding comment to note {0}: {1}", note.getId(), text);
+        }
         NoteComment comment = new NoteComment(new Date(), getCurrentUser(), text, NoteComment.Action.commented, true);
         note.addComment(comment);
         dataUpdated();
@@ -122,14 +155,16 @@ public class NoteData {
      * @param note Note to close. Must already exist in the layer
      * @param text Comment to attach to close action, if desired
      */
-    public void closeNote(Note note, String text) {
+    public synchronized void closeNote(Note note, String text) {
         if (!noteList.contains(note)) {
             throw new IllegalArgumentException("Note to close must be in layer");
         }
         if (note.getState() != State.open) {
             throw new IllegalStateException("Cannot close a note that isn't open");
         }
-        Main.debug("closing note {0} with comment: {1}", note.getId(), text);
+        if (Main.isDebugEnabled()) {
+            Main.debug("closing note {0} with comment: {1}", note.getId(), text);
+        }
         NoteComment comment = new NoteComment(new Date(), getCurrentUser(), text, NoteComment.Action.closed, true);
         note.addComment(comment);
         note.setState(State.closed);
@@ -142,14 +177,16 @@ public class NoteData {
      * @param note Note to reopen. Must already exist in the layer
      * @param text Comment to attach to the reopen action, if desired
      */
-    public void reOpenNote(Note note, String text) {
+    public synchronized void reOpenNote(Note note, String text) {
         if (!noteList.contains(note)) {
             throw new IllegalArgumentException("Note to reopen must be in layer");
         }
         if (note.getState() != State.closed) {
             throw new IllegalStateException("Cannot reopen a note that isn't closed");
         }
-        Main.debug("reopening note {0} with comment: {1}", note.getId(), text);
+        if (Main.isDebugEnabled()) {
+            Main.debug("reopening note {0} with comment: {1}", note.getId(), text);
+        }
         NoteComment comment = new NoteComment(new Date(), getCurrentUser(), text, NoteComment.Action.reopened, true);
         note.addComment(comment);
         note.setState(State.open);
@@ -165,4 +202,18 @@ public class NoteData {
         JosmUserIdentityManager userMgr = JosmUserIdentityManager.getInstance();
         return User.createOsmUser(userMgr.getUserId(), userMgr.getUserName());
     }
+
+    /**
+     * Updates notes with new state. Primarily to be used when updating the
+     * note layer after uploading note changes to the server.
+     * @param updatedNotes Map containing the original note as the key and the updated note as the value
+     */
+    public synchronized void updateNotes(Map<Note, Note> updatedNotes) {
+        for (Map.Entry<Note, Note> entry : updatedNotes.entrySet()) {
+            Note oldNote = entry.getKey();
+            Note newNote = entry.getValue();
+            oldNote.updateWith(newNote);
+        }
+        dataUpdated();
+    }
 }
diff --git a/src/org/openstreetmap/josm/data/osm/TagCollection.java b/src/org/openstreetmap/josm/data/osm/TagCollection.java
index 378f9cd..9b16407 100644
--- a/src/org/openstreetmap/josm/data/osm/TagCollection.java
+++ b/src/org/openstreetmap/josm/data/osm/TagCollection.java
@@ -17,6 +17,7 @@ import java.util.Map.Entry;
 import java.util.Set;
 import java.util.regex.Pattern;
 
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -721,6 +722,7 @@ public class TagCollection implements Iterable<Tag> {
 
     /**
      * Replies the concatenation of all tag values (concatenated by a semicolon)
+     * @param key the key to look up
      *
      * @return the concatenation of all tag values
      */
@@ -749,6 +751,28 @@ public class TagCollection implements Iterable<Tag> {
         return Utils.join(";", values);
     }
 
+    /**
+     * Replies the sum of all numeric tag values.
+     * @param key the key to look up
+     *
+     * @return the sum of all numeric tag values, as string
+     * @since 7743
+     */
+    public String getSummedValues(String key) {
+        int result = 0;
+        for (String value : getValues(key)) {
+            try {
+                result += Integer.parseInt(value);
+            } catch (NumberFormatException e) {
+                if (Main.isTraceEnabled()) {
+                    Main.trace(e.getMessage());
+                }
+            }
+        }
+        return Integer.toString(result);
+    }
+
+
     @Override
     public String toString() {
         return tags.toString();
diff --git a/src/org/openstreetmap/josm/data/osm/Way.java b/src/org/openstreetmap/josm/data/osm/Way.java
index e63affa..71aabe5 100644
--- a/src/org/openstreetmap/josm/data/osm/Way.java
+++ b/src/org/openstreetmap/josm/data/osm/Way.java
@@ -284,13 +284,18 @@ public final class Way extends OsmPrimitive implements IWay {
 
             WayData wayData = (WayData) data;
 
+            if (!wayData.getNodes().isEmpty() && getDataSet() == null) {
+                throw new AssertionError("Data consistency problem - way without dataset detected");
+            }
+
             List<Node> newNodes = new ArrayList<>(wayData.getNodes().size());
             for (Long nodeId : wayData.getNodes()) {
                 Node node = (Node)getDataSet().getPrimitiveById(nodeId, OsmPrimitiveType.NODE);
                 if (node != null) {
                     newNodes.add(node);
-                } else
+                } else {
                     throw new AssertionError("Data consistency problem - way with missing node detected");
+                }
             }
             setNodes(newNodes);
         } finally {
diff --git a/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java b/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java
index 955eee8..a723378 100644
--- a/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java
+++ b/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java
@@ -27,8 +27,10 @@ import java.awt.geom.Rectangle2D;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
 import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
@@ -234,7 +236,7 @@ public class StyledMapRenderer extends AbstractMapRenderer {
         }
     }
 
-    private static Boolean IS_GLYPH_VECTOR_DOUBLE_TRANSLATION_BUG = null;
+    private static Map<Font,Boolean> IS_GLYPH_VECTOR_DOUBLE_TRANSLATION_BUG = new HashMap<>();
 
     /**
      * Check, if this System has the GlyphVector double translation bug.
@@ -258,25 +260,26 @@ public class StyledMapRenderer extends AbstractMapRenderer {
      * preference glyph-bug=false|true|auto, where auto is the automatic detection
      * method which apparently no longer gives a useful result for Java 7.
      */
-    public static boolean isGlyphVectorDoubleTranslationBug() {
-        if (IS_GLYPH_VECTOR_DOUBLE_TRANSLATION_BUG != null)
-            return IS_GLYPH_VECTOR_DOUBLE_TRANSLATION_BUG;
-        String overridePref = Main.pref.get("glyph-bug", "false");
+    public static boolean isGlyphVectorDoubleTranslationBug(Font font) {
+        Boolean cached  = IS_GLYPH_VECTOR_DOUBLE_TRANSLATION_BUG.get(font);
+        if (cached != null)
+            return cached;
+        String overridePref = Main.pref.get("glyph-bug", "auto");
         if ("auto".equals(overridePref)) {
             FontRenderContext frc = new FontRenderContext(null, false, false);
-            Font font = new Font("Dialog", Font.PLAIN, 12);
             GlyphVector gv = font.createGlyphVector(frc, "x");
             gv.setGlyphTransform(0, AffineTransform.getTranslateInstance(1000, 1000));
             Shape shape = gv.getGlyphOutline(0);
             Main.trace("#10446: shape: "+shape.getBounds());
             // x is about 1000 on normal stystems and about 2000 when the bug occurs
             int x = shape.getBounds().x;
-            IS_GLYPH_VECTOR_DOUBLE_TRANSLATION_BUG = x > 1500;
-            return IS_GLYPH_VECTOR_DOUBLE_TRANSLATION_BUG;
+            boolean isBug = x > 1500;
+            IS_GLYPH_VECTOR_DOUBLE_TRANSLATION_BUG.put(font, isBug);
+            return isBug;
         } else {
             boolean override = Boolean.parseBoolean(overridePref);
-            IS_GLYPH_VECTOR_DOUBLE_TRANSLATION_BUG = override;
-            return IS_GLYPH_VECTOR_DOUBLE_TRANSLATION_BUG;
+            IS_GLYPH_VECTOR_DOUBLE_TRANSLATION_BUG.put(font, override);
+            return override;
         }
     }
 
@@ -1205,7 +1208,7 @@ public class StyledMapRenderer extends AbstractMapRenderer {
                 trfm.rotate(p[2]+angleOffset);
                 double off = -rect.getY() - rect.getHeight()/2 + text.yOffset;
                 trfm.translate(-rect.getWidth()/2, off);
-                if (isGlyphVectorDoubleTranslationBug()) {
+                if (isGlyphVectorDoubleTranslationBug(text.font)) {
                     // scale the translation components by one half
                     AffineTransform tmp = AffineTransform.getTranslateInstance(-0.5 * trfm.getTranslateX(), -0.5 * trfm.getTranslateY());
                     tmp.concatenate(trfm);
diff --git a/src/org/openstreetmap/josm/data/osm/visitor/paint/relations/MultipolygonCache.java b/src/org/openstreetmap/josm/data/osm/visitor/paint/relations/MultipolygonCache.java
index 0476e29..8780f0e 100644
--- a/src/org/openstreetmap/josm/data/osm/visitor/paint/relations/MultipolygonCache.java
+++ b/src/org/openstreetmap/josm/data/osm/visitor/paint/relations/MultipolygonCache.java
@@ -220,6 +220,10 @@ public final class MultipolygonCache implements DataSetListener, LayerChangeList
         for (Map<Relation, Multipolygon> map : maps) {
             map.remove(r);
         }
+        // Erase style cache for polygon members
+        for (OsmPrimitive member : r.getMemberPrimitives()) {
+            member.clearCachedStyle();
+        }
     }
 
     @Override
@@ -234,7 +238,7 @@ public final class MultipolygonCache implements DataSetListener, LayerChangeList
 
     @Override
     public void tagsChanged(TagsChangedEvent event) {
-        // Do nothing
+        updateMultipolygonsReferringTo(event);
     }
 
     @Override
diff --git a/src/org/openstreetmap/josm/data/validation/routines/UrlValidator.java b/src/org/openstreetmap/josm/data/validation/routines/UrlValidator.java
index 2e8abb1..ac9af60 100644
--- a/src/org/openstreetmap/josm/data/validation/routines/UrlValidator.java
+++ b/src/org/openstreetmap/josm/data/validation/routines/UrlValidator.java
@@ -156,6 +156,9 @@ public class UrlValidator extends AbstractValidator {
     private static final String PORT_REGEX = "^:(\\d{1,5})$";
     private static final Pattern PORT_PATTERN = Pattern.compile(PORT_REGEX);
 
+    private static final String SIMPLE_WEBSITE = "^www[.].*";
+    private static final Pattern SIMPLE_WEBSITE_PATTERN = Pattern.compile(SIMPLE_WEBSITE);
+
     /**
      * Holds the set of current validation options.
      */
@@ -297,6 +300,9 @@ public class UrlValidator extends AbstractValidator {
         String scheme = urlMatcher.group(PARSE_URL_SCHEME);
         if (!isValidScheme(scheme)) {
             setErrorMessage(tr("URL contains an invalid protocol: {0}", scheme));
+            if (SIMPLE_WEBSITE_PATTERN.matcher(value).matches()) {
+                setFix("http://" + value);
+            }
             return false;
         }
 
diff --git a/src/org/openstreetmap/josm/data/validation/tests/DuplicateWay.java b/src/org/openstreetmap/josm/data/validation/tests/DuplicateWay.java
index 0c8452c..f8af0f3 100644
--- a/src/org/openstreetmap/josm/data/validation/tests/DuplicateWay.java
+++ b/src/org/openstreetmap/josm/data/validation/tests/DuplicateWay.java
@@ -166,12 +166,44 @@ public class DuplicateWay extends Test {
     public void visit(Way w) {
         if (!w.isUsable())
             return;
-        List<Node> wNodes = w.getNodes();                            // The original list of nodes for this way
+        List<LatLon> wLat = getOrderedNodes(w);
+        // If this way has not direction-dependant keys, make sure the list is ordered the same for all ways (fix #8015)
+        if (!w.hasDirectionKeys()) {
+            int hash = wLat.hashCode();
+            if (!knownHashCodes.contains(hash)) {
+                List<LatLon> reversedwLat = new ArrayList<>(wLat);
+                Collections.reverse(reversedwLat);
+                int reverseHash = reversedwLat.hashCode();
+                if (!knownHashCodes.contains(reverseHash)) {
+                    // Neither hash or reversed hash is known, remember hash
+                    knownHashCodes.add(hash);
+                } else {
+                    // Reversed hash is known, use the reverse list then
+                    wLat = reversedwLat;
+                }
+            }
+        }
+        Map<String, String> wkeys = w.getKeys();
+        removeUninterestingKeys(wkeys);
+        WayPair wKey = new WayPair(wLat, wkeys);
+        ways.put(wKey, w);
+        WayPairNoTags wKeyN = new WayPairNoTags(wLat);
+        waysNoTags.put(wKeyN, w);
+    }
+
+    /**
+     * Replies the ordered list of nodes of way w such as it is easier to find duplicated ways.
+     * In case of a closed way, build the list of lat/lon starting from the node with the lowest id
+     * to ensure this list will produce the same hashcode as the list obtained from another closed
+     * way with the same nodes, in the same order, but that does not start from the same node (fix #8008)
+     * @param w way
+     * @return the ordered list of nodes of way w such as it is easier to find duplicated ways
+     * @since 7721
+     */
+    public static List<LatLon> getOrderedNodes(Way w) {
+        List<Node> wNodes = w.getNodes();                        // The original list of nodes for this way
         List<Node> wNodesToUse = new ArrayList<>(wNodes.size()); // The list that will be considered for this test
         if (w.isClosed()) {
-            // In case of a closed way, build the list of lat/lon starting from the node with the lowest id
-            // to ensure this list will produce the same hashcode as the list obtained from another closed
-            // way with the same nodes, in the same order, but that does not start from the same node (fix #8008)
             int lowestIndex = 0;
             long lowestNodeId = wNodes.get(0).getUniqueId();
             for (int i=1; i<wNodes.size(); i++) {
@@ -195,28 +227,7 @@ public class DuplicateWay extends Test {
         for (Node node : wNodesToUse) {
             wLat.add(node.getCoor());
         }
-        // If this way has not direction-dependant keys, make sure the list is ordered the same for all ways (fix #8015)
-        if (!w.hasDirectionKeys()) {
-            int hash = wLat.hashCode();
-            if (!knownHashCodes.contains(hash)) {
-                List<LatLon> reversedwLat = new ArrayList<>(wLat);
-                   Collections.reverse(reversedwLat);
-                int reverseHash = reversedwLat.hashCode();
-                if (!knownHashCodes.contains(reverseHash)) {
-                    // Neither hash or reversed hash is known, remember hash
-                    knownHashCodes.add(hash);
-                } else {
-                    // Reversed hash is known, use the reverse list then
-                    wLat = reversedwLat;
-                }
-            }
-        }
-        Map<String, String> wkeys = w.getKeys();
-        removeUninterestingKeys(wkeys);
-        WayPair wKey = new WayPair(wLat, wkeys);
-        ways.put(wKey, w);
-        WayPairNoTags wKeyN = new WayPairNoTags(wLat);
-        waysNoTags.put(wKeyN, w);
+        return wLat;
     }
 
     /**
diff --git a/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java b/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java
index 6bfe1ee..5bf9b20 100644
--- a/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java
+++ b/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java
@@ -573,7 +573,8 @@ public class MapCSSTagChecker extends Test.TagTest {
     public synchronized void addMapCSS(String url) throws ParseException, IOException {
         CheckParameterUtil.ensureParameterNotNull(url, "url");
         CachedFile cache = new CachedFile(url);
-        try (InputStream s = cache.getInputStream()) {
+        InputStream zip = cache.findZipEntryInputStream("validator.mapcss", "");
+        try (InputStream s = zip != null ? zip : cache.getInputStream()) {
             List<TagCheck> tagchecks = TagCheck.readMapCSS(new BufferedReader(UTFInputStreamReader.create(s)));
             checks.remove(url);
             checks.putAll(url, tagchecks);
diff --git a/src/org/openstreetmap/josm/data/validation/tests/UnclosedWays.java b/src/org/openstreetmap/josm/data/validation/tests/UnclosedWays.java
index 1a9a5d5..1c6721e 100644
--- a/src/org/openstreetmap/josm/data/validation/tests/UnclosedWays.java
+++ b/src/org/openstreetmap/josm/data/validation/tests/UnclosedWays.java
@@ -142,7 +142,7 @@ public class UnclosedWays extends Test {
         new UnclosedWaysCheck(1104, "sport",     marktr("sport type {0}"), Arrays.asList("water_slide", "climbing")),
         new UnclosedWaysCheck(1105, "tourism",   marktr("tourism type {0}"), Arrays.asList("attraction")),
         new UnclosedWaysCheck(1106, "shop",      marktr("shop type {0}")),
-        new UnclosedWaysCheck(1107, "leisure",   marktr("leisure type {0}"), Arrays.asList("track")),
+        new UnclosedWaysCheck(1107, "leisure",   marktr("leisure type {0}"), Arrays.asList("track", "slipway")),
         new UnclosedWaysCheck(1108, "waterway",  marktr("waterway type {0}"), Arrays.asList("riverbank"), false),
         new UnclosedWaysCheck(1109, "boundary", marktr("boundary type {0}")),
         new UnclosedWaysBooleanCheck(1120, "building", marktr("building")),
diff --git a/src/org/openstreetmap/josm/data/validation/tests/WayConnectedToArea.java b/src/org/openstreetmap/josm/data/validation/tests/WayConnectedToArea.java
index 526429d..8325afd 100644
--- a/src/org/openstreetmap/josm/data/validation/tests/WayConnectedToArea.java
+++ b/src/org/openstreetmap/josm/data/validation/tests/WayConnectedToArea.java
@@ -70,13 +70,13 @@ public class WayConnectedToArea extends Test {
         } else if (Utils.exists(wayNode.getReferrers(), Predicates.hasTag("route", "ferry"))) {
             return;
         } else if (isArea(p)) {
-            addError(w, wayNode, p);
+            addPossibleError(w, wayNode, p, p);
         } else {
             for (OsmPrimitive r : p.getReferrers()) {
                 if (r instanceof Relation
                         && r.hasTag("type", "multipolygon")
                         && isArea(r)) {
-                    addError(w, wayNode, p);
+                    addPossibleError(w, wayNode, p, r);
                     break;
                 }
             }
@@ -88,7 +88,11 @@ public class WayConnectedToArea extends Test {
                 && ElemStyles.hasAreaElemStyle(p, false);
     }
 
-    private void addError(Way w, Node wayNode, OsmPrimitive p) {
+    private void addPossibleError(Way w, Node wayNode, OsmPrimitive p, OsmPrimitive area) {
+        // Avoid "legal" cases (see #10655)
+        if (w.hasKey("highway") && wayNode.hasTag("leisure", "slipway") && area.hasTag("natural", "water")) {
+            return;
+        }
         errors.add(new TestError(this, Severity.WARNING,
                 tr("Way terminates on Area"), 2301,
                 Arrays.asList(w, p),
diff --git a/src/org/openstreetmap/josm/gui/IconToggleButton.java b/src/org/openstreetmap/josm/gui/IconToggleButton.java
index 4deb5dc..6d2fc79 100644
--- a/src/org/openstreetmap/josm/gui/IconToggleButton.java
+++ b/src/org/openstreetmap/josm/gui/IconToggleButton.java
@@ -157,7 +157,10 @@ public class IconToggleButton extends JToggleButton implements HideableButton, P
 
     @Override
     public Icon getIcon() {
-        return (Icon) getSafeActionValue(Action.SMALL_ICON);
+        Object o = getSafeActionValue(Action.LARGE_ICON_KEY);
+        if (o == null)
+            o = getSafeActionValue(Action.SMALL_ICON);
+        return (Icon) o;
     }
 
     @Override
diff --git a/src/org/openstreetmap/josm/gui/ImageryMenu.java b/src/org/openstreetmap/josm/gui/ImageryMenu.java
index ff70bcc..0bf6e63 100644
--- a/src/org/openstreetmap/josm/gui/ImageryMenu.java
+++ b/src/org/openstreetmap/josm/gui/ImageryMenu.java
@@ -199,14 +199,7 @@ public class ImageryMenu extends JMenu implements LayerChangeListener {
             return singleOffset;
         }
         offsetAction.setEnabled(true);
-        JMenu newMenu = new JMenu(trc("layer","Offset")) {
-            // Hack to prevent ToolbarPreference from tracing this menu
-            // TODO: Modify ToolbarPreference to not to trace such dynamic submenus?
-            @Override
-            public MenuElement[] getSubElements() {
-                return new MenuElement[0];
-            }
-        };
+        JMenu newMenu = new JMenu(trc("layer","Offset"));
         newMenu.setIcon(ImageProvider.get("mapmode", "adjustimg"));
         newMenu.setAction(offsetAction);
         if (layers.size() == 1)
diff --git a/src/org/openstreetmap/josm/gui/MainMenu.java b/src/org/openstreetmap/josm/gui/MainMenu.java
index 6694cfe..f3aaa5c 100644
--- a/src/org/openstreetmap/josm/gui/MainMenu.java
+++ b/src/org/openstreetmap/josm/gui/MainMenu.java
@@ -603,7 +603,7 @@ public class MainMenu extends JMenuBar {
         add(fileMenu, save);
         add(fileMenu, saveAs);
         sessionMenu.setToolTipText(tr("Save and load the current session (list of layers, etc.)"));
-        sessionMenu.setIcon(ImageProvider.get("session"));
+        sessionMenu.setIcon(new ImageProvider("session").setSize(ImageProvider.ImageSizes.MENU).get());
         sessionSaveAs = new SessionSaveAsAction();
         sessionLoad = new SessionLoadAction();
         add(sessionMenu, sessionSaveAs);
diff --git a/src/org/openstreetmap/josm/gui/MapFrame.java b/src/org/openstreetmap/josm/gui/MapFrame.java
index d1a0035..866ba06 100644
--- a/src/org/openstreetmap/josm/gui/MapFrame.java
+++ b/src/org/openstreetmap/josm/gui/MapFrame.java
@@ -63,7 +63,6 @@ import org.openstreetmap.josm.gui.dialogs.CommandStackDialog;
 import org.openstreetmap.josm.gui.dialogs.ConflictDialog;
 import org.openstreetmap.josm.gui.dialogs.DialogsPanel;
 import org.openstreetmap.josm.gui.dialogs.FilterDialog;
-import org.openstreetmap.josm.gui.dialogs.HistoryDialog;
 import org.openstreetmap.josm.gui.dialogs.LayerListDialog;
 import org.openstreetmap.josm.gui.dialogs.MapPaintDialog;
 import org.openstreetmap.josm.gui.dialogs.NoteDialog;
@@ -238,7 +237,6 @@ public class MapFrame extends JPanel implements Destroyable, LayerChangeListener
         addToggleDialog(relationListDialog = new RelationListDialog());
         addToggleDialog(new CommandStackDialog());
         addToggleDialog(new UserListDialog());
-        addToggleDialog(new HistoryDialog(), true);
         addToggleDialog(conflictDialog = new ConflictDialog());
         addToggleDialog(validatorDialog = new ValidatorDialog());
         addToggleDialog(filterDialog = new FilterDialog());
diff --git a/src/org/openstreetmap/josm/gui/MapStatus.java b/src/org/openstreetmap/josm/gui/MapStatus.java
index 296c986..c6f83ce 100644
--- a/src/org/openstreetmap/josm/gui/MapStatus.java
+++ b/src/org/openstreetmap/josm/gui/MapStatus.java
@@ -474,13 +474,13 @@ public class MapStatus extends JPanel implements Helpful, Destroyable, Preferenc
             }
 
             // This will cycle through the available items.
-            if(firstSelected == null) {
-                ds.addSelected(firstItem);
-            } else {
+            if (firstSelected != null) {
                 ds.clearSelection(firstSelected);
                 if(nextSelected != null) {
                     ds.addSelected(nextSelected);
                 }
+            } else if (firstItem != null) {
+                ds.addSelected(firstItem);
             }
         }
 
diff --git a/src/org/openstreetmap/josm/gui/NoteInputDialog.java b/src/org/openstreetmap/josm/gui/NoteInputDialog.java
new file mode 100644
index 0000000..e68f0c8
--- /dev/null
+++ b/src/org/openstreetmap/josm/gui/NoteInputDialog.java
@@ -0,0 +1,67 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.awt.Component;
+
+import javax.swing.BoxLayout;
+import javax.swing.Icon;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.JTextArea;
+
+import org.openstreetmap.josm.tools.ImageProvider;
+
+/**
+ * Class to show user input dialog for notes. It sets up a
+ * simple label and text area to prompt for user input.
+ * @since 7720
+ */
+public class NoteInputDialog extends ExtendedDialog {
+
+    private JTextArea textArea = new JTextArea();
+
+    /**
+     * Construct the dialog with a title and button text. A cancel button is
+     * automatically added
+     * @param parent The parent GUI element
+     * @param title Translated string to display in the dialog's title bar
+     * @param buttonText Translated string to display on the action button
+     */
+    public NoteInputDialog(Component parent, String title, String buttonText) {
+        super(parent, title, new String[] {buttonText, tr("Cancel")});
+    }
+
+    /**
+     * Displays the dialog to the user
+     * @param message Translated message to display to the user as input prompt
+     * @param icon Icon to display in the action button
+     */
+    public void showNoteDialog(String message, Icon icon) {
+        JLabel label = new JLabel(message);
+        textArea.setRows(6);
+        textArea.setColumns(30);
+        textArea.setLineWrap(true);
+        JScrollPane scrollPane = new JScrollPane(textArea);
+        scrollPane.setAlignmentX(Component.LEFT_ALIGNMENT); //without this the label gets pushed to the right
+
+        JPanel contentPanel = new JPanel();
+        contentPanel.setLayout(new BoxLayout(contentPanel, BoxLayout.Y_AXIS));
+        contentPanel.add(label);
+        contentPanel.add(scrollPane);
+        setContent(contentPanel, false);
+        setButtonIcons(new Icon[] {icon, ImageProvider.get("cancel.png")});
+
+        showDialog();
+    }
+
+    /** Get the content of the text area
+     * @return Text input by user
+     */
+    public String getInputText() {
+        return textArea.getText();
+    }
+
+}
diff --git a/src/org/openstreetmap/josm/gui/SplashScreen.java b/src/org/openstreetmap/josm/gui/SplashScreen.java
index 7864edf..1336867 100644
--- a/src/org/openstreetmap/josm/gui/SplashScreen.java
+++ b/src/org/openstreetmap/josm/gui/SplashScreen.java
@@ -7,12 +7,14 @@ import java.awt.Color;
 import java.awt.Dimension;
 import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;
+import java.awt.Image;
 import java.awt.Insets;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.util.Arrays;
 import java.util.LinkedList;
 
+import javax.swing.ImageIcon;
 import javax.swing.JFrame;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
@@ -33,7 +35,7 @@ import org.openstreetmap.josm.tools.WindowGeometry;
 
 /**
  * Show a splash screen so the user knows what is happening during startup.
- *
+ * @since 976
  */
 public class SplashScreen extends JFrame {
 
@@ -43,7 +45,6 @@ public class SplashScreen extends JFrame {
      * Constructs a new {@code SplashScreen}.
      */
     public SplashScreen() {
-        super();
         setUndecorated(true);
 
         // Add a nice border to the main splash screen
@@ -58,7 +59,7 @@ public class SplashScreen extends JFrame {
         innerContentPane.setLayout(new GridBagLayout());
 
         // Add the logo
-        JLabel logo = new JLabel(ImageProvider.get("logo.png"));
+        JLabel logo = new JLabel(new ImageIcon(ImageProvider.get("logo.png").getImage().getScaledInstance(128, 129, Image.SCALE_SMOOTH)));
         GridBagConstraints gbc = new GridBagConstraints();
         gbc.gridheight = 2;
         gbc.insets = new Insets(0, 0, 0, 70);
diff --git a/src/org/openstreetmap/josm/gui/conflict/ConflictColors.java b/src/org/openstreetmap/josm/gui/conflict/ConflictColors.java
index e674c04..941a94d 100644
--- a/src/org/openstreetmap/josm/gui/conflict/ConflictColors.java
+++ b/src/org/openstreetmap/josm/gui/conflict/ConflictColors.java
@@ -39,6 +39,8 @@ public enum ConflictColors implements ColorKey {
     FGCOLOR_TAG_KEEP_NONE(marktr("Conflict foreground: drop tag"), Color.black),
     BGCOLOR_TAG_KEEP_ALL (marktr("Conflict background: keep all tags"), new Color(255,234,213)),
     FGCOLOR_TAG_KEEP_ALL (marktr("Conflict foreground: keep all tags"), Color.black),
+    BGCOLOR_TAG_SUM_ALL_NUM(marktr("Conflict background: sum all numeric tags"), new Color(255,234,213)),
+    FGCOLOR_TAG_SUM_ALL_NUM(marktr("Conflict foreground: sum all numeric tags"), Color.black),
 
     BGCOLOR_MEMBER_KEEP  (marktr("Conflict background: keep member"), new Color(217,255,217)),
     FGCOLOR_MEMBER_KEEP  (marktr("Conflict foreground: keep member"), Color.black),
diff --git a/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java b/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java
index bfae4a6..1d15370 100644
--- a/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java
+++ b/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java
@@ -417,7 +417,7 @@ public abstract class ListMerger<T extends PrimitiveId> extends JPanel implement
     abstract class CopyAction extends AbstractAction implements ListSelectionListener {
 
         protected CopyAction(String icon_name, String action_name, String short_description) {
-            ImageIcon icon = ImageProvider.get("dialogs/conflict", icon_name+".png");
+            ImageIcon icon = ImageProvider.get("dialogs/conflict", icon_name);
             putValue(Action.SMALL_ICON, icon);
             if (icon == null) {
                 putValue(Action.NAME, action_name);
@@ -434,7 +434,8 @@ public abstract class ListMerger<T extends PrimitiveId> extends JPanel implement
     class CopyStartLeftAction extends CopyAction {
 
         public CopyStartLeftAction() {
-            super("copystartleft", tr("> top"), tr("Copy my selected nodes to the start of the merged node list"));
+            super(/* ICON(dialogs/conflict/)*/ "copystartleft", tr("> top"),
+                tr("Copy my selected nodes to the start of the merged node list"));
         }
 
         @Override
@@ -455,7 +456,8 @@ public abstract class ListMerger<T extends PrimitiveId> extends JPanel implement
     class CopyEndLeftAction extends CopyAction {
 
         public CopyEndLeftAction() {
-            super("copyendleft", tr("> bottom"), tr("Copy my selected elements to the end of the list of merged elements."));
+            super(/* ICON(dialogs/conflict/)*/ "copyendleft", tr("> bottom"),
+                tr("Copy my selected elements to the end of the list of merged elements."));
         }
 
         @Override
@@ -476,7 +478,7 @@ public abstract class ListMerger<T extends PrimitiveId> extends JPanel implement
     class CopyBeforeCurrentLeftAction extends CopyAction {
 
         public CopyBeforeCurrentLeftAction() {
-            super("copybeforecurrentleft", tr("> before"),
+            super(/* ICON(dialogs/conflict/)*/ "copybeforecurrentleft", tr("> before"),
                     tr("Copy my selected elements before the first selected element in the list of merged elements."));
         }
 
@@ -506,7 +508,7 @@ public abstract class ListMerger<T extends PrimitiveId> extends JPanel implement
     class CopyAfterCurrentLeftAction extends CopyAction {
 
         public CopyAfterCurrentLeftAction() {
-            super("copyaftercurrentleft", tr("> after"),
+            super(/* ICON(dialogs/conflict/)*/ "copyaftercurrentleft", tr("> after"),
                     tr("Copy my selected elements after the first selected element in the list of merged elements."));
         }
 
@@ -532,7 +534,8 @@ public abstract class ListMerger<T extends PrimitiveId> extends JPanel implement
     class CopyStartRightAction extends CopyAction {
 
         public CopyStartRightAction() {
-            super("copystartright", tr("< top"), tr("Copy their selected element to the start of the list of merged elements."));
+            super(/* ICON(dialogs/conflict/)*/ "copystartright", tr("< top"),
+                tr("Copy their selected element to the start of the list of merged elements."));
         }
 
         @Override
@@ -549,7 +552,8 @@ public abstract class ListMerger<T extends PrimitiveId> extends JPanel implement
     class CopyEndRightAction extends CopyAction {
 
         public CopyEndRightAction() {
-            super("copyendright", tr("< bottom"), tr("Copy their selected elements to the end of the list of merged elements."));
+            super(/* ICON(dialogs/conflict/)*/ "copyendright", tr("< bottom"),
+                tr("Copy their selected elements to the end of the list of merged elements."));
         }
 
         @Override
@@ -566,7 +570,7 @@ public abstract class ListMerger<T extends PrimitiveId> extends JPanel implement
     class CopyBeforeCurrentRightAction extends CopyAction {
 
         public CopyBeforeCurrentRightAction() {
-            super("copybeforecurrentright", tr("< before"),
+            super(/* ICON(dialogs/conflict/)*/ "copybeforecurrentright", tr("< before"),
                     tr("Copy their selected elements before the first selected element in the list of merged elements."));
         }
 
@@ -592,7 +596,7 @@ public abstract class ListMerger<T extends PrimitiveId> extends JPanel implement
     class CopyAfterCurrentRightAction extends CopyAction {
 
         public CopyAfterCurrentRightAction() {
-            super("copyaftercurrentright", tr("< after"),
+            super(/* ICON(dialogs/conflict/)*/ "copyaftercurrentright", tr("< after"),
                     tr("Copy their selected element after the first selected element in the list of merged elements"));
         }
 
diff --git a/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java b/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java
index ece951f..92fe52d 100644
--- a/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java
+++ b/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java
@@ -112,10 +112,10 @@ public class CombinePrimitiveResolverDialog extends JDialog {
 
     private AutoAdjustingSplitPane spTagConflictTypes;
     private TagConflictResolver pnlTagConflictResolver;
-    private RelationMemberConflictResolver pnlRelationMemberConflictResolver;
+    protected RelationMemberConflictResolver pnlRelationMemberConflictResolver;
     private boolean canceled;
     private JPanel pnlButtons;
-    private OsmPrimitive targetPrimitive;
+    protected OsmPrimitive targetPrimitive;
 
     /** the private help action */
     private ContextSensitiveHelpAction helpAction;
@@ -186,15 +186,19 @@ public class CombinePrimitiveResolverDialog extends JDialog {
     }
 
     protected JPanel buildRelationMemberConflictResolverPanel() {
-        pnlRelationMemberConflictResolver = new RelationMemberConflictResolver();
+        pnlRelationMemberConflictResolver = new RelationMemberConflictResolver(new RelationMemberConflictResolverModel());
         return pnlRelationMemberConflictResolver;
     }
 
+    protected ApplyAction buildApplyAction() {
+        return new ApplyAction();
+    }
+
     protected JPanel buildButtonPanel() {
         JPanel pnl = new JPanel(new FlowLayout(FlowLayout.CENTER));
 
         // -- apply button
-        ApplyAction applyAction = new ApplyAction();
+        ApplyAction applyAction = buildApplyAction();
         pnlTagConflictResolver.getModel().addPropertyChangeListener(applyAction);
         pnlRelationMemberConflictResolver.getModel().addPropertyChangeListener(applyAction);
         btnApply = new SideButton(applyAction);
@@ -294,9 +298,7 @@ public class CombinePrimitiveResolverDialog extends JDialog {
     }
 
     protected void prepareDefaultTagDecisions() {
-        TagConflictResolverModel model = getTagConflictResolverModel();
-        model.prepareDefaultTagDecisions();
-        model.rebuild();
+        getTagConflictResolverModel().prepareDefaultTagDecisions();
     }
 
     protected void prepareDefaultRelationDecisions() {
@@ -416,7 +418,7 @@ public class CombinePrimitiveResolverDialog extends JDialog {
         }
     }
 
-    class ApplyAction extends AbstractAction implements PropertyChangeListener {
+    protected class ApplyAction extends AbstractAction implements PropertyChangeListener {
 
         public ApplyAction() {
             putValue(Action.SHORT_DESCRIPTION, tr("Apply resolved conflicts"));
diff --git a/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java b/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java
index 08755ec..54e78a9 100644
--- a/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java
+++ b/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java
@@ -21,6 +21,7 @@ import javax.swing.ListCellRenderer;
 import javax.swing.UIManager;
 import javax.swing.table.TableCellEditor;
 
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.gui.widgets.JosmComboBox;
 
 /**
@@ -51,13 +52,21 @@ public class MultiValueCellEditor extends AbstractCellEditor implements TableCel
     private DefaultComboBoxModel<Object> editorModel;
     private CopyOnWriteArrayList<NavigationListener> listeners;
 
-    public void addNavigationListeners(NavigationListener listener) {
+    /**
+     * Adds a navigation listener.
+     * @param listener navigation listener to add
+     */
+    public void addNavigationListener(NavigationListener listener) {
         if (listener != null) {
             listeners.addIfAbsent(listener);
         }
     }
 
-    public void removeNavigationListeners(NavigationListener listener) {
+    /**
+     * Removes a navigation listener.
+     * @param listener navigation listener to remove
+     */
+    public void removeNavigationListener(NavigationListener listener) {
         listeners.remove(listener);
     }
 
@@ -133,6 +142,9 @@ public class MultiValueCellEditor extends AbstractCellEditor implements TableCel
         for (String value: decision.getValues()) {
             editorModel.addElement(value);
         }
+        if (decision.canSumAllNumeric()) {
+            editorModel.addElement(MultiValueDecisionType.SUM_ALL_NUMERIC);
+        }
         if (decision.canKeepNone()) {
             editorModel.addElement(MultiValueDecisionType.KEEP_NONE);
         }
@@ -151,6 +163,12 @@ public class MultiValueCellEditor extends AbstractCellEditor implements TableCel
             break;
         case KEEP_ALL:
             editor.setSelectedItem(MultiValueDecisionType.KEEP_ALL);
+            break;
+        case SUM_ALL_NUMERIC:
+            editor.setSelectedItem(MultiValueDecisionType.SUM_ALL_NUMERIC);
+            break;
+        default:
+            Main.error("Unknown decision type in initEditor(): "+decision.getDecisionType());
         }
     }
 
@@ -216,6 +234,10 @@ public class MultiValueCellEditor extends AbstractCellEditor implements TableCel
                     setText(tr("all"));
                     setFont(UIManager.getFont("ComboBox.font").deriveFont(Font.ITALIC + Font.BOLD));
                     break;
+                case SUM_ALL_NUMERIC:
+                    setText(tr("sum"));
+                    setFont(UIManager.getFont("ComboBox.font").deriveFont(Font.ITALIC + Font.BOLD));
+                    break;
                 default:
                     // don't display other values
                 }
diff --git a/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java b/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java
index c308695..9f31579 100644
--- a/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java
+++ b/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java
@@ -65,8 +65,12 @@ public class MultiValueCellRenderer extends JLabel implements TableCellRenderer
                         setForeground(ConflictColors.FGCOLOR_TAG_KEEP_ALL.get());
                         setBackground(ConflictColors.BGCOLOR_TAG_KEEP_ALL.get());
                         break;
+                    case SUM_ALL_NUMERIC:
+                        setForeground(ConflictColors.FGCOLOR_TAG_SUM_ALL_NUM.get());
+                        setBackground(ConflictColors.BGCOLOR_TAG_SUM_ALL_NUM.get());
+                        break;
                     default:
-                        Main.error("Unknown decision type: "+decision.getDecisionType());
+                        Main.error("Unknown decision type in renderColors(): "+decision.getDecisionType());
                     }
                 } else {
                     setForeground(UIManager.getColor("Table.foreground"));
@@ -85,21 +89,20 @@ public class MultiValueCellRenderer extends JLabel implements TableCellRenderer
             cbDecisionRenderer.setFont(getFont().deriveFont(Font.ITALIC));
             cbDecisionRenderer.setSelectedIndex(0);
             break;
-        case KEEP_ONE:
-            model.addElement(decision.getChosenValue());
-            cbDecisionRenderer.setFont(getFont());
-            cbDecisionRenderer.setSelectedIndex(0);
-            break;
         case KEEP_NONE:
             model.addElement(tr("deleted"));
             cbDecisionRenderer.setFont(getFont().deriveFont(Font.ITALIC));
             cbDecisionRenderer.setSelectedIndex(0);
             break;
+        case KEEP_ONE:
         case KEEP_ALL:
+        case SUM_ALL_NUMERIC:
             model.addElement(decision.getChosenValue());
             cbDecisionRenderer.setFont(getFont());
             cbDecisionRenderer.setSelectedIndex(0);
             break;
+        default:
+            Main.error("Unknown decision type in renderValue(): "+decision.getDecisionType());
         }
     }
 
@@ -107,29 +110,26 @@ public class MultiValueCellRenderer extends JLabel implements TableCellRenderer
      * Sets the text of the tooltip for both renderers, this (the JLabel) and the combobox renderer.
      */
     protected void renderToolTipText(MultiValueResolutionDecision decision) {
-        String toolTipText;
+        String toolTipText = null;
         switch (decision.getDecisionType()) {
         case UNDECIDED:
             toolTipText = tr("Please decide which values to keep");
-            setToolTipText(toolTipText);
-            cbDecisionRenderer.setToolTipText(toolTipText);
             break;
         case KEEP_ONE:
             toolTipText = tr("Value ''{0}'' is going to be applied for key ''{1}''", decision.getChosenValue(), decision.getKey());
-            setToolTipText(toolTipText);
-            cbDecisionRenderer.setToolTipText(toolTipText);
+            break;
+        case SUM_ALL_NUMERIC:
+            toolTipText = tr("All numeric values sumed as ''{0}'' are going to be applied for key ''{1}''", decision.getChosenValue(), decision.getKey());
             break;
         case KEEP_NONE:
             toolTipText = tr("The key ''{0}'' and all its values are going to be removed", decision.getKey());
-            setToolTipText(toolTipText);
-            cbDecisionRenderer.setToolTipText(toolTipText);
             break;
         case KEEP_ALL:
             toolTipText = tr("All values joined as ''{0}'' are going to be applied for key ''{1}''", decision.getChosenValue(), decision.getKey());
-            setToolTipText(toolTipText);
-            cbDecisionRenderer.setToolTipText(toolTipText);
             break;
         }
+        setToolTipText(toolTipText);
+        cbDecisionRenderer.setToolTipText(toolTipText);
     }
 
     protected void reset() {
diff --git a/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueDecisionType.java b/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueDecisionType.java
index fe17fac..82829f2 100644
--- a/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueDecisionType.java
+++ b/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueDecisionType.java
@@ -3,14 +3,15 @@ package org.openstreetmap.josm.gui.conflict.tags;
 
 /**
  * Represents a decision for a tag conflict due to multiple possible values.
- *
- *
+ * @since 2008
  */
 public enum MultiValueDecisionType {
     /** not yet decided */
     UNDECIDED,
     /** keep exactly one values */
     KEEP_ONE,
+    /** sum all numeric values; only available for a few keys (eg: capacity) */
+    SUM_ALL_NUMERIC,
     /** keep no value, delete the tag */
     KEEP_NONE,
     /** keep all values; concatenate them with ; */
diff --git a/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java b/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java
index d0fc8e8..c96d95a 100644
--- a/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java
+++ b/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java
@@ -15,20 +15,24 @@ import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Tag;
 import org.openstreetmap.josm.data.osm.TagCollection;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
+
 /**
  * Represents a decision for a conflict due to multiple possible value for a tag.
- *
- *
+ * @since 2008
  */
 public class MultiValueResolutionDecision {
 
     /** the type of decision */
     private MultiValueDecisionType type;
     /** the collection of tags for which a decision is needed */
-    private TagCollection  tags;
+    private TagCollection tags;
     /** the selected value if {@link #type} is {@link MultiValueDecisionType#KEEP_ONE} */
     private String value;
 
+    private static final String[] SUMMABLE_KEYS = new String[] {
+        "capacity(:.+)?", "step_count"
+    };
+
     /**
      * constuctor
      */
@@ -88,6 +92,14 @@ public class MultiValueResolutionDecision {
     }
 
     /**
+     * Apply the decision to sum all numeric values
+     * @since 7743
+     */
+    public void sumAllNumeric() {
+        this.type = MultiValueDecisionType.SUM_ALL_NUMERIC;
+    }
+
+    /**
      * Apply the decision to keep exactly one value
      *
      * @param value  the value to keep
@@ -134,11 +146,11 @@ public class MultiValueResolutionDecision {
         switch(type) {
         case UNDECIDED: throw new IllegalStateException(tr("Not decided yet."));
         case KEEP_ONE: return value;
+        case SUM_ALL_NUMERIC: return tags.getSummedValues(getKey());
         case KEEP_NONE: return null;
         case KEEP_ALL: return tags.getJoinedValues(getKey());
+        default: return null;
         }
-        // should not happen
-        return null;
     }
 
     /**
@@ -182,6 +194,24 @@ public class MultiValueResolutionDecision {
     }
 
     /**
+     * Replies true, if summing all numeric values is a possible value in this resolution
+     *
+     * @return true, if summing all numeric values is a possible value in this resolution
+     * @since 7743
+     */
+    public boolean canSumAllNumeric() {
+        if (!canKeepAll()) {
+            return false;
+        }
+        for (String key : SUMMABLE_KEYS) {
+            if (getKey().matches(key)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
      * Replies  true if this resolution is decided
      *
      * @return true if this resolution is decided
@@ -206,16 +236,15 @@ public class MultiValueResolutionDecision {
      * @throws IllegalStateException thrown if this resolution is not resolved yet
      *
      */
-    public void applyTo(OsmPrimitive primitive) throws IllegalStateException{
+    public void applyTo(OsmPrimitive primitive) {
         if (primitive == null) return;
         if (!isDecided())
             throw new IllegalStateException(tr("Not decided yet."));
         String key = tags.getKeys().iterator().next();
-        String value = getChosenValue();
         if (type.equals(MultiValueDecisionType.KEEP_NONE)) {
             primitive.remove(key);
         } else {
-            primitive.put(key, value);
+            primitive.put(key, getChosenValue());
         }
     }
 
@@ -225,7 +254,7 @@ public class MultiValueResolutionDecision {
      * @param primitives the collection of primitives
      * @throws IllegalStateException thrown if this resolution is not resolved yet
      */
-    public void applyTo(Collection<? extends OsmPrimitive> primitives) throws IllegalStateException {
+    public void applyTo(Collection<? extends OsmPrimitive> primitives) {
         if (primitives == null) return;
         for (OsmPrimitive primitive: primitives) {
             if (primitive == null) {
@@ -243,7 +272,7 @@ public class MultiValueResolutionDecision {
      * @throws IllegalArgumentException thrown if primitive is null
      * @throws IllegalStateException thrown if this resolution is not resolved yet
      */
-    public Command buildChangeCommand(OsmPrimitive primitive) throws IllegalArgumentException, IllegalStateException {
+    public Command buildChangeCommand(OsmPrimitive primitive) {
         CheckParameterUtil.ensureParameterNotNull(primitive, "primitive");
         if (!isDecided())
             throw new IllegalStateException(tr("Not decided yet."));
@@ -274,11 +303,12 @@ public class MultiValueResolutionDecision {
      */
     public Tag getResolution() {
         switch(type) {
+        case SUM_ALL_NUMERIC: return new Tag(getKey(), tags.getSummedValues(getKey()));
         case KEEP_ALL: return new Tag(getKey(), tags.getJoinedValues(getKey()));
         case KEEP_ONE: return new Tag(getKey(),value);
         case KEEP_NONE: return new Tag(getKey(), "");
         case UNDECIDED: return null;
+        default: return null;
         }
-        return null;
     }
 }
diff --git a/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java b/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java
index 9d49d50..376c619 100644
--- a/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java
+++ b/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java
@@ -43,7 +43,7 @@ public class RelationMemberConflictResolver extends JPanel {
     private AutoCompletingTextField tfKey;
     private AutoCompletingTextField tfValue;
     private JCheckBox cbTagRelations;
-    private RelationMemberConflictResolverModel model;
+    private final RelationMemberConflictResolverModel model;
     private RelationMemberConflictResolverTable tblResolver;
     private JMultilineLabel lblHeader;
 
@@ -58,7 +58,6 @@ public class RelationMemberConflictResolver extends JPanel {
         gc.weightx = 1.0;
         gc.insets = new Insets(5,5,5,5);
         add(pnl, gc);
-        model = new RelationMemberConflictResolverModel();
 
         gc.gridy = 1;
         gc.weighty = 1.0;
@@ -117,8 +116,11 @@ public class RelationMemberConflictResolver extends JPanel {
 
     /**
      * Constructs a new {@code RelationMemberConflictResolver}.
+     * @param model model managing a list of conflicting relation members
+     * @since 7661
      */
-    public RelationMemberConflictResolver() {
+    public RelationMemberConflictResolver(RelationMemberConflictResolverModel model) {
+        this.model = model;
         build();
     }
 
diff --git a/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverModel.java b/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverModel.java
index d08211f..bf0724d 100644
--- a/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverModel.java
+++ b/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverModel.java
@@ -30,18 +30,17 @@ public class RelationMemberConflictResolverModel extends DefaultTableModel {
     public static final String NUM_CONFLICTS_PROP = RelationMemberConflictResolverModel.class.getName() + ".numConflicts";
 
     /** the list of conflict decisions */
-    private List<RelationMemberConflictDecision> decisions;
+    protected final List<RelationMemberConflictDecision> decisions;
     /** the collection of relations for which we manage conflicts */
-    private Collection<Relation> relations;
+    protected Collection<Relation> relations;
     /** the number of conflicts */
     private int numConflicts;
-    private PropertyChangeSupport support;
+    private final PropertyChangeSupport support;
 
     /**
      * Replies true if each {@link MultiValueResolutionDecision} is decided.
      *
-     * @return true if each {@link MultiValueResolutionDecision} is decided; false
-     * otherwise
+     * @return true if each {@link MultiValueResolutionDecision} is decided; false otherwise
      */
     public boolean isResolvedCompletely() {
         return numConflicts == 0;
@@ -71,10 +70,14 @@ public class RelationMemberConflictResolverModel extends DefaultTableModel {
         int oldValue = numConflicts;
         numConflicts = count;
         if (numConflicts != oldValue) {
-            support.firePropertyChange(NUM_CONFLICTS_PROP, oldValue, numConflicts);
+            support.firePropertyChange(getProperty(), oldValue, numConflicts);
         }
     }
 
+    protected String getProperty() {
+        return NUM_CONFLICTS_PROP;
+    }
+
     public void addPropertyChangeListener(PropertyChangeListener l) {
         support.addPropertyChangeListener(l);
     }
@@ -306,7 +309,7 @@ public class RelationMemberConflictResolverModel extends DefaultTableModel {
      * to the decisions managed by this model
      */
     public Set<Relation> getModifiedRelations(OsmPrimitive newPrimitive) {
-        HashSet<Relation> ret = new HashSet<>();
+        Set<Relation> ret = new HashSet<>();
         for (Relation relation: relations) {
             if (isChanged(relation, newPrimitive)) {
                 ret.add(relation);
diff --git a/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java b/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java
index 4089e2e..28061f5 100644
--- a/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java
+++ b/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java
@@ -177,6 +177,9 @@ public class TagConflictResolverModel extends DefaultTableModel {
             case KEEP_ALL:
                 decision.keepAll();
                 break;
+            case SUM_ALL_NUMERIC:
+                decision.sumAllNumeric();
+                break;
             }
         }
         GuiHelper.runInEDTAndWait(new Runnable() {
diff --git a/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverTable.java b/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverTable.java
index 0788d7e..c22d524 100644
--- a/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverTable.java
+++ b/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverTable.java
@@ -39,7 +39,7 @@ public class TagConflictResolverTable extends JTable implements MultiValueCellEd
         getActionMap().put("selectNextColumnCell", selectNextColumnCellAction);
         getActionMap().put("selectPreviousColumnCell", selectPreviousColumnCellAction);
 
-        ((MultiValueCellEditor)getColumnModel().getColumn(2).getCellEditor()).addNavigationListeners(this);
+        ((MultiValueCellEditor)getColumnModel().getColumn(2).getCellEditor()).addNavigationListener(this);
 
         setRowHeight((int)new JosmComboBox<String>().getPreferredSize().getHeight());
     }
diff --git a/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java b/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java
index e479337..f721d92 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java
@@ -422,7 +422,7 @@ public class ChangesetDialog extends ToggleDialog{
         public ShowChangesetInfoAction() {
             putValue(NAME, tr("Show info"));
             putValue(SHORT_DESCRIPTION, tr("Open a web page for each selected changeset"));
-            putValue(SMALL_ICON, ImageProvider.get("about"));
+            putValue(SMALL_ICON, ImageProvider.get("help/internet"));
             updateEnabledState();
         }
 
@@ -433,7 +433,7 @@ public class ChangesetDialog extends ToggleDialog{
                 return;
             if (sel.size() > 10 && ! AbstractInfoAction.confirmLaunchMultiple(sel.size()))
                 return;
-            String baseUrl = AbstractInfoAction.getBaseBrowseUrl();
+            String baseUrl = Main.getBaseBrowseUrl();
             for (Changeset cs: sel) {
                 String url = baseUrl + "/changeset/" + cs.getId();
                 OpenBrowser.displayUrl(
diff --git a/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java b/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java
index b900c9a..6897716 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java
@@ -356,6 +356,15 @@ public class FilterDialog extends ToggleDialog implements DataSetListener {
         filterModel.executeFilters(getAffectedPrimitives(event.getPrimitives()));
     }
 
+    /**
+     * This method is intendet for Plugins getting the filtermodel and using .addFilter() to
+     * add a new filter.
+     * @return the filtermodel
+     */
+    public FilterTableModel getFilterModel(){
+        return filterModel;
+    }
+
     abstract class AbstractFilterAction extends AbstractAction implements MultikeyShortcutAction {
 
         protected Filter lastFilter;
diff --git a/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java b/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java
deleted file mode 100644
index 061c0dd..0000000
--- a/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java
+++ /dev/null
@@ -1,335 +0,0 @@
-// License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.gui.dialogs;
-
-import static org.openstreetmap.josm.tools.I18n.tr;
-
-import java.awt.Component;
-import java.awt.event.ActionEvent;
-import java.awt.event.KeyEvent;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-
-import javax.swing.AbstractAction;
-import javax.swing.Action;
-import javax.swing.DefaultListSelectionModel;
-import javax.swing.JComponent;
-import javax.swing.JLabel;
-import javax.swing.JTable;
-import javax.swing.ListSelectionModel;
-import javax.swing.event.ListSelectionEvent;
-import javax.swing.event.ListSelectionListener;
-import javax.swing.table.DefaultTableCellRenderer;
-import javax.swing.table.DefaultTableColumnModel;
-import javax.swing.table.DefaultTableModel;
-import javax.swing.table.TableCellRenderer;
-import javax.swing.table.TableColumn;
-
-import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.data.SelectionChangedListener;
-import org.openstreetmap.josm.data.osm.DataSet;
-import org.openstreetmap.josm.data.osm.OsmPrimitive;
-import org.openstreetmap.josm.data.osm.PrimitiveId;
-import org.openstreetmap.josm.data.osm.history.HistoryDataSet;
-import org.openstreetmap.josm.data.osm.history.HistoryDataSetListener;
-import org.openstreetmap.josm.gui.OsmPrimitivRenderer;
-import org.openstreetmap.josm.gui.SideButton;
-import org.openstreetmap.josm.gui.help.HelpUtil;
-import org.openstreetmap.josm.gui.history.HistoryBrowserDialogManager;
-import org.openstreetmap.josm.gui.history.HistoryLoadTask;
-import org.openstreetmap.josm.io.OnlineResource;
-import org.openstreetmap.josm.tools.ImageProvider;
-import org.openstreetmap.josm.tools.InputMapUtils;
-import org.openstreetmap.josm.tools.Shortcut;
-
-/**
- * HistoryDialog displays a list of the currently selected primitives and provides
- * two actions for (1) (re)loading the history of the selected primitives and (2)
- * for launching a history browser for each selected primitive.
- *
- */
-public class HistoryDialog extends ToggleDialog implements HistoryDataSetListener {
-
-    /** the table model */
-    protected HistoryItemTableModel model;
-    /** the table with the history items */
-    protected JTable historyTable;
-
-    protected ShowHistoryAction showHistoryAction;
-    protected ReloadAction reloadAction;
-
-    /**
-     * Constructs a new {@code HistoryDialog}.
-     */
-    public HistoryDialog() {
-        super(tr("History"), "history", tr("Display the history of all selected items."),
-                Shortcut.registerShortcut("subwindow:history", tr("Toggle: {0}", tr("History")), KeyEvent.VK_H,
-                        Shortcut.ALT_SHIFT), 150);
-        build();
-        HelpUtil.setHelpContext(this, HelpUtil.ht("/Dialog/History"));
-    }
-
-    /**
-     * builds the GUI
-     */
-    protected void build() {
-        DefaultListSelectionModel selectionModel = new DefaultListSelectionModel();
-        historyTable = new JTable(
-                model = new HistoryItemTableModel(selectionModel),
-                new HistoryTableColumnModel(),
-                selectionModel
-        );
-        historyTable.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
-        final TableCellRenderer oldRenderer = historyTable.getTableHeader().getDefaultRenderer();
-        historyTable.getTableHeader().setDefaultRenderer(new DefaultTableCellRenderer(){
-            @Override public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) {
-                JComponent c = (JComponent)oldRenderer.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column);
-                if (!"".equals(value))
-                    return c;
-                JLabel l = new JLabel(ImageProvider.get("misc","showhide"));
-                l.setForeground(c.getForeground());
-                l.setBackground(c.getBackground());
-                l.setFont(c.getFont());
-                l.setBorder(c.getBorder());
-                l.setOpaque(true);
-                return l;
-            }
-        });
-        historyTable.addMouseListener(new ShowHistoryMouseAdapter());
-        historyTable.setTableHeader(null);
-
-        createLayout(historyTable, true, Arrays.asList(new SideButton[] {
-            new SideButton(reloadAction = new ReloadAction()),
-            new SideButton(showHistoryAction = new ShowHistoryAction())
-        }));
-
-        // wire actions
-        //
-        historyTable.getSelectionModel().addListSelectionListener(showHistoryAction);
-        historyTable.getSelectionModel().addListSelectionListener(reloadAction);
-
-        // Show history dialog on Enter/Spacebar
-        InputMapUtils.addEnterAction(historyTable, showHistoryAction);
-        InputMapUtils.addSpacebarAction(historyTable, showHistoryAction);
-    }
-
-    @Override
-    public void showNotify() {
-        HistoryDataSet.getInstance().addHistoryDataSetListener(this);
-        DataSet.addSelectionListener(model);
-        if (Main.main.getCurrentDataSet() == null) {
-            model.selectionChanged(null);
-        } else {
-            model.selectionChanged(Main.main.getCurrentDataSet().getAllSelected());
-        }
-    }
-
-    @Override
-    public void hideNotify() {
-        HistoryDataSet.getInstance().removeHistoryDataSetListener(this);
-        DataSet.removeSelectionListener(model);
-    }
-
-    /* ----------------------------------------------------------------------------- */
-    /* interface HistoryDataSetListener                                              */
-    /* ----------------------------------------------------------------------------- */
-    @Override
-    public void historyUpdated(HistoryDataSet source, PrimitiveId primitiveId) {
-        model.refresh();
-    }
-
-    @Override
-    public void historyDataSetCleared(HistoryDataSet source) {
-        model.refresh();
-    }
-
-    /**
-     * The table model with the history items
-     *
-     */
-    static class HistoryItemTableModel extends DefaultTableModel implements SelectionChangedListener{
-        private List<OsmPrimitive> data;
-        private DefaultListSelectionModel selectionModel;
-
-        public HistoryItemTableModel(DefaultListSelectionModel selectionModel) {
-            data = new ArrayList<>();
-            this.selectionModel = selectionModel;
-        }
-
-        @Override
-        public int getRowCount() {
-            if (data == null)
-                return 0;
-            return data.size();
-        }
-
-        @Override
-        public Object getValueAt(int row, int column) {
-            return data.get(row);
-        }
-
-        @Override
-        public boolean isCellEditable(int row, int column) {
-            return false;
-        }
-
-        protected List<OsmPrimitive> getSelectedPrimitives() {
-            List<OsmPrimitive> ret = new ArrayList<>();
-            for (int i=0; i< data.size(); i++) {
-                if (selectionModel.isSelectedIndex(i)) {
-                    ret.add(data.get(i));
-                }
-            }
-            return ret;
-        }
-
-        protected void selectPrimitives(Collection<OsmPrimitive> primitives) {
-            for (OsmPrimitive p: primitives) {
-                int idx = data.indexOf(p);
-                if (idx < 0) {
-                    continue;
-                }
-                selectionModel.addSelectionInterval(idx, idx);
-            }
-        }
-
-        public void refresh() {
-            List<OsmPrimitive> selectedPrimitives = getSelectedPrimitives();
-            data.clear();
-            if (Main.main.getCurrentDataSet() == null)
-                return;
-            for (OsmPrimitive primitive: Main.main.getCurrentDataSet().getAllSelected()) {
-                if (primitive.isNew()) {
-                    continue;
-                }
-                data.add(primitive);
-            }
-            fireTableDataChanged();
-            selectPrimitives(selectedPrimitives);
-        }
-
-        @Override
-        public void selectionChanged(Collection<? extends OsmPrimitive> newSelection) {
-            data.clear();
-            selectionModel.clearSelection();
-            if (newSelection != null && !newSelection.isEmpty()) {
-                for (OsmPrimitive primitive: newSelection) {
-                    if (primitive.isNew()) {
-                        continue;
-                    }
-                    data.add(primitive);
-                }
-            }
-            fireTableDataChanged();
-            selectionModel.addSelectionInterval(0, data.size()-1);
-        }
-
-        public List<OsmPrimitive> getPrimitives(int [] rows) {
-            if (rows == null || rows.length == 0) return Collections.emptyList();
-            List<OsmPrimitive> ret = new ArrayList<>(rows.length);
-            for (int row: rows) {
-                ret.add(data.get(row));
-            }
-            return ret;
-        }
-
-        public OsmPrimitive getPrimitive(int row) {
-            return data.get(row);
-        }
-    }
-
-    /**
-     * The column model
-     */
-    static class HistoryTableColumnModel extends DefaultTableColumnModel {
-        protected void createColumns() {
-            TableColumn col = null;
-            OsmPrimitivRenderer renderer = new OsmPrimitivRenderer();
-            // column 0 - History item
-            col = new TableColumn(0);
-            col.setHeaderValue(tr("Object with history"));
-            col.setCellRenderer(renderer);
-            addColumn(col);
-        }
-
-        public HistoryTableColumnModel() {
-            createColumns();
-        }
-    }
-
-    /**
-     * The action for reloading history information of the currently selected primitives.
-     *
-     */
-    class ReloadAction extends AbstractAction implements ListSelectionListener {
-
-        public ReloadAction() {
-            putValue(Action.SMALL_ICON, ImageProvider.get("dialogs","refresh"));
-            putValue(Action.NAME, tr("Reload"));
-            putValue(Action.SHORT_DESCRIPTION, tr("Reload all currently selected objects and refresh the list."));
-            updateEnabledState();
-        }
-
-        @Override
-        public void actionPerformed(ActionEvent e) {
-            int [] rows = historyTable.getSelectedRows();
-            if (rows == null || rows.length == 0) return;
-
-            List<OsmPrimitive> selectedItems = model.getPrimitives(rows);
-            HistoryLoadTask task = new HistoryLoadTask();
-            task.add(selectedItems);
-            Main.worker.execute(task);
-        }
-
-        protected void updateEnabledState() {
-            setEnabled(historyTable.getSelectedRowCount() > 0 && !Main.isOffline(OnlineResource.OSM_API));
-        }
-
-        @Override
-        public void valueChanged(ListSelectionEvent e) {
-            updateEnabledState();
-        }
-    }
-
-    class ShowHistoryMouseAdapter extends MouseAdapter {
-        @Override
-        public void mouseClicked(MouseEvent e) {
-            if (e.getClickCount() == 2 && e.getButton() == MouseEvent.BUTTON1) {
-                int row = historyTable.rowAtPoint(e.getPoint());
-                HistoryBrowserDialogManager.getInstance().showHistory(Collections.singletonList(model.getPrimitive(row)));
-            }
-        }
-    }
-
-    /**
-     * The action for showing history information of the current history item.
-     */
-    class ShowHistoryAction extends AbstractAction implements ListSelectionListener {
-        public ShowHistoryAction() {
-            putValue(Action.SMALL_ICON, ImageProvider.get("dialogs","history"));
-            putValue(Action.NAME, tr("Show"));
-            putValue(Action.SHORT_DESCRIPTION, tr("Display the history of the selected objects."));
-            updateEnabledState();
-        }
-
-        @Override
-        public void actionPerformed(ActionEvent e) {
-            int [] rows = historyTable.getSelectedRows();
-            if (rows == null || rows.length == 0) return;
-            HistoryBrowserDialogManager.getInstance().showHistory(model.getPrimitives(rows));
-        }
-
-        protected void updateEnabledState() {
-            setEnabled(historyTable.getSelectedRowCount() > 0);
-        }
-
-        @Override
-        public void valueChanged(ListSelectionEvent e) {
-            updateEnabledState();
-        }
-    }
-}
diff --git a/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java b/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java
index d9cdb42..126dee5 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java
@@ -96,7 +96,7 @@ public class MapPaintDialog extends ToggleDialog {
     protected JCheckBox cbWireframe;
 
     public static final JosmAction PREFERENCE_ACTION = PreferencesAction.forPreferenceSubTab(
-            tr("Map paint preferences"), null, MapPaintPreference.class, "dialogs/mappaintpreference");
+            tr("Map paint preferences"), null, MapPaintPreference.class, /* ICON */ "dialogs/mappaintpreference");
 
     /**
      * Constructs a new {@code MapPaintDialog}.
diff --git a/src/org/openstreetmap/josm/gui/dialogs/NoteDialog.java b/src/org/openstreetmap/josm/gui/dialogs/NoteDialog.java
index a765f75..121e5aa 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/NoteDialog.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/NoteDialog.java
@@ -27,12 +27,14 @@ import javax.swing.event.ListSelectionEvent;
 import javax.swing.event.ListSelectionListener;
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.actions.UploadNotesAction;
 import org.openstreetmap.josm.actions.mapmode.AddNoteAction;
 import org.openstreetmap.josm.data.notes.Note;
 import org.openstreetmap.josm.data.notes.Note.State;
 import org.openstreetmap.josm.data.osm.NoteData;
 import org.openstreetmap.josm.gui.MapView;
 import org.openstreetmap.josm.gui.MapView.LayerChangeListener;
+import org.openstreetmap.josm.gui.NoteInputDialog;
 import org.openstreetmap.josm.gui.SideButton;
 import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.gui.layer.NoteLayer;
@@ -72,18 +74,22 @@ public class NoteDialog extends ToggleDialog implements LayerChangeListener {
     private final CloseAction closeAction;
     private final NewAction newAction;
     private final ReopenAction reopenAction;
+    private final UploadNotesAction uploadAction;
 
     private NoteData noteData;
 
     /** Creates a new toggle dialog for notes */
     public NoteDialog() {
         super("Notes", "notes/note_open.png", "List of notes", null, 150);
-        Main.debug("constructed note dialog");
+        if (Main.isDebugEnabled()) {
+            Main.debug("constructed note dialog");
+        }
 
         addCommentAction = new AddCommentAction();
         closeAction = new CloseAction();
         newAction = new NewAction();
         reopenAction = new ReopenAction();
+        uploadAction = new UploadNotesAction();
         buildDialog();
     }
 
@@ -113,7 +119,8 @@ public class NoteDialog extends ToggleDialog implements LayerChangeListener {
                 new SideButton(newAction, false),
                 new SideButton(addCommentAction, false),
                 new SideButton(closeAction, false),
-                new SideButton(reopenAction, false)}));
+                new SideButton(reopenAction, false),
+                new SideButton(uploadAction, false)}));
         updateButtonStates();
     }
 
@@ -131,6 +138,11 @@ public class NoteDialog extends ToggleDialog implements LayerChangeListener {
             addCommentAction.setEnabled(false);
             reopenAction.setEnabled(true);
         }
+        if(noteData == null || !noteData.isModified()) {
+            uploadAction.setEnabled(false);
+        } else {
+            uploadAction.setEnabled(true);
+        }
     }
 
     @Override
@@ -148,9 +160,13 @@ public class NoteDialog extends ToggleDialog implements LayerChangeListener {
 
     @Override
     public void layerAdded(Layer newLayer) {
-        Main.debug("layer added: " + newLayer);
+        if (Main.isDebugEnabled()) {
+            Main.debug("layer added: " + newLayer);
+        }
         if (newLayer instanceof NoteLayer) {
-            Main.debug("note layer added");
+            if (Main.isDebugEnabled()) {
+                Main.debug("note layer added");
+            }
             noteData = ((NoteLayer)newLayer).getNoteData();
             model.setData(noteData.getNotes());
         }
@@ -159,7 +175,9 @@ public class NoteDialog extends ToggleDialog implements LayerChangeListener {
     @Override
     public void layerRemoved(Layer oldLayer) {
         if (oldLayer instanceof NoteLayer) {
-            Main.debug("note layer removed. Clearing everything");
+            if (Main.isDebugEnabled()) {
+                Main.debug("note layer removed. Clearing everything");
+            }
             noteData = null;
             model.clearData();
             if (Main.map.mapMode instanceof AddNoteAction) {
@@ -276,16 +294,13 @@ public class NoteDialog extends ToggleDialog implements LayerChangeListener {
                         JOptionPane.ERROR_MESSAGE);
                 return;
             }
-            Object userInput = JOptionPane.showInputDialog(Main.map,
-                    tr("Add comment to note:"),
-                    tr("Add comment"),
-                    JOptionPane.QUESTION_MESSAGE,
-                    ICON_COMMENT,
-                    null,null);
-            if (userInput == null) { //user pressed cancel
+            NoteInputDialog dialog = new NoteInputDialog(Main.parent, tr("Comment on note"), tr("Add comment"));
+            dialog.showNoteDialog(tr("Add comment to note:"), NoteDialog.ICON_COMMENT);
+            if (dialog.getValue() != 1) {
+                Main.debug("User aborted note reopening");
                 return;
             }
-            noteData.addCommentToNote(note, userInput.toString());
+            noteData.addCommentToNote(note, dialog.getInputText());
         }
     }
 
@@ -299,17 +314,14 @@ public class NoteDialog extends ToggleDialog implements LayerChangeListener {
 
         @Override
         public void actionPerformed(ActionEvent e) {
-            Object userInput = JOptionPane.showInputDialog(Main.map,
-                    tr("Close note with message:"),
-                    tr("Close Note"),
-                    JOptionPane.QUESTION_MESSAGE,
-                    ICON_CLOSED,
-                    null,null);
-            if (userInput == null) { //user pressed cancel
+            NoteInputDialog dialog = new NoteInputDialog(Main.parent, tr("Close note"), tr("Close note"));
+            dialog.showNoteDialog(tr("Close note with message:"), NoteDialog.ICON_CLOSED);
+            if (dialog.getValue() != 1) {
+                Main.debug("User aborted note closing");
                 return;
             }
             Note note = displayList.getSelectedValue();
-            noteData.closeNote(note, userInput.toString());
+            noteData.closeNote(note, dialog.getInputText());
         }
     }
 
@@ -340,17 +352,15 @@ public class NoteDialog extends ToggleDialog implements LayerChangeListener {
 
         @Override
         public void actionPerformed(ActionEvent e) {
-            Object userInput = JOptionPane.showInputDialog(Main.map,
-                    tr("Reopen note with message:"),
-                    tr("Reopen note"),
-                    JOptionPane.QUESTION_MESSAGE,
-                    ICON_OPEN,
-                    null,null);
-            if (userInput == null) { //user pressed cancel
+            NoteInputDialog dialog = new NoteInputDialog(Main.parent, tr("Reopen note"), tr("Reopen note"));
+            dialog.showNoteDialog(tr("Reopen note with message:"), NoteDialog.ICON_OPEN);
+            if (dialog.getValue() != 1) {
+                Main.debug("User aborted note reopening");
                 return;
             }
+
             Note note = displayList.getSelectedValue();
-            noteData.reOpenNote(note, userInput.toString());
+            noteData.reOpenNote(note, dialog.getInputText());
         }
     }
 }
diff --git a/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java b/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java
index 5b55355..483b3f3 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java
@@ -63,6 +63,7 @@ import org.openstreetmap.josm.gui.MapView.EditLayerChangeListener;
 import org.openstreetmap.josm.gui.OsmPrimitivRenderer;
 import org.openstreetmap.josm.gui.PopupMenuHandler;
 import org.openstreetmap.josm.gui.SideButton;
+import org.openstreetmap.josm.gui.history.HistoryBrowserDialogManager;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.gui.util.GuiHelper;
 import org.openstreetmap.josm.gui.util.HighlightHelper;
@@ -85,6 +86,7 @@ public class SelectionListDialog extends ToggleDialog  {
 
     private SelectAction actSelect = new SelectAction();
     private SearchAction actSearch = new SearchAction();
+    private ShowHistoryAction actShowHistory = new ShowHistoryAction();
     private ZoomToJOSMSelectionAction actZoomToJOSMSelection = new ZoomToJOSMSelectionAction();
     private ZoomToListSelection actZoomToListSelection = new ZoomToListSelection();
     private SelectInRelationListAction actSetRelationSelection = new SelectInRelationListAction();
@@ -103,11 +105,14 @@ public class SelectionListDialog extends ToggleDialog  {
         lstPrimitives.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
         lstPrimitives.setSelectionModel(selectionModel);
         lstPrimitives.setCellRenderer(new OsmPrimitivRenderer());
-        lstPrimitives.setTransferHandler(null); // Fix #6290. Drag & Drop is not supported anyway and Copy/Paste is better propagated to main window
+        // Fix #6290. Drag & Drop is not supported anyway and Copy/Paste is better propagated to main window
+        lstPrimitives.setTransferHandler(null);
+
+        lstPrimitives.getSelectionModel().addListSelectionListener(actSelect);
+        lstPrimitives.getSelectionModel().addListSelectionListener(actShowHistory);
 
         // the select action
         final SideButton selectButton = new SideButton(actSelect);
-        lstPrimitives.getSelectionModel().addListSelectionListener(actSelect);
         selectButton.createArrow(new ActionListener() {
             @Override
             public void actionPerformed(ActionEvent e) {
@@ -125,7 +130,7 @@ public class SelectionListDialog extends ToggleDialog  {
         });
 
         createLayout(lstPrimitives, true, Arrays.asList(new SideButton[] {
-            selectButton, searchButton
+            selectButton, searchButton, new SideButton(actShowHistory)
         }));
     }
 
@@ -200,7 +205,15 @@ public class SelectionListDialog extends ToggleDialog  {
             if (isDoubleClick(e)) {
                 OsmDataLayer layer = Main.main.getEditLayer();
                 if (layer == null) return;
-                layer.data.setSelected(Collections.singleton(model.getElementAt(idx)));
+                OsmPrimitive osm = model.getElementAt(idx);
+                Collection<OsmPrimitive> sel = layer.data.getSelected();
+                if (sel.size() != 1 || !sel.iterator().next().equals(osm)) {
+                    // Select primitive if it's not the whole current selection
+                    layer.data.setSelected(Collections.singleton(osm));
+                } else if (osm instanceof Relation) {
+                    // else open relation editor if applicable
+                    actEditRelationSelection.actionPerformed(null);
+                }
             } else if (highlightEnabled && Main.isDisplayingMapView()) {
                 if (helper.highlightOnly(model.getElementAt(idx))) {
                     Main.map.mapView.repaint();
@@ -271,6 +284,9 @@ public class SelectionListDialog extends ToggleDialog  {
      * Launches the search dialog
      */
     static class SearchAction extends AbstractAction implements EditLayerChangeListener {
+        /**
+         * Constructs a new {@code SearchAction}.
+         */
         public SearchAction() {
             putValue(NAME, tr("Search"));
             putValue(SHORT_DESCRIPTION,   tr("Search for objects"));
@@ -284,7 +300,7 @@ public class SelectionListDialog extends ToggleDialog  {
             org.openstreetmap.josm.actions.search.SearchAction.search();
         }
 
-        public void updateEnabledState() {
+        protected void updateEnabledState() {
             setEnabled(Main.main != null && Main.main.hasEditLayer());
         }
 
@@ -299,6 +315,9 @@ public class SelectionListDialog extends ToggleDialog  {
      * of this dialog
      */
     class SelectAction extends AbstractAction implements ListSelectionListener {
+        /**
+         * Constructs a new {@code SelectAction}.
+         */
         public SelectAction() {
             putValue(NAME, tr("Select"));
             putValue(SHORT_DESCRIPTION,  tr("Set the selected elements on the map to the selected items in the list above."));
@@ -315,7 +334,38 @@ public class SelectionListDialog extends ToggleDialog  {
             editLayer.data.setSelected(sel);
         }
 
-        public void updateEnabledState() {
+        protected void updateEnabledState() {
+            setEnabled(!model.getSelected().isEmpty());
+        }
+
+        @Override
+        public void valueChanged(ListSelectionEvent e) {
+            updateEnabledState();
+        }
+    }
+
+    /**
+     * The action for showing history information of the current history item.
+     */
+    class ShowHistoryAction extends AbstractAction implements ListSelectionListener {
+        /**
+         * Constructs a new {@code ShowHistoryAction}.
+         */
+        public ShowHistoryAction() {
+            putValue(NAME, tr("History"));
+            putValue(SHORT_DESCRIPTION, tr("Display the history of the selected objects."));
+            putValue(SMALL_ICON, ImageProvider.get("dialogs", "history"));
+            updateEnabledState();
+        }
+
+        @Override
+        public void actionPerformed(ActionEvent e) {
+            Collection<OsmPrimitive> sel = model.getSelected();
+            if (sel.isEmpty())return;
+            HistoryBrowserDialogManager.getInstance().showHistory(sel);
+        }
+
+        protected void updateEnabledState() {
             setEnabled(!model.getSelected().isEmpty());
         }
 
@@ -368,7 +418,10 @@ public class SelectionListDialog extends ToggleDialog  {
      * the list displaying the JOSM selection
      *
      */
-    class ZoomToListSelection extends AbstractAction implements ListSelectionListener{
+    class ZoomToListSelection extends AbstractAction implements ListSelectionListener {
+        /**
+         * Constructs a new {@code ZoomToListSelection}.
+         */
         public ZoomToListSelection() {
             putValue(NAME, tr("Zoom to selected element(s)"));
             putValue(SHORT_DESCRIPTION, tr("Zoom to selected element(s)"));
@@ -388,7 +441,7 @@ public class SelectionListDialog extends ToggleDialog  {
             Main.map.mapView.recalculateCenterScale(box);
         }
 
-        public void updateEnabledState() {
+        protected void updateEnabledState() {
             setEnabled(!model.getSelected().isEmpty());
         }
 
diff --git a/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java b/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java
index 3ee3bdb..eb35946 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java
@@ -521,7 +521,8 @@ public class ToggleDialog extends JPanel implements ShowHideButtonListener, Help
             lblTitle_weak.setMinimumSize(new Dimension(0,20));
             add(lblTitle_weak, GBC.std().fill(GBC.HORIZONTAL));
 
-            buttonsHide = new JButton(ImageProvider.get("misc", buttonHiding != ButtonHidingType.ALWAYS_SHOWN ? "buttonhide" : "buttonshow"));
+            buttonsHide = new JButton(ImageProvider.get("misc", buttonHiding != ButtonHidingType.ALWAYS_SHOWN
+                ? /* ICON(misc/)*/ "buttonhide" :  /* ICON(misc/)*/ "buttonshow"));
             buttonsHide.setToolTipText(tr("Toggle dynamic buttons"));
             buttonsHide.setBorder(BorderFactory.createEmptyBorder());
             buttonsHide.addActionListener(
@@ -940,7 +941,8 @@ public class ToggleDialog extends JPanel implements ShowHideButtonListener, Help
     }
 
     private void refreshHidingButtons() {
-        titleBar.buttonsHide.setIcon(ImageProvider.get("misc", buttonHiding != ButtonHidingType.ALWAYS_SHOWN ? "buttonhide" : "buttonshow"));
+        titleBar.buttonsHide.setIcon(ImageProvider.get("misc", buttonHiding != ButtonHidingType.ALWAYS_SHOWN
+            ?  /* ICON(misc/)*/ "buttonhide" :  /* ICON(misc/)*/ "buttonshow"));
         titleBar.buttonsHide.setEnabled(buttonHiding != ButtonHidingType.ALWAYS_HIDDEN);
         if (buttonsPanel != null) {
             buttonsPanel.setVisible(buttonHiding != ButtonHidingType.ALWAYS_HIDDEN || !isDocked);
diff --git a/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java b/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java
index 0cc5436..4f6882a 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java
@@ -192,7 +192,7 @@ public class UserListDialog extends ToggleDialog implements SelectionChangedList
             super(false);
             putValue(NAME, tr("Show info"));
             putValue(SHORT_DESCRIPTION, tr("Launches a browser with information about the user"));
-            putValue(SMALL_ICON, ImageProvider.get("about"));
+            putValue(SMALL_ICON, ImageProvider.get("help/internet"));
             updateEnabledState();
         }
 
@@ -221,7 +221,7 @@ public class UserListDialog extends ToggleDialog implements SelectionChangedList
         protected String createInfoUrl(Object infoObject) {
             User user = (User)infoObject;
             try {
-                return getBaseUserUrl() + "/" + URLEncoder.encode(user.getName(), "UTF-8").replaceAll("\\+", "%20");
+                return Main.getBaseUserUrl() + "/" + URLEncoder.encode(user.getName(), "UTF-8").replaceAll("\\+", "%20");
             } catch(UnsupportedEncodingException e) {
                 Main.error(e);
                 JOptionPane.showMessageDialog(
diff --git a/src/org/openstreetmap/josm/gui/dialogs/changeset/AbstractCellRenderer.java b/src/org/openstreetmap/josm/gui/dialogs/changeset/AbstractCellRenderer.java
new file mode 100644
index 0000000..cbaad24
--- /dev/null
+++ b/src/org/openstreetmap/josm/gui/dialogs/changeset/AbstractCellRenderer.java
@@ -0,0 +1,76 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.dialogs.changeset;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.awt.Font;
+import java.text.DateFormat;
+import java.util.Date;
+
+import javax.swing.JComponent;
+import javax.swing.JLabel;
+import javax.swing.UIManager;
+import javax.swing.table.TableCellRenderer;
+
+import org.openstreetmap.josm.data.osm.User;
+import org.openstreetmap.josm.tools.date.DateUtils;
+
+/**
+ * Superclass of changeset cell renderers.
+ * @since 7715
+ */
+public abstract class AbstractCellRenderer extends JLabel implements TableCellRenderer {
+
+    protected void reset(JComponent c, boolean tableFont) {
+        c.setBackground(UIManager.getColor("Table.background"));
+        c.setForeground(UIManager.getColor("Table.foreground"));
+        if (tableFont) {
+            c.setFont(UIManager.getFont("Table.font"));
+        }
+        c.setToolTipText(null);
+        c.setOpaque(true);
+    }
+
+    protected void reset() {
+        reset(this, true);
+    }
+
+    protected void renderColors(JComponent c, boolean isSelected) {
+        if (isSelected) {
+            c.setBackground(UIManager.getColor("Table.selectionBackground"));
+            c.setForeground(UIManager.getColor("Table.selectionForeground"));
+        } else {
+            c.setBackground(UIManager.getColor("Table.background"));
+            c.setForeground(UIManager.getColor("Table.foreground"));
+        }
+    }
+
+    protected void renderColors(boolean isSelected) {
+        renderColors(this, isSelected);
+    }
+
+    protected void renderId(long id) {
+        setText(Long.toString(id));
+        setToolTipText(null);
+    }
+
+    protected void renderUser(User user) {
+        if (user == null || user.getName().trim().isEmpty()) {
+            setFont(UIManager.getFont("Table.font").deriveFont(Font.ITALIC));
+            setText(tr("anonymous"));
+        } else {
+            setFont(UIManager.getFont("Table.font"));
+            setText(user.getName());
+            setToolTipText(user.getName());
+        }
+    }
+
+    protected void renderDate(Date d) {
+        if (d == null) {
+            setText("");
+        } else {
+            setText(DateUtils.formatDateTime(d, DateFormat.SHORT, DateFormat.SHORT));
+        }
+        setToolTipText(null);
+    }
+}
diff --git a/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java b/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java
index aa24ab8..5d6019a 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java
@@ -180,12 +180,19 @@ public class ChangesetCacheManager extends JFrame {
         tp.add(pnlChangesetContent);
         model.addPropertyChangeListener(pnlChangesetContent);
 
+        // -- add the panel for the changeset discussion
+        ChangesetDiscussionPanel pnlChangesetDiscussion = new ChangesetDiscussionPanel();
+        tp.add(pnlChangesetDiscussion);
+        model.addPropertyChangeListener(pnlChangesetDiscussion);
+
         tp.setTitleAt(0, tr("Properties"));
         tp.setToolTipTextAt(0, tr("Display the basic properties of the changeset"));
         tp.setTitleAt(1, tr("Tags"));
         tp.setToolTipTextAt(1, tr("Display the tags of the changeset"));
         tp.setTitleAt(2, tr("Content"));
         tp.setToolTipTextAt(2, tr("Display the objects created, updated, and deleted by the changeset"));
+        tp.setTitleAt(3, tr("Discussion"));
+        tp.setToolTipTextAt(3, tr("Display the public discussion around this changeset"));
 
         pnl.add(tp, BorderLayout.CENTER);
         return pnl;
diff --git a/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableCellRenderer.java b/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableCellRenderer.java
index ec8cc94..70f4cca 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableCellRenderer.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableCellRenderer.java
@@ -1,57 +1,21 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.gui.dialogs.changeset;
 
-import static org.openstreetmap.josm.tools.I18n.tr;
 import static org.openstreetmap.josm.tools.I18n.trc;
 
 import java.awt.Component;
 import java.awt.Font;
-import java.text.DateFormat;
-import java.util.Date;
 
-import javax.swing.JLabel;
 import javax.swing.JTable;
 import javax.swing.UIManager;
-import javax.swing.table.TableCellRenderer;
 
 import org.openstreetmap.josm.data.osm.Changeset;
-import org.openstreetmap.josm.data.osm.User;
-import org.openstreetmap.josm.tools.date.DateUtils;
 
 /**
  * The cell renderer for the changeset table
  * @since 2689
  */
-public class ChangesetCacheTableCellRenderer extends JLabel implements TableCellRenderer{
-
-    /**
-     * Constructs a new {@code ChangesetCacheTableCellRenderer}.
-     */
-    public ChangesetCacheTableCellRenderer() {
-        setOpaque(true);
-    }
-
-    protected void reset() {
-        setBackground(UIManager.getColor("Table.background"));
-        setForeground(UIManager.getColor("Table.foreground"));
-        setFont(UIManager.getFont("Table.font"));
-        setToolTipText("");
-    }
-
-    protected void renderColors(boolean isSelected) {
-        if (isSelected) {
-            setBackground(UIManager.getColor("Table.selectionBackground"));
-            setForeground(UIManager.getColor("Table.selectionForeground"));
-        } else {
-            setBackground(UIManager.getColor("Table.background"));
-            setForeground(UIManager.getColor("Table.foreground"));
-        }
-    }
-
-    protected void renderId(Changeset cs) {
-        setText(Integer.toString(cs.getId()));
-        setToolTipText("");
-    }
+public class ChangesetCacheTableCellRenderer extends AbstractCellRenderer {
 
     protected void renderUploadComment(Changeset cs) {
         String comment = cs.get("comment");
@@ -71,28 +35,12 @@ public class ChangesetCacheTableCellRenderer extends JLabel implements TableCell
         } else {
             setText(trc("changeset.state", "Closed"));
         }
-        setToolTipText("");
+        setToolTipText(null);
     }
 
-    protected void renderUser(Changeset cs) {
-        User user = cs.getUser();
-        if (user == null || user.getName().trim().isEmpty()) {
-            setFont(UIManager.getFont("Table.font").deriveFont(Font.ITALIC));
-            setText(tr("anonymous"));
-        } else {
-            setFont(UIManager.getFont("Table.font"));
-            setText(user.getName());
-            setToolTipText(user.getName());
-        }
-    }
-
-    protected void renderDate(Date d) {
-        if (d == null) {
-            setText("");
-        } else {
-            setText(DateUtils.formatDateTime(d, DateFormat.SHORT, DateFormat.SHORT));
-        }
-        setToolTipText("");
+    protected void renderDiscussions(Changeset cs) {
+        setText(Integer.toString(cs.getCommentsCount()));
+        setToolTipText(null);
     }
 
     @Override
@@ -104,12 +52,13 @@ public class ChangesetCacheTableCellRenderer extends JLabel implements TableCell
         renderColors(isSelected);
         Changeset cs = (Changeset)value;
         switch(column) {
-        case 0: /* id */ renderId(cs); break;
+        case 0: /* id */ renderId(cs.getId()); break;
         case 1: /* upload comment */ renderUploadComment(cs); break;
         case 2: /* open/closed */ renderOpen(cs); break;
-        case 3: /* user */ renderUser(cs); break;
+        case 3: /* user */ renderUser(cs.getUser()); break;
         case 4: /* created at */ renderDate(cs.getCreatedAt()); break;
         case 5: /* closed at */ renderDate(cs.getClosedAt()); break;
+        case 6: /* discussions */ renderDiscussions(cs); break;
         }
         return this;
     }
diff --git a/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableColumnModel.java b/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableColumnModel.java
index d6d9280..264a9ff 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableColumnModel.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableColumnModel.java
@@ -35,7 +35,7 @@ public class ChangesetCacheTableColumnModel extends DefaultTableColumnModel {
         createColumn(1, tr("Comment"), 200, -1);
 
         // column 2 - Open
-        createColumn(2, tr("Open"), 50, -1);
+        createColumn(2, tr("Open"), 25, -1);
 
         // column 3 - User
         createColumn(3, tr("User"), 50, -1);
@@ -45,6 +45,9 @@ public class ChangesetCacheTableColumnModel extends DefaultTableColumnModel {
 
         // column 5 - Closed at
         createColumn(5, tr("Closed at"), 100, -1);
+
+        // column 6 - Discussions
+        createColumn(6, tr("Discussions"), 25, -1);
     }
 
     /**
diff --git a/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentDownloadTask.java b/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentDownloadTask.java
index 0fd07fa..c4d5011 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentDownloadTask.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentDownloadTask.java
@@ -134,7 +134,7 @@ public class ChangesetContentDownloadTask extends PleaseWaitRunnable implements
         synchronized(this) {
             reader = new OsmServerChangesetReader();
         }
-        Changeset cs = reader.readChangeset(changesetId, getProgressMonitor().createSubTaskMonitor(0, false));
+        Changeset cs = reader.readChangeset(changesetId, false, getProgressMonitor().createSubTaskMonitor(0, false));
         synchronized(this) {
             reader = null;
         }
diff --git a/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java b/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java
index 09429ff..a638061 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java
@@ -52,7 +52,7 @@ import org.openstreetmap.josm.tools.BugReportExceptionHandler;
 import org.openstreetmap.josm.tools.ImageProvider;
 
 /**
- * The panel which displays the content of a changeset in a scollable table.
+ * The panel which displays the content of a changeset in a scrollable table.
  *
  * It listens to property change events for {@link ChangesetCacheManagerModel#CHANGESET_IN_DETAIL_VIEW_PROP}
  * and updates its view accordingly.
diff --git a/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableCellRenderer.java b/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableCellRenderer.java
index 32f025b..de5c119 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableCellRenderer.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableCellRenderer.java
@@ -5,10 +5,7 @@ import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.awt.Component;
 
-import javax.swing.JLabel;
 import javax.swing.JTable;
-import javax.swing.UIManager;
-import javax.swing.table.TableCellRenderer;
 
 import org.openstreetmap.josm.data.osm.ChangesetDataSet.ChangesetModificationType;
 import org.openstreetmap.josm.data.osm.history.HistoryOsmPrimitive;
@@ -16,34 +13,8 @@ import org.openstreetmap.josm.data.osm.history.HistoryOsmPrimitive;
 /**
  * The table cell renderer used in the changeset content table, except for the "name"
  * column in which we use a {@link org.openstreetmap.josm.gui.OsmPrimitivRenderer}.
- *
  */
-public class ChangesetContentTableCellRenderer extends JLabel implements TableCellRenderer{
-
-    public ChangesetContentTableCellRenderer() {
-        setOpaque(true);
-    }
-
-    protected void reset() {
-        setBackground(UIManager.getColor("Table.background"));
-        setForeground(UIManager.getColor("Table.foreground"));
-        setFont(UIManager.getFont("Table.font"));
-    }
-
-    protected void renderColors(boolean isSelected) {
-        if (isSelected) {
-            setBackground(UIManager.getColor("Table.selectionBackground"));
-            setForeground(UIManager.getColor("Table.selectionForeground"));
-        } else {
-            setBackground(UIManager.getColor("Table.background"));
-            setForeground(UIManager.getColor("Table.foreground"));
-        }
-    }
-
-    protected void renderId(HistoryOsmPrimitive primitive) {
-        setText(Long.toString(primitive.getId()));
-        setToolTipText("");
-    }
+public class ChangesetContentTableCellRenderer extends AbstractCellRenderer {
 
     protected void renderModificationType(ChangesetModificationType type) {
         switch(type) {
@@ -51,7 +22,7 @@ public class ChangesetContentTableCellRenderer extends JLabel implements TableCe
         case UPDATED: setText(tr("Updated")); break;
         case DELETED: setText(tr("Deleted")); break;
         }
-        setToolTipText("");
+        setToolTipText(null);
     }
 
     @Override
@@ -68,7 +39,7 @@ public class ChangesetContentTableCellRenderer extends JLabel implements TableCe
             break;
         case 1:
             HistoryOsmPrimitive primitive = (HistoryOsmPrimitive)value;
-            renderId(primitive);
+            renderId(primitive.getId());
             break;
         default:
             /* do nothing */
diff --git a/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableColumnModel.java b/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableColumnModel.java
index fa374e9..750bc80 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableColumnModel.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableColumnModel.java
@@ -45,6 +45,9 @@ public class ChangesetContentTableColumnModel extends DefaultTableColumnModel {
         addColumn(col);
     }
 
+    /**
+     * Constructs a new {@code ChangesetContentTableColumnModel}.
+     */
     public ChangesetContentTableColumnModel() {
         createColumns();
     }
diff --git a/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableModel.java b/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableModel.java
index 4fcabb0..ab64af3 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableModel.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableModel.java
@@ -62,8 +62,7 @@ public class ChangesetContentTableModel extends AbstractTableModel {
     }
 
     /**
-     * Populates the model with the content of a model. If ds is null, the
-     * table is cleared.
+     * Populates the model with the content of a changeset. If ds is null, the table is cleared.
      *
      * @param ds the changeset content.
      */
diff --git a/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDiscussionPanel.java b/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDiscussionPanel.java
new file mode 100644
index 0000000..5d52710
--- /dev/null
+++ b/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDiscussionPanel.java
@@ -0,0 +1,144 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.dialogs.changeset;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.awt.BorderLayout;
+import java.awt.Component;
+import java.awt.FlowLayout;
+import java.awt.event.ActionEvent;
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
+import java.util.Collections;
+
+import javax.swing.AbstractAction;
+import javax.swing.BorderFactory;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.JTable;
+import javax.swing.JToolBar;
+
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.osm.Changeset;
+import org.openstreetmap.josm.io.OnlineResource;
+
+/**
+ * The panel which displays the public discussion around a changeset in a scrollable table.
+ *
+ * It listens to property change events for {@link ChangesetCacheManagerModel#CHANGESET_IN_DETAIL_VIEW_PROP}
+ * and updates its view accordingly.
+ *
+ * @since 7704
+ */
+public class ChangesetDiscussionPanel extends JPanel implements PropertyChangeListener {
+
+    private final UpdateChangesetDiscussionAction actUpdateChangesets = new UpdateChangesetDiscussionAction();
+
+    private final ChangesetDiscussionTableModel model = new ChangesetDiscussionTableModel();
+
+    private JTable table;
+
+    private Changeset current = null;
+
+    protected JPanel buildActionButtonPanel() {
+        JPanel pnl = new JPanel(new FlowLayout(FlowLayout.LEFT));
+
+        JToolBar tb = new JToolBar(JToolBar.VERTICAL);
+        tb.setFloatable(false);
+
+        // -- changeset discussion update
+        tb.add(actUpdateChangesets);
+        actUpdateChangesets.initProperties(current);
+
+        pnl.add(tb);
+        return pnl;
+    }
+
+    /**
+     * Updates the current changeset discussion from the OSM server
+     */
+    class UpdateChangesetDiscussionAction extends AbstractAction {
+        public UpdateChangesetDiscussionAction() {
+            putValue(NAME, tr("Update changeset discussion"));
+            putValue(SMALL_ICON, ChangesetCacheManager.UPDATE_CONTENT_ICON);
+            putValue(SHORT_DESCRIPTION, tr("Update the changeset discussion from the OSM server"));
+        }
+
+        @Override
+        public void actionPerformed(ActionEvent evt) {
+            if (current == null) return;
+            Main.worker.submit(
+                    new ChangesetHeaderDownloadTask(
+                            ChangesetDiscussionPanel.this,
+                            Collections.singleton(current.getId()),
+                            true /* include discussion */
+                    )
+            );
+        }
+
+        public void initProperties(Changeset cs) {
+            setEnabled(cs != null && !Main.isOffline(OnlineResource.OSM_API));
+        }
+    }
+
+    /**
+     * Constructs a new {@code ChangesetDiscussionPanel}.
+     */
+    public ChangesetDiscussionPanel() {
+        build();
+    }
+
+    protected void setCurrentChangeset(Changeset cs) {
+        current = cs;
+        if (cs == null) {
+            clearView();
+        } else {
+            updateView(cs);
+        }
+        actUpdateChangesets.initProperties(current);
+        if (cs != null && cs.getDiscussion().size() < cs.getCommentsCount()) {
+            actUpdateChangesets.actionPerformed(null);
+        }
+    }
+
+    protected final void build() {
+        setLayout(new BorderLayout());
+        setBorder(BorderFactory.createEmptyBorder(3,3,3,3));
+        add(buildActionButtonPanel(), BorderLayout.WEST);
+        add(buildDiscussionPanel(), BorderLayout.CENTER);
+    }
+
+    private Component buildDiscussionPanel() {
+        JPanel pnl = new JPanel(new BorderLayout());
+        table = new JTable(model, new ChangesetDiscussionTableColumnModel());
+        pnl.add(new JScrollPane(table), BorderLayout.CENTER);
+        return pnl;
+    }
+
+    protected void clearView() {
+        model.populate(null);
+    }
+
+    protected void updateView(Changeset cs) {
+        model.populate(cs.getDiscussion());
+        // Update row heights
+        for (int row = 0; row < table.getRowCount(); row++) {
+            int rowHeight = table.getRowHeight();
+
+            Component comp = table.prepareRenderer(table.getCellRenderer(row, 2), row, 2);
+            rowHeight = Math.max(rowHeight, comp.getPreferredSize().height);
+
+            table.setRowHeight(row, rowHeight);
+        }
+    }
+
+    /* ---------------------------------------------------------------------------- */
+    /* interface PropertyChangeListener                                             */
+    /* ---------------------------------------------------------------------------- */
+    @Override
+    public void propertyChange(PropertyChangeEvent evt) {
+        if (! evt.getPropertyName().equals(ChangesetCacheManagerModel.CHANGESET_IN_DETAIL_VIEW_PROP))
+            return;
+        setCurrentChangeset((Changeset)evt.getNewValue());
+    }
+}
diff --git a/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDiscussionTableCellRenderer.java b/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDiscussionTableCellRenderer.java
new file mode 100644
index 0000000..16c417f
--- /dev/null
+++ b/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDiscussionTableCellRenderer.java
@@ -0,0 +1,41 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.dialogs.changeset;
+
+import java.awt.Component;
+import java.util.Date;
+
+import javax.swing.JComponent;
+import javax.swing.JTable;
+
+import org.openstreetmap.josm.data.osm.User;
+import org.openstreetmap.josm.gui.widgets.JosmTextArea;
+
+/**
+ * The cell renderer for the changeset dicussion table
+ * @since 7715
+ */
+public class ChangesetDiscussionTableCellRenderer extends AbstractCellRenderer {
+
+    @Override
+    public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus,
+            int row, int column) {
+        if (value == null)
+            return this;
+        JComponent comp = this;
+        reset(comp, true);
+        renderColors(comp, isSelected);
+        switch(column) {
+        case 0:
+            renderDate((Date)value);
+            break;
+        case 1:
+            renderUser((User)value);
+            break;
+        case 2:
+            comp = new JosmTextArea((String) value);
+            reset(comp, false);
+            renderColors(comp, isSelected);
+        }
+        return comp;
+    }
+}
diff --git a/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDiscussionTableColumnModel.java b/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDiscussionTableColumnModel.java
new file mode 100644
index 0000000..eff648a
--- /dev/null
+++ b/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDiscussionTableColumnModel.java
@@ -0,0 +1,48 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.dialogs.changeset;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import javax.swing.table.DefaultTableColumnModel;
+import javax.swing.table.TableColumn;
+
+/**
+ * The column model for the changeset content
+ * @since 7715
+ */
+public class ChangesetDiscussionTableColumnModel extends DefaultTableColumnModel {
+
+    protected void createColumns() {
+        TableColumn col = null;
+        ChangesetDiscussionTableCellRenderer renderer = new ChangesetDiscussionTableCellRenderer();
+        // column 0 - Date
+        col = new TableColumn(0, 150);
+        col.setHeaderValue(tr("Date"));
+        col.setResizable(true);
+        col.setMaxWidth(200);
+        col.setCellRenderer(renderer);
+        addColumn(col);
+
+        // column 1 - User
+        col = new TableColumn(1, 150);
+        col.setHeaderValue(tr("User"));
+        col.setResizable(true);
+        col.setMaxWidth(300);
+        col.setCellRenderer(renderer);
+        addColumn(col);
+
+        // column 2 - Text
+        col = new TableColumn(2, 400);
+        col.setHeaderValue(tr("Comment"));
+        col.setResizable(true);
+        col.setCellRenderer(renderer);
+        addColumn(col);
+    }
+
+    /**
+     * Constructs a new {@code ChangesetContentTableColumnModel}.
+     */
+    public ChangesetDiscussionTableColumnModel() {
+        createColumns();
+    }
+}
diff --git a/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDiscussionTableModel.java b/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDiscussionTableModel.java
new file mode 100644
index 0000000..c839081
--- /dev/null
+++ b/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDiscussionTableModel.java
@@ -0,0 +1,55 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.dialogs.changeset;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.swing.table.AbstractTableModel;
+
+import org.openstreetmap.josm.data.osm.ChangesetDiscussionComment;
+
+/**
+ * Model of changeset discussion table.
+ * @since 7715
+ */
+public class ChangesetDiscussionTableModel extends AbstractTableModel {
+
+    private final List<ChangesetDiscussionComment> data = new ArrayList<>();
+
+    @Override
+    public int getRowCount() {
+        return data.size();
+    }
+
+    @Override
+    public int getColumnCount() {
+        return 3;
+    }
+
+    @Override
+    public Object getValueAt(int rowIndex, int columnIndex) {
+        if (rowIndex < 0 || rowIndex >= data.size())
+            return null;
+        switch (columnIndex) {
+        case 0:
+            return data.get(rowIndex).getDate();
+        case 1:
+            return data.get(rowIndex).getUser();
+        default:
+            return data.get(rowIndex).getText();
+        }
+    }
+
+    /**
+     * Populates the model with the discussion of a changeset. If ds is null, the table is cleared.
+     *
+     * @param list the changeset discussion.
+     */
+    public void populate(List<ChangesetDiscussionComment> list) {
+        data.clear();
+        if (list != null) {
+            data.addAll(list);
+        }
+        fireTableDataChanged();
+    }
+}
diff --git a/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetHeaderDownloadTask.java b/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetHeaderDownloadTask.java
index e16d7fa..7c12923 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetHeaderDownloadTask.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetHeaderDownloadTask.java
@@ -83,6 +83,7 @@ public class ChangesetHeaderDownloadTask extends PleaseWaitRunnable implements C
     private boolean canceled;
     private Exception lastException;
     private Set<Changeset> downloadedChangesets;
+    private final boolean includeDiscussion;
 
     protected void init(Collection<Integer> ids) {
         if (ids == null) {
@@ -111,6 +112,7 @@ public class ChangesetHeaderDownloadTask extends PleaseWaitRunnable implements C
         // parent for dialog is Main.parent
         super(tr("Download changesets"), false /* don't ignore exceptions */);
         init(ids);
+        this.includeDiscussion = false;
     }
 
     /**
@@ -124,8 +126,26 @@ public class ChangesetHeaderDownloadTask extends PleaseWaitRunnable implements C
      * @throws IllegalArgumentException thrown if dialogParent is null
      */
     public ChangesetHeaderDownloadTask(Component dialogParent, Collection<Integer> ids) throws IllegalArgumentException{
-        super(dialogParent,tr("Download changesets"), false /* don't ignore exceptions */);
+        this(dialogParent, ids, false);
+    }
+
+    /**
+     * Creates the download task for a collection of changeset ids, with possibility to download changeset discussion.
+     * Uses a {@link org.openstreetmap.josm.gui.PleaseWaitDialog} whose parent is the parent window of <code>dialogParent</code>.
+     *
+     * Null ids or or ids <= 0 in the id collection are ignored.
+     *
+     * @param dialogParent the parent reference component for the {@link org.openstreetmap.josm.gui.PleaseWaitDialog}. Must not be null.
+     * @param ids the collection of ids. Empty collection assumed if null.
+     * @param includeDiscussion determines if discussion comments must be downloaded or not
+     * @throws IllegalArgumentException thrown if dialogParent is null
+     * @since 7704
+     */
+    public ChangesetHeaderDownloadTask(Component dialogParent, Collection<Integer> ids, boolean includeDiscussion)
+            throws IllegalArgumentException {
+        super(dialogParent, tr("Download changesets"), false /* don't ignore exceptions */);
         init(ids);
+        this.includeDiscussion = includeDiscussion;
     }
 
     @Override
@@ -179,7 +199,8 @@ public class ChangesetHeaderDownloadTask extends PleaseWaitRunnable implements C
                 reader = new OsmServerChangesetReader();
             }
             downloadedChangesets = new HashSet<>();
-            downloadedChangesets.addAll(reader.readChangesets(idsToDownload, getProgressMonitor().createSubTaskMonitor(0, false)));
+            downloadedChangesets.addAll(reader.readChangesets(idsToDownload, includeDiscussion,
+                    getProgressMonitor().createSubTaskMonitor(0, false)));
         } catch(OsmTransferException e) {
             if (canceled)
                 // ignore exception if canceled
diff --git a/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java b/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java
index b8f510f..52677a8 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java
@@ -171,7 +171,7 @@ public class UrlBasedQueryPanel extends JPanel {
         protected void feedbackValid() {
             if ("valid".equals(getCurrentFeedback())) return;
             lblValid.setIcon(ImageProvider.get("dialogs", "valid"));
-            lblValid.setToolTipText("");
+            lblValid.setToolTipText(null);
             lblValid.putClientProperty("valid", "valid");
         }
 
diff --git a/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java b/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java
index b80e2d9..d6ad964 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java
@@ -890,7 +890,7 @@ public class PropertiesDialog extends ToggleDialog implements SelectionChangedLi
         static final String DELETE_FROM_RELATION_PREF = "delete_from_relation";
 
         public DeleteAction() {
-            super(tr("Delete"), "dialogs/delete", tr("Delete the selected key in all objects"),
+            super(tr("Delete"), /* ICON() */ "dialogs/delete", tr("Delete the selected key in all objects"),
                     Shortcut.registerShortcut("properties:delete", tr("Delete Tags"), KeyEvent.VK_D,
                             Shortcut.ALT_CTRL_SHIFT), false);
             updateEnabledState();
@@ -998,7 +998,7 @@ public class PropertiesDialog extends ToggleDialog implements SelectionChangedLi
      */
     class AddAction extends JosmAction {
         public AddAction() {
-            super(tr("Add"), "dialogs/add", tr("Add a new key/value pair to all objects"),
+            super(tr("Add"), /* ICON() */ "dialogs/add", tr("Add a new key/value pair to all objects"),
                     Shortcut.registerShortcut("properties:add", tr("Add Tag"), KeyEvent.VK_A,
                             Shortcut.ALT), false);
         }
@@ -1015,7 +1015,7 @@ public class PropertiesDialog extends ToggleDialog implements SelectionChangedLi
      */
     class EditAction extends JosmAction implements ListSelectionListener {
         public EditAction() {
-            super(tr("Edit"), "dialogs/edit", tr("Edit the value of the selected key for all objects"),
+            super(tr("Edit"), /* ICON() */ "dialogs/edit", tr("Edit the value of the selected key for all objects"),
                     Shortcut.registerShortcut("properties:edit", tr("Edit Tags"), KeyEvent.VK_S,
                             Shortcut.ALT), false);
             updateEnabledState();
diff --git a/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java b/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java
index 09a67fa..294e305 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java
@@ -370,6 +370,7 @@ class TagEditHelper {
                 return;
             if (key.equals(newkey) || value == null) {
                 Main.main.undoRedo.add(new ChangePropertyCommand(sel, newkey, value));
+                AutoCompletionManager.rememberUserInput(newkey, value, true);
             } else {
                 for (OsmPrimitive osm: sel) {
                     if (osm.get(newkey) != null) {
@@ -400,6 +401,7 @@ class TagEditHelper {
                     }
                 } else {
                     commands.add(new ChangePropertyCommand(sel, newkey, value));
+                    AutoCompletionManager.rememberUserInput(newkey, value, false);
                 }
                 Main.main.undoRedo.add(new SequenceCommand(
                         trn("Change properties of up to {0} object",
@@ -412,7 +414,7 @@ class TagEditHelper {
     }
 
     public static final BooleanProperty PROPERTY_FIX_TAG_LOCALE = new BooleanProperty("properties.fix-tag-combobox-locale", false);
-    public static final BooleanProperty PROPERTY_REMEMBER_TAGS = new BooleanProperty("properties.remember-recently-added-tags", false);
+    public static final BooleanProperty PROPERTY_REMEMBER_TAGS = new BooleanProperty("properties.remember-recently-added-tags", true);
     public static final IntegerProperty PROPERTY_RECENT_TAGS_NUMBER = new IntegerProperty("properties.recently-added-tags", DEFAULT_LRU_TAGS_NUMBER);
 
     abstract class AbstractTagsDialog extends ExtendedDialog {
@@ -618,7 +620,7 @@ class TagEditHelper {
                 }
             });
             JCheckBoxMenuItem rememberLastTags = new JCheckBoxMenuItem(
-                new AbstractAction(tr("Remember last used tags")){
+                new AbstractAction(tr("Remember last used tags after a restart")){
                 @Override
                 public void actionPerformed(ActionEvent e) {
                     boolean sel=((JCheckBoxMenuItem) e.getSource()).getState();
@@ -770,6 +772,7 @@ class TagEditHelper {
             lastAddKey = key;
             lastAddValue = value;
             recentTags.put(new Tag(key, value), null);
+            AutoCompletionManager.rememberUserInput(key, value, false);
             commandCount++;
             Main.main.undoRedo.add(new ChangePropertyCommand(sel, key, value));
             changedKey = key;
diff --git a/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java b/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java
index 864331b..4b3325e 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java
@@ -736,6 +736,13 @@ public class GenericRelationEditor extends RelationEditor  {
                 JOptionPane.WARNING_MESSAGE);
     }
 
+    /**
+     * Adds primitives to a given relation.
+     * @param orig The relation to modify
+     * @param primitivesToAdd The primitives to add as relation members
+     * @return The resulting command
+     * @throws IllegalArgumentException if orig is null
+     */
     public static Command addPrimitivesToRelation(final Relation orig, Collection<? extends OsmPrimitive> primitivesToAdd)
             throws IllegalArgumentException {
         CheckParameterUtil.ensureParameterNotNull(orig, "orig");
@@ -752,8 +759,8 @@ public class GenericRelationEditor extends RelationEditor  {
                         && !confirmAddingPrimitive(p)) {
                     continue;
                 }
-                final String role = presets.isEmpty() ? null : presets.iterator().next().suggestRoleForOsmPrimitive(p);
-                relation.addMember(new RelationMember(role == null ? "" : role, p));
+                final Set<String> roles = findSuggestedRoles(presets, p);
+                relation.addMember(new RelationMember(roles.size() == 1 ? roles.iterator().next() : "", p));
                 modified = true;
             }
             return modified ? new ChangeCommand(orig, relation) : null;
@@ -762,6 +769,17 @@ public class GenericRelationEditor extends RelationEditor  {
         }
     }
 
+    protected static Set<String> findSuggestedRoles(final Collection<TaggingPreset> presets, OsmPrimitive p) {
+        final Set<String> roles = new HashSet<>();
+        for (TaggingPreset preset : presets) {
+            String role = preset.suggestRoleForOsmPrimitive(p);
+            if (role != null && !role.isEmpty()) {
+                roles.add(role);
+            }
+        }
+        return roles;
+    }
+
     abstract class AddFromSelectionAction extends AbstractAction {
         protected boolean isPotentialDuplicate(OsmPrimitive primitive) {
             return memberTableModel.hasMembersReferringTo(Collections.singleton(primitive));
diff --git a/src/org/openstreetmap/josm/gui/dialogs/relation/sort/RelationNodeMap.java b/src/org/openstreetmap/josm/gui/dialogs/relation/sort/RelationNodeMap.java
index 2cbaa6b..bbc9ca8 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/relation/sort/RelationNodeMap.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/relation/sort/RelationNodeMap.java
@@ -79,7 +79,7 @@ public class RelationNodeMap {
     RelationNodeMap(List<RelationMember> members) {
         for (int i = 0; i < members.size(); ++i) {
             RelationMember m = members.get(i);
-            if (m.getMember().isIncomplete() || !m.isWay()) {
+            if (m.getMember().isIncomplete() || !m.isWay() || m.getWay().getNodesCount() < 2) {
                 notSortable.add(i);
                 continue;
             }
diff --git a/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java b/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java
index efd60d6..3580c48 100644
--- a/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java
+++ b/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java
@@ -183,7 +183,7 @@ public class BoundingBoxSelection implements DownloadSelection {
 
     protected void resetErrorMessage(JosmTextField tf) {
         tf.setBorder(UIManager.getBorder("TextField.border"));
-        tf.setToolTipText("");
+        tf.setToolTipText(null);
     }
 
     class LatValueChecker extends FocusAdapter implements ActionListener{
diff --git a/src/org/openstreetmap/josm/gui/download/DownloadDialog.java b/src/org/openstreetmap/josm/gui/download/DownloadDialog.java
index 121d482..afed8dd 100644
--- a/src/org/openstreetmap/josm/gui/download/DownloadDialog.java
+++ b/src/org/openstreetmap/josm/gui/download/DownloadDialog.java
@@ -77,6 +77,7 @@ public class DownloadDialog extends JDialog  {
 
     protected JCheckBox cbDownloadOsmData;
     protected JCheckBox cbDownloadGpxData;
+    protected JCheckBox cbDownloadNotes;
     /** the download action and button */
     private DownloadAction actDownload;
     protected SideButton btnDownload;
@@ -97,7 +98,16 @@ public class DownloadDialog extends JDialog  {
         pnl.add(cbDownloadOsmData,  GBC.std().insets(1,5,1,5));
         cbDownloadGpxData = new JCheckBox(tr("Raw GPS data"));
         cbDownloadGpxData.setToolTipText(tr("Select to download GPS traces in the selected download area."));
-        pnl.add(cbDownloadGpxData,  GBC.eol().insets(5,5,1,5));
+        //TODO: uncomment this and remove logic below once notes are enabled
+        //pnl.add(cbDownloadGpxData,  GBC.std().insets(5,5,1,5));
+        cbDownloadNotes = new JCheckBox(tr("Notes"));
+        cbDownloadNotes.setToolTipText(tr("Select to download notes in the selected download area."));
+        if (Main.pref.getBoolean("osm.notes.enableDownload", false)) {
+            pnl.add(cbDownloadGpxData,  GBC.std().insets(5,5,1,5));
+            pnl.add(cbDownloadNotes, GBC.eol().insets(50, 5, 1, 5));
+        } else {
+            pnl.add(cbDownloadGpxData,  GBC.eol().insets(5,5,1,5));
+        }
 
         // hook for subclasses
         buildMainPanelAboveDownloadSelections(pnl);
@@ -173,6 +183,7 @@ public class DownloadDialog extends JDialog  {
 
         makeCheckBoxRespondToEnter(cbDownloadGpxData);
         makeCheckBoxRespondToEnter(cbDownloadOsmData);
+        makeCheckBoxRespondToEnter(cbDownloadNotes);
         makeCheckBoxRespondToEnter(cbNewLayer);
 
         // -- cancel button
@@ -278,6 +289,15 @@ public class DownloadDialog extends JDialog  {
     }
 
     /**
+     * Replies true if user selected to download notes
+     *
+     * @return true if user selected to download notes
+     */
+    public boolean isDownloadNotes() {
+        return cbDownloadNotes.isSelected();
+    }
+
+    /**
      * Replies true if the user requires to download into a new layer
      *
      * @return true if the user requires to download into a new layer
@@ -313,6 +333,7 @@ public class DownloadDialog extends JDialog  {
         Main.pref.put("download.tab", Integer.toString(tpDownloadAreaSelectors.getSelectedIndex()));
         Main.pref.put("download.osm", cbDownloadOsmData.isSelected());
         Main.pref.put("download.gps", cbDownloadGpxData.isSelected());
+        Main.pref.put("download.notes", cbDownloadNotes.isSelected());
         Main.pref.put("download.newlayer", cbNewLayer.isSelected());
         if (currentBounds != null) {
             Main.pref.put("osm-download.bounds", currentBounds.encodeAsString(";"));
@@ -325,6 +346,11 @@ public class DownloadDialog extends JDialog  {
     public void restoreSettings() {
         cbDownloadOsmData.setSelected(Main.pref.getBoolean("download.osm", true));
         cbDownloadGpxData.setSelected(Main.pref.getBoolean("download.gps", false));
+        //TODO: This is to make sure notes are not downloaded if the Notes checkbox isn't being displayed.
+        //      Make it look like the ones above when notes are enabled
+        boolean downloadNotes = Main.pref.getBoolean("download.notes", false)
+                && Main.pref.getBoolean("osm.notes.enableDownload", false);
+        cbDownloadNotes.setSelected(downloadNotes);
         cbNewLayer.setSelected(Main.pref.getBoolean("download.newlayer", false));
         cbStartup.setSelected( isAutorunEnabled() );
         int idx = Main.pref.getInteger("download.tab", 0);
@@ -457,6 +483,7 @@ public class DownloadDialog extends JDialog  {
                 );
                 return;
             }
+            //TODO: add notes into this logic once they are fully enabled in core
             if (!isDownloadOsmData() && !isDownloadGpxData()) {
                 JOptionPane.showMessageDialog(
                         DownloadDialog.this,
diff --git a/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java b/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java
index 11debda..ec36057 100644
--- a/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java
+++ b/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java
@@ -19,7 +19,6 @@ import javax.swing.JPanel;
 import javax.swing.JTextArea;
 
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.actions.AbstractInfoAction;
 import org.openstreetmap.josm.data.osm.Changeset;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.User;
@@ -168,7 +167,7 @@ public class VersionInfoPanel extends JPanel implements Observer{
     }
 
     protected static String getUserUrl(String username) throws UnsupportedEncodingException {
-        return AbstractInfoAction.getBaseUserUrl() + "/" +  URLEncoder.encode(username, "UTF-8").replaceAll("\\+", "%20");
+        return Main.getBaseUserUrl() + "/" +  URLEncoder.encode(username, "UTF-8").replaceAll("\\+", "%20");
     }
 
     @Override
@@ -180,7 +179,7 @@ public class VersionInfoPanel extends JPanel implements Observer{
 
         if (!model.isLatest(primitive)) {
             User user = primitive.getUser();
-            String url = AbstractInfoAction.getBaseBrowseUrl() + "/changeset/" + primitive.getChangesetId();
+            String url = Main.getBaseBrowseUrl() + "/changeset/" + primitive.getChangesetId();
             lblChangeset.setUrl(url);
             lblChangeset.setDescription(Long.toString(primitive.getChangesetId()));
 
diff --git a/src/org/openstreetmap/josm/gui/history/VersionTable.java b/src/org/openstreetmap/josm/gui/history/VersionTable.java
index 0d3541e..b39da93 100644
--- a/src/org/openstreetmap/josm/gui/history/VersionTable.java
+++ b/src/org/openstreetmap/josm/gui/history/VersionTable.java
@@ -149,13 +149,13 @@ public class VersionTable extends JTable implements Observer{
             super(true);
             putValue(NAME, tr("Changeset info"));
             putValue(SHORT_DESCRIPTION, tr("Launch browser with information about the changeset"));
-            putValue(SMALL_ICON, ImageProvider.get("about"));
+            putValue(SMALL_ICON, ImageProvider.get("data/changeset"));
         }
 
         @Override
         protected String createInfoUrl(Object infoObject) {
             HistoryOsmPrimitive primitive = (HistoryOsmPrimitive) infoObject;
-            return getBaseBrowseUrl() + "/changeset/" + primitive.getChangesetId();
+            return Main.getBaseBrowseUrl() + "/changeset/" + primitive.getChangesetId();
         }
 
         @Override
@@ -179,13 +179,13 @@ public class VersionTable extends JTable implements Observer{
             super(true);
             putValue(NAME, tr("User info"));
             putValue(SHORT_DESCRIPTION, tr("Launch browser with information about the user"));
-            putValue(SMALL_ICON, ImageProvider.get("about"));
+            putValue(SMALL_ICON, ImageProvider.get("data/user"));
         }
 
         @Override
         protected String createInfoUrl(Object infoObject) {
             HistoryOsmPrimitive hp = (HistoryOsmPrimitive) infoObject;
-            return hp.getUser() == null ? null : getBaseUserUrl() + "/" + hp.getUser().getName();
+            return hp.getUser() == null ? null : Main.getBaseUserUrl() + "/" + hp.getUser().getName();
         }
 
         @Override
diff --git a/src/org/openstreetmap/josm/gui/io/RecentlyOpenedFilesMenu.java b/src/org/openstreetmap/josm/gui/io/RecentlyOpenedFilesMenu.java
index 455510d..d5943b8 100644
--- a/src/org/openstreetmap/josm/gui/io/RecentlyOpenedFilesMenu.java
+++ b/src/org/openstreetmap/josm/gui/io/RecentlyOpenedFilesMenu.java
@@ -29,7 +29,7 @@ public class RecentlyOpenedFilesMenu extends JMenu {
     public RecentlyOpenedFilesMenu() {
         super(tr("Open Recent"));
         setToolTipText(tr("List of recently opened files"));
-        setIcon(ImageProvider.get("openrecent.png"));
+        setIcon(new ImageProvider("openrecent").setSize(ImageProvider.ImageSizes.MENU).get());
         putClientProperty("help", ht("/Action/OpenRecent"));
 
         // build dynamically
diff --git a/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java b/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java
index 448f9f3..68544b6 100644
--- a/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java
+++ b/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java
@@ -341,7 +341,7 @@ public class UploadStrategySelectionPanel extends JPanel implements PropertyChan
             rbStrategy.get(UploadStrategy.SINGLE_REQUEST_STRATEGY).setEnabled(true);
             JMultilineLabel lbl = lblStrategies.get(UploadStrategy.SINGLE_REQUEST_STRATEGY);
             lbl.setText(tr("Upload data in one request"));
-            lbl.setToolTipText("");
+            lbl.setToolTipText(null);
             lblNumRequests.get(UploadStrategy.SINGLE_REQUEST_STRATEGY).setVisible(true);
 
             pnlMultiChangesetPolicyPanel.setVisible(false);
diff --git a/src/org/openstreetmap/josm/gui/layer/NoteLayer.java b/src/org/openstreetmap/josm/gui/layer/NoteLayer.java
index 3b108fb..43399ae 100644
--- a/src/org/openstreetmap/josm/gui/layer/NoteLayer.java
+++ b/src/org/openstreetmap/josm/gui/layer/NoteLayer.java
@@ -8,6 +8,7 @@ import java.awt.Graphics2D;
 import java.awt.Point;
 import java.awt.event.MouseEvent;
 import java.awt.event.MouseListener;
+import java.io.File;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.List;
@@ -18,6 +19,7 @@ import javax.swing.ImageIcon;
 import javax.swing.JToolTip;
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.actions.SaveActionBase;
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.notes.Note;
 import org.openstreetmap.josm.data.notes.Note.State;
@@ -28,6 +30,7 @@ import org.openstreetmap.josm.gui.MapView;
 import org.openstreetmap.josm.gui.dialogs.LayerListDialog;
 import org.openstreetmap.josm.gui.dialogs.LayerListPopup;
 import org.openstreetmap.josm.gui.dialogs.NoteDialog;
+import org.openstreetmap.josm.io.NoteExporter;
 import org.openstreetmap.josm.io.XmlWriter;
 import org.openstreetmap.josm.tools.ColorHelper;
 
@@ -72,17 +75,7 @@ public class NoteLayer extends AbstractModifiableLayer implements MouseListener
 
     @Override
     public boolean isModified() {
-        for (Note note : noteData.getNotes()) {
-            if (note.getId() < 0) { //notes with negative IDs are new
-                return true;
-            }
-            for (NoteComment comment : note.getComments()) {
-                if (comment.getIsNew()) {
-                    return true;
-                }
-            }
-        }
-        return false;
+        return noteData.isModified();
     }
 
     @Override
@@ -91,6 +84,17 @@ public class NoteLayer extends AbstractModifiableLayer implements MouseListener
     }
 
     @Override
+    public boolean isSavable() {
+        return true;
+    }
+
+    @Override
+    public boolean requiresSaveToFile() {
+        Main.debug("associated notes file: " + getAssociatedFile());
+        return getAssociatedFile() != null && isModified();
+    }
+
+    @Override
     public void paint(Graphics2D g, MapView mv, Bounds box) {
         for (Note note : noteData.getNotes()) {
             Point p = mv.getPoint(note.getLatLon());
@@ -117,7 +121,7 @@ public class NoteLayer extends AbstractModifiableLayer implements MouseListener
                 //closing a note creates an empty comment that we don't want to show
                 if (commentText != null && commentText.trim().length() > 0) {
                     sb.append(sep);
-                    String userName = comment.getUser().getName();
+                    String userName = XmlWriter.encode(comment.getUser().getName());
                     if (userName == null || userName.trim().length() == 0) {
                         userName = "<Anonymous>";
                     }
@@ -200,6 +204,8 @@ public class NoteLayer extends AbstractModifiableLayer implements MouseListener
         actions.add(LayerListDialog.getInstance().createShowHideLayerAction());
         actions.add(LayerListDialog.getInstance().createDeleteLayerAction());
         actions.add(new LayerListPopup.InfoAction(this));
+        actions.add(new LayerSaveAction(this));
+        actions.add(new LayerSaveAsAction(this));
         return actions.toArray(new Action[actions.size()]);
     }
 
@@ -226,6 +232,11 @@ public class NoteLayer extends AbstractModifiableLayer implements MouseListener
     }
 
     @Override
+    public File createAndOpenSaveFileChooser() {
+        return SaveActionBase.createAndOpenSaveFileChooser(tr("Save GPX file"), NoteExporter.FILE_FILTER);
+    }
+
+    @Override
     public void mousePressed(MouseEvent e) { }
 
     @Override
diff --git a/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java b/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java
index 93d16f0..304a086 100644
--- a/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java
+++ b/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java
@@ -351,13 +351,12 @@ public class OsmDataLayer extends AbstractModifiableLayer implements Listener, S
     @Override public String getToolTipText() {
         int nodes = new FilteredCollection<>(data.getNodes(), OsmPrimitive.nonDeletedPredicate).size();
         int ways = new FilteredCollection<>(data.getWays(), OsmPrimitive.nonDeletedPredicate).size();
+        int rels = new FilteredCollection<>(data.getRelations(), OsmPrimitive.nonDeletedPredicate).size();
 
         String tool = trn("{0} node", "{0} nodes", nodes, nodes)+", ";
-        tool += trn("{0} way", "{0} ways", ways, ways);
+        tool += trn("{0} way", "{0} ways", ways, ways)+", ";
+        tool += trn("{0} relation", "{0} relations", rels, rels);
 
-        if (data.getVersion() != null) {
-            tool += ", " + tr("version {0}", data.getVersion());
-        }
         File f = getAssociatedFile();
         if (f != null) {
             tool = "<html>"+tool+"<br>"+f.getPath()+"</html>";
diff --git a/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java b/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java
index 832bb6f..65332b8 100644
--- a/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java
+++ b/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java
@@ -40,6 +40,7 @@ import javax.swing.JOptionPane;
 import javax.swing.SwingConstants;
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.actions.LassoModeAction;
 import org.openstreetmap.josm.actions.RenameLayerAction;
 import org.openstreetmap.josm.actions.mapmode.MapMode;
 import org.openstreetmap.josm.actions.mapmode.SelectAction;
@@ -837,14 +838,16 @@ public class GeoImageLayer extends Layer implements PropertyChangeListener, Jump
 
     /**
      * Determines if the functionality of this layer is available in
-     * the specified map mode.  SelectAction is supported by default,
+     * the specified map mode. {@link SelectAction} and {@link LassoModeAction} are supported by default,
      * other map modes can be registered.
      * @param mapMode Map mode to be checked
      * @return {@code true} if the map mode is supported,
      *         {@code false} otherwise
      */
     private static final boolean isSupportedMapMode(MapMode mapMode) {
-        if (mapMode instanceof SelectAction) return true;
+        if (mapMode instanceof SelectAction || mapMode instanceof LassoModeAction) {
+            return true;
+        }
         if (supportedMapModes != null) {
             for (MapMode supmmode: supportedMapModes) {
                 if (mapMode == supmmode) {
diff --git a/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java b/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java
index 57c62a0..016f8d4 100644
--- a/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java
+++ b/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java
@@ -279,7 +279,7 @@ public final class ImageViewerDialog extends ToggleDialog implements LayerChange
                 // (e.g. to update the OSD).
                 imgDisplay.setImage(entry.getFile(), entry.getExifOrientation());
             }
-            setTitle("Geotagged Images" + (entry.getFile() != null ? " - " + entry.getFile().getName() : ""));
+            setTitle(tr("Geotagged Images") + (entry.getFile() != null ? " - " + entry.getFile().getName() : ""));
             StringBuilder osd = new StringBuilder(entry.getFile() != null ? entry.getFile().getName() : "");
             if (entry.getElevation() != null) {
                 osd.append(tr("\nAltitude: {0} m", entry.getElevation().longValue()));
@@ -300,8 +300,12 @@ public final class ImageViewerDialog extends ToggleDialog implements LayerChange
 
             imgDisplay.setOsdText(osd.toString());
         } else {
+            // if this method is called to reinitialize dialog content with a blank image,
+            // do not actually show the dialog again with a blank image if currently hidden (fix #10672)
+            setTitle(tr("Geotagged Images"));
             imgDisplay.setImage(null, null);
             imgDisplay.setOsdText("");
+            return;
         }
         if (! isDialogShowing()) {
             setIsDocked(false);     // always open a detached window when an image is clicked and dialog is closed
diff --git a/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java b/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java
index 91fea90..38ab447 100644
--- a/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java
+++ b/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java
@@ -294,6 +294,9 @@ public class Marker implements TemplateEngineDataProvider {
 
         this.offset = offset;
         this.time = time;
+        /* tell icon checking that we expect these names to exist */
+        // /* ICON(markers/) */"Bridge"
+        // /* ICON(markers/) */"Crossing"
         this.symbol = iconName != null ? ImageProvider.getIfAvailable("markers",iconName) : null;
         this.parentLayer = parentLayer;
 
diff --git a/src/org/openstreetmap/josm/gui/mappaint/MapPaintMenu.java b/src/org/openstreetmap/josm/gui/mappaint/MapPaintMenu.java
index 8e23a69..d316bc1 100644
--- a/src/org/openstreetmap/josm/gui/mappaint/MapPaintMenu.java
+++ b/src/org/openstreetmap/josm/gui/mappaint/MapPaintMenu.java
@@ -1,6 +1,7 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.gui.mappaint;
 
+import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
 import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.awt.event.ActionEvent;
@@ -37,6 +38,7 @@ public class MapPaintMenu extends JMenu implements MapPaintSylesUpdateListener {
             this.button = new StayOpenCheckBoxMenuItem(this);
             this.style = style;
             updateButton();
+            putValue("help", ht("/Dialog/MapPaint"));
         }
 
         private void updateButton() {
@@ -82,8 +84,9 @@ public class MapPaintMenu extends JMenu implements MapPaintSylesUpdateListener {
      */
     public MapPaintMenu() {
         super(tr("Map Paint Styles"));
-        setIcon(ImageProvider.get("dialogs", "mapstyle"));
+        setIcon(new ImageProvider("dialogs", "mapstyle").setSize(ImageProvider.ImageSizes.MENU).get());
         MapPaintStyles.addMapPaintSylesUpdateListener(this);
+        putClientProperty("help", ht("/Dialog/MapPaint"));
     }
 
     @Override
diff --git a/src/org/openstreetmap/josm/gui/mappaint/mapcss/ExpressionFactory.java b/src/org/openstreetmap/josm/gui/mappaint/mapcss/ExpressionFactory.java
index 25d873e..c473120 100644
--- a/src/org/openstreetmap/josm/gui/mappaint/mapcss/ExpressionFactory.java
+++ b/src/org/openstreetmap/josm/gui/mappaint/mapcss/ExpressionFactory.java
@@ -727,7 +727,7 @@ public final class ExpressionFactory {
         /**
          * Percent-encode a string. (See https://en.wikipedia.org/wiki/Percent-encoding)
          * This is especially useful for data urls, e.g.
-         * <code>icon-image: concat("data:image/svg+xml,", URL_encode("<svg>...</svg>"));</code>
+         * <code>concat("data:image/svg+xml,", URL_encode("<svg>...</svg>"));</code>
          * @param s arbitrary string
          * @return the encoded string
          */
diff --git a/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSParser.jj b/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSParser.jj
index 1f90bab..2ed49d9 100644
--- a/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSParser.jj
+++ b/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSParser.jj
@@ -132,7 +132,7 @@ TOKEN:
     < IDENT: ["a"-"z","A"-"Z","_"] ( ["a"-"z","A"-"Z","_","-","0"-"9"] )* >
 |   < UINT: ["1"-"9"] ( ["0"-"9"] )* >
 |   < STRING: "\"" ( [" ","!","#"-"[","]"-"~","\u0080"-"\uFFFF"] | "\\\"" | "\\\\" )*  "\"" >
-|   < #PREDEFINED: "\\" ["d","D","s","S","w","W"] >
+|   < #PREDEFINED: "\\" ["d","D","s","S","w","W","b","B","A","G","Z","z"] >
 |   < #REGEX_CHAR_WITHOUT_STAR: [" "-")","+"-".","0"-"[","]"-"~","\u0080"-"\uFFFF"] | "\\/" | "\\\\" | "\\[" | "\\]" | "\\+" | "\\." | "\\'" | "\\\"" |  "\\(" | "\\)" |<PREDEFINED> >
 |   < REGEX: "/" <REGEX_CHAR_WITHOUT_STAR> ( <REGEX_CHAR_WITHOUT_STAR> | "*" )*  "/" >
 |   < LBRACE: "{" >
diff --git a/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java b/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java
index 8896426..cee3f79 100644
--- a/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java
+++ b/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java
@@ -386,7 +386,7 @@ public class FullyAutomaticAuthorizationUI extends AbstractAuthorizationUI {
     class TestAccessTokenAction extends AbstractAction {
         public TestAccessTokenAction() {
             putValue(NAME, tr("Test Access Token"));
-            putValue(SMALL_ICON, ImageProvider.get("about"));
+            putValue(SMALL_ICON, ImageProvider.get("logo"));
         }
 
         @Override
diff --git a/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java b/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java
index 9dffc02..e968e18 100644
--- a/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java
+++ b/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java
@@ -123,7 +123,12 @@ public class ToolbarPreferences implements PreferenceSettingFactory {
         }
 
         public Icon getDisplayIcon() {
-            return ico != null ? ico : (Icon) action.getValue(Action.SMALL_ICON);
+            if(ico != null)
+                return ico;
+            Object o = action.getValue(Action.LARGE_ICON_KEY);
+            if(o == null)
+                o = action.getValue(Action.SMALL_ICON);
+            return (Icon) o;
         }
 
         public void setName(String name) {
@@ -569,7 +574,7 @@ public class ToolbarPreferences implements PreferenceSettingFactory {
         private String movingComponent;
 
         public Settings(DefaultMutableTreeNode rootActionsNode) {
-            super("toolbar", tr("Toolbar customization"), tr("Customize the elements on the toolbar."));
+            super(/* ICON(preferences/) */ "toolbar", tr("Toolbar customization"), tr("Customize the elements on the toolbar."));
             actionsTreeModel = new DefaultTreeModel(rootActionsNode);
             actionsTree = new JTree(actionsTreeModel);
         }
diff --git a/src/org/openstreetmap/josm/gui/preferences/advanced/AdvancedPreference.java b/src/org/openstreetmap/josm/gui/preferences/advanced/AdvancedPreference.java
index 6dea82a..bce8c75 100644
--- a/src/org/openstreetmap/josm/gui/preferences/advanced/AdvancedPreference.java
+++ b/src/org/openstreetmap/josm/gui/preferences/advanced/AdvancedPreference.java
@@ -65,7 +65,7 @@ public final class AdvancedPreference extends DefaultTabPreferenceSetting {
     }
 
     private AdvancedPreference() {
-        super("advanced", tr("Advanced Preferences"), tr("Setting Preference entries directly. Use with caution!"));
+        super(/* ICON(preferences/) */ "advanced", tr("Advanced Preferences"), tr("Setting Preference entries directly. Use with caution!"));
     }
 
     @Override
diff --git a/src/org/openstreetmap/josm/gui/preferences/audio/AudioPreference.java b/src/org/openstreetmap/josm/gui/preferences/audio/AudioPreference.java
index d700c43..254f115 100644
--- a/src/org/openstreetmap/josm/gui/preferences/audio/AudioPreference.java
+++ b/src/org/openstreetmap/josm/gui/preferences/audio/AudioPreference.java
@@ -34,7 +34,7 @@ public final class AudioPreference extends DefaultTabPreferenceSetting {
     }
 
     private AudioPreference() {
-        super("audio", tr("Audio Settings"), tr("Settings for the audio player and audio markers."));
+        super(/* ICON(preferences/) */ "audio", tr("Audio Settings"), tr("Settings for the audio player and audio markers."));
     }
 
     private JCheckBox audioMenuVisible = new JCheckBox(tr("Display the Audio menu."));
diff --git a/src/org/openstreetmap/josm/gui/preferences/display/DisplayPreference.java b/src/org/openstreetmap/josm/gui/preferences/display/DisplayPreference.java
index 3a1a46b..406e365 100644
--- a/src/org/openstreetmap/josm/gui/preferences/display/DisplayPreference.java
+++ b/src/org/openstreetmap/josm/gui/preferences/display/DisplayPreference.java
@@ -28,7 +28,7 @@ public final class DisplayPreference extends DefaultTabPreferenceSetting {
     }
 
     private DisplayPreference() {
-        super("display", tr("Display Settings"), tr("Various settings that influence the visual representation of the whole program."), false, new JTabbedPane());
+        super(/* ICON(preferences/) */ "display", tr("Display Settings"), tr("Various settings that influence the visual representation of the whole program."), false, new JTabbedPane());
     }
 
     @Override
diff --git a/src/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreference.java b/src/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreference.java
index 2324892..12848e7 100644
--- a/src/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreference.java
+++ b/src/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreference.java
@@ -82,7 +82,7 @@ public final class ImageryPreference extends DefaultTabPreferenceSetting {
     }
 
     private ImageryPreference() {
-        super("imagery", tr("Imagery Preferences"), tr("Modify list of imagery layers displayed in the Imagery menu"), false, new JTabbedPane());
+        super(/* ICON(preferences/) */ "imagery", tr("Imagery Preferences"), tr("Modify list of imagery layers displayed in the Imagery menu"), false, new JTabbedPane());
     }
 
     private ImageryProvidersPanel imageryProviders;
@@ -452,8 +452,12 @@ public final class ImageryPreference extends DefaultTabPreferenceSetting {
             public NewEntryAction(ImageryInfo.ImageryType type) {
                 putValue(NAME, type.toString());
                 putValue(SHORT_DESCRIPTION, tr("Add a new {0} entry by entering the URL", type.toString()));
-                putValue(SMALL_ICON, ImageProvider.get("dialogs",
-                            "add" + (ImageryInfo.ImageryType.WMS.equals(type) ? "_wms" : ImageryInfo.ImageryType.TMS.equals(type) ? "_tms" : "")));
+                String icon = /* ICON(dialogs/) */ "add";
+                if(ImageryInfo.ImageryType.WMS.equals(type))
+                    icon = /* ICON(dialogs/) */ "add_wms";
+                else if(ImageryInfo.ImageryType.TMS.equals(type))
+                    icon = /* ICON(dialogs/) */ "add_tms";
+                putValue(SMALL_ICON, ImageProvider.get("dialogs", icon));
                 this.type = type;
             }
 
@@ -587,6 +591,8 @@ public final class ImageryPreference extends DefaultTabPreferenceSetting {
             public void actionPerformed(ActionEvent evt) {
                 layerInfo.loadDefaults(true);
                 defaultModel.fireTableDataChanged();
+                /* loading new file may change active layers */
+                activeModel.fireTableDataChanged();
             }
         }
 
diff --git a/src/org/openstreetmap/josm/gui/preferences/map/MapPreference.java b/src/org/openstreetmap/josm/gui/preferences/map/MapPreference.java
index 45b6b19..a4849f3 100644
--- a/src/org/openstreetmap/josm/gui/preferences/map/MapPreference.java
+++ b/src/org/openstreetmap/josm/gui/preferences/map/MapPreference.java
@@ -27,7 +27,7 @@ public final class MapPreference extends DefaultTabPreferenceSetting {
     }
     
     private MapPreference() {
-        super("map", tr("Map Settings"), tr("Settings for the map projection and data interpretation."), false, new JTabbedPane());
+        super(/* ICON(preferences/) */ "map", tr("Map Settings"), tr("Settings for the map projection and data interpretation."), false, new JTabbedPane());
     }
     
     @Override
diff --git a/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreference.java b/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreference.java
index 2d84ea1..95454d5 100644
--- a/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreference.java
+++ b/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreference.java
@@ -75,7 +75,7 @@ public final class PluginPreference extends DefaultTabPreferenceSetting {
     }
 
     private PluginPreference() {
-        super("plugin", tr("Plugins"), tr("Configure available plugins."), false, new JTabbedPane());
+        super(/* ICON(preferences/) */ "plugin", tr("Plugins"), tr("Configure available plugins."), false, new JTabbedPane());
     }
 
     /**
diff --git a/src/org/openstreetmap/josm/gui/preferences/projection/CodeProjectionChoice.java b/src/org/openstreetmap/josm/gui/preferences/projection/CodeProjectionChoice.java
index 9e21f5c..9e92714 100644
--- a/src/org/openstreetmap/josm/gui/preferences/projection/CodeProjectionChoice.java
+++ b/src/org/openstreetmap/josm/gui/preferences/projection/CodeProjectionChoice.java
@@ -39,7 +39,7 @@ public class CodeProjectionChoice extends AbstractProjectionChoice implements Su
      * Constructs a new {@code CodeProjectionChoice}.
      */
     public CodeProjectionChoice() {
-        super(tr("By Code (EPSG)"), "core:code");
+        super(tr("By Code (EPSG)"), /* NO-ICON */ "core:code");
     }
 
     private static class CodeSelectionPanel extends JPanel implements ListSelectionListener, DocumentListener {
diff --git a/src/org/openstreetmap/josm/gui/preferences/projection/CustomProjectionChoice.java b/src/org/openstreetmap/josm/gui/preferences/projection/CustomProjectionChoice.java
index 3298146..b56a4b6 100644
--- a/src/org/openstreetmap/josm/gui/preferences/projection/CustomProjectionChoice.java
+++ b/src/org/openstreetmap/josm/gui/preferences/projection/CustomProjectionChoice.java
@@ -45,7 +45,7 @@ public class CustomProjectionChoice extends AbstractProjectionChoice implements
      * Constructs a new {@code CustomProjectionChoice}.
      */
     public CustomProjectionChoice() {
-        super(tr("Custom Projection"), "core:custom");
+        super(tr("Custom Projection"), /* NO-ICON */ "core:custom");
     }
 
     private static class PreferencePanel extends JPanel {
diff --git a/src/org/openstreetmap/josm/gui/preferences/projection/GaussKruegerProjectionChoice.java b/src/org/openstreetmap/josm/gui/preferences/projection/GaussKruegerProjectionChoice.java
index 330da5c..bf8af3e 100644
--- a/src/org/openstreetmap/josm/gui/preferences/projection/GaussKruegerProjectionChoice.java
+++ b/src/org/openstreetmap/josm/gui/preferences/projection/GaussKruegerProjectionChoice.java
@@ -16,7 +16,7 @@ public class GaussKruegerProjectionChoice extends ListProjectionChoice {
      * Constructs a new {@code GaussKruegerProjectionChoice}.
      */
     public GaussKruegerProjectionChoice() {
-        super(tr("Gau\u00DF-Kr\u00FCger"), "core:gauss-krueger", zones, tr("GK Zone"));
+        super(tr("Gau\u00DF-Kr\u00FCger"), /* NO-ICON */ "core:gauss-krueger", zones, tr("GK Zone"));
     }
 
     @Override
diff --git a/src/org/openstreetmap/josm/gui/preferences/projection/LambertCC9ZonesProjectionChoice.java b/src/org/openstreetmap/josm/gui/preferences/projection/LambertCC9ZonesProjectionChoice.java
index ec8e492..a62143c 100644
--- a/src/org/openstreetmap/josm/gui/preferences/projection/LambertCC9ZonesProjectionChoice.java
+++ b/src/org/openstreetmap/josm/gui/preferences/projection/LambertCC9ZonesProjectionChoice.java
@@ -32,7 +32,7 @@ public class LambertCC9ZonesProjectionChoice extends ListProjectionChoice {
      * Constructs a new {@code LambertCC9ZonesProjectionChoice}.
      */
     public LambertCC9ZonesProjectionChoice() {
-        super(tr("Lambert CC9 Zone (France)"), "core:lambertcc9", lambert9zones, tr("Lambert CC Zone"));
+        super(tr("Lambert CC9 Zone (France)"), /* NO-ICON */ "core:lambertcc9", lambert9zones, tr("Lambert CC Zone"));
     }
 
     private class LambertCC9CBPanel extends CBPanel {
diff --git a/src/org/openstreetmap/josm/gui/preferences/projection/LambertProjectionChoice.java b/src/org/openstreetmap/josm/gui/preferences/projection/LambertProjectionChoice.java
index 085e9f6..de07a3d 100644
--- a/src/org/openstreetmap/josm/gui/preferences/projection/LambertProjectionChoice.java
+++ b/src/org/openstreetmap/josm/gui/preferences/projection/LambertProjectionChoice.java
@@ -27,7 +27,7 @@ public class LambertProjectionChoice extends ListProjectionChoice {
      * Constructs a new {@code LambertProjectionChoice}.
      */
     public LambertProjectionChoice() {
-        super(tr("Lambert 4 Zones (France)"), "core:lambert", lambert4zones, tr("Lambert CC Zone"));
+        super(tr("Lambert 4 Zones (France)"), /* NO-ICON */ "core:lambert", lambert4zones, tr("Lambert CC Zone"));
     }
 
     private class LambertCBPanel extends CBPanel {
diff --git a/src/org/openstreetmap/josm/gui/preferences/projection/PuwgProjectionChoice.java b/src/org/openstreetmap/josm/gui/preferences/projection/PuwgProjectionChoice.java
index 59fc7d6..584334a 100644
--- a/src/org/openstreetmap/josm/gui/preferences/projection/PuwgProjectionChoice.java
+++ b/src/org/openstreetmap/josm/gui/preferences/projection/PuwgProjectionChoice.java
@@ -30,7 +30,7 @@ public class PuwgProjectionChoice extends ListProjectionChoice {
      * Constructs a new {@code PuwgProjectionChoice}.
      */
     public PuwgProjectionChoice() {
-        super(tr("PUWG (Poland)"), "core:puwg", NAMES, tr("PUWG Zone"));
+        super(tr("PUWG (Poland)"), /* NO-ICON */ "core:puwg", NAMES, tr("PUWG Zone"));
     }
 
     @Override
diff --git a/src/org/openstreetmap/josm/gui/preferences/projection/SwissGridProjectionChoice.java b/src/org/openstreetmap/josm/gui/preferences/projection/SwissGridProjectionChoice.java
index def4b7e..1355cc6 100644
--- a/src/org/openstreetmap/josm/gui/preferences/projection/SwissGridProjectionChoice.java
+++ b/src/org/openstreetmap/josm/gui/preferences/projection/SwissGridProjectionChoice.java
@@ -18,7 +18,7 @@ public class SwissGridProjectionChoice extends SingleProjectionChoice {
      * Constructs a new {@code SwissGridProjectionChoice}.
      */
     public SwissGridProjectionChoice() {
-        super(tr("Swiss Grid (Switzerland)"), "core:swissgrid", "EPSG:21781");
+        super(tr("Swiss Grid (Switzerland)"), /* NO-ICON */ "core:swissgrid", "EPSG:21781");
     }
 
     @Override
diff --git a/src/org/openstreetmap/josm/gui/preferences/projection/UTMFranceDOMProjectionChoice.java b/src/org/openstreetmap/josm/gui/preferences/projection/UTMFranceDOMProjectionChoice.java
index f21feba..9463602 100644
--- a/src/org/openstreetmap/josm/gui/preferences/projection/UTMFranceDOMProjectionChoice.java
+++ b/src/org/openstreetmap/josm/gui/preferences/projection/UTMFranceDOMProjectionChoice.java
@@ -28,7 +28,7 @@ public class UTMFranceDOMProjectionChoice extends ListProjectionChoice {
      * Constructs a new {@code UTMFranceDOMProjectionChoice}.
      */
     public UTMFranceDOMProjectionChoice() {
-        super(tr("UTM France (DOM)"), "core:utmfrancedom", utmGeodesicsNames, tr("UTM Geodesic system"));
+        super(tr("UTM France (DOM)"), /* NO-ICON */ "core:utmfrancedom", utmGeodesicsNames, tr("UTM Geodesic system"));
     }
 
     @Override
diff --git a/src/org/openstreetmap/josm/gui/preferences/projection/UTMProjectionChoice.java b/src/org/openstreetmap/josm/gui/preferences/projection/UTMProjectionChoice.java
index 4632f84..557368b 100644
--- a/src/org/openstreetmap/josm/gui/preferences/projection/UTMProjectionChoice.java
+++ b/src/org/openstreetmap/josm/gui/preferences/projection/UTMProjectionChoice.java
@@ -43,7 +43,7 @@ public class UTMProjectionChoice extends ListProjectionChoice {
      * Constructs a new {@code UTMProjectionChoice}.
      */
     public UTMProjectionChoice() {
-        super(tr("UTM"), "core:utm", cbEntries.toArray(new String[0]), tr("UTM Zone"));
+        super(tr("UTM"), /* NO-ICON */ "core:utm", cbEntries.toArray(new String[0]), tr("UTM Zone"));
     }
 
     private class UTMPanel extends CBPanel {
diff --git a/src/org/openstreetmap/josm/gui/preferences/remotecontrol/RemoteControlPreference.java b/src/org/openstreetmap/josm/gui/preferences/remotecontrol/RemoteControlPreference.java
index 9fd85e4..2001dd4 100644
--- a/src/org/openstreetmap/josm/gui/preferences/remotecontrol/RemoteControlPreference.java
+++ b/src/org/openstreetmap/josm/gui/preferences/remotecontrol/RemoteControlPreference.java
@@ -59,7 +59,7 @@ public final class RemoteControlPreference extends DefaultTabPreferenceSetting {
     }
 
     private RemoteControlPreference() {
-        super("remotecontrol", tr("Remote Control"), tr("Settings for the remote control feature."));
+        super(/* ICON(preferences/) */ "remotecontrol", tr("Remote Control"), tr("Settings for the remote control feature."));
         for (PermissionPrefWithDefault p : PermissionPrefWithDefault.getPermissionPrefs()) {
             JCheckBox cb = new JCheckBox(p.preferenceText);
             cb.setSelected(p.isAllowed());
diff --git a/src/org/openstreetmap/josm/gui/preferences/server/ServerAccessPreference.java b/src/org/openstreetmap/josm/gui/preferences/server/ServerAccessPreference.java
index e1f3fce..61c464c 100644
--- a/src/org/openstreetmap/josm/gui/preferences/server/ServerAccessPreference.java
+++ b/src/org/openstreetmap/josm/gui/preferences/server/ServerAccessPreference.java
@@ -34,7 +34,7 @@ public final class ServerAccessPreference extends DefaultTabPreferenceSetting {
     }
 
     private ServerAccessPreference() {
-        super("connection", tr("Connection Settings"), tr("Connection Settings for the OSM server."), false, new JTabbedPane());
+        super(/* ICON(preferences/) */ "connection", tr("Connection Settings"), tr("Connection Settings for the OSM server."), false, new JTabbedPane());
     }
 
     /** indicates whether to use the default OSM URL or not */
diff --git a/src/org/openstreetmap/josm/gui/preferences/shortcut/ShortcutPreference.java b/src/org/openstreetmap/josm/gui/preferences/shortcut/ShortcutPreference.java
index c9c3b50..49a6437 100644
--- a/src/org/openstreetmap/josm/gui/preferences/shortcut/ShortcutPreference.java
+++ b/src/org/openstreetmap/josm/gui/preferences/shortcut/ShortcutPreference.java
@@ -30,7 +30,7 @@ public final class ShortcutPreference extends DefaultTabPreferenceSetting {
     }
 
     private ShortcutPreference() {
-        super("shortcuts", tr("Keyboard Shortcuts"), tr("Changing keyboard shortcuts manually."));
+        super(/* ICON(preferences/) */ "shortcuts", tr("Keyboard Shortcuts"), tr("Changing keyboard shortcuts manually."));
     }
 
     @Override
diff --git a/src/org/openstreetmap/josm/gui/preferences/validator/ValidatorPreference.java b/src/org/openstreetmap/josm/gui/preferences/validator/ValidatorPreference.java
index 6b15d40..c8dbd5c 100644
--- a/src/org/openstreetmap/josm/gui/preferences/validator/ValidatorPreference.java
+++ b/src/org/openstreetmap/josm/gui/preferences/validator/ValidatorPreference.java
@@ -30,7 +30,7 @@ public final class ValidatorPreference extends DefaultTabPreferenceSetting {
     }
 
     private ValidatorPreference() {
-        super("validator", tr("Data validator"),
+        super(/* ICON(preferences/) */ "validator", tr("Data validator"),
                 tr("An OSM data validator that checks for common errors made by users and editor programs."),
                 false, new JTabbedPane());
     }
diff --git a/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java b/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java
index 997bf34..854b9db 100644
--- a/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java
+++ b/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java
@@ -10,6 +10,7 @@ import java.awt.Dimension;
 import java.awt.GridBagLayout;
 import java.awt.Insets;
 import java.awt.event.ActionEvent;
+import java.io.File;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -50,6 +51,7 @@ import org.openstreetmap.josm.gui.tagging.TaggingPresetItems.Roles;
 import org.openstreetmap.josm.gui.util.GuiHelper;
 import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.tools.ImageResource;
 import org.openstreetmap.josm.tools.Predicate;
 import org.openstreetmap.josm.tools.Utils;
 import org.openstreetmap.josm.tools.template_engine.ParseError;
@@ -142,26 +144,23 @@ public class TaggingPreset extends AbstractAction implements MapView.LayerChange
     /**
      * Called from the XML parser to set the icon.
      * This task is performed in the background in order to speedup startup.
-     *
-     * FIXME for Java 1.6 - use 24x24 icons for LARGE_ICON_KEY (button bar)
-     * and the 16x16 icons for SMALL_ICON.
      */
     public void setIcon(final String iconName) {
-        ImageProvider imgProv = new ImageProvider(iconName);
+        File arch = TaggingPresetReader.getZipIcons();
         final Collection<String> s = Main.pref.getCollection("taggingpreset.icon.sources", null);
+        ImageProvider imgProv = new ImageProvider(iconName);
         imgProv.setDirs(s);
         imgProv.setId("presets");
-        imgProv.setArchive(TaggingPresetReader.getZipIcons());
+        imgProv.setArchive(arch);
         imgProv.setOptional(true);
-        imgProv.setMaxWidth(16).setMaxHeight(16);
-        imgProv.getInBackground(new ImageProvider.ImageCallback() {
+        imgProv.getInBackground(new ImageProvider.ImageResourceCallback() {
             @Override
-            public void finished(final ImageIcon result) {
+            public void finished(final ImageResource result) {
                 if (result != null) {
                     GuiHelper.runInEDT(new Runnable() {
                         @Override
                         public void run() {
-                            putValue(Action.SMALL_ICON, result);
+                            result.getImageIcon(TaggingPreset.this);
                         }
                     });
                 } else {
diff --git a/src/org/openstreetmap/josm/gui/tagging/TaggingPresetItems.java b/src/org/openstreetmap/josm/gui/tagging/TaggingPresetItems.java
index 309c03e..4ec8674 100644
--- a/src/org/openstreetmap/josm/gui/tagging/TaggingPresetItems.java
+++ b/src/org/openstreetmap/josm/gui/tagging/TaggingPresetItems.java
@@ -53,6 +53,7 @@ import org.openstreetmap.josm.data.preferences.BooleanProperty;
 import org.openstreetmap.josm.gui.tagging.ac.AutoCompletingTextField;
 import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionItemPriority;
 import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionList;
+import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionManager;
 import org.openstreetmap.josm.gui.widgets.JosmComboBox;
 import org.openstreetmap.josm.gui.widgets.JosmTextField;
 import org.openstreetmap.josm.gui.widgets.QuadStateCheckBox;
@@ -113,7 +114,7 @@ public final class TaggingPresetItems {
                 return " ";
 
             final StringBuilder res = new StringBuilder("<b>");
-            res.append(getDisplayValue(true));
+            res.append(getDisplayValue(true).replaceAll("<", "<").replaceAll(">", ">"));
             res.append("</b>");
             if (getShortDescription(true) != null) {
                 // wrap in table to restrict the text width
@@ -766,6 +767,7 @@ public final class TaggingPresetItems {
                 return;
 
             changedTags.add(new Tag(key, v));
+            AutoCompletionManager.rememberUserInput(key, v, true);
         }
 
         @Override
diff --git a/src/org/openstreetmap/josm/gui/tagging/TaggingPresetType.java b/src/org/openstreetmap/josm/gui/tagging/TaggingPresetType.java
index 54b3df1..8c41c40 100644
--- a/src/org/openstreetmap/josm/gui/tagging/TaggingPresetType.java
+++ b/src/org/openstreetmap/josm/gui/tagging/TaggingPresetType.java
@@ -9,7 +9,10 @@ import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
  * @since 6068
  */
 public enum TaggingPresetType {
-    NODE("Mf_node", "node"), WAY("Mf_way", "way"), RELATION("Mf_relation", "relation"), CLOSEDWAY("Mf_closedway", "closedway");
+    NODE(/* ICON */ "Mf_node", "node"),
+    WAY(/* ICON */ "Mf_way", "way"),
+    RELATION(/* ICON */ "Mf_relation", "relation"),
+    CLOSEDWAY(/* ICON */ "Mf_closedway", "closedway");
     private final String iconName;
     private final String name;
 
diff --git a/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionItemPriority.java b/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionItemPriority.java
index bca4596..f70ec50 100644
--- a/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionItemPriority.java
+++ b/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionItemPriority.java
@@ -36,14 +36,33 @@ public class AutoCompletionItemPriority implements Comparable<AutoCompletionItem
     /** Unknown priority. This is the lowest priority. */
     public static final AutoCompletionItemPriority UNKNOWN = new AutoCompletionItemPriority(false, false, false);
 
+    private final static int NO_USER_INPUT = Integer.MAX_VALUE;
+
+    private final int userInput;
     private final boolean inDataSet;
     private final boolean inStandard;
     private final boolean selected;
+    
 
-    public AutoCompletionItemPriority(boolean inDataSet, boolean inStandard, boolean selected) {
+    /**
+     * Create new AutoCompletionItemPriority object.
+     * 
+     * @param inDataSet true, if the item is found in the currently active data layer
+     * @param inStandard true, if the item is a standard tag, e.g. from the presets.
+     * @param selected true, if it is found on an object that is currently selected
+     * @param userInput null, if the user hasn't entered this tag so far. A number when
+     * the tag key / value has been entered by the user before. A lower number means
+     * this happened more recently and beats a higher number in priority.
+     */
+    public AutoCompletionItemPriority(boolean inDataSet, boolean inStandard, boolean selected, Integer userInput) {
         this.inDataSet = inDataSet;
         this.inStandard = inStandard;
         this.selected = selected;
+        this.userInput = userInput == null ? NO_USER_INPUT : userInput;
+    }
+
+    public AutoCompletionItemPriority(boolean inDataSet, boolean inStandard, boolean selected) {
+        this(inDataSet, inStandard, selected, NO_USER_INPUT);
     }
 
     public boolean isInDataSet() {
@@ -58,12 +77,19 @@ public class AutoCompletionItemPriority implements Comparable<AutoCompletionItem
         return selected;
     }
 
+    public Integer getUserInput() {
+        return userInput == NO_USER_INPUT ? null : userInput;
+    }
+    
     /**
      * Imposes an ordering on the priorities.
      * Currently, being in the current DataSet is worth more than being in the Presets.
      */
     @Override
     public int compareTo(AutoCompletionItemPriority other) {
+        int ui = -Integer.compare(userInput, other.userInput);
+        if (ui != 0) return ui;
+
         int sel = Boolean.valueOf(selected).compareTo(other.selected);
         if (sel != 0) return sel;
 
@@ -84,10 +110,12 @@ public class AutoCompletionItemPriority implements Comparable<AutoCompletionItem
         return new AutoCompletionItemPriority(
                 inDataSet || other.inDataSet,
                 inStandard || other.inStandard,
-                selected || other.selected);
+                selected || other.selected,
+                Math.min(userInput, other.userInput));
     }
 
     @Override public String toString() {
-        return String.format("<Priority; inDataSet: %b, inStandard: %b, selected: %b>", inDataSet, inStandard, selected);
+        return String.format("<Priority; userInput: %s, inDataSet: %b, inStandard: %b, selected: %b>", 
+                userInput == NO_USER_INPUT ? "no" : Integer.toString(userInput), inDataSet, inStandard, selected);
     }
 }
diff --git a/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionList.java b/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionList.java
index 713bfdf..3eb2cfd 100644
--- a/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionList.java
+++ b/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionList.java
@@ -147,6 +147,21 @@ public class AutoCompletionList extends AbstractTableModel {
         sort();
         filter();
     }
+    
+    public void addUserInput(Collection<String> values) {
+        if (values == null) return;
+        int i = 0;
+        for (String value: values) {
+            if (value == null) {
+                continue;
+            }
+            AutoCompletionListItem item = new AutoCompletionListItem(value, new AutoCompletionItemPriority(false, false, false, i));
+            appendOrUpdatePriority(item);
+            i++;
+        }
+        sort();
+        filter();
+    }
 
     protected void appendOrUpdatePriority(AutoCompletionListItem toAdd) {
         AutoCompletionListItem item = valutToItemMap.get(toAdd.getValue());
diff --git a/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionManager.java b/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionManager.java
index 2b0f0fe..c899961 100644
--- a/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionManager.java
+++ b/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionManager.java
@@ -6,9 +6,11 @@ import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashSet;
+import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.Objects;
 import java.util.Set;
 
 import org.openstreetmap.josm.Main;
@@ -53,6 +55,50 @@ import org.openstreetmap.josm.tools.Utils;
  */
 public class AutoCompletionManager implements DataSetListener {
 
+    /**
+     * Data class to remember tags that the user has entered.
+     */
+    public static class UserInputTag {
+        private final String key;
+        private final String value;
+        private final boolean defaultKey;
+
+        /**
+         * Constructor.
+         *
+         * @param key the tag key
+         * @param value the tag value
+         * @param defaultKey true, if the key was not really entered by the
+         * user, e.g. for preset text fields.
+         * In this case, the key will not get any higher priority, just the value.
+         */
+        public UserInputTag(String key, String value, boolean defaultKey) {
+            this.key = key;
+            this.value = value;
+            this.defaultKey = defaultKey;
+        }
+
+        @Override
+        public int hashCode() {
+            int hash = 7;
+            hash = 59 * hash + Objects.hashCode(this.key);
+            hash = 59 * hash + Objects.hashCode(this.value);
+            hash = 59 * hash + (this.defaultKey ? 1 : 0);
+            return hash;
+        }
+
+        @Override
+        public boolean equals(Object obj) {
+            if (obj == null || getClass() != obj.getClass()) {
+                return false;
+            }
+            final UserInputTag other = (UserInputTag) obj;
+            return Objects.equals(this.key, other.key)
+                && Objects.equals(this.value, other.value)
+                && this.defaultKey == other.defaultKey;
+        }
+    }
+
     /** If the dirty flag is set true, a rebuild is necessary. */
     protected boolean dirty;
     /** The data set that is managed */
@@ -64,26 +110,36 @@ public class AutoCompletionManager implements DataSetListener {
      * use getTagCache() accessor
      */
     protected MultiMap<String, String> tagCache;
+
+    /**
+     * the same as tagCache but for the preset keys and values can be accessed directly
+     */
+    protected static final MultiMap<String, String> PRESET_TAG_CACHE = new MultiMap<>();
+
     /**
-     * the same as tagCache but for the preset keys and values
-     * can be accessed directly
+     * Cache for tags that have been entered by the user.
      */
-    protected static final MultiMap<String, String> presetTagCache = new MultiMap<>();
+    protected static final Set<UserInputTag> USER_INPUT_TAG_CACHE = new LinkedHashSet<>();
+
     /**
      * the cached list of member roles
      * only accessed by getRoleCache(), rebuild() and cacheRelationMemberRoles()
      * use getRoleCache() accessor
      */
     protected Set<String> roleCache;
+
     /**
-     * the same as roleCache but for the preset roles
-     * can be accessed directly
+     * the same as roleCache but for the preset roles can be accessed directly
      */
-    protected static final Set<String> presetRoleCache = new HashSet<>();
+    protected static final Set<String> PRESET_ROLE_CACHE = new HashSet<>();
 
+    /**
+     * Constructs a new {@code AutoCompletionManager}.
+     * @param ds data set
+     */
     public AutoCompletionManager(DataSet ds) {
         this.ds = ds;
-        dirty = true;
+        this.dirty = true;
     }
 
     protected MultiMap<String, String> getTagCache() {
@@ -104,7 +160,6 @@ public class AutoCompletionManager implements DataSetListener {
 
     /**
      * initializes the cache from the primitives in the dataset
-     *
      */
     protected void rebuild() {
         tagCache = new MultiMap<>();
@@ -149,6 +204,7 @@ public class AutoCompletionManager implements DataSetListener {
 
     /**
      * Initialize the cache for presets. This is done only once.
+     * @param presets Tagging presets to cache
      */
     public static void cachePresets(Collection<TaggingPreset> presets) {
         for (final TaggingPreset p : presets) {
@@ -157,7 +213,7 @@ public class AutoCompletionManager implements DataSetListener {
                     TaggingPresetItems.KeyedItem ki = (TaggingPresetItems.KeyedItem) item;
                     if (ki.key != null && ki.getValues() != null) {
                         try {
-                            presetTagCache.putAll(ki.key, ki.getValues());
+                            PRESET_TAG_CACHE.putAll(ki.key, ki.getValues());
                         } catch (NullPointerException e) {
                             Main.error(p+": Unable to cache "+ki);
                         }
@@ -166,7 +222,7 @@ public class AutoCompletionManager implements DataSetListener {
                     TaggingPresetItems.Roles r = (TaggingPresetItems.Roles) item;
                     for (TaggingPresetItems.Role i : r.roles) {
                         if (i.key != null) {
-                            presetRoleCache.add(i.key);
+                            PRESET_ROLE_CACHE.add(i.key);
                         }
                     }
                 }
@@ -175,6 +231,18 @@ public class AutoCompletionManager implements DataSetListener {
     }
 
     /**
+     * Remembers user input for the given key/value.
+     * @param key Tag key
+     * @param value Tag value
+     * @param defaultKey true, if the key was not really entered by the user, e.g. for preset text fields
+     */
+    public static void rememberUserInput(String key, String value, boolean defaultKey) {
+        UserInputTag tag = new UserInputTag(key, value, defaultKey);
+        USER_INPUT_TAG_CACHE.remove(tag); // re-add, so it gets to the last position of the LinkedHashSet
+        USER_INPUT_TAG_CACHE.add(tag);
+    }
+
+    /**
      * replies the keys held by the cache
      *
      * @return the list of keys held by the cache
@@ -184,7 +252,18 @@ public class AutoCompletionManager implements DataSetListener {
     }
 
     protected List<String> getPresetKeys() {
-        return new ArrayList<>(presetTagCache.keySet());
+        return new ArrayList<>(PRESET_TAG_CACHE.keySet());
+    }
+
+    protected Collection<String> getUserInputKeys() {
+        List<String> keys = new ArrayList<>();
+        for (UserInputTag tag : USER_INPUT_TAG_CACHE) {
+            if (!tag.defaultKey) {
+                keys.add(tag.key);
+            }
+        }
+        Collections.reverse(keys);
+        return new LinkedHashSet<>(keys);
     }
 
     /**
@@ -199,7 +278,18 @@ public class AutoCompletionManager implements DataSetListener {
     }
 
     protected static List<String> getPresetValues(String key) {
-        return new ArrayList<>(presetTagCache.getValues(key));
+        return new ArrayList<>(PRESET_TAG_CACHE.getValues(key));
+    }
+
+    protected static Collection<String> getUserInputValues(String key) {
+        List<String> values = new ArrayList<>();
+        for (UserInputTag tag : USER_INPUT_TAG_CACHE) {
+            if (key.equals(tag.key)) {
+                values.add(tag.value);
+            }
+        }
+        Collections.reverse(values);
+        return new LinkedHashSet<>(values);
     }
 
     /**
@@ -218,7 +308,7 @@ public class AutoCompletionManager implements DataSetListener {
      * @param list the list to populate
      */
     public void populateWithMemberRoles(AutoCompletionList list) {
-        list.add(presetRoleCache, AutoCompletionItemPriority.IS_IN_STANDARD);
+        list.add(PRESET_ROLE_CACHE, AutoCompletionItemPriority.IS_IN_STANDARD);
         list.add(getRoleCache(), AutoCompletionItemPriority.IS_IN_DATASET);
     }
 
@@ -260,6 +350,7 @@ public class AutoCompletionManager implements DataSetListener {
         list.add(getPresetKeys(), AutoCompletionItemPriority.IS_IN_STANDARD);
         list.add(new AutoCompletionListItem("source", AutoCompletionItemPriority.IS_IN_STANDARD));
         list.add(getDataKeys(), AutoCompletionItemPriority.IS_IN_DATASET);
+        list.addUserInput(getUserInputKeys());
     }
 
     /**
@@ -284,6 +375,7 @@ public class AutoCompletionManager implements DataSetListener {
         for (String key : keys) {
             list.add(getPresetValues(key), AutoCompletionItemPriority.IS_IN_STANDARD);
             list.add(getDataValues(key), AutoCompletionItemPriority.IS_IN_DATASET);
+            list.addUserInput(getUserInputValues(key));
         }
     }
 
diff --git a/src/org/openstreetmap/josm/io/DiffResultProcessor.java b/src/org/openstreetmap/josm/io/DiffResultProcessor.java
index a533d1a..8960851 100644
--- a/src/org/openstreetmap/josm/io/DiffResultProcessor.java
+++ b/src/org/openstreetmap/josm/io/DiffResultProcessor.java
@@ -16,7 +16,8 @@ import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.parsers.SAXParserFactory;
 
 import org.openstreetmap.josm.data.osm.Changeset;
-import org.openstreetmap.josm.data.osm.IPrimitive;
+import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
 import org.openstreetmap.josm.data.osm.PrimitiveId;
 import org.openstreetmap.josm.data.osm.SimplePrimitiveId;
@@ -43,14 +44,13 @@ public class DiffResultProcessor  {
      */
     private Map<PrimitiveId, DiffResultEntry> diffResults = new HashMap<>();
     /**
-     * the set of processed primitives *after* the new id, the new version and the new changeset id
-     * is set
+     * the set of processed primitives *after* the new id, the new version and the new changeset id is set
      */
-    private Set<IPrimitive> processed;
+    private Set<OsmPrimitive> processed;
     /**
      * the collection of primitives being uploaded
      */
-    private Collection<? extends IPrimitive> primitives;
+    private Collection<? extends OsmPrimitive> primitives;
 
     /**
      * Creates a diff result reader
@@ -58,7 +58,7 @@ public class DiffResultProcessor  {
      * @param primitives the collection of primitives which have been uploaded. If null,
      * assumes an empty collection.
      */
-    public DiffResultProcessor(Collection<? extends IPrimitive> primitives) {
+    public DiffResultProcessor(Collection<? extends OsmPrimitive> primitives) {
         if (primitives == null) {
             primitives = Collections.emptyList();
         }
@@ -104,15 +104,22 @@ public class DiffResultProcessor  {
      * @param monitor the progress monitor. Set to {@link NullProgressMonitor#INSTANCE} if null
      * @return the collection of processed primitives
      */
-    protected Set<IPrimitive> postProcess(Changeset cs, ProgressMonitor monitor) {
+    protected Set<OsmPrimitive> postProcess(Changeset cs, ProgressMonitor monitor) {
         if (monitor == null) {
             monitor = NullProgressMonitor.INSTANCE;
         }
+        DataSet ds = null;
+        if (!primitives.isEmpty()) {
+            ds = primitives.iterator().next().getDataSet();
+        }
+        if (ds != null) {
+            ds.beginUpdate();
+        }
         try {
             monitor.beginTask("Postprocessing uploaded data ...");
             monitor.setTicksCount(primitives.size());
             monitor.setTicks(0);
-            for (IPrimitive p : primitives) {
+            for (OsmPrimitive p : primitives) {
                 monitor.worked(1);
                 DiffResultEntry entry = diffResults.get(p.getPrimitiveId());
                 if (entry == null) {
@@ -131,6 +138,9 @@ public class DiffResultProcessor  {
             }
             return processed;
         } finally {
+            if (ds != null) {
+                ds.endUpdate();
+            }
             monitor.finishTask();
         }
     }
diff --git a/src/org/openstreetmap/josm/io/MessageNotifier.java b/src/org/openstreetmap/josm/io/MessageNotifier.java
index db4af0a..f934761 100644
--- a/src/org/openstreetmap/josm/io/MessageNotifier.java
+++ b/src/org/openstreetmap/josm/io/MessageNotifier.java
@@ -66,7 +66,7 @@ public final class MessageNotifier {
                         public void run() {
                             JPanel panel = new JPanel(new GridBagLayout());
                             panel.add(new JLabel(trn("You have {0} unread message.", "You have {0} unread messages.", unread, unread)), GBC.eol());
-                            panel.add(new UrlLabel(Main.getOSMWebsite() + "/user/"+userInfo.getDisplayName()+"/inbox", tr("Click here to see your inbox.")), GBC.eol());
+                            panel.add(new UrlLabel(Main.getBaseUserUrl() + "/"+userInfo.getDisplayName()+"/inbox", tr("Click here to see your inbox.")), GBC.eol());
                             panel.setOpaque(false);
                             new Notification().setContent(panel)
                                 .setIcon(JOptionPane.INFORMATION_MESSAGE)
diff --git a/src/org/openstreetmap/josm/io/NoteExporter.java b/src/org/openstreetmap/josm/io/NoteExporter.java
new file mode 100644
index 0000000..f8212ea
--- /dev/null
+++ b/src/org/openstreetmap/josm/io/NoteExporter.java
@@ -0,0 +1,48 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.io;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.actions.ExtensionFileFilter;
+import org.openstreetmap.josm.gui.layer.Layer;
+import org.openstreetmap.josm.gui.layer.NoteLayer;
+
+/**
+ * Exporter to write note data to an XML file
+ */
+public class NoteExporter extends FileExporter {
+
+    /** File extension filter for .osn files */
+    public static final ExtensionFileFilter FILE_FILTER = new ExtensionFileFilter(
+            "osn", "osn", tr("Note Files") + " (*.osn)");
+
+    /** Create a new note exporter with the default .osn file filter */
+    public NoteExporter() {
+        super(FILE_FILTER);
+    }
+
+    @Override
+    public boolean acceptFile(File pathname, Layer layer) {
+        if (!(layer instanceof NoteLayer))
+            return false;
+        return super.acceptFile(pathname, layer);
+    }
+
+    @Override
+    public void exportData(File file, Layer layer) throws IOException {
+        Main.info("exporting notes to file: " + file);
+        if (layer instanceof NoteLayer) {
+            OutputStream os = new FileOutputStream(file);
+            NoteWriter writer = new NoteWriter(os);
+            writer.write(((NoteLayer) layer).getNoteData());
+            os.flush();
+            writer.close();
+        }
+    }
+}
diff --git a/src/org/openstreetmap/josm/io/NoteReader.java b/src/org/openstreetmap/josm/io/NoteReader.java
index 3872607..9839c94 100644
--- a/src/org/openstreetmap/josm/io/NoteReader.java
+++ b/src/org/openstreetmap/josm/io/NoteReader.java
@@ -1,8 +1,10 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.io;
 
+import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
@@ -134,6 +136,9 @@ public class NoteReader {
             }
             if("comment".equals(qName)) {
                 User commentUser = User.createOsmUser(commentUid, commentUsername);
+                if (commentUid == 0) {
+                    commentUser = User.getAnonymous();
+                }
                 if(parseMode == NoteParseMode.API) {
                     commentIsNew = false;
                 }
@@ -162,6 +167,9 @@ public class NoteReader {
             case "date_created":
                 thisNote.setCreatedAt(parseDate(NOTE_DATE_FORMAT, buffer.toString()));
                 break;
+            case "date_closed":
+                thisNote.setClosedAt(parseDate(NOTE_DATE_FORMAT, buffer.toString()));
+                break;
             case "date":
                 commentCreateDate = parseDate(NOTE_DATE_FORMAT, buffer.toString());
                 break;
@@ -217,6 +225,15 @@ public class NoteReader {
     }
 
     /**
+     * Initializes the reader with a string as a source
+     * @param source UTF-8 string containing Notes XML to parse
+     * @throws IOException
+     */
+    public NoteReader(String source) throws IOException {
+        this.inputSource = new InputSource(new ByteArrayInputStream(source.getBytes(StandardCharsets.UTF_8)));
+    }
+
+    /**
      * Parses the InputStream given to the constructor and returns
      * the resulting Note objects
      * @return List of Notes parsed from the input data
diff --git a/src/org/openstreetmap/josm/io/NoteWriter.java b/src/org/openstreetmap/josm/io/NoteWriter.java
new file mode 100644
index 0000000..f186760
--- /dev/null
+++ b/src/org/openstreetmap/josm/io/NoteWriter.java
@@ -0,0 +1,84 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.io;
+
+import java.io.BufferedWriter;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.io.PrintWriter;
+import java.nio.charset.StandardCharsets;
+import java.text.SimpleDateFormat;
+import java.util.Locale;
+
+import org.openstreetmap.josm.data.notes.Note;
+import org.openstreetmap.josm.data.notes.NoteComment;
+import org.openstreetmap.josm.data.osm.NoteData;
+import org.openstreetmap.josm.data.osm.User;
+
+/**
+ * Class to write a collection of notes out to XML.
+ * The format is that of the note dump file with the addition of one
+ * attribute in the comment element to indicate if the comment is a new local
+ * comment that has not been uploaded to the OSM server yet.
+ */
+public class NoteWriter extends XmlWriter {
+
+    private final SimpleDateFormat ISO8601_FORMAT = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssX", Locale.ENGLISH);
+
+    /**
+     * Create a NoteWriter that will write to the given PrintWriter
+     * @param out PrintWriter to write XML to
+     */
+    public NoteWriter(PrintWriter out) {
+        super(out);
+    }
+
+    /**
+     * Create a NoteWriter that will write to a given OutputStream.
+     * @param out OutputStream to write XML to
+     */
+    public NoteWriter(OutputStream out) {
+        super(new PrintWriter(new BufferedWriter(new OutputStreamWriter(out, StandardCharsets.UTF_8))));
+    }
+
+    /**
+     * Write notes to designated output target
+     * @param data Note collection to write
+     */
+    public void write(NoteData data) {
+        out.println("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
+        out.println("<osm-notes>");
+        for (Note note : data.getNotes()) {
+            out.print("  <note ");
+            out.print("id=\"" + note.getId() + "\" ");
+            out.print("lat=\"" + note.getLatLon().lat() + "\" ");
+            out.print("lon=\"" + note.getLatLon().lon() + "\" ");
+            out.print("created_at=\"" + ISO8601_FORMAT.format(note.getCreatedAt()) + "\" ");
+            if (note.getClosedAt() != null) {
+                out.print("closed_at=\"" + ISO8601_FORMAT.format(note.getClosedAt()) + "\" ");
+            }
+
+            out.println(">");
+            for (NoteComment comment : note.getComments()) {
+                writeComment(comment);
+            }
+            out.println("  </note>");
+        }
+
+        out.println("</osm-notes>");
+        out.flush();
+    }
+
+    private void writeComment(NoteComment comment) {
+        out.print("    <comment");
+        out.print(" action=\"" + comment.getNoteAction() + "\" ");
+        out.print("timestamp=\"" + ISO8601_FORMAT.format(comment.getCommentTimestamp()) + "\" ");
+        if (comment.getUser() != null && !comment.getUser().equals(User.getAnonymous())) {
+            out.print("uid=\"" + comment.getUser().getId() + "\" ");
+            out.print("user=\"" + encode(comment.getUser().getName()) + "\" ");
+        }
+        out.print("is_new=\"" + comment.getIsNew() + "\" ");
+        out.print(">");
+        out.print(encode(comment.getText(), false));
+        out.println("</comment>");
+    }
+}
diff --git a/src/org/openstreetmap/josm/io/OsmApi.java b/src/org/openstreetmap/josm/io/OsmApi.java
index 5395a1c..b937b81 100644
--- a/src/org/openstreetmap/josm/io/OsmApi.java
+++ b/src/org/openstreetmap/josm/io/OsmApi.java
@@ -14,22 +14,28 @@ import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
 import java.io.StringReader;
 import java.io.StringWriter;
+import java.io.UnsupportedEncodingException;
 import java.net.ConnectException;
 import java.net.HttpURLConnection;
 import java.net.MalformedURLException;
 import java.net.SocketTimeoutException;
 import java.net.URL;
+import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 import javax.xml.parsers.ParserConfigurationException;
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.data.notes.Note;
 import org.openstreetmap.josm.data.osm.Changeset;
 import org.openstreetmap.josm.data.osm.IPrimitive;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
 import org.openstreetmap.josm.gui.layer.ImageryLayer;
 import org.openstreetmap.josm.gui.layer.Layer;
@@ -325,7 +331,10 @@ public class OsmApi extends OsmConnection {
         rv.append("/");
         // this works around a ruby (or lighttpd) bug where two consecutive slashes in
         // an URL will cause a "404 not found" response.
-        int p; while ((p = rv.indexOf("//", rv.indexOf("://")+2)) > -1) { rv.delete(p, p + 1); }
+        int p;
+        while ((p = rv.indexOf("//", rv.indexOf("://")+2)) > -1) {
+            rv.delete(p, p + 1);
+        }
         return rv.toString();
     }
 
@@ -376,7 +385,8 @@ public class OsmApi extends OsmConnection {
             osm.setChangesetId(getChangeset().getId());
             osm.setVisible(true);
         } catch(NumberFormatException e) {
-            throw new OsmTransferException(tr("Unexpected format of new version of modified primitive ''{0}''. Got ''{1}''.", osm.getId(), ret));
+            throw new OsmTransferException(tr("Unexpected format of new version of modified primitive ''{0}''. Got ''{1}''.",
+                    osm.getId(), ret));
         }
     }
 
@@ -386,7 +396,7 @@ public class OsmApi extends OsmConnection {
      * @param monitor the progress monitor
      * @throws OsmTransferException if something goes wrong
      */
-    public void deletePrimitive(IPrimitive osm, ProgressMonitor monitor) throws OsmTransferException {
+    public void deletePrimitive(OsmPrimitive osm, ProgressMonitor monitor) throws OsmTransferException {
         ensureValidChangeset();
         initialize(monitor);
         // can't use a the individual DELETE method in the 0.6 API. Java doesn't allow
@@ -460,8 +470,9 @@ public class OsmApi extends OsmConnection {
             e.setSource(ChangesetClosedException.Source.UPDATE_CHANGESET);
             throw e;
         } catch(OsmApiException e) {
-            if (e.getResponseCode() == HttpURLConnection.HTTP_CONFLICT && ChangesetClosedException.errorHeaderMatchesPattern(e.getErrorHeader()))
-                throw new ChangesetClosedException(e.getErrorHeader(), ChangesetClosedException.Source.UPDATE_CHANGESET);
+            String errorHeader = e.getErrorHeader();
+            if (e.getResponseCode() == HttpURLConnection.HTTP_CONFLICT && ChangesetClosedException.errorHeaderMatchesPattern(errorHeader))
+                throw new ChangesetClosedException(errorHeader, ChangesetClosedException.Source.UPDATE_CHANGESET);
             throw e;
         } finally {
             monitor.finishTask();
@@ -505,7 +516,8 @@ public class OsmApi extends OsmConnection {
      * @return list of processed primitives
      * @throws OsmTransferException if something is wrong
      */
-    public Collection<IPrimitive> uploadDiff(Collection<? extends IPrimitive> list, ProgressMonitor monitor) throws OsmTransferException {
+    public Collection<OsmPrimitive> uploadDiff(Collection<? extends OsmPrimitive> list, ProgressMonitor monitor)
+            throws OsmTransferException {
         try {
             monitor.beginTask("", list.size() * 2);
             if (changeset == null)
@@ -581,7 +593,8 @@ public class OsmApi extends OsmConnection {
         return "oauth".equals(Main.pref.get("osm-server.auth-method", "basic"));
     }
 
-    protected final String sendRequest(String requestMethod, String urlSuffix,String requestBody, ProgressMonitor monitor) throws OsmTransferException {
+    protected final String sendRequest(String requestMethod, String urlSuffix,String requestBody, ProgressMonitor monitor)
+            throws OsmTransferException {
         return sendRequest(requestMethod, urlSuffix, requestBody, monitor, true, false);
     }
 
@@ -604,7 +617,8 @@ public class OsmApi extends OsmConnection {
      * @throws OsmTransferException if the HTTP return code was not 200 (and retries have
      *    been exhausted), or rewrapping a Java exception.
      */
-    protected final String sendRequest(String requestMethod, String urlSuffix,String requestBody, ProgressMonitor monitor, boolean doAuthenticate, boolean fastFail) throws OsmTransferException {
+    protected final String sendRequest(String requestMethod, String urlSuffix,String requestBody, ProgressMonitor monitor,
+            boolean doAuthenticate, boolean fastFail) throws OsmTransferException {
         StringBuilder responseBody = new StringBuilder();
         int retries = fastFail ? 0 : getMaxRetries();
 
@@ -780,4 +794,117 @@ public class OsmApi extends OsmConnection {
             throw new IllegalArgumentException(tr("Open changeset expected. Got closed changeset with id {0}.", changeset.getId()));
         this.changeset = changeset;
     }
+
+    private static StringBuilder noteStringBuilder(Note note) {
+        return new StringBuilder().append("notes/").append(note.getId());
+    }
+
+    /**
+     * Create a new note on the server.
+     * @param latlon Location of note
+     * @param text Comment entered by user to open the note
+     * @param monitor Progress monitor
+     * @return Note as it exists on the server after creation (ID assigned)
+     * @throws OsmTransferException
+     */
+    public Note createNote(LatLon latlon, String text, ProgressMonitor monitor) throws OsmTransferException {
+        initialize(monitor);
+        String noteUrl = new StringBuilder()
+            .append("notes?lat=")
+            .append(latlon.lat())
+            .append("&lon=")
+            .append(latlon.lon())
+            .append("&text=")
+            .append(urlEncode(text)).toString();
+
+        String response = sendRequest("POST", noteUrl, null, monitor, true, false);
+        return parseSingleNote(response);
+    }
+
+    /**
+     * Add a comment to an existing note.
+     * @param note The note to add a comment to
+     * @param comment Text of the comment
+     * @param monitor Progress monitor
+     * @return Note returned by the API after the comment was added
+     * @throws OsmTransferException
+     */
+    public Note addCommentToNote(Note note, String comment, ProgressMonitor monitor) throws OsmTransferException {
+        initialize(monitor);
+        String noteUrl = noteStringBuilder(note)
+            .append("/comment?text=")
+            .append(urlEncode(comment)).toString();
+
+        String response = sendRequest("POST", noteUrl, null, monitor, true, false);
+        return parseSingleNote(response);
+    }
+
+    /**
+     * Close a note.
+     * @param note Note to close. Must currently be open
+     * @param closeMessage Optional message supplied by the user when closing the note
+     * @param monitor Progress monitor
+     * @return Note returned by the API after the close operation
+     * @throws OsmTransferException
+     */
+    public Note closeNote(Note note, String closeMessage, ProgressMonitor monitor) throws OsmTransferException {
+        initialize(monitor);
+        String encodedMessage = urlEncode(closeMessage);
+        StringBuilder urlBuilder = noteStringBuilder(note)
+            .append("/close");
+        if (encodedMessage != null && !encodedMessage.trim().isEmpty()) {
+            urlBuilder.append("?text=");
+            urlBuilder.append(encodedMessage);
+        }
+
+        String response = sendRequest("POST", urlBuilder.toString(), null, monitor, true, false);
+        return parseSingleNote(response);
+    }
+
+    /**
+     * Reopen a closed note
+     * @param note Note to reopen. Must currently be closed
+     * @param reactivateMessage Optional message supplied by the user when reopening the note
+     * @param monitor Progress monitor
+     * @return Note returned by the API after the reopen operation
+     * @throws OsmTransferException
+     */
+    public Note reopenNote(Note note, String reactivateMessage, ProgressMonitor monitor) throws OsmTransferException {
+        initialize(monitor);
+        String encodedMessage = urlEncode(reactivateMessage);
+        StringBuilder urlBuilder = noteStringBuilder(note)
+            .append("/reopen");
+        if (encodedMessage != null && !encodedMessage.trim().isEmpty()) {
+            urlBuilder.append("?text=");
+            urlBuilder.append(encodedMessage);
+        }
+
+        String response = sendRequest("POST", urlBuilder.toString(), null, monitor, true, false);
+        return parseSingleNote(response);
+    }
+
+    /** Method for parsing API responses for operations on individual notes */
+    private Note parseSingleNote(String xml) throws OsmTransferException {
+        try {
+            List<Note> newNotes = new NoteReader(xml).parse();
+            if(newNotes.size() == 1) {
+                return newNotes.get(0);
+            }
+            //Shouldn't ever execute. Server will either respond with an error (caught elsewhere) or one note
+            throw new OsmTransferException(tr("Note upload failed"));
+        } catch (SAXException|IOException e) {
+            Main.error(e, true);
+            throw new OsmTransferException(tr("Error parsing note response from server"), e);
+        }
+    }
+
+    /** URL encodes a string. Useful for transforming user input into URL query strings*/
+    private String urlEncode(String string) throws OsmTransferException {
+        try {
+            return URLEncoder.encode(string, "UTF-8");
+        } catch (UnsupportedEncodingException e) {
+            Main.error(e, true);
+            throw new OsmTransferException(tr("Error encoding string: {0}", string), e);
+        }
+    }
 }
diff --git a/src/org/openstreetmap/josm/io/OsmChangesetParser.java b/src/org/openstreetmap/josm/io/OsmChangesetParser.java
index 420f093..9d0e760 100644
--- a/src/org/openstreetmap/josm/io/OsmChangesetParser.java
+++ b/src/org/openstreetmap/josm/io/OsmChangesetParser.java
@@ -7,6 +7,7 @@ import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.nio.charset.StandardCharsets;
 import java.text.MessageFormat;
+import java.util.Date;
 import java.util.LinkedList;
 import java.util.List;
 
@@ -15,6 +16,7 @@ import javax.xml.parsers.SAXParserFactory;
 
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.Changeset;
+import org.openstreetmap.josm.data.osm.ChangesetDiscussionComment;
 import org.openstreetmap.josm.data.osm.User;
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
 import org.openstreetmap.josm.tools.XmlParsingException;
@@ -69,27 +71,22 @@ public final class OsmChangesetParser {
         /** The current changeset */
         private Changeset current = null;
 
+        /** The current comment */
+        private ChangesetDiscussionComment comment = null;
+
+        /** The current comment text */
+        private StringBuilder text = null;
+
         protected void parseChangesetAttributes(Changeset cs, Attributes atts) throws XmlParsingException {
             // -- id
             String value = atts.getValue("id");
             if (value == null) {
                 throwException(tr("Missing mandatory attribute ''{0}''.", "id"));
             }
-            int id = 0;
-            try {
-                id = Integer.parseInt(value);
-            } catch(NumberFormatException e) {
-                throwException(tr("Illegal value for attribute ''{0}''. Got ''{1}''.", "id", value));
-            }
-            if (id <= 0) {
-                throwException(tr("Illegal numeric value for attribute ''{0}''. Got ''{1}''.", "id", id));
-            }
-            current.setId(id);
+            current.setId(parseNumericAttribute(value, 1));
 
-            // -- user
-            String user = atts.getValue("user");
-            String uid = atts.getValue("uid");
-            current.setUser(createUser(uid, user));
+            // -- user / uid
+            current.setUser(createUser(atts));
 
             // -- created_at
             value = atts.getValue("created_at");
@@ -155,6 +152,36 @@ public final class OsmChangesetParser {
                 }
                 current.setMax(new LatLon(maxLon, maxLat));
             }
+
+            // -- comments_count
+            String commentsCount = atts.getValue("comments_count");
+            if (commentsCount != null) {
+                current.setCommentsCount(parseNumericAttribute(commentsCount, 0));
+            }
+        }
+
+        private void parseCommentAttributes(Attributes atts) throws XmlParsingException {
+            // -- date
+            String value = atts.getValue("date");
+            Date date = null;
+            if (value != null) {
+                date = DateUtils.fromString(value);
+            }
+
+            comment = new ChangesetDiscussionComment(date, createUser(atts));
+        }
+
+        private int parseNumericAttribute(String value, int minAllowed) throws XmlParsingException {
+            int att = 0;
+            try {
+                att = Integer.parseInt(value);
+            } catch(NumberFormatException e) {
+                throwException(tr("Illegal value for attribute ''{0}''. Got ''{1}''.", "id", value));
+            }
+            if (att < minAllowed) {
+                throwException(tr("Illegal numeric value for attribute ''{0}''. Got ''{1}''.", "id", att));
+            }
+            return att;
         }
 
         @Override
@@ -163,6 +190,7 @@ public final class OsmChangesetParser {
             case "osm":
                 if (atts == null) {
                     throwException(tr("Missing mandatory attribute ''{0}'' of XML element {1}.", "version", "osm"));
+                    return;
                 }
                 String v = atts.getValue("version");
                 if (v == null) {
@@ -181,19 +209,43 @@ public final class OsmChangesetParser {
                 String value = atts.getValue("v");
                 current.put(key, value);
                 break;
+            case "discussion":
+                break;
+            case "comment":
+                parseCommentAttributes(atts);
+                break;
+            case "text":
+                text = new StringBuilder();
+                break;
             default:
                 throwException(tr("Undefined element ''{0}'' found in input stream. Aborting.", qName));
             }
         }
 
         @Override
+        public void characters(char[] ch, int start, int length) throws SAXException {
+            if (text != null) {
+                text.append(ch, start, length);
+            }
+        }
+
+        @Override
         public void endElement(String uri, String localName, String qName) throws SAXException {
             if ("changeset".equals(qName)) {
                 changesets.add(current);
+                current = null;
+            } else if ("comment".equals(qName)) {
+                current.addDiscussionComment(comment);
+                comment = null;
+            } else if ("text".equals(qName)) {
+                comment.setText(text.toString());
+                text = null;
             }
         }
 
-        protected User createUser(String uid, String name) throws XmlParsingException {
+        protected User createUser(Attributes atts) throws XmlParsingException {
+            String name = atts.getValue("user");
+            String uid = atts.getValue("uid");
             if (uid == null) {
                 if (name == null)
                     return null;
diff --git a/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java b/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java
index 99150fe..ecc2949 100644
--- a/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java
+++ b/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java
@@ -28,22 +28,30 @@ import org.openstreetmap.josm.tools.XmlParsingException;
 public class OsmServerChangesetReader extends OsmServerReader {
 
     /**
-     * constructor
-     *
+     * Constructs a new {@code OsmServerChangesetReader}.
      */
-    public OsmServerChangesetReader(){
+    public OsmServerChangesetReader() {
         setDoAuthenticate(false);
     }
 
     /**
      * don't use - not implemented!
-     *
      */
     @Override
     public DataSet parseOsm(ProgressMonitor progressMonitor) throws OsmTransferException {
         return null;
     }
 
+    protected final InputStream getChangesetInputStream(long id, boolean includeDiscussion, ProgressMonitor monitor)
+            throws OsmTransferException {
+        StringBuilder sb = new StringBuilder();
+        sb.append("changeset/").append(id);
+        if (includeDiscussion) {
+            sb.append("?include_discussion=true");
+        }
+        return getInputStream(sb.toString(), monitor.createSubTaskMonitor(1, true));
+    }
+
     /**
      * Queries a list
      * @param query  the query specification. Must not be null.
@@ -81,15 +89,17 @@ public class OsmServerChangesetReader extends OsmServerReader {
     }
 
     /**
-     * Reads the changeset with id <code>id</code> from the server
+     * Reads the changeset with id <code>id</code> from the server.
      *
-     * @param id  the changeset id. id > 0 required.
+     * @param id the changeset id. id > 0 required.
+     * @param includeDiscussion determines if discussion comments must be downloaded or not
      * @param monitor the progress monitor. Set to {@link NullProgressMonitor#INSTANCE} if null
      * @return the changeset read
      * @throws OsmTransferException thrown if something goes wrong
      * @throws IllegalArgumentException if id <= 0
+     * @since 7704
      */
-    public Changeset readChangeset(long id, ProgressMonitor monitor) throws OsmTransferException {
+    public Changeset readChangeset(long id, boolean includeDiscussion, ProgressMonitor monitor) throws OsmTransferException {
         if (id <= 0)
             throw new IllegalArgumentException(MessageFormat.format("Parameter ''{0}'' > 0 expected. Got ''{1}''.", "id", id));
         if (monitor == null) {
@@ -98,9 +108,7 @@ public class OsmServerChangesetReader extends OsmServerReader {
         Changeset result = null;
         try {
             monitor.beginTask(tr("Reading changeset {0} ...",id));
-            StringBuilder sb = new StringBuilder();
-            sb.append("changeset/").append(id);
-            try (InputStream in = getInputStream(sb.toString(), monitor.createSubTaskMonitor(1, true))) {
+            try (InputStream in = getChangesetInputStream(id, includeDiscussion, monitor)) {
                 if (in == null)
                     return null;
                 monitor.indeterminateSubTask(tr("Downloading changeset {0} ...", id));
@@ -122,15 +130,17 @@ public class OsmServerChangesetReader extends OsmServerReader {
     }
 
     /**
-     * Reads the changeset with id <code>id</code> from the server
+     * Reads the changesets with id <code>ids</code> from the server.
      *
-     * @param ids  the list of ids. Ignored if null. Only load changesets for ids > 0.
+     * @param ids the list of ids. Ignored if null. Only load changesets for ids > 0.
+     * @param includeDiscussion determines if discussion comments must be downloaded or not
      * @param monitor the progress monitor. Set to {@link NullProgressMonitor#INSTANCE} if null
      * @return the changeset read
      * @throws OsmTransferException thrown if something goes wrong
      * @throws IllegalArgumentException if id <= 0
+     * @since 7704
      */
-    public List<Changeset> readChangesets(Collection<Integer> ids, ProgressMonitor monitor) throws OsmTransferException {
+    public List<Changeset> readChangesets(Collection<Integer> ids, boolean includeDiscussion, ProgressMonitor monitor) throws OsmTransferException {
         if (ids == null)
             return Collections.emptyList();
         if (monitor == null) {
@@ -146,9 +156,7 @@ public class OsmServerChangesetReader extends OsmServerReader {
                     continue;
                 }
                 i++;
-                StringBuilder sb = new StringBuilder();
-                sb.append("changeset/").append(id);
-                try (InputStream in = getInputStream(sb.toString(), monitor.createSubTaskMonitor(1, true))) {
+                try (InputStream in = getChangesetInputStream(id, includeDiscussion, monitor)) {
                     if (in == null)
                         return null;
                     monitor.indeterminateSubTask(tr("({0}/{1}) Downloading changeset {2} ...", i, ids.size(), id));
diff --git a/src/org/openstreetmap/josm/io/OsmServerWritePostprocessor.java b/src/org/openstreetmap/josm/io/OsmServerWritePostprocessor.java
index a8a785f..d125299 100644
--- a/src/org/openstreetmap/josm/io/OsmServerWritePostprocessor.java
+++ b/src/org/openstreetmap/josm/io/OsmServerWritePostprocessor.java
@@ -3,11 +3,11 @@ package org.openstreetmap.josm.io;
 
 import java.util.Collection;
 
-import org.openstreetmap.josm.data.osm.IPrimitive;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
 
 public interface OsmServerWritePostprocessor {
 
-    public void postprocessUploadedPrimitives(Collection<IPrimitive> p, ProgressMonitor progress);
+    public void postprocessUploadedPrimitives(Collection<OsmPrimitive> p, ProgressMonitor progress);
 
 }
diff --git a/src/org/openstreetmap/josm/io/OsmServerWriter.java b/src/org/openstreetmap/josm/io/OsmServerWriter.java
index 67a17bb..14a9d53 100644
--- a/src/org/openstreetmap/josm/io/OsmServerWriter.java
+++ b/src/org/openstreetmap/josm/io/OsmServerWriter.java
@@ -12,7 +12,7 @@ import java.util.LinkedList;
 import java.util.List;
 
 import org.openstreetmap.josm.data.osm.Changeset;
-import org.openstreetmap.josm.data.osm.IPrimitive;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
 import org.openstreetmap.josm.gui.io.UploadStrategySpecification;
 import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
@@ -34,7 +34,7 @@ public class OsmServerWriter {
      * If a server connection error occurs, this may contain fewer entries
      * than where passed in the list to upload*.
      */
-    private Collection<IPrimitive> processed;
+    private Collection<OsmPrimitive> processed;
 
     private static List<OsmServerWritePostprocessor> postprocessors;
     public static void registerPostprocessor(OsmServerWritePostprocessor pp) {
@@ -84,12 +84,12 @@ public class OsmServerWriter {
      * @param progressMonitor the progress monitor
      * @throws OsmTransferException thrown if an exception occurs
      */
-    protected void uploadChangesIndividually(Collection<? extends IPrimitive> primitives, ProgressMonitor progressMonitor) throws OsmTransferException {
+    protected void uploadChangesIndividually(Collection<? extends OsmPrimitive> primitives, ProgressMonitor progressMonitor) throws OsmTransferException {
         try {
             progressMonitor.beginTask(tr("Starting to upload with one request per primitive ..."));
             progressMonitor.setTicksCount(primitives.size());
             uploadStartTime = System.currentTimeMillis();
-            for (IPrimitive osm : primitives) {
+            for (OsmPrimitive osm : primitives) {
                 int progress = progressMonitor.getTicks();
                 String time_left_str = timeLeft(progress, primitives.size());
                 String msg = "";
@@ -126,7 +126,7 @@ public class OsmServerWriter {
      * @param progressMonitor  the progress monitor
      * @throws OsmTransferException thrown if an exception occurs
      */
-    protected void uploadChangesAsDiffUpload(Collection<? extends IPrimitive> primitives, ProgressMonitor progressMonitor) throws OsmTransferException {
+    protected void uploadChangesAsDiffUpload(Collection<? extends OsmPrimitive> primitives, ProgressMonitor progressMonitor) throws OsmTransferException {
         try {
             progressMonitor.beginTask(tr("Starting to upload in one request ..."));
             processed.addAll(api.uploadDiff(primitives, progressMonitor.createSubTaskMonitor(ProgressMonitor.ALL_TICKS, false)));
@@ -146,13 +146,13 @@ public class OsmServerWriter {
      * @throws IllegalArgumentException thrown if chunkSize <= 0
      * @throws OsmTransferException thrown if an exception occurs
      */
-    protected void uploadChangesInChunks(Collection<? extends IPrimitive> primitives, ProgressMonitor progressMonitor, int chunkSize) throws OsmTransferException, IllegalArgumentException {
+    protected void uploadChangesInChunks(Collection<? extends OsmPrimitive> primitives, ProgressMonitor progressMonitor, int chunkSize) throws OsmTransferException, IllegalArgumentException {
         if (chunkSize <=0)
             throw new IllegalArgumentException(tr("Value >0 expected for parameter ''{0}'', got {1}", "chunkSize", chunkSize));
         try {
             progressMonitor.beginTask(tr("Starting to upload in chunks..."));
-            List<IPrimitive> chunk = new ArrayList<>(chunkSize);
-            Iterator<? extends IPrimitive> it = primitives.iterator();
+            List<OsmPrimitive> chunk = new ArrayList<>(chunkSize);
+            Iterator<? extends OsmPrimitive> it = primitives.iterator();
             int numChunks = (int)Math.ceil((double)primitives.size() / (double)chunkSize);
             int i= 0;
             while(it.hasNext()) {
@@ -189,7 +189,7 @@ public class OsmServerWriter {
      * @throws IllegalArgumentException thrown if strategy is null
      * @throws OsmTransferException thrown if something goes wrong
      */
-    public void uploadOsm(UploadStrategySpecification strategy, Collection<? extends IPrimitive> primitives, Changeset changeset, ProgressMonitor monitor) throws OsmTransferException {
+    public void uploadOsm(UploadStrategySpecification strategy, Collection<? extends OsmPrimitive> primitives, Changeset changeset, ProgressMonitor monitor) throws OsmTransferException {
         CheckParameterUtil.ensureParameterNotNull(changeset, "changeset");
         processed = new LinkedList<>();
         monitor = monitor == null ? NullProgressMonitor.INSTANCE : monitor;
@@ -223,7 +223,7 @@ public class OsmServerWriter {
         }
     }
 
-    void makeApiRequest(IPrimitive osm, ProgressMonitor progressMonitor) throws OsmTransferException {
+    void makeApiRequest(OsmPrimitive osm, ProgressMonitor progressMonitor) throws OsmTransferException {
         if (osm.isDeleted()) {
             api.deletePrimitive(osm, progressMonitor);
         } else if (osm.isNew()) {
@@ -245,7 +245,7 @@ public class OsmServerWriter {
      *
      * @return the collection of successfully processed primitives
      */
-    public Collection<IPrimitive> getProcessedPrimitives() {
+    public Collection<OsmPrimitive> getProcessedPrimitives() {
         return processed;
     }
 
diff --git a/src/org/openstreetmap/josm/io/imagery/WMSGrabber.java b/src/org/openstreetmap/josm/io/imagery/WMSGrabber.java
index a112a8e..2323bc2 100644
--- a/src/org/openstreetmap/josm/io/imagery/WMSGrabber.java
+++ b/src/org/openstreetmap/josm/io/imagery/WMSGrabber.java
@@ -258,6 +258,7 @@ public class WMSGrabber implements Runnable {
         Main.info("Grabbing WMS " + (attempt > 1? "(attempt " + attempt + ") ":"") + url);
 
         HttpURLConnection conn = Utils.openHttpConnection(url);
+        conn.setUseCaches(true);
         for (Entry<String, String> e : props.entrySet()) {
             conn.setRequestProperty(e.getKey(), e.getValue());
         }
diff --git a/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java b/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java
index cc8b654..1a6cbc2 100644
--- a/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java
+++ b/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java
@@ -30,8 +30,6 @@ import javax.swing.table.TableModel;
 
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.command.ChangePropertyCommand;
-import org.openstreetmap.josm.data.SelectionChangedListener;
-import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.gui.ExtendedDialog;
 import org.openstreetmap.josm.gui.util.GuiHelper;
@@ -39,26 +37,20 @@ import org.openstreetmap.josm.gui.util.TableHelper;
 import org.openstreetmap.josm.tools.GBC;
 
 /**
- *
- * @author master
- *
- * Dialog to add tags as part of the remotecontrol
+ * Dialog to add tags as part of the remotecontrol.
  * Existing Keys get grey color and unchecked selectboxes so they will not overwrite the old Key-Value-Pairs by default.
  * You can choose the tags you want to add by selectboxes. You can edit the tags before you apply them.
- *
+ * @author master
+ * @since 3850
  */
-public class AddTagsDialog extends ExtendedDialog implements SelectionChangedListener {
-
-
-    /** initially given tags  **/
-    String[][] tags;
+public class AddTagsDialog extends ExtendedDialog {
 
     private final JTable propertyTable;
-    private Collection<? extends OsmPrimitive> sel;
-    int[] count;
+    private final Collection<? extends OsmPrimitive> sel;
+    private final int[] count;
 
-    String sender;
-    static Set<String> trustedSenders = new HashSet<>();
+    private final String sender;
+    private static final Set<String> trustedSenders = new HashSet<>();
 
     /**
      * Class for displaying "delete from ... objects" in the table
@@ -121,7 +113,10 @@ public class AddTagsDialog extends ExtendedDialog implements SelectionChangedLis
         }
     }
 
-    public AddTagsDialog(String[][] tags, String senderName) {
+    /**
+     * Constructs a new {@code AddTagsDialog}.
+     */
+    public AddTagsDialog(String[][] tags, String senderName, Collection<? extends OsmPrimitive> primitives) {
         super(Main.parent, tr("Add tags to selected objects"), new String[] { tr("Add selected tags"), tr("Add all tags"),  tr("Cancel")},
                 false,
                 true);
@@ -129,9 +124,6 @@ public class AddTagsDialog extends ExtendedDialog implements SelectionChangedLis
 
         this.sender = senderName;
 
-        DataSet.addSelectionListener(this);
-
-
         final DefaultTableModel tm = new DefaultTableModel(new String[] {tr("Assume"), tr("Key"), tr("Value"), tr("Existing values")}, tags.length) {
             final Class<?>[] types = {Boolean.class, String.class, Object.class, ExistingValues.class};
             @Override
@@ -140,7 +132,7 @@ public class AddTagsDialog extends ExtendedDialog implements SelectionChangedLis
             }
         };
 
-        sel = Main.main.getCurrentDataSet().getSelected();
+        sel = primitives;
         count = new int[tags.length];
 
         for (int i = 0; i<tags.length; i++) {
@@ -167,8 +159,6 @@ public class AddTagsDialog extends ExtendedDialog implements SelectionChangedLis
 
         propertyTable = new JTable(tm) {
 
-            private static final long serialVersionUID = 1L;
-
             @Override
             public Component prepareRenderer(TableCellRenderer renderer, int row, int column) {
                 Component c = super.prepareRenderer(renderer, row, column);
@@ -199,7 +189,6 @@ public class AddTagsDialog extends ExtendedDialog implements SelectionChangedLis
                 if (c==3) return ((ExistingValues)o).getToolTip();
                 return tr("Enable the checkbox to accept the value");
             }
-
         };
 
         propertyTable.setAutoResizeMode(JTable.AUTO_RESIZE_LAST_COLUMN);
@@ -239,25 +228,6 @@ public class AddTagsDialog extends ExtendedDialog implements SelectionChangedLis
     }
 
     /**
-     * This method looks for existing tags in the current selection and sets the corresponding boolean in the boolean array existing[]
-     */
-    private void findExistingTags() {
-        TableModel tm = propertyTable.getModel();
-        for (int i=0; i<tm.getRowCount(); i++) {
-            String key = (String)tm.getValueAt(i, 1);
-            String value = (String)tm.getValueAt(i, 1);
-            count[i] = 0;
-            for (OsmPrimitive osm : sel) {
-                if (osm.keySet().contains(key) && !osm.get(key).equals(value)) {
-                    count[i]++;
-                    break;
-                }
-            }
-        }
-        propertyTable.repaint();
-    }
-
-    /**
      * If you click the "Add tags" button build a ChangePropertyCommand for every key that has a checked checkbox to apply the key value pair to all selected osm objects.
      * You get a entry for every key in the command queue.
      */
@@ -281,12 +251,6 @@ public class AddTagsDialog extends ExtendedDialog implements SelectionChangedLis
         setVisible(false);
     }
 
-    @Override
-    public void selectionChanged(Collection<? extends OsmPrimitive> newSelection) {
-        sel = newSelection;
-        findExistingTags();
-    }
-
     /**
      * parse addtags parameters Example URL (part):
      * addtags=wikipedia:de%3DResidenzschloss Dresden|name:en%3DDresden Castle
@@ -322,8 +286,6 @@ public class AddTagsDialog extends ExtendedDialog implements SelectionChangedLis
                         addTags(keyValue, sender, primitives);
                     }
                 }
-
-
             });
         }
     }
@@ -331,7 +293,7 @@ public class AddTagsDialog extends ExtendedDialog implements SelectionChangedLis
     /**
      * Ask user and add the tags he confirm.
      * @param keyValue is a table or {{tag1,val1},{tag2,val2},...}
-     * @param sender is a string for skipping confirmations. Use epmty string for always confirmed adding.
+     * @param sender is a string for skipping confirmations. Use empty string for always confirmed adding.
      * @param primitives OSM objects that will be modified
      * @since 7521
      */
@@ -343,7 +305,7 @@ public class AddTagsDialog extends ExtendedDialog implements SelectionChangedLis
                 }
             }
         } else {
-            new AddTagsDialog(keyValue, sender).showDialog();
+            new AddTagsDialog(keyValue, sender, primitives).showDialog();
         }
     }
 }
diff --git a/src/org/openstreetmap/josm/io/remotecontrol/RemoteControl.java b/src/org/openstreetmap/josm/io/remotecontrol/RemoteControl.java
index 53b05c3..b46e681 100644
--- a/src/org/openstreetmap/josm/io/remotecontrol/RemoteControl.java
+++ b/src/org/openstreetmap/josm/io/remotecontrol/RemoteControl.java
@@ -32,7 +32,7 @@ public class RemoteControl {
      * changes.
      */
     static final int protocolMajorVersion = 1;
-    static final int protocolMinorVersion = 6;
+    static final int protocolMinorVersion = 7;
 
     /**
      * Starts the remote control server
diff --git a/src/org/openstreetmap/josm/io/remotecontrol/handler/ImageryHandler.java b/src/org/openstreetmap/josm/io/remotecontrol/handler/ImageryHandler.java
index b0b333f..f1ba802 100644
--- a/src/org/openstreetmap/josm/io/remotecontrol/handler/ImageryHandler.java
+++ b/src/org/openstreetmap/josm/io/remotecontrol/handler/ImageryHandler.java
@@ -8,6 +8,8 @@ import java.util.HashMap;
 
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.imagery.ImageryInfo;
+import org.openstreetmap.josm.data.imagery.ImageryInfo.ImageryType;
+import org.openstreetmap.josm.data.imagery.ImageryLayerInfo;
 import org.openstreetmap.josm.gui.layer.ImageryLayer;
 import org.openstreetmap.josm.gui.util.GuiHelper;
 import org.openstreetmap.josm.io.remotecontrol.PermissionPrefWithDefault;
@@ -45,16 +47,32 @@ public class ImageryHandler extends RequestHandler {
         return PermissionPrefWithDefault.LOAD_IMAGERY;
     }
 
+    protected static ImageryInfo findBingEntry() {
+        for (ImageryInfo i : ImageryLayerInfo.instance.getDefaultLayers()) {
+            if (ImageryType.BING.equals(i.getImageryType())) {
+                return i;
+            }
+        }
+        return null;
+    }
+
     @Override
     protected void handleRequest() throws RequestHandlerErrorException {
         String url = args.get("url");
         String title = args.get("title");
         String type = args.get("type");
-        if ((title == null) || (title.isEmpty())) {
+        final ImageryInfo bing = ImageryType.BING.getTypeString().equals(type) ? findBingEntry() : null;
+        if ((title == null || title.isEmpty()) && bing != null) {
+            title = bing.getName();
+        }
+        if (title == null || title.isEmpty()) {
             title = tr("Remote imagery");
         }
         String cookies = args.get("cookies");
         final ImageryInfo imgInfo = new ImageryInfo(title, url, type, null, cookies);
+        if (bing != null) {
+            imgInfo.setIcon(bing.getIcon());
+        }
         String min_zoom = args.get("min_zoom");
         if (min_zoom != null && !min_zoom.isEmpty()) {
             try {
diff --git a/src/org/openstreetmap/josm/io/remotecontrol/handler/ImportHandler.java b/src/org/openstreetmap/josm/io/remotecontrol/handler/ImportHandler.java
index a71aa2d..9f03e67 100644
--- a/src/org/openstreetmap/josm/io/remotecontrol/handler/ImportHandler.java
+++ b/src/org/openstreetmap/josm/io/remotecontrol/handler/ImportHandler.java
@@ -124,7 +124,7 @@ public class ImportHandler extends RequestHandler {
             throw new RequestHandlerBadRequestException("MalformedURLException: "+e.getMessage(), e);
         }
         // Find download tasks for the given URL
-        suitableDownloadTasks = Main.main.menu.openLocation.findDownloadTasks(urlString);
+        suitableDownloadTasks = Main.main.menu.openLocation.findDownloadTasks(urlString, true);
         if (suitableDownloadTasks.isEmpty()) {
             // It should maybe be better to reject the request in that case ?
             // For compatibility reasons with older instances of JOSM, arbitrary choice of DownloadOsmTask
diff --git a/src/org/openstreetmap/josm/plugins/PluginInformation.java b/src/org/openstreetmap/josm/plugins/PluginInformation.java
index 48e9b33..ccc5318 100644
--- a/src/org/openstreetmap/josm/plugins/PluginInformation.java
+++ b/src/org/openstreetmap/josm/plugins/PluginInformation.java
@@ -240,9 +240,14 @@ public class PluginInformation {
         }
         author = attr.getValue("Author");
         iconPath = attr.getValue("Plugin-Icon");
-        if (iconPath != null && file != null) {
-            // extract icon from the plugin jar file
-            icon = new ImageProvider(iconPath).setArchive(file).setMaxWidth(24).setMaxHeight(24).setOptional(true).get();
+        if (iconPath != null)
+        {
+            if (file != null) {
+                // extract icon from the plugin jar file
+                icon = new ImageProvider(iconPath).setArchive(file).setMaxWidth(24).setMaxHeight(24).setOptional(true).get();
+            } else if (iconPath.startsWith("data:")) {
+                icon = new ImageProvider(iconPath).setMaxWidth(24).setMaxHeight(24).setOptional(true).get();
+            }
         }
         if (oldcheck && mainversion > Version.getInstance().getVersion()) {
             int myv = Version.getInstance().getVersion();
diff --git a/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java b/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java
index 54e6202..34efc50 100644
--- a/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java
+++ b/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java
@@ -30,7 +30,7 @@ import org.xml.sax.SAXException;
  *   <li>.jar files, assuming that they represent plugin jars</li>
  *   <li>.jar.new files, assuming that these are downloaded but not yet installed plugins</li>
  *   <li>cached lists of available plugins, downloaded for instance from
- *   <a href="https://josm.openstreetmap.de/plugin">https://josm.openstreetmap.de/plugin</a></li>
+ *   <a href="https://josm.openstreetmap.de/pluginicons">https://josm.openstreetmap.de/pluginicons</a></li>
  * </ul>
  *
  */
@@ -102,27 +102,6 @@ public class ReadLocalPluginInformationTask extends PleaseWaitRunnable {
             monitor.worked(1);
         }
     }
-    protected void scanIconCacheFiles(ProgressMonitor monitor, File pluginsDirectory) {
-        File[] siteCacheFiles = listFiles(pluginsDirectory, "^([0-9]+-)?site.*plugin-icons\\.zip$");
-        if (siteCacheFiles == null || siteCacheFiles.length == 0)
-            return;
-        monitor.subTask(tr("Processing plugin site cache icon files..."));
-        monitor.setTicksCount(siteCacheFiles.length);
-        for (File f: siteCacheFiles) {
-            String fname = f.getName();
-            monitor.setCustomText(tr("Processing file ''{0}''", fname));
-            for (PluginInformation pi : availablePlugins.values()) {
-                if (pi.icon == null && pi.iconPath != null) {
-                    pi.icon = new ImageProvider(pi.name+".jar/"+pi.iconPath)
-                                    .setArchive(f)
-                                    .setMaxWidth(24)
-                                    .setMaxHeight(24)
-                                    .setOptional(true).get();
-                }
-            }
-            monitor.worked(1);
-        }
-    }
 
     protected void scanPluginFiles(ProgressMonitor monitor, File pluginsDirectory) {
         File[] pluginFiles = pluginsDirectory.listFiles(
@@ -161,7 +140,6 @@ public class ReadLocalPluginInformationTask extends PleaseWaitRunnable {
         try {
             monitor.beginTask("");
             scanSiteCacheFiles(monitor, pluginsDirectory);
-            scanIconCacheFiles(monitor, pluginsDirectory);
             scanPluginFiles(monitor, pluginsDirectory);
         } finally {
             monitor.setCustomText("");
diff --git a/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java b/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java
index 729b208..ca708ff 100644
--- a/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java
+++ b/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java
@@ -57,8 +57,6 @@ public class ReadRemotePluginInformationTask extends PleaseWaitRunnable {
     private List<PluginInformation> availablePlugins;
     private boolean displayErrMsg;
 
-    protected enum CacheType {PLUGIN_LIST, ICON_LIST}
-
     protected final void init(Collection<String> sites, boolean displayErrMsg) {
         this.sites = sites;
         if (sites == null) {
@@ -110,7 +108,7 @@ public class ReadRemotePluginInformationTask extends PleaseWaitRunnable {
      * @param type icon cache or plugin list cache
      * @return the file name for the cache file
      */
-    protected File createSiteCacheFile(File pluginDir, String site, CacheType type) {
+    protected File createSiteCacheFile(File pluginDir, String site) {
         String name;
         try {
             site = site.replaceAll("%<(.*)>", "");
@@ -130,14 +128,7 @@ public class ReadRemotePluginInformationTask extends PleaseWaitRunnable {
                     sb.append("_");
                 }
             }
-            switch (type) {
-            case PLUGIN_LIST:
-                sb.append(".txt");
-                break;
-            case ICON_LIST:
-                sb.append("-icons.zip");
-                break;
-            }
+            sb.append(".txt");
             name = sb.toString();
         } catch(MalformedURLException e) {
             name = "site-unknown.txt";
@@ -256,61 +247,6 @@ public class ReadRemotePluginInformationTask extends PleaseWaitRunnable {
     }
 
     /**
-     * Downloads the icon archive from a remote location
-     *
-     * @param site the site URL
-     * @param monitor a progress monitor
-     */
-    protected void downloadPluginIcons(String site, File destFile, ProgressMonitor monitor) {
-        try {
-            site = site.replaceAll("%<(.*)>", "");
-
-            monitor.beginTask("");
-            monitor.indeterminateSubTask(tr("Downloading plugin list from ''{0}''", site));
-
-            URL url = new URL(site);
-            synchronized(this) {
-                connection = Utils.openHttpConnection(url);
-                connection.setRequestProperty("Cache-Control", "no-cache");
-            }
-            try (
-                InputStream in = connection.getInputStream();
-                OutputStream out = new FileOutputStream(destFile)
-            ) {
-                byte[] buffer = new byte[8192];
-                for (int read = in.read(buffer); read != -1; read = in.read(buffer)) {
-                    out.write(buffer, 0, read);
-                }
-            }
-        } catch (MalformedURLException e) {
-            if (canceled) return;
-            Main.error(e);
-            return;
-        } catch (IOException e) {
-            if (canceled) return;
-            handleIOException(monitor, e, tr("Plugin icons download error"), tr("JOSM failed to download plugin icons:"), displayErrMsg);
-            return;
-        } finally {
-            synchronized(this) {
-                if (connection != null) {
-                    connection.disconnect();
-                }
-                connection = null;
-            }
-            monitor.finishTask();
-        }
-        for (PluginInformation pi : availablePlugins) {
-            if (pi.icon == null && pi.iconPath != null) {
-                pi.icon = new ImageProvider(pi.name+".jar/"+pi.iconPath)
-                                .setArchive(destFile)
-                                .setMaxWidth(24)
-                                .setMaxHeight(24)
-                                .setOptional(true).get();
-            }
-        }
-    }
-
-    /**
      * Writes the list of plugins to a cache file
      *
      * @param site the site from where the list was downloaded
@@ -321,7 +257,7 @@ public class ReadRemotePluginInformationTask extends PleaseWaitRunnable {
         if (!pluginDir.exists() && !pluginDir.mkdirs()) {
             Main.warn(tr("Failed to create plugin directory ''{0}''. Cannot cache plugin list from plugin site ''{1}''.", pluginDir.toString(), site));
         }
-        File cacheFile = createSiteCacheFile(pluginDir, site, CacheType.PLUGIN_LIST);
+        File cacheFile = createSiteCacheFile(pluginDir, site);
         getProgressMonitor().subTask(tr("Writing plugin list to local cache ''{0}''", cacheFile.toString()));
         try (PrintWriter writer = new PrintWriter(new OutputStreamWriter(new FileOutputStream(cacheFile), StandardCharsets.UTF_8))) {
             writer.write(list);
@@ -400,8 +336,7 @@ public class ReadRemotePluginInformationTask extends PleaseWaitRunnable {
             getProgressMonitor().subTask(tr("Processing plugin list from site ''{0}''", printsite));
             String list = downloadPluginList(site, getProgressMonitor().createSubTaskMonitor(0, false));
             if (canceled) return;
-            siteCacheFiles.remove(createSiteCacheFile(pluginDir, site, CacheType.PLUGIN_LIST));
-            siteCacheFiles.remove(createSiteCacheFile(pluginDir, site, CacheType.ICON_LIST));
+            siteCacheFiles.remove(createSiteCacheFile(pluginDir, site));
             if (list != null) {
                 getProgressMonitor().worked(1);
                 cachePluginList(site, list);
@@ -412,7 +347,6 @@ public class ReadRemotePluginInformationTask extends PleaseWaitRunnable {
                 getProgressMonitor().worked(1);
                 if (canceled) return;
             }
-            downloadPluginIcons(site+"-icons.zip", createSiteCacheFile(pluginDir, site, CacheType.ICON_LIST), getProgressMonitor().createSubTaskMonitor(0, false));
         }
         // remove old stuff or whole update process is broken
         for (File file: siteCacheFiles) {
diff --git a/src/org/openstreetmap/josm/tools/Geometry.java b/src/org/openstreetmap/josm/tools/Geometry.java
index 0916333..ff90c68 100644
--- a/src/org/openstreetmap/josm/tools/Geometry.java
+++ b/src/org/openstreetmap/josm/tools/Geometry.java
@@ -825,44 +825,6 @@ public final class Geometry {
         return new EastNorth(xC, yC);
     }
 
-    /**
-     * Returns the coordinate of intersection of segment sp1-sp2 and an altitude
-     * to it starting at point ap. If the line defined with sp1-sp2 intersects
-     * its altitude out of sp1-sp2, null is returned.
-     *
-     * @param sp1
-     * @param sp2
-     * @param ap
-     * @return Intersection coordinate or null
-     */
-    public static EastNorth getSegmentAltituteIntersection(EastNorth sp1, EastNorth sp2, EastNorth ap) {
-
-        CheckParameterUtil.ensureValidCoordinates(sp1, "sp1");
-        CheckParameterUtil.ensureValidCoordinates(sp2, "sp2");
-        CheckParameterUtil.ensureValidCoordinates(ap, "ap");
-
-        Double segmentLenght = sp1.distance(sp2);
-        Double altitudeAngle = getSegmentAngle(sp1, sp2) + Math.PI / 2;
-
-        // Taking a random point on the altitude line (angle is known).
-        EastNorth ap2 = new EastNorth(ap.east() + 1000
-                * Math.cos(altitudeAngle), ap.north() + 1000
-                * Math.sin(altitudeAngle));
-
-        // Finding the intersection of two lines
-        EastNorth resultCandidate = Geometry.getLineLineIntersection(sp1, sp2,
-                ap, ap2);
-
-        // Filtering result
-        if (resultCandidate != null
-                && resultCandidate.distance(sp1) * .999 < segmentLenght
-                && resultCandidate.distance(sp2) * .999 < segmentLenght) {
-            return resultCandidate;
-        } else {
-            return null;
-        }
-    }
-
     public static class MultiPolygonMembers {
         public final Set<Way> outers = new HashSet<>();
         public final Set<Way> inners = new HashSet<>();
diff --git a/src/org/openstreetmap/josm/tools/ImageProvider.java b/src/org/openstreetmap/josm/tools/ImageProvider.java
index 2992097..35aa1cd 100644
--- a/src/org/openstreetmap/josm/tools/ImageProvider.java
+++ b/src/org/openstreetmap/josm/tools/ImageProvider.java
@@ -90,11 +90,22 @@ import com.kitfox.svg.SVGUniverse;
  */
 public class ImageProvider {
 
+    private static final String HTTP_PROTOCOL  = "http://";
+    private static final String HTTPS_PROTOCOL = "https://";
+    private static final String WIKI_PROTOCOL  = "wiki://";
+
     /**
      * Position of an overlay icon
      */
     public static enum OverlayPosition {
-        NORTHWEST, NORTHEAST, SOUTHWEST, SOUTHEAST
+        /** North west */
+        NORTHWEST,
+        /** North east */
+        NORTHEAST,
+        /** South west */
+        SOUTHWEST,
+        /** South east */
+        SOUTHEAST
     }
 
     /**
@@ -108,6 +119,23 @@ public class ImageProvider {
     }
 
     /**
+     * Supported image sizes
+     * @since 7687
+     */
+    public static enum ImageSizes {
+        /** SMALL_ICON value of on Action */
+        SMALLICON,
+        /** LARGE_ICON_KEY value of on Action */
+        LARGEICON,
+        /** MAP icon */
+        MAP,
+        /** MAP icon maximum size */
+        MAPMAX,
+        /** MENU icon size */
+        MENU,
+    }
+
+    /**
      * Property set on {@code BufferedImage} returned by {@link #makeImageTransparent}.
      * @since 7132
      */
@@ -147,11 +175,30 @@ public class ImageProvider {
 
     private static final ExecutorService IMAGE_FETCHER = Executors.newSingleThreadExecutor();
 
+    /**
+     * Callback interface for asynchronous image loading.
+     */
     public interface ImageCallback {
+        /**
+         * Called when image loading has finished.
+         * @param result the loaded image icon
+         */
         void finished(ImageIcon result);
     }
 
     /**
+     * Callback interface for asynchronous image loading (with delayed scaling possibility).
+     * @since 7693
+     */
+    public interface ImageResourceCallback {
+        /**
+         * Called when image loading has finished.
+         * @param result the loaded image resource
+         */
+        void finished(ImageResource result);
+    }
+
+    /**
      * Constructs a new {@code ImageProvider} from a filename in a given directory.
      * @param subdir    subdirectory the image lies in
      * @param name      the name of the image. If it does not end with '.png' or '.svg',
@@ -217,6 +264,25 @@ public class ImageProvider {
     }
 
     /**
+     * Convert enumerated size values to real numbers
+     * @param size the size enumeration
+     * @return dimension of image in pixels
+     * @since 7687
+     */
+    public static Dimension getImageSizes(ImageSizes size) {
+        int sizeval;
+        switch(size) {
+        case MAPMAX: sizeval = Main.pref.getInteger("iconsize.mapmax", 48); break;
+        case MAP: sizeval = Main.pref.getInteger("iconsize.mapmax", 16); break;
+        case LARGEICON: sizeval = Main.pref.getInteger("iconsize.largeicon", 24); break;
+        case MENU: /* MENU is SMALLICON - only provided in case of future changes */
+        case SMALLICON: sizeval = Main.pref.getInteger("iconsize.smallicon", 16); break;
+        default: sizeval = Main.pref.getInteger("iconsize.default", 24); break;
+        }
+        return new Dimension(sizeval, sizeval);
+    }
+
+    /**
      * Set the dimensions of the image.
      *
      * If not specified, the original size of the image is used.
@@ -231,6 +297,17 @@ public class ImageProvider {
     }
 
     /**
+     * Set the dimensions of the image.
+     *
+     * If not specified, the original size of the image is used.
+     * @return the current object, for convenience
+     * @since 7687
+     */
+    public ImageProvider setSize(ImageSizes size) {
+        return setSize(getImageSizes(size));
+    }
+
+    /**
      * @see #setSize
      * @return the current object, for convenience
      */
@@ -264,6 +341,20 @@ public class ImageProvider {
     }
 
     /**
+     * Limit the maximum size of the image.
+     *
+     * It will shrink the image if necessary, but keep the aspect ratio.
+     * The given width or height can be -1 which means this direction is not bounded.
+     *
+     * 'size' and 'maxSize' are not compatible, you should set only one of them.
+     * @return the current object, for convenience
+     * @since 7687
+     */
+    public ImageProvider setMaxSize(ImageSizes size) {
+        return setMaxSize(getImageSizes(size));
+    }
+
+    /**
      * Convenience method, see {@link #setMaxSize(Dimension)}.
      * @return the current object, for convenience
      */
@@ -324,10 +415,25 @@ public class ImageProvider {
     }
 
     /**
-     * Execute the image request.
+     * Execute the image request and scale result.
      * @return the requested image or null if the request failed
      */
     public ImageIcon get() {
+        ImageResource ir = getResource();
+        if (ir == null)
+            return null;
+        if (maxWidth != -1 || maxHeight != -1)
+            return ir.getImageIconBounded(new Dimension(maxWidth, maxHeight));
+        else
+            return ir.getImageIcon(new Dimension(width, height));
+    }
+
+    /**
+     * Execute the image request.
+     * @return the requested image or null if the request failed
+     * @since 7693
+     */
+    public ImageResource getResource() {
         ImageResource ir = getIfAvailableImpl(additionalClassLoaders);
         if (ir == null) {
             if (!optional) {
@@ -340,10 +446,7 @@ public class ImageProvider {
                 return null;
             }
         }
-        if (maxWidth != -1 || maxHeight != -1)
-            return ir.getImageIconBounded(new Dimension(maxWidth, maxHeight));
-        else
-            return ir.getImageIcon(new Dimension(width, height));
+        return ir;
     }
 
     /**
@@ -358,7 +461,7 @@ public class ImageProvider {
      * value is returned to callback (just like {@link #get}).
      */
     public void getInBackground(final ImageCallback callback) {
-        if (name.startsWith("http://") || name.startsWith("wiki://")) {
+        if (name.startsWith(HTTP_PROTOCOL) || name.startsWith(WIKI_PROTOCOL)) {
             Runnable fetch = new Runnable() {
                 @Override
                 public void run() {
@@ -374,6 +477,32 @@ public class ImageProvider {
     }
 
     /**
+     * Load the image in a background thread.
+     *
+     * This method returns immediately and runs the image request
+     * asynchronously.
+     *
+     * @param callback a callback. It is called, when the image is ready.
+     * This can happen before the call to this method returns or it may be
+     * invoked some time (seconds) later. If no image is available, a null
+     * value is returned to callback (just like {@link #get}).
+     * @since 7693
+     */
+    public void getInBackground(final ImageResourceCallback callback) {
+        if (name.startsWith(HTTP_PROTOCOL) || name.startsWith(WIKI_PROTOCOL)) {
+            Runnable fetch = new Runnable() {
+                @Override
+                public void run() {
+                    callback.finished(getResource());
+                }
+            };
+            IMAGE_FETCHER.submit(fetch);
+        } else {
+            callback.finished(getResource());
+        }
+    }
+
+    /**
      * Load an image with a given file name.
      *
      * @param subdir subdirectory the image lies in
@@ -386,6 +515,8 @@ public class ImageProvider {
     }
 
     /**
+     * Load an image with a given file name.
+     *
      * @param name The icon name (base name with or without '.png' or '.svg' extension)
      * @return the requested image or null if the request failed
      * @see #get(String, String)
@@ -444,7 +575,7 @@ public class ImageProvider {
 
             ImageType type = name.toLowerCase().endsWith(".svg") ? ImageType.SVG : ImageType.OTHER;
 
-            if (name.startsWith("http://") || name.startsWith("https://")) {
+            if (name.startsWith(HTTP_PROTOCOL) || name.startsWith(HTTPS_PROTOCOL)) {
                 String url = name;
                 ImageResource ir = cache.get(url);
                 if (ir != null) return ir;
@@ -453,7 +584,7 @@ public class ImageProvider {
                     cache.put(url, ir);
                 }
                 return ir;
-            } else if (name.startsWith("wiki://")) {
+            } else if (name.startsWith(WIKI_PROTOCOL)) {
                 ImageResource ir = cache.get(name);
                 if (ir != null) return ir;
                 ir = getIfAvailableWiki(name, type);
@@ -573,7 +704,7 @@ public class ImageProvider {
                         return null;
                     }
                 }
-                if (mediatype != null && mediatype.contains("image/svg+xml")) {
+                if ("image/svg+xml".equals(mediatype)) {
                     String s = new String(bytes, StandardCharsets.UTF_8);
                     URI uri = getSvgUniverse().loadSVG(new StringReader(s), URLEncoder.encode(s, "UTF-8"));
                     SVGDiagram svg = getSvgUniverse().getDiagram(uri);
@@ -587,7 +718,8 @@ public class ImageProvider {
                         // See #10479: for PNG files, always enforce transparency to be sure tNRS chunk is used even not in paletted mode
                         // This can be removed if someday Oracle fixes https://bugs.openjdk.java.net/browse/JDK-6788458
                         // hg.openjdk.java.net/jdk7u/jdk7u/jdk/file/828c4fedd29f/src/share/classes/com/sun/imageio/plugins/png/PNGImageReader.java#l656
-                        return new ImageResource(read(new ByteArrayInputStream(bytes), false, true));
+                        Image img = read(new ByteArrayInputStream(bytes), false, true);
+                        return img == null ? null : new ImageResource(img);
                     } catch (IOException e) {
                         Main.warn("IOException while reading image: "+e.getMessage());
                     }
@@ -822,6 +954,13 @@ public class ImageProvider {
         return null;
     }
 
+    /**
+     * Load a cursor with a given file name, optionally decorated with an overlay image.
+     *
+     * @param name the cursor image filename in "cursor" directory
+     * @param overlay optional overlay image
+     * @return cursor with a given file name, optionally decorated with an overlay image
+     */
     public static Cursor getCursor(String name, String overlay) {
         ImageIcon img = get("cursor", name);
         if (overlay != null) {
@@ -844,7 +983,13 @@ public class ImageProvider {
      * in one of the corners)
      * @return an icon that represent the overlay of the two given icons. The second icon is layed
      * on the first relative to the given position.
+     * FIXME: This function does not fit into the ImageProvider concept as public function!
+     * Overlay should be handled like all the other functions only settings arguments and
+     * overlay must be transparent in the background.
+     * Also scaling is not cared about with current implementation.
+     * @deprecated this method will be refactored
      */
+    @Deprecated
     public static ImageIcon overlay(Icon ground, Icon overlay, OverlayPosition pos) {
         int w = ground.getIconWidth();
         int h = ground.getIconHeight();
@@ -995,6 +1140,12 @@ public class ImageProvider {
         return get("data", type.getAPIName());
     }
 
+    /**
+     * Constructs an image from the given SVG data.
+     * @param svg the SVG data
+     * @param dim the desired image dimension
+     * @return an image from the given SVG data at the desired dimension.
+     */
     public static BufferedImage createImageFromSvg(SVGDiagram svg, Dimension dim) {
         float realWidth = svg.getWidth();
         float realHeight = svg.getHeight();
diff --git a/src/org/openstreetmap/josm/tools/ImageResource.java b/src/org/openstreetmap/josm/tools/ImageResource.java
index 4168aa4..67746e8 100644
--- a/src/org/openstreetmap/josm/tools/ImageResource.java
+++ b/src/org/openstreetmap/josm/tools/ImageResource.java
@@ -7,6 +7,8 @@ import java.awt.image.BufferedImage;
 import java.util.HashMap;
 import java.util.Map;
 
+import javax.swing.AbstractAction;
+import javax.swing.Action;
 import javax.swing.ImageIcon;
 
 import com.kitfox.svg.SVGDiagram;
@@ -19,30 +21,57 @@ import com.kitfox.svg.SVGDiagram;
  * at least one entry for the key DEFAULT_DIMENSION.
  * @since 4271
  */
-class ImageResource {
+public class ImageResource {
 
     /**
      * Caches the image data for resized versions of the same image.
      */
     private Map<Dimension, Image> imgCache = new HashMap<>();
     private SVGDiagram svg;
+    /**
+     * Use this dimension to request original file dimension.
+     */
     public static final Dimension DEFAULT_DIMENSION = new Dimension(-1, -1);
 
+    /**
+     * Constructs a new {@code ImageResource} from an image.
+     * @param img the image
+     */
     public ImageResource(Image img) {
         CheckParameterUtil.ensureParameterNotNull(img);
         imgCache.put(DEFAULT_DIMENSION, img);
     }
 
+    /**
+     * Constructs a new {@code ImageResource} from SVG data.
+     * @param svg SVG data
+     */
     public ImageResource(SVGDiagram svg) {
         CheckParameterUtil.ensureParameterNotNull(svg);
         this.svg = svg;
     }
 
+    /**
+     * Returns the image icon at default dimension.
+     * @return the image icon at default dimension
+     */
     public ImageIcon getImageIcon() {
         return getImageIcon(DEFAULT_DIMENSION);
     }
 
     /**
+     * Set both icons of an Action
+     * @param a The action for the icons
+     * @since 7693
+     */
+    public void getImageIcon(AbstractAction a) {
+        ImageIcon icon = getImageIconBounded(ImageProvider.getImageSizes(ImageProvider.ImageSizes.SMALLICON));
+        a.putValue(Action.SMALL_ICON, icon);
+        icon = getImageIconBounded(ImageProvider.getImageSizes(ImageProvider.ImageSizes.LARGEICON));
+        a.putValue(Action.LARGE_ICON_KEY, icon);
+    }
+
+    /**
      * Get an ImageIcon object for the image of this resource
      * @param   dim The requested dimensions. Use (-1,-1) for the original size
      *          and (width, -1) to set the width, but otherwise scale the image
diff --git a/styles/standard/elemstyles.mapcss b/styles/standard/elemstyles.mapcss
index 9cfe2cd..708d646 100644
--- a/styles/standard/elemstyles.mapcss
+++ b/styles/standard/elemstyles.mapcss
@@ -42,48 +42,46 @@ setting::highway_labels {
 /* turn restrictions */
 /*********************/
 
-relation[restriction=no_left_turn],
-node[restriction=no_left_turn] {
+relation[restriction=no_left_turn] {
     icon-image: "vehicle/restriction/turn_restrictions/no_left_turn.png";
     set icon_z17;
     text: auto;
 }
-relation[restriction=no_right_turn],
-node[restriction=no_right_turn] {
+relation[restriction=no_right_turn] {
     icon-image: "vehicle/restriction/turn_restrictions/no_right_turn.png";
     set icon_z17;
     text: auto;
 }
-relation[restriction=no_straight_on],
-node[restriction=no_straight_on] {
+relation[restriction=no_straight_on] {
     icon-image: "vehicle/restriction/turn_restrictions/no_straight_on.png";
     set icon_z17;
     text: auto;
 }
-relation[restriction=no_u_turn],
-node[restriction=no_u_turn] {
+relation[restriction=no_u_turn] {
     icon-image: "vehicle/restriction/turn_restrictions/no_u_turn.png";
     set icon_z17;
     text: auto;
 }
-relation[restriction=only_left_turn],
-node[restriction=only_left_turn] {
+relation[restriction=only_left_turn] {
     icon-image: "vehicle/restriction/turn_restrictions/only_left_turn.png";
     set icon_z17;
     text: auto;
 }
-relation[restriction=only_right_turn],
-node[restriction=only_right_turn] {
+relation[restriction=only_right_turn] {
     icon-image: "vehicle/restriction/turn_restrictions/only_right_turn.png";
     set icon_z17;
     text: auto;
 }
-relation[restriction=only_straight_on],
-node[restriction=only_straight_on] {
+relation[restriction=only_straight_on] {
     icon-image: "vehicle/restriction/turn_restrictions/only_straight_on.png";
     set icon_z17;
     text: auto;
 }
+node[restriction] {
+    icon-image: "misc/deprecated.png";
+    set icon_z17;
+    text: auto;
+}
 
 /******************/
 /* bridge, tunnel */
@@ -431,11 +429,15 @@ node[barrier=sally_port] {
     set icon_z17;
     text: auto;
 }
+node[barrier=spikes] {
+    icon-image: "vehicle/spikes.svg";
+    set icon_z17;
+    text: auto;
+}
 node[barrier=fence],
 node[barrier=kissing_gate],
 node[barrier=bump_gate],
 node[barrier=portcullis],
-node[barrier=spikes],
 node[barrier=bus_trap],
 node[barrier=drawbridge],
 node[barrier=hampshire_gate] {
@@ -614,6 +616,9 @@ way[highway=raceway] {
     width: 1;
     color: raceway#ff80ff;
 }
+way[highway=raceway][area?], relation[type=multipolygon][highway=raceway] {
+    fill-color: raceway#ff80ff;
+}
 node[direction=clockwise] {
     icon-image: "vehicle/restriction/roundabout_left.png";
     set icon_z17;
@@ -938,6 +943,12 @@ way[highway=track][tracktype=grade5] {
 /* piste tags */
 /**************/
 
+way[route=ski]::core_piste {
+    z-index: -1;
+    modifier: false;
+    width: 6;
+    color: ski#809bc0;
+}
 area[piste:difficulty=easy][!highway]:closed::core_piste {
     fill-color: piste_easy#0000ff;
 }
@@ -1039,13 +1050,15 @@ node[power=minor_line] {
 area[power=plant],
 area[power=sub_station],
 area[power=substation],
-area[power=transformer] {
+area[power=transformer],
+area[power=generator] {
     fill-color: power#eeeeee;
 }
 node[power=plant],
 node[power=sub_station],
 node[power=substation],
-node[power=cable_distribution_cabinet] {
+node[power=cable_distribution_cabinet],
+node[power=generator] {
     icon-image: "misc/landmark/power.png";
     set icon_z17;
     text: auto;
@@ -1055,62 +1068,99 @@ node[power=transformer] {
     set icon_z17;
     text: auto;
 }
-/* power_source is deprecated by the wiki, but still in use */
-/* generator:source replaces power_source */
-area[power_source=wind], area[generator:source=wind],
-area[power_source=hydro], area[generator:source=hydro],
-area[power_source=fossil],
-area[power_source=coal], area[generator:source=coal],
-area[power_source=gas], area[generator:source=gas],
-area[power_source=photovoltaic],
-area[power_source=nuclear], area[generator:source=nuclear],
-area[power=generator] {
+
+/*************************/
+/* generator:source tags */
+/*************************/
+
+area[generator:source=nuclear],
+area[generator:source=wind],
+area[generator:source=hydro],
+area[generator:source=tidal],
+area[generator:source=wave],
+area[generator:source=osmotic],
+area[generator:source=geothermal],
+area[generator:source=solar],
+area[generator:source=coal],
+area[generator:source=gas],
+area[generator:source=biomass],
+area[generator:source=biofuel],
+area[generator:source=biogas],
+area[generator:source=oil],
+area[generator:source=diesel],
+area[generator:source=gasoline],
+area[generator:source=waste] {
     fill-color: power#eeeeee;
 }
-node[power_source=wind], node[generator:source=wind] {
-    icon-image: "misc/landmark/power/wind.png";
+node[generator:source=nuclear] {
+    icon-image: "presets/power_source-nuclear.svg";
     set icon_z17;
     text: auto;
 }
-node[power_source=hydro], node[generator:source=hydro] {
-    icon-image: "misc/landmark/power/hydro.png";
+node[generator:source=wind] {
+    icon-image: "presets/power_source-wind.svg";
     set icon_z17;
     text: auto;
 }
-node[power_source=fossil],
-node[power_source=coal], node[generator:source=coal],
-node[power_source=gas], node[generator:source=gas] {
-    icon-image: "misc/landmark/power/fossil.png";
+node[generator:source=hydro],
+node[generator:source=tidal],
+node[generator:source=wave],
+node[generator:source=osmotic],
+node[generator:source=geothermal] {
+    icon-image: "presets/power_source-water.svg";
     set icon_z17;
     text: auto;
 }
-node[power_source=photovoltaic] {
-/*    FIXME photovoltaic NOT fossil*/
-    icon-image: "misc/landmark/power/fossil.png";
+node[generator:source=solar] {
+    icon-image: "presets/power_source-sun.svg";
     set icon_z17;
     text: auto;
 }
-node[power_source=nuclear], node[generator:source=nuclear] {
-    icon-image: "misc/landmark/power/nuclear.png";
+node[generator:source=coal] {
+    icon-image: "presets/power_source-coal.svg";
     set icon_z17;
     text: auto;
 }
-node[power=generator] {
-    icon-image: "misc/landmark/power.png";
+node[generator:source=gas] {
+    icon-image: "presets/power_source-gas.svg";
+    set icon_z17;
+    text: auto;
+}
+node[generator:source=biomass],
+node[generator:source=biofuel],
+node[generator:source=biogas] {
+    icon-image: "presets/power_source-biofuel.svg";
+    set icon_z17;
+    text: auto;
+}
+node[generator:source=oil],
+node[generator:source=diesel],
+node[generator:source=gasoline] {
+    icon-image: "presets/power_source-oil.svg";
+    set icon_z17;
+    text: auto;
+}
+node[generator:source=waste] {
+    icon-image: "presets/power_source-waste.svg";
+    set icon_z17;
+    text: auto;
+}
+node[power_source] {
+    icon-image: "misc/deprecated.png";
     set icon_z17;
     text: auto;
 }
-
 /*****************/
 /* man_made tags */
 /*****************/
 
 area[man_made=beacon],
+area[man_made=bridge],
 area[man_made=chimney],
 area[man_made=crane],
 area[man_made=flagpole],
 area[man_made=gasometer],
-area[man_made=groyne],
+area[man_made=bunker_silo],
 area[man_made=lighthouse],
 area[man_made=monitoring_station],
 area[man_made=mineshaft],
@@ -1142,6 +1192,25 @@ node[man_made=gasometer] {
     set icon_z17;
     text: auto;
 }
+node[man_made=bunker_silo] {
+    icon-image: "bunker_silo.svg";
+    set icon_z17;
+    text: auto;
+}
+area[man_made=groyne]:closed {
+    fill-color: manmade#d8d8d8;
+}
+way[man_made=groyne] {
+    width: 2;
+    color: manmade#d8d8d8;
+}
+area[man_made=breakwater]:closed {
+    fill-color: manmade#d8d8d8;
+}
+way[man_made=breakwater] {
+    width: 2;
+    color: manmade#d8d8d8;
+}
 node[man_made=groyne] {
     icon-image: "nautical/groyne.png";
     set icon_z17;
@@ -1314,7 +1383,7 @@ node[leisure=sports_centre] {
     text: auto;
 }
 node[leisure=golf_course] {
-    icon-image: "sport/golf.png";
+    icon-image: "sport/golf.svg";
     set icon_z17;
     text: auto;
 }
@@ -1376,7 +1445,7 @@ node[leisure=nature_reserve] {
     text: auto;
 }
 node[leisure=park] {
-    icon-image: "leisure/park.png";
+    icon-image: "misc/deprecated.png";
     set icon_z17;
     text: auto;
 }
@@ -1415,7 +1484,7 @@ area[leisure=sauna] {
     fill-color: leisure#c7f1a3;
 }
 node[leisure=miniature_golf] {
-    icon-image: "sport/golf.png";
+    icon-image: "sport/miniature_golf.svg";
     set icon_z17;
     text: auto;
 }
@@ -1512,6 +1581,12 @@ area[shop=beauty],
 area[shop=tea],
 area[shop=coffee],
 area[shop=antiques],
+area[shop=music],
+area[shop=funeral_directors],
+area[shop=wine],
+area[shop=farm],
+area[shop=tattoo],
+area[shop=art],
 area[shop=bag] {
     fill-color: shop#00005f;
 }
@@ -1579,7 +1654,7 @@ node[shop=boutique] {
 }
 node[shop=car],
 node[shop=car_dealer] {
-    icon-image: "transport/car.png";
+    icon-image: "vehicle.png";
     set icon_z17;
     text: auto;
 }
@@ -1869,6 +1944,36 @@ node[shop=antiques] {
     set icon_z17;
     text: auto;
 }
+node[shop=music] {
+    icon-image: "shop/music.svg";
+    set icon_z17;
+    text: auto;
+}
+node[shop=funeral_directors] {
+    icon-image: "shop/funeral_directors.svg";
+    set icon_z17;
+    text: auto;
+}
+node[shop=wine] {
+    icon-image: "shop/wine.svg";
+    set icon_z17;
+    text: auto;
+}
+node[shop=farm] {
+    icon-image: "presets/apple.png";
+    set icon_z17;
+    text: auto;
+}
+node[shop=tattoo] {
+    icon-image: "shop/tattoo.svg";
+    set icon_z17;
+    text: auto;
+}
+node[shop=art] {
+    icon-image: "shop/art.svg";
+    set icon_z17;
+    text: auto;
+}
 node[shop=bag] {
     icon-image: "shop/bag.svg";
     set icon_z17;
@@ -1945,12 +2050,8 @@ node[amenity=ice_cream] {
 }
 area[amenity=parking_space],
 area[amenity=parking],
-area[parking=multi-storey],
 area[amenity=motorcycle_parking],
 area[amenity=bicycle_parking],
-area[parking=park_and_ride],
-area[parking=underground],
-area[parking=surface],
 area[amenity=bicycle_rental],
 area[amenity=car_rental],
 area[amenity=car_sharing],
@@ -1964,16 +2065,29 @@ node[amenity=parking_space] {
     icon-image: "vehicle/parking.png";
     set icon_z17;
     text: auto;
-}node[amenity=parking] {
-    icon-image: vehicle/parking.png;
+}
+node[amenity=parking] {
+    icon-image: "vehicle/parking.png";
+    set icon_z17;
+    text: auto;
+}
+node[amenity=parking_entrance] {
+    icon-image: "vehicle/parking.png";
     set icon_z17;
     text: auto;
 }
-node[parking=multi-storey] {
+node[amenity=parking_entrance][parking=multi-storey],
+node[amenity=parking][parking=multi-storey] {
     icon-image: "vehicle/parking/multi-storey.png";
     set icon_z17;
     text: auto;
 }
+node[amenity=parking_entrance][parking=underground],
+node[amenity=parking][parking=underground] {
+    icon-image: "vehicle/parking/underground.png";
+    set icon_z17;
+    text: auto;
+}
 node[amenity=motorcycle_parking] {
     icon-image: "vehicle/parking/motorbike.png";
     set icon_z17;
@@ -1989,16 +2103,6 @@ node[park_ride][park_ride!=no] {
     set icon_z17;
     text: auto;
 }
-node[parking=underground] {
-    icon-image: "vehicle/parking/underground.png";
-    set icon_z17;
-    text: auto;
-}
-node[parking=surface] {
-    icon-image: "vehicle/parking.png";
-    set icon_z17;
-    text: auto;
-}
 node[amenity=parking_space][wheelchair?] {
     icon-image: "vehicle/parking/handicapped.png";
     set icon_z17;
@@ -2137,6 +2241,7 @@ node[amenity=community_centre] {
     text: auto;
 }
 area[amenity=drinking_water],
+area[amenity=water_point],
 area[amenity=fountain] {
     fill-color: light_water#00005f;
 }
@@ -2145,6 +2250,11 @@ node[amenity=drinking_water] {
     set icon_z17;
     text: auto;
 }
+node[amenity=water_point] {
+    icon-image: "accommodation/camping/water.png";
+    set icon_z17;
+    text: auto;
+}
 node[amenity=fountain] {
     icon-image: "misc/fountain.png";
     set icon_z17;
@@ -2367,6 +2477,7 @@ node[amenity=bus_station] {
 }
 node[amenity=ferry_terminal] {
     icon-image: "nautical/ferry.png";
+    icon-width: 16;
     set icon_z17;
     text: auto;
 }
@@ -2754,152 +2865,50 @@ area[landuse=vineyard],
 area[landuse=orchard] {
     fill-color: green#b1e0c2;
 }
-node[landuse=farm] {
-    icon-image: "misc/landmark/farm.png";
-    set icon_z17;
-    text: auto;
-}
-node[landuse=farmland] {
-    icon-image: "misc/landuse/farmland.png";
-    set icon_z17;
-    text: auto;
-}
-node[landuse=meadow] {
-    icon-image: "misc/no_icon.png";
-    set icon_z17;
-    text: auto;
-}
-node[landuse=vineyard] {
-    icon-image: "shop/groceries/fruits.png";
-    set icon_z17;
-    text: auto;
-}
 area[landuse=quarry] {
     fill-color: quarry#888888;
 }
-node[landuse=quarry] {
-    icon-image: "misc/landmark/mine.png";
-    set icon_z17;
-    text: auto;
-}
 area[landuse=landfill] {
     fill-color: landfill#663300;
 }
-node[landuse=landfill] {
-    icon-image: "misc/no_icon.png";
-    set icon_z17;
-    text: auto;
-}
 area[landuse=basin],
 area[landuse=reservoir] {
     fill-color: basin#0000bf;
 }
-node[landuse=basin],
-node[landuse=reservoir] {
-    icon-image: "misc/no_icon.png";
-    set icon_z17;
-    text: auto;
-}
 area[landuse=forest] {
     fill-color: forest#b1efc8;
 }
-node[landuse=forest] {
-    icon-image: "misc/landmark/trees.png";
-    set icon_z17;
-    text: auto;
-}
 area[landuse=allotments],
 area[landuse=greenhouse_horticulture],
 area[landuse=plant_nursery],
 area[landuse=grass] {
     fill-color: green#b1e0c2;
 }
-node[landuse=allotments] {
-    icon-image: "misc/landmark/plant.png";
-    set icon_z17;
-    text: auto;
-}
-node[landuse=greenhouse_horticulture] {
-    icon-image: "misc/landuse/greenhouse_horticulture.png";
-    set icon_z17;
-    text: auto;
-}
-node[landuse=plant_nursery],
-node[landuse=grass] {
-    icon-image: "misc/landmark/plant.png";
-    set icon_z17;
-    text: auto;
-}
 area[landuse=residential] {
     fill-color: residential#f0f0f0;
 }
-node[landuse=residential] {
-    icon-image: "misc/landuse/residential.png";
-    set icon_z17;
-    text: auto;
-}
 area[landuse=garages] {
     fill-color: garages#d6c8aa;
 }
-node[landuse=garages] {
-    icon-image: "misc/landuse/garages.png";
-    set icon_z17;
-    text: auto;
-}
 area[landuse=farmyard] {
     fill-color: farmyard#f0f0f0;
 }
-node[landuse=farmyard] {
-    icon-image: "misc/no_icon.png";
-    set icon_z17;
-    text: auto;
-}
 area[landuse=retail],
 area[landuse=commercial] {
     fill-color: retail#ffc4ee;
 }
-node[landuse=retail] {
-    icon-image: "shop/mall.png";
-    set icon_z17;
-    text: auto;
-}
-node[landuse=commercial] {
-    icon-image: "misc/landuse/commercial.png";
-    set icon_z17;
-    text: auto;
-}
 area[landuse=industrial] {
     fill-color: industrial#ecd8ff;
 }
-node[landuse=industrial] {
-    icon-image: "misc/landmark/works.png";
-    set icon_z17;
-    text: auto;
-}
 area[landuse=brownfield] {
     fill-color: brownfield#ecba32;
 }
-node[landuse=brownfield] {
-    icon-image: "misc/no_icon.png";
-    set icon_z17;
-    text: auto;
-}
 area[landuse=greenfield] {
     fill-color: greenfield#b1ec5c;
 }
-node[landuse=greenfield] {
-    icon-image: "misc/no_icon.png";
-    set icon_z17;
-    text: auto;
-}
 area[landuse=railway] {
     fill-color: railland#888888;
 }
-node[landuse=railway] {
-    icon-image: "transport/railway_station.png";
-    set icon_z17;
-    text: auto;
-}
 area[landuse=construction] {
     fill-color: construction#ffff00;
 }
@@ -2908,43 +2917,23 @@ way[landuse=construction] {
     color: construction#ffff00;
     dashes: 9,9;
 }
-node[landuse=construction] {
-    icon-image: "misc/construction.png";
-    set icon_z17;
-    text: auto;
-}
 area[landuse=military] {
     fill-color: military#b62c2c;
 }
-node[landuse=military] {
-    icon-image: "vehicle/tank.png";
-    set icon_z17;
-    text: auto;
-}
 area[landuse=religious] {
     fill-color: religious#ffd454;
 }
 area[landuse=cemetery] {
     fill-color: cemetery#b1efc8;
 }
-node[landuse=cemetery] {
-    icon-image: "rendering/landuse/cemetery.png";
-    set icon_z17;
-    text: auto;
-}
 area[landuse=village_green] {
     fill-color: green#b1e0c2;
 }
-node[landuse=village_green] {
-    icon-image: "leisure/common.png";
-    set icon_z17;
-    text: auto;
-}
 area[landuse=recreation_ground] {
     fill-color: green#b1e0c2;
 }
-node[landuse=recreation_ground] {
-    icon-image: "leisure/common.png";
+node[landuse] {
+    icon-image: "misc/deprecated.png";
     set icon_z17;
     text: auto;
 }
@@ -3380,7 +3369,7 @@ area[sport=soccer],
 area[sport=australian_football],
 area[sport=american_football],
 area[sport=canadian_football],
-area[sport=gaelic_football],
+area[sport=gaelic_games],
 area[sport=rugby_league],
 area[sport=rugby_union] {
     fill-color: sport#bde3cb;
@@ -3401,14 +3390,14 @@ node[sport=athletics] {
     text: auto;
 }
 node[sport=soccer],
-node[sport=australian_football],
-node[sport=american_football],
-node[sport=canadian_football],
-node[sport=gaelic_football] {
+node[sport=gaelic_games] {
     icon-image: "sport/soccer.png";
     set icon_z17;
     text: auto;
 }
+node[sport=australian_football],
+node[sport=american_football],
+node[sport=canadian_football],
 node[sport=rugby_league],
 node[sport=rugby_union] {
     icon-image: "sport/football.png";
@@ -3448,7 +3437,7 @@ node[sport=bowls] {
     text: auto;
 }
 node[sport=canoe] {
-    icon-image: "sport/canoe.png";
+    icon-image: "sport/canoe.svg";
     set icon_z17;
     text: auto;
 }
@@ -3468,7 +3457,7 @@ node[sport=cricket] {
     text: auto;
 }
 node[sport=cricket_nets] {
-    icon-image: "misc/no_icon.png";
+    icon-image: "sport/cricket.png";
     set icon_z17;
     text: auto;
 }
@@ -3500,17 +3489,19 @@ node[sport=dog_racing] {
     text: auto;
 }
 node[sport=equestrian] {
-    icon-image: "sport/riding.png";
+    icon-image: "presets/equestrian.png";
+    icon-width: 16;
     set icon_z17;
     text: auto;
 }
 node[sport=golf] {
-    icon-image: "sport/golf.png";
+    icon-image: "sport/golf.svg";
     set icon_z17;
     text: auto;
 }
 node[sport=gymnastics] {
-    icon-image: "sport/multi.png";
+    icon-image: "presets/gymnastics.png";
+    icon-width: 16;
     set icon_z17;
     text: auto;
 }
@@ -3623,7 +3614,8 @@ node[sport=squash] {
     text: auto;
 }
 node[sport=shooting] {
-    icon-image: "misc/no_icon.png";
+    icon-image: "presets/range.png";
+    icon-width: 16;
     set icon_z17;
     text: auto;
 }
@@ -3765,114 +3757,63 @@ node[natural=cliff] {
     set icon_z17;
     text: auto;
 }
+way[natural=ridge] {
+    width: 1;
+    color: natural#002f00;
+}
 area[natural=scree] {
     fill-color: natural#002f00;
 }
-node[natural=scree] {
-    icon-image: "misc/no_icon.png";
-    set icon_z17;
-    text: auto;
-}
 area[natural=scrub] {
     fill-color: scrub#007000;
 }
-node[natural=scrub] {
-    icon-image: "presets/scrub.svg";
-    set icon_z17;
-    text: auto;
-}
 area[natural=fell] {
     fill-color: natural#002f00;
 }
-node[natural=fell] {
-    icon-image: "misc/no_icon.png";
-    set icon_z17;
-    text: auto;
-}
 area[natural=heath] {
     fill-color: heath#ffffc0;
 }
-node[natural=heath] {
-    icon-image: "misc/no_icon.png";
-    set icon_z17;
-    text: auto;
-}
 way[natural=tree_row] {
     width: 2;
     color: woodarea#008000;
 }
-node[natural=tree_row] {
-    icon-image: "misc/no_icon.png";
-    set icon_z17;
-    text: auto;
-}
 area[natural=wood] {
     fill-color: woodarea#008000;
 }
-node[natural=wood] {
-    icon-image: "misc/landmark/trees.png";
-    set icon_z17;
-    text: auto;
-}
 area[natural=grassland] {
     fill-color: green#b1e0c2;
 }
-node[natural=grassland] {
-    icon-image: "misc/no_icon.png";
-    set icon_z17;
-    text: auto;
-}
 area[natural=wetland] {
     fill-color: marsh#4f4ff3;
 }
-node[natural=wetland] {
-    icon-image: "misc/no_icon.png";
-    set icon_z17;
-    text: auto;
-}
 area[natural=water] {
     fill-color: water#0000ff;
 }
-node[natural=water] {
-    icon-image: "nautical/water.png";
-    set icon_z17;
-    text: auto;
-}
 way[natural=coastline] {
     width: 1;
     color: water#0000ff;
 }
-node[natural=coastline] {
-    icon-image: "misc/coastline.png";
-    set icon_z17;
-    text: auto;
-}
 area[natural=mud] {
     fill-color: mud#cba762;
 }
-node[natural=mud] {
-    icon-image: "misc/mud.png";
-    set icon_z17;
-    text: auto;
-}
 area[natural=beach] {
     fill-color: beach#f8dba2;
 }
-node[natural=beach] {
-    icon-image: "misc/beach.png";
-    set icon_z17;
-    text: auto;
-}
 area[natural=sand] {
     fill-color: sand#f8dba2;
 }
-node[natural=sand] {
+area[natural=bare_rock] {
+    fill-color: bare_rock#f8f8c7;
+}
+area[natural=stone] {
+    fill-color: stone#f8f8c7;
+}
+node[natural=stone] {
     icon-image: "misc/no_icon.png";
     set icon_z17;
     text: auto;
 }
 area[natural=bay],
-area[natural=land],
 area[natural=cave_entrance] {
     fill-color: natural#002f00;
 }
@@ -3881,11 +3822,6 @@ node[natural=bay] {
     set icon_z17;
     text: auto;
 }
-node[natural=land] {
-    icon-image: "misc/no_icon.png";
-    set icon_z17;
-    text: auto;
-}
 node[natural=cave_entrance] {
     icon-image: "misc/landmark/cave_entrance.png";
     set icon_z17;
@@ -3913,7 +3849,26 @@ node[natural=tree][type=palm] {
     set icon_z17;
     text: auto;
 }
-
+node[natural=scree],
+node[natural=scrub],
+node[natural=fell],
+node[natural=heath],
+node[natural=tree_row],
+node[natural=wood],
+node[natural=grassland],
+node[natural=wetland],
+node[natural=water],
+node[natural=coastline],
+node[natural=mud],
+node[natural=beach],
+node[natural=sand],
+node[natural=land],
+node[natural=bare_rock],
+node[natural=ridge] {
+    icon-image: "misc/deprecated.png";
+    set icon_z17;
+    text: auto;
+}
 /*****************/
 /* waterway tags */
 /*****************/
@@ -3965,17 +3920,14 @@ node[waterway=boatyard] {
     set icon_z17;
     text: auto;
 }
-node[waterway=water_point] {
-    icon-image: "accommodation/camping/water.png";
-    set icon_z17;
-    text: auto;
-}
-node[waterway=waste_disposal] {
-    icon-image: "accommodation/camping/wastewater.png";
+node[waterway=water_point],
+node[waterway=waste_disposal],
+node[waterway=mooring] {
+    icon-image: "misc/deprecated.png";
     set icon_z17;
     text: auto;
 }
-node[waterway=mooring] {
+node[mooring] {
     icon-image: "nautical/marina.png";
     set icon_z17;
     text: auto;
@@ -4033,16 +3985,9 @@ node[waterway=ditch], node[waterway=drain] {
 /* route tags */
 /**************/
 
-way[route=bus],
-way[route=ferry],
-way[route=flight],
-way[route=ncn],
-way[route=subsea],
-way[route=ski],
-way[route=tour],
-way[route=pub_crawl] {
+way[route=ferry] {
     width: 1;
-    color: route#809bc0;
+    color: ferry#809bc0;
     dashes: 9,9;
 }
 node[route=bus],
diff --git a/styles/standard/potlatch2.mapcss b/styles/standard/potlatch2.mapcss
index 7511b29..365fc64 100644
--- a/styles/standard/potlatch2.mapcss
+++ b/styles/standard/potlatch2.mapcss
@@ -303,7 +303,7 @@ node[highway=crossing] { icon-image: icons/transport_zebracrossing.n.16.png; z-i
 /* Misc */
 node[leisure=playground] { icon-image: icons/amenity_playground.n.16.png; z-index: 20; }
 node[leisure=sports_centre] { icon-image: icons/sport_leisure_centre.n.16.png; z-index: 20; text-offset:0; text: auto; font-size: 10; z-index: 20; }
-/* node[landuse=cemetery], node[landuse=grave_yard] { icon-image: icons/?.png; z-index: 20; } */
+/* node[landuse=cemetery], node[landuse=grave_yard] { i|||con-image: icons/?.png; z-index: 20; } */
 node[man_made=survey_point] { icon-image: icons/manmade_lighthouse.png; z-index: 20; }
 node[man_made=tower] { icon-image: icons/manmade_tower.png; z-index: 20; }
 /* Yes these power stations seem a little backward - but that's seemingly what the side menu uses ATM */
@@ -370,14 +370,14 @@ way[boundary=administrative]                { z-index: 5; color: purple; width:
 way[boundary=administrative][waterway]      { z-index: 5; opacity: 0.8; z-index: 4; dashes: 24,4; width: 6; }
 area[landuse=cemetery]:closed						{ color: #664466; width: 2; fill-color: #664466; opacity: 0.2; prop_area_small_name : 1;}
 /* Addressing. Nodes with addresses *and* match POIs should have a poi icon, so we put addressing first */
-/* Route relations */
-
-relation[type=route] > way::route { z-index: -1; width: 13; color: blue; opacity: 0.3; linecap: none; }
-relation[type=route][route=bicycle][network=ncn] > way::route { z-index: -1; width: 12; color: red; opacity: 0.3; linecap: none; }
-relation[type=route][route=bicycle][network=rcn] > way::route { z-index: -1; width: 12; color: cyan; opacity: 0.3; linecap: none; }
-relation[type=route][route=bicycle][network=lcn] > way::route { z-index: -1; width: 12; color: blue; opacity: 0.3; linecap: none; }
-relation[type=route][route=mtb] > way::route { z-index: -1; width: 12; color: brown; opacity: 0.3; linecap: none; }
-relation[type=route][route=foot] > way::route { z-index: -1; width: 10; color: #80ff80; opacity: 0.6; linecap: none; }
+/* Route relations */
+
+relation[type=route] > way::route { z-index: -1; width: 13; color: blue; opacity: 0.3; linecap: none; }
+relation[type=route][route=bicycle][network=ncn] > way::route { z-index: -1; width: 12; color: red; opacity: 0.3; linecap: none; }
+relation[type=route][route=bicycle][network=rcn] > way::route { z-index: -1; width: 12; color: cyan; opacity: 0.3; linecap: none; }
+relation[type=route][route=bicycle][network=lcn] > way::route { z-index: -1; width: 12; color: blue; opacity: 0.3; linecap: none; }
+relation[type=route][route=mtb] > way::route { z-index: -1; width: 12; color: brown; opacity: 0.3; linecap: none; }
+relation[type=route][route=foot] > way::route { z-index: -1; width: 10; color: #80ff80; opacity: 0.6; linecap: none; }
 
 /*@import("stylesheets/core_ways.css");*/
 /*@import("stylesheets/core_pois.css");*/
@@ -391,6 +391,6 @@ way[is_prop_set("prop_area_small_name")] {text-color: black; font-size: 10; text
 /*way[_status=no]::status       { z-index: 0; width: eval('_width+7'); color: #AA0000; }
 way[_status=partial]::status  { z-index: 0; width: eval('_width+7'); color: #AA0000; opacity: 0.6; }
 way[_status=unsure]::status   { z-index: 0; width: eval('_width+7'); color: darkorange; opacity: 0.6; }
-node[_status=no]::status      { z-index: 0; icon-image: square; icon-width: eval('_width+7'); color: #AA0000; }
-node[_status=partial]::status { z-index: 0; icon-image: square; icon-width: eval('_width+7'); color: #AA0000; opacity: 0.6; }
-node[_status=unsure]::status  { z-index: 0; icon-image: square; icon-width: eval('_width+7'); color: darkorange; opacity: 0.6; }*/
+node[_status=no]::status      { z-index: 0; i|||con-image: square; icon-width: eval('_width+7'); color: #AA0000; }
+node[_status=partial]::status { z-index: 0; i|||con-image: square; icon-width: eval('_width+7'); color: #AA0000; opacity: 0.6; }
+node[_status=unsure]::status  { z-index: 0; i|||con-image: square; icon-width: eval('_width+7'); color: darkorange; opacity: 0.6; }*/

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



More information about the Pkg-grass-devel mailing list