[josm] 01/05: Imported Upstream version 0.0.svn8159+dfsg1
Sebastiaan Couwenberg
sebastic at moszumanska.debian.org
Wed Apr 1 07:00:30 UTC 2015
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository josm.
commit b230281a7ccf9e8c719f0213c2eb1bc07293d0eb
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Wed Apr 1 08:05:14 2015 +0200
Imported Upstream version 0.0.svn8159+dfsg1
---
CONTRIBUTION | 2 +-
README | 7 +-
REVISION | 10 +-
build.xml | 6 +-
data/defaultpresets.xml | 207 +++--
data/validator/combinations.mapcss | 13 +-
data/validator/deprecated.mapcss | 20 +
data/validator/geometry.mapcss | 5 +-
i18n/launchpad.pl | 4 +-
i18n/po/af.po | 165 +++-
i18n/po/am.po | 165 +++-
i18n/po/ar.po | 167 +++-
i18n/po/ast.po | 197 +++--
i18n/po/az.po | 165 +++-
i18n/po/be.po | 165 +++-
i18n/po/bg.po | 175 +++-
i18n/po/bn.po | 165 +++-
i18n/po/br.po | 165 +++-
i18n/po/bs.po | 165 +++-
i18n/po/ca.po | 199 +++--
i18n/po/ca at valencia.po | 169 +++-
i18n/po/cs.po | 181 +++-
i18n/po/cy.po | 165 +++-
i18n/po/da.po | 475 +++++++----
i18n/po/de.po | 738 +++++++++-------
i18n/po/de_DE.po | 165 +++-
i18n/po/el.po | 237 ++++--
i18n/po/en_AU.po | 167 +++-
i18n/po/en_CA.po | 165 +++-
i18n/po/en_GB.po | 355 +++++---
i18n/po/eo.po | 167 +++-
i18n/po/es.po | 232 +++--
i18n/po/et.po | 167 +++-
i18n/po/eu.po | 231 +++--
i18n/po/fa.po | 165 +++-
i18n/po/fi.po | 210 +++--
i18n/po/fil.po | 165 +++-
i18n/po/fo.po | 165 +++-
i18n/po/fr.po | 219 +++--
i18n/po/gl.po | 169 +++-
i18n/po/he.po | 167 +++-
i18n/po/hi.po | 165 +++-
i18n/po/hr.po | 165 +++-
i18n/po/ht.po | 165 +++-
i18n/po/hu.po | 181 +++-
i18n/po/hy.po | 165 +++-
i18n/po/ia.po | 165 +++-
i18n/po/id.po | 169 +++-
i18n/po/is.po | 167 +++-
i18n/po/it.po | 197 +++--
i18n/po/ja.po | 319 ++++---
i18n/po/ka.po | 165 +++-
i18n/po/km.po | 165 +++-
i18n/po/ko.po | 165 +++-
i18n/po/ky.po | 165 +++-
i18n/po/lo.po | 165 +++-
i18n/po/lt.po | 930 +++++++++++++--------
i18n/po/lv.po | 165 +++-
i18n/po/mk.po | 165 +++-
i18n/po/ms.po | 165 +++-
i18n/po/nb.po | 167 +++-
i18n/po/nds.po | 165 +++-
i18n/po/nl.po | 263 ++++--
i18n/po/nn.po | 165 +++-
i18n/po/oc.po | 165 +++-
i18n/po/pa.po | 165 +++-
i18n/po/pl.po | 478 +++++++----
i18n/po/pt.po | 598 +++++++------
i18n/po/pt_BR.po | 175 +++-
i18n/po/rm.po | 165 +++-
i18n/po/ro.po | 165 +++-
i18n/po/ru.po | 187 ++++-
i18n/po/sk.po | 177 +++-
i18n/po/sl.po | 167 +++-
i18n/po/sq.po | 165 +++-
i18n/po/sr.po | 165 +++-
i18n/po/sv.po | 220 +++--
i18n/po/ta.po | 165 +++-
i18n/po/te.po | 165 +++-
i18n/po/th.po | 165 +++-
i18n/po/tr.po | 169 +++-
i18n/po/ug.po | 165 +++-
i18n/po/uk.po | 199 +++--
i18n/po/ur.po | 165 +++-
i18n/po/vi.po | 165 +++-
i18n/po/zh_CN.po | 259 ++++--
i18n/po/zh_TW.po | 169 +++-
images/presets/dam.png | Bin 342 -> 481 bytes
images/presets/ridge.svg | 69 ++
images/presets/valley.svg | 70 ++
patches/base64.patch | 127 +++
src/org/openstreetmap/josm/Main.java | 14 +-
.../josm/actions/ImageryAdjustAction.java | 12 +-
.../josm/actions/SelectByInternalPointAction.java | 11 +-
.../actions/downloadtasks/DownloadNotesTask.java | 11 +-
.../actions/downloadtasks/DownloadOsmTask.java | 2 +-
.../josm/actions/search/SearchAction.java | 9 +-
.../josm/corrector/CorrectionTable.java | 2 +-
src/org/openstreetmap/josm/data/Version.java | 2 +-
.../josm/data/coor/CoordinateFormat.java | 2 +-
.../josm/data/imagery/ImageryLayerInfo.java | 4 +-
src/org/openstreetmap/josm/data/osm/Changeset.java | 6 +-
src/org/openstreetmap/josm/data/osm/User.java | 30 +-
.../josm/data/osm/history/HistoryDataSet.java | 2 +-
.../data/osm/visitor/paint/MapRendererFactory.java | 2 +-
.../josm/data/osm/visitor/paint/PaintColors.java | 4 +-
.../data/osm/visitor/paint/StyledMapRenderer.java | 32 +-
.../osm/visitor/paint/relations/Multipolygon.java | 2 +-
.../josm/data/validation/OsmValidator.java | 2 +-
.../data/validation/tests/MapCSSTagChecker.java | 4 +-
.../data/validation/tests/MultipolygonTest.java | 4 +-
.../josm/data/validation/tests/TagChecker.java | 10 +-
.../josm/data/validation/util/Entities.java | 2 +-
.../josm/gui/DefaultNameFormatter.java | 4 +-
src/org/openstreetmap/josm/gui/FileDrop.java | 25 +-
.../josm/gui/JosmUserIdentityManager.java | 4 +-
src/org/openstreetmap/josm/gui/MapStatus.java | 6 +-
.../josm/gui/NotificationManager.java | 16 +-
.../DeleteFromRelationConfirmationDialog.java | 2 +-
.../tags/CombinePrimitiveResolverDialog.java | 2 +-
.../josm/gui/dialogs/LayerListDialog.java | 2 +-
.../josm/gui/dialogs/NotesDialog.java | 2 +-
.../dialogs/changeset/ChangesetCacheManager.java | 2 +-
.../josm/gui/download/DownloadDialog.java | 2 +-
.../openstreetmap/josm/gui/help/HelpBrowser.java | 2 +-
.../gui/history/HistoryBrowserDialogManager.java | 2 +-
.../josm/gui/io/ChangesetCommentModel.java | 8 +-
.../openstreetmap/josm/gui/io/UploadDialog.java | 2 +-
.../josm/gui/layer/JumpToMarkerActions.java | 4 +-
.../openstreetmap/josm/gui/layer/OsmDataLayer.java | 93 +--
src/org/openstreetmap/josm/gui/layer/TMSLayer.java | 8 +-
.../josm/gui/layer/geoimage/GeoImageLayer.java | 14 +-
.../josm/gui/layer/geoimage/ImageViewerDialog.java | 2 +-
.../josm/gui/layer/markerlayer/AudioMarker.java | 2 +-
.../josm/gui/layer/markerlayer/PlayHeadMarker.java | 2 +-
.../josm/gui/mappaint/BoxTextElemStyle.java | 2 +-
.../josm/gui/mappaint/ElemStyles.java | 2 +-
.../josm/gui/mappaint/NodeElemStyle.java | 2 +
.../josm/gui/mappaint/StyleSource.java | 2 +-
.../gui/mappaint/mapcss/MapCSSStyleSource.java | 16 +-
.../preferences/server/OAuthAccessTokenHolder.java | 2 +-
.../josm/gui/tagging/PresetLabel.java | 36 +-
.../gui/tagging/TaggingPresetNameTemplateList.java | 2 +-
.../josm/gui/tagging/TaggingPresetReader.java | 2 +-
.../gui/tagging/TaggingPresetSearchDialog.java | 2 +-
.../TaggingPresetSearchPrimitiveDialog.java | 16 +-
.../gui/tagging/ac/AutoCompletionItemPriority.java | 13 +-
.../josm/gui/util/FileFilterAllFiles.java | 7 +-
.../josm/gui/util/StayOpenCheckBoxMenuItem.java | 2 +-
.../josm/gui/util/StayOpenMenuItem.java | 2 +-
.../josm/gui/util/StayOpenRadioButtonMenuItem.java | 2 +-
.../josm/gui/widgets/AbstractFileChooser.java | 2 +-
src/org/openstreetmap/josm/io/AbstractParser.java | 2 +-
.../josm/io/BoundingBoxDownloader.java | 2 +-
src/org/openstreetmap/josm/io/MessageNotifier.java | 2 +-
src/org/openstreetmap/josm/io/OsmReader.java | 2 +-
src/org/openstreetmap/josm/io/OsmServerWriter.java | 2 +-
.../openstreetmap/josm/io/OsmWriterFactory.java | 2 +-
.../josm/io/auth/CredentialsManager.java | 2 +-
.../josm/io/auth/DefaultAuthenticator.java | 2 +-
.../io/remotecontrol/RemoteControlHttpServer.java | 2 +-
.../io/remotecontrol/RemoteControlHttpsServer.java | 2 +-
.../openstreetmap/josm/plugins/PluginHandler.java | 2 +-
src/org/openstreetmap/josm/tools/AudioPlayer.java | 2 +-
.../josm/tools/BugReportExceptionHandler.java | 2 +-
src/org/openstreetmap/josm/tools/ExifReader.java | 8 +-
src/org/openstreetmap/josm/tools/Geometry.java | 8 +-
src/org/openstreetmap/josm/tools/I18n.java | 8 +-
.../openstreetmap/josm/tools/ImageProvider.java | 6 +-
.../josm/tools/MultikeyActionsHandler.java | 2 +-
.../josm/tools/PlatformHookUnixoid.java | 4 +-
.../josm/tools/RightAndLefthandTraffic.java | 5 +-
.../openstreetmap/josm/tools/date/DateUtils.java | 2 +-
styles/standard/elemstyles.mapcss | 96 ++-
174 files changed, 13019 insertions(+), 4586 deletions(-)
diff --git a/CONTRIBUTION b/CONTRIBUTION
index df5de61..babe30f 100644
--- a/CONTRIBUTION
+++ b/CONTRIBUTION
@@ -34,7 +34,7 @@ Copyright rests with the contributors.
-------------------------------- EXTERNAL CODE --------------------------------
The jpeg metadata extraction code is from Drew Noakes
-(http://code.google.com/p/metadata-extractor/) and licensed
+(https://github.com/drewnoakes/metadata-extractor) and licensed
with Apache license version 2.0.
The Bzip2 code is from Apache Commons Compress and licensed
diff --git a/README b/README
index 368f6f2..b86d9d1 100644
--- a/README
+++ b/README
@@ -114,12 +114,12 @@ This is an overview of the files and directories in the JOSM code repository:
- performance/ performance tests (source code)
- unit/ unit tests (source code)
- tools/ libraries and tools that help in the development process
- - animal-sniffer-ant-tasks-1.13.jar
+ - animal-sniffer-ant-tasks-1.14.jar
used to build and check code signatures to ensure plugins binary compatibility
- appbundler-1.0ea.jar used to build Mac OS X package for Oracle Java 7
- findbugs/ libs and config files for findbugs (automatically detects common bugs and potential
problems in source code); can be launched as an ant target in build.xml
- - groovy-all-2.3.9.jar used for some unit tests and various scripts
+ - groovy-all-2.4.3.jar used for some unit tests and various scripts
- jacocoant.jar used to include coverage data into JUnit test reports
- javacc.jar used in the build process to generate some .java files from a javacc source file
(src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSParser.jj)
@@ -147,9 +147,6 @@ There are some third party libraries which are directly included in the source c
* jmapviewer: Java component to browse a TMS map
src/org/openstreetmap/gui (svn external)
-> http://svn.openstreetmap.org/applications/viewer/jmapviewer/
-* Apache commons codec: Better Base64 support
- src/org/apache/commons/codec (svn external)
- -> http://svn.apache.org/repos/asf/commons/proper/codec/trunk/src/main/java/org/apache/commons/codec
* Apache commons compress: Support for bzip2 compression when opening files
src/org/apache/commons/compress/compressors (svn external)
-> http://svn.apache.org/repos/asf/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/compressors
diff --git a/REVISION b/REVISION
index 1b8ae91..f6c199d 100644
--- a/REVISION
+++ b/REVISION
@@ -1,18 +1,18 @@
<?xml version="1.0"?>
<info>
<entry
- kind="dir"
path="trunk"
- revision="8109">
+ revision="8159"
+ 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="8109">
-<author>Don-vip</author>
-<date>2015-03-01T23:13:51.162375Z</date>
+ revision="8159">
+<author>stoecker</author>
+<date>2015-03-29T12:37:50.444628Z</date>
</commit>
</entry>
</info>
diff --git a/build.xml b/build.xml
index 0a9e62a..7435674 100644
--- a/build.xml
+++ b/build.xml
@@ -278,7 +278,7 @@ Build-Date: ${build.tstamp}
<include name="**/*.jar"/>
</fileset>
<pathelement path="dist/josm-custom.jar"/>
- <pathelement path="tools/groovy-all-2.4.0.jar"/>
+ <pathelement path="tools/groovy-all-2.4.3.jar"/>
</path>
<macrodef name="init-test-preferences">
<attribute name="testfamily"/>
@@ -325,7 +325,7 @@ Build-Date: ${build.tstamp}
</sequential>
</macrodef>
<target name="test-compile" depends="test-init,dist">
- <taskdef name="groovyc" classname="org.codehaus.groovy.ant.Groovyc" classpath="tools/groovy-all-2.4.0.jar"/>
+ <taskdef name="groovyc" classname="org.codehaus.groovy.ant.Groovyc" classpath="tools/groovy-all-2.4.3.jar"/>
<call-groovyc testfamily="unit">
<cp-elements>
<path refid="test.classpath"/>
@@ -448,7 +448,7 @@ Build-Date: ${build.tstamp}
<local name="plugins"/>
<property name="dir" value="plugin-check"/>
<typedef uri="antlib:org.codehaus.mojo.animal_sniffer">
- <classpath path="tools/animal-sniffer-ant-tasks-1.13.jar"/>
+ <classpath path="tools/animal-sniffer-ant-tasks-1.14.jar"/>
</typedef>
<mkdir dir="${dir}"/>
<!-- List of deprecated plugins -->
diff --git a/data/defaultpresets.xml b/data/defaultpresets.xml
index 9ab7ece..a1a1a10 100644
--- a/data/defaultpresets.xml
+++ b/data/defaultpresets.xml
@@ -175,10 +175,8 @@
<text key="name" text="Name" />
<combo key="leisure" text="Type" values="pitch,sports_centre,stadium" default="pitch" />
</chunk>
- <chunk id="optional_sport">
- <optional text="Select sport:">
- <combo key="sport" text="Sport" values="multi,archery,athletics,american_football,australian_football,baseball,basketball,boules,bowls,canadian_football,canoe,climbing,cricket,cricket_nets,croquet,cycling,dog_racing,equestrian,gaelic_games,golf,gymnastics,handball,hockey,horse_racing,motor,pelota,racquet,rugby_league,rugby_union,shooting,skateboard,skating,skiing,soccer,swimming,table_tennis,tennis" values_context="sport" />
- </optional>
+ <chunk id="sport">
+ <combo key="sport" text="Sport" values="multi,archery,athletics,american_football,australian_football,baseball,basketball,boules,bowls,canadian_football,canoe,climbing,cricket,cricket_nets,croquet,cycling,dog_racing,equestrian,gaelic_games,golf,gymnastics,handball,hockey,horse_racing,motor,pelota,racquet,rugby_league,rugby_union,running,shooting,skateboard,skating,soccer,swimming,table_tennis,tennis" values_context="sport" />
</chunk>
<chunk id="fee">
<combo key="fee" text="Fee" values="yes,no" />
@@ -310,6 +308,24 @@
<check key="toll" text="Toll" />
</optional>
</chunk>
+ <chunk id="waterway">
+ <reference ref="name_layer" />
+ <check key="intermittent" text="Is the water body intermittent (disappears seasonally)?" disable_off="true" />
+ <combo key="tunnel" text="Tunnel" values="culvert,yes" />
+ <text key="width" text="Width (meters)" />
+ </chunk>
+ <chunk id="waterway_wikipedia">
+ <reference ref="waterway" />
+ <text key="wikipedia" text="Wikipedia" />
+ </chunk>
+ <chunk id="water_access">
+ <optional text="Water access rules:">
+ <combo key="ship" text="Ship" values="yes,designated,destination,delivery,permissive,private,no" />
+ <combo key="boat" text="Boat" values="yes,designated,destination,delivery,permissive,private,no" />
+ <combo key="motorboat" text="Motorboat" values="yes,designated,destination,delivery,permissive,private,no" />
+ <combo key="canoe" text="Canoe" values="yes,designated,destination,delivery,permissive,private,no" />
+ </optional>
+ </chunk>
<!-- Link chunks -->
<chunk id="link_contact_address">
<preset_link preset_name="Contact (Common Schema)" />
@@ -795,7 +811,7 @@
<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">
+ <item name="Roundabout" icon="presets/roundabout.png" type="node,way,closedway" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Tag:junction=roundabout"
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:junction=roundabout"
es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:junction=roundabout"
@@ -1164,6 +1180,9 @@
<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" />
+ <label text="In case of traffic signals:" />
+ <check key="button_operated" text="Button operated" />
+ <check key="traffic_signals:sound" text="Sound signals" />
</item> <!-- Pedestrian Crossing -->
<item name="Traffic Calming" icon="styles/standard/vehicle/traffic_calming_blue.png" type="node,way" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"
@@ -1673,8 +1692,9 @@
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:waterway=drain" />
<space />
<key key="waterway" value="drain" />
- <text key="name" text="Name" />
- <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
+ <optional>
+ <reference ref="waterway" />
+ </optional>
</item> <!-- Drain -->
<item name="Ditch" icon="presets/waterway.png" type="way" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=ditch"
@@ -1684,8 +1704,9 @@
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:waterway=ditch" />
<space />
<key key="waterway" value="ditch" />
- <text key="name" text="Name" />
- <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
+ <optional>
+ <reference ref="waterway" />
+ </optional>
</item> <!-- Ditch -->
<item name="Stream" icon="presets/waterway.png" type="way" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream"
@@ -1700,29 +1721,11 @@
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:waterway=stream" />
<space />
<key key="waterway" value="stream" />
- <text key="name" text="Name" />
- <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
+ <optional>
+ <reference ref="waterway_wikipedia" />
+ </optional>
+ <reference ref="water_access" />
</item> <!-- Stream -->
- <item name="Wadi" icon="presets/waterway.png" type="way" preset_name_label="true">
- <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=wadi" />
- <space />
- <key key="waterway" value="wadi" />
- <text key="name" text="Name" />
- <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
- </item> <!-- Wadi -->
- <item name="Canal" icon="presets/waterway.png" type="way" preset_name_label="true">
- <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal"
- de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=canal"
- fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:waterway=canal"
- ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:waterway=canal"
- pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:waterway=canal"
- pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:waterway=canal"
- ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:waterway=canal" />
- <space />
- <key key="waterway" value="canal" />
- <reference ref="name_wikipedia" />
- <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
- </item> <!-- Canal -->
<item name="River" icon="presets/river.png" type="way" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=river"
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=river"
@@ -1735,9 +1738,29 @@
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:waterway=river" />
<space />
<key key="waterway" value="river" />
- <reference ref="name_wikipedia" />
- <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
+ <optional>
+ <reference ref="waterway_wikipedia" />
+ </optional>
+ <reference ref="water_access" />
</item> <!-- River -->
+ <item name="Canal" icon="presets/waterway.png" type="way" preset_name_label="true">
+ <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal"
+ de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=canal"
+ fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:waterway=canal"
+ ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:waterway=canal"
+ pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:waterway=canal"
+ pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:waterway=canal"
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:waterway=canal" />
+ <space />
+ <key key="waterway" value="canal" />
+ <optional>
+ <reference ref="name_layer" />
+ <combo key="tunnel" text="Tunnel" values="culvert,yes" />
+ <text key="width" text="Width (meters)" />
+ <text key="wikipedia" text="Wikipedia" />
+ </optional>
+ <reference ref="water_access" />
+ </item> <!-- Canal -->
<separator/>
<item name="Spring" icon="presets/spring.png" type="node,closedway" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring"
@@ -1867,6 +1890,8 @@
<combo key="water" text="Water Body" values="canal,lake,lagoon,oxbow,pond,reservoir,river" match="key" values_searchable="true" />
<check key="salt" text="Salt Water" disable_off="true" />
<check key="intermittent" text="Is the water body intermittent (disappears seasonally)?" disable_off="true" />
+ <text key="wikipedia" text="Wikipedia" />
+ <reference ref="water_access" />
</item> <!-- Water -->
<item name="Coastline" icon="presets/coastline.png" type="way,closedway,relation" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline"
@@ -1895,6 +1920,7 @@
<space />
<key key="waterway" value="riverbank" />
<text key="name" text="Name" />
+ <check key="intermittent" text="Is the water body intermittent (disappears seasonally)?" disable_off="true" />
</item> <!-- Riverbank -->
<separator/>
<item name="Wetland" icon="presets/empty.png" type="closedway,relation" preset_name_label="true">
@@ -2735,13 +2761,13 @@
</optional>
<roles>
<role key="stop" text="Stop Position" requisite="optional" type="node" member_expression="public_transport=stop_position" />
- <role key="platform" text="Platform" requisite="optional" type="node,way,closedway" member_expression="public_transport=platform" />
+ <role key="platform" text="Platform" requisite="optional" type="node,way,closedway,relation" member_expression="public_transport=platform" />
<role key="" text="Station or amenities" requisite="optional" type="node,way,closedway" member_expression="amenity|public_transport=station" />
</roles>
</item> <!-- Stop Area -->
<separator/>
<item name="Stop Position" type="node" icon="presets/barrier.png" preset_name_label="true">
- <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Public_Transport#Stop_area" />
+ <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Public_Transport#Stop_position" />
<space />
<key key="public_transport" value="stop_position" />
<text key="name" text="Name" />
@@ -2936,9 +2962,9 @@
<key key="highway" value="bus_stop" />
<optional>
<text key="name" text="Name" />
- <combo key="shelter" text="Shelter" values="yes,no" />
- <combo key="bench" text="Bench" values="yes,no" />
- <combo key="tactile_paving" text="Tactile Paving" values="yes,no" />
+ <check key="shelter" text="Shelter" />
+ <check key="bench" text="Bench" />
+ <combo key="tactile_paving" text="Tactile Paving" values="yes,no,incorrect" />
</optional>
</item> <!-- Bus Stop -->
<item name="Bus Platform" icon="presets/platform_bus.png" type="node,way,closedway" preset_name_label="true">
@@ -3237,6 +3263,7 @@
<reference ref="name_operator" />
<multiselect key="cuisine" text="Cuisine" values="italian;chinese;pizza;burger;greek;german;indian;regional;kebab;turkish;asian;thai;mexican;japanese;french;sandwich;sushi" values_searchable="true" />
<check key="microbrewery" text="Microbrewery" />
+ <check key="outdoor_seating" text="Outdoor seating" />
<reference ref="oh_wheelchair" />
<combo key="stars" text="Stars" values="1,2,3,4,5,6,7" />
<space />
@@ -3254,6 +3281,7 @@
<key key="amenity" value="fast_food" />
<reference ref="name_operator" />
<combo key="cuisine" text="Cuisine" values="italian,chinese,pizza,burger,greek,german,indian,regional,kebab,turkish,asian,thai,mexican,japanese,french,sandwich,sushi,fish_and_chips,chicken" />
+ <check key="outdoor_seating" text="Outdoor seating" />
<reference ref="oh_wheelchair" />
<space />
<reference ref="internet_smoking" />
@@ -3267,7 +3295,9 @@
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=food_court" />
<space />
<key key="amenity" value="food_court" />
- <reference ref="name_operator_oh_wheelchair" />
+ <reference ref="name_operator" />
+ <check key="outdoor_seating" text="Outdoor seating" />
+ <reference ref="oh_wheelchair" />
<space />
<reference ref="internet_smoking" />
<space />
@@ -3287,6 +3317,7 @@
<key key="amenity" value="cafe" />
<reference ref="name_operator" />
<combo key="cuisine" text="Cuisine" values="ice_cream" />
+ <check key="outdoor_seating" text="Outdoor seating" />
<reference ref="oh_wheelchair" />
<space />
<reference ref="internet_smoking" />
@@ -3303,6 +3334,7 @@
<key key="amenity" value="pub" />
<reference ref="name_operator" />
<check key="microbrewery" text="Microbrewery" />
+ <check key="outdoor_seating" text="Outdoor seating" />
<reference ref="oh_wheelchair" />
<space />
<reference ref="internet_smoking" />
@@ -3336,7 +3368,9 @@
zh_CN.href="http://wiki.openstreetmap.org/wiki/Zh-hans:Tag:amenity=bar" />
<space />
<key key="amenity" value="bar" />
- <reference ref="name_operator_oh_wheelchair" />
+ <reference ref="name_operator" />
+ <check key="outdoor_seating" text="Outdoor seating" />
+ <reference ref="oh_wheelchair" />
<space />
<reference ref="internet_smoking" />
<space />
@@ -3653,7 +3687,7 @@
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:leisure=playground" />
<space />
<key key="leisure" value="playground" />
- <text key="name" text="Name" />
+ <reference ref="name_operator_oh_wheelchair" />
</item> <!-- Playground -->
<item name="Picnic Site" icon="styles/standard/leisure/picnic.png" type="node,closedway" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=picnic_site"
@@ -4241,7 +4275,7 @@
<space />
<key key="amenity" value="pharmacy" />
<reference ref="name_operator_oh_wheelchair" />
- <combo key="dispensing" text="Dispensing" values="yes,no" />
+ <check key="dispensing" text="Dispensing"/>
<reference ref="link_contact_address_payment" />
</item> <!-- Pharmacy -->
<separator/>
@@ -4341,7 +4375,7 @@
<key key="amenity" value="post_box" />
<text key="operator" text="Operator" />
<text key="ref" text="Reference number" />
- <combo key="collection_times" text="Collection times" delimiter="|" values="11:30|Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00|Mo-Fr 09:00-12:00,17:15; Sa 14:00; Su,PH off" />
+ <combo key="collection_times" text="Collection times" delimiter="|" values="Mo-Sa 09:00|Mo-Fr 17:30; Sa 12:00|Mo-Fr 15:00,19:00; Sa 15:10; Su 10:30" />
<check key="drive_through" text="Drive through" />
</item> <!-- Post Box -->
<item name="Telephone" icon="presets/telephone.png" type="node" preset_name_label="true">
@@ -4475,7 +4509,7 @@
zh_TW.href="http://wiki.openstreetmap.org/wiki/Zh-hant:Tag:amenity=bench" />
<space />
<key key="amenity" value="bench" />
- <combo key="backrest" text="Backrest" values="yes,no" />
+ <check key="backrest" text="Backrest" />
<combo key="material" text="Material" values="stone,metal,wood,plastic" />
<combo key="colour" text="Color (HTML name or hexadecimal code)" values_context="color" values="black,brown,green,red,blue,gray,white,#CD853F" />
<combo key="seats" text="Amount of Seats" values="2,3,4,5,6,7,8,9,10" />
@@ -4504,9 +4538,9 @@
<space />
<key key="amenity" value="hunting_stand" />
<combo key="height" text="Height" values="low,half,full,5,10,15,20" values_context="height" />
- <combo key="shelter" text="Shelter" values="yes,no" />
- <combo key="hide" text="Hide" values="yes,no" />
- <combo key="lock" text="Lock" values="yes,no" />
+ <check key="shelter" text="Shelter" />
+ <check key="hide" text="Hide" />
+ <check key="lock" text="Lock" />
</item> <!-- Hunting Stand -->
<separator/>
<item name="Drinking Water" icon="styles/standard/food/drinking_water.png" type="node" preset_name_label="true">
@@ -4580,7 +4614,7 @@
<space />
<key key="leisure" value="stadium" />
<text key="name" text="Name" />
- <reference ref="optional_sport" />
+ <reference ref="sport" />
<reference ref="link_contact_address_payment" />
</item> <!-- Stadium -->
<item name="Sports Centre" icon="styles/standard/sport/centre.png" type="node,closedway" preset_name_label="true">
@@ -4593,7 +4627,7 @@
<space />
<key key="leisure" value="sports_centre" />
<text key="name" text="Name" />
- <reference ref="optional_sport" />
+ <reference ref="sport" />
<reference ref="link_contact_address_payment" />
</item> <!-- Sports Centre -->
<item name="Pitch" icon="styles/standard/sport/pitch.png" type="node,closedway" preset_name_label="true">
@@ -4609,7 +4643,8 @@
<space />
<key key="leisure" value="pitch" />
<text key="name" text="Name" />
- <reference ref="optional_sport" />
+ <reference ref="sport" />
+ <combo key="surface" text="Surface" values="artificial_turf,asphalt,clay,concrete,decoturf,grass,sand,tartan,ground" />
<reference ref="link_contact_address_payment" />
</item> <!-- Pitch -->
<item name="Racetrack" icon="styles/standard/sport/track.png" type="node,way,closedway,relation" preset_name_label="true">
@@ -4623,7 +4658,7 @@
<space />
<key key="leisure" value="track" />
<text key="name" text="Name" />
- <reference ref="optional_sport" />
+ <reference ref="sport" />
</item> <!-- Racetrack -->
<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"
@@ -4773,11 +4808,12 @@
it.href="http://wiki.openstreetmap.org/wiki/IT:Piste_Maps"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Piste_Maps" />
<space />
- <key key="sport" value="skiing" />
<text key="name" text="Name" />
- <combo key="piste:type" text="Piste type" values="downhill,nordic,skitour,snow_park" />
- <combo key="piste:difficulty" text="Difficulty" values="novice,easy,intermediate,advanced,expert,freeride" values_context="piste:difficulty" values_searchable="true" />
- <combo key="piste:grooming" text="Grooming" values="classic,mogul,skating,classic;skating,scooter,backcountry" values_context="piste:grooming" />
+ <combo key="piste:type" text="Piste type" values="downhill,nordic,skitour,sled,sleigh,snow_park" match="keyvalue"/>
+ <optional>
+ <combo key="piste:difficulty" text="Difficulty" values="novice,easy,intermediate,advanced,expert,freeride" values_context="piste:difficulty" values_searchable="true" />
+ <combo key="piste:grooming" text="Grooming" values="classic,mogul,skating,classic;skating,scooter,backcountry" values_context="piste:grooming" />
+ </optional>
</item> <!-- Skiing -->
<item name="Shooting" icon="presets/range.png" type="node,closedway" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting"
@@ -5055,6 +5091,8 @@
<space />
<combo key="building" text="Building" values="yes,roof,garage,garages,industrial,school,hangar,commercial,barn,farm_auxiliary,transportation,greenhouse,office,university,hospital,warehouse,retail,shed,cowshed,construction" values_context="building" default="yes" match="keyvalue!" values_searchable="true" />
<text key="name" text="Name" />
+ <combo key="building:levels" text="Levels" values="1,2,3,4,5,6,7,8,9,10,11" text_context="building" />
+ <text key="height" text="Height (meters)" />
</item> <!-- Building -->
<item name="Residential Building" icon="styles/standard/misc/landmark/building.png" type="node,closedway,relation" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Key:building"
@@ -5073,7 +5111,19 @@
<space />
<combo key="building" text="Building" values="residential,apartments,house,hut,dormitory,terrace,detached,farm,roof" default="residential" match="keyvalue!" values_context="building" values_searchable="true" />
<text key="name" text="Name" />
+ <combo key="building:levels" text="Levels" values="1,2,3,4,5,6,7,8,9,10,11" text_context="building" />
+ <text key="height" text="Height (meters)" />
</item> <!-- Residential Building -->
+ <item name="Building part" icon="styles/standard/misc/landmark/building.png" type="closedway,relation" preset_name_label="true">
+ <link href="http://wiki.openstreetmap.org/wiki/Key:building:part" />
+ <space />
+ <combo key="building:part" text="Building part" values="yes,roof,garage,garages,industrial,school,hangar,commercial,barn,farm_auxiliary,transportation,greenhouse,office,university,hospital,warehouse,retail,shed,cowshed,construction" values_context="building" default="yes" match="keyvalue!" values_searchable="true" />
+ <text key="name" text="Name" />
+ <combo key="building:levels" text="Levels" values="1,2,3,4,5,6,7,8,9,10,11" text_context="building" />
+ <combo key="building:min_level" text="Skipped Levels" values="1,2,3,4,5,6,7,8,9,10" text_context="building" />
+ <text key="height" text="Height (meters)" />
+ <text key="min_height" text="Skipped height (meters)" />
+ </item> <!-- Building part -->
<item name="Entrance" icon="styles/standard/misc/entrance-yes.png" type="node" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Key:entrance"
de.href="http://wiki.openstreetmap.org/wiki/DE:Key:entrance"
@@ -5194,7 +5244,7 @@
<text key="depth" text="Depth in meters" />
<text key="operator" text="Operator" />
<combo key="resource" text="Resource" values="aggregate,bauxite,coal,copper,dimension_stone,gold,ilmenite,iron_ore,lead,limestone,nickel,rutile,salt,silver,tin,zinc,zircon" />
- <combo key="headframe" text="Visible Headframe" values="yes,no" />
+ <check key="headframe" text="Visible Headframe" />
<check key="disused" text="Disused" />
</item> <!-- Mineshaft -->
<item name="Adit" icon="presets/adit.png" type="node" preset_name_label="true">
@@ -6657,7 +6707,7 @@
<space />
<key key="shop" value="medical_supply" />
<reference ref="name_operator_oh_wheelchair" />
- <combo key="dispensing" text="Dispensing" values="yes,no" />
+ <check key="dispensing" text="Dispensing" />
<reference ref="link_contact_address_payment" />
</item> <!-- Medical Supply -->
<item name="Jewellery" icon="styles/standard/shop/jewelry.png" type="node,closedway" preset_name_label="true">
@@ -7195,6 +7245,25 @@
<combo key="volcano:type" text="Type" values="stratovolcano,shield,scoria" />
</optional>
</item> <!-- Volcano -->
+ <item name="Ridge" icon="presets/ridge.svg" type="way,relation" preset_name_label="true">
+ <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=ridge"
+ cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:natural=ridge"
+ de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=ridge"
+ pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:natural=ridge"
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:natural=ridge" />
+ <label text="A mountain or hill ridge." />
+ <space />
+ <key key="natural" value="ridge" />
+ <reference ref="name_wikipedia" />
+ <text key="ele" text="Elevation" />
+ </item> <!-- Ridge -->
+ <item name="Valley" icon="presets/valley.svg" type="way,relation" preset_name_label="true">
+ <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=valley" />
+ <label text="A low area between hills." />
+ <space />
+ <key key="natural" value="valley" />
+ <reference ref="name_wikipedia" />
+ </item> <!-- Valley -->
<item name="Cave Entrance" icon="presets/cave_entrance.png" type="node,closedway,relation" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance"
cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:natural=cave_entrance"
@@ -7231,18 +7300,6 @@
<key key="place" value="islet" />
<reference ref="name_wikipedia" />
</item> <!-- Islet -->
- <item name="Ridge" icon="presets/empty.png" type="way,relation" preset_name_label="true">
- <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=ridge"
- cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:natural=ridge"
- de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=ridge"
- pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:natural=ridge"
- ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:natural=ridge" />
- <label text="A mountain or hill ridge." />
- <space />
- <key key="natural" value="ridge" />
- <reference ref="name_wikipedia" />
- <text key="ele" text="Elevation" />
- </item> <!-- Ridge -->
</group> <!-- Geography -->
<group name="Nature" icon="styles/standard/misc/landmark/trees.png">
<item name="Tree" icon="styles/standard/misc/landmark/trees.png" type="node" preset_name_label="true">
@@ -7314,6 +7371,12 @@
<text key="name" text="Name" />
<reference ref="leaf" />
</item> <!-- Forest -->
+ <item name="Cutline" icon="styles/standard/misc/landmark/cutline.svg" type="way" preset_name_label="true">
+ <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=cutline" />
+ <space />
+ <key key="man_made" value="cutline" />
+ <combo key="cutline" text="Type" values="border,firebreak,hunting,loggingmachine,pipeline,piste,section" values_context="cutline" />
+ </item> <!-- Cutline -->
<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"
@@ -8074,7 +8137,7 @@
<reference ref="route_hikebike_optionals" />
</optional>
<roles>
- <role key="" text="route segment" requisite="required" type="way,closedway"/>
+ <role key="" text="route segment" requisite="required" type="way,closedway" member_expression="highway"/>
<role key="forward" text="forward segment" requisite="optional" type="way,closedway" />
<role key="backward" text="backward segment" requisite="optional" type="way,closedway" />
</roles>
@@ -8119,7 +8182,7 @@
<reference ref="route_hikebike_optionals" />
</optional>
<roles>
- <role key="" text="route segment" requisite="required" type="way,closedway" member_expression="highway=path OR highway=footway OR highway=track"/>
+ <role key="" text="route segment" requisite="required" type="way,closedway" member_expression="highway"/>
<role key="" text="infrastructure" requisite="optional" type="node,closedway" member_expression="tourism OR amenity"/>
<role key="" text="natural" requisite="optional" type="node,closedway" member_expression="natural=peak OR natural=volcano OR mountain_pass=yes OR natural=water OR tourism=viewpoint OR amenity=drinking_water OR natural=spring OR place=locality"/>
</roles>
@@ -8179,7 +8242,7 @@
<text key="detour" text="Ref of the way this is a detour to"/>
</optional>
<roles>
- <role key="" text="route segment" requisite="required" type="way,closedway"/>
+ <role key="" text="route segment" requisite="required" type="way,closedway" member_expression="highway"/>
<role key="fork" text="fork node for alternative routes" requisite="optional" type="node"/>
</roles>
</item> <!-- Detour Route -->
diff --git a/data/validator/combinations.mapcss b/data/validator/combinations.mapcss
index 754a852..5f3f280 100644
--- a/data/validator/combinations.mapcss
+++ b/data/validator/combinations.mapcss
@@ -45,6 +45,7 @@ way[junction ][!highway][junction!=yes],
*[have_riverbank ][!waterway],
*[border_type ][!boundary],
*[bridge:structure ][!bridge],
+*[piste:difficulty ][!piste:type],
*[source:date ][!source],
*[source:name ][!name],
*[source:maxspeed:forward ][!maxspeed:forward],
@@ -103,7 +104,8 @@ way[junction ][!highway][junction!=yes],
*[castle_type ][historic!=castle],
*[reservoir_type ][landuse!=reservoir][water!=reservoir],
*[bridge:movable ][bridge!=movable],
-*[parking ][amenity!~/^(parking|parking_space|parking_entrance|motorcycle_parking)$/]
+*[parking ][amenity!~/^(parking|parking_space|parking_entrance|motorcycle_parking)$/],
+*[cutline ][man_made!=cutline],
*[bunker_type ][military!=bunker] {
throwWarning: tr("{0} without {1}", "{0.key}", "{1.tag}");
}
@@ -168,6 +170,11 @@ way[junction ][!highway][junction!=yes],
throwOther: tr("{0} together with {1}", "{0.tag}", "{1.tag}");
}
+/* {0.tag} together with {1.tag}, see #10186 */
+*[highway=footway][bicycle=designated] {
+ throwWarning: tr("{0} together with {1}", "{0.tag}", "{1.tag}");
+}
+
/*see #11127*/
way[waterway][bridge=yes] {
throwWarning: tr("{0} together with {1}", "{0.key}", "{1.tag}");
@@ -232,8 +239,8 @@ way[highway][natural],
fixRemove: "natural";
}
-/* see #9593 */
-*[sport][!building][tourism != hotel][highway != raceway][leisure !~ /^(sports_centre|stadium|track|pitch|golf_course|water_park|swimming_pool|recreation_ground)$/][natural !~ /^(beach|bare_rock|peak)$/][amenity !~ /^(pub|restaurant|swimming_pool)$/][landuse !~ /^(recreation_ground|piste|farm|farmland)$/] {
+/* see #9593, #11183 */
+*[sport][!building][tourism != hotel][highway != raceway][leisure !~ /^(sports_centre|stadium|track|pitch|golf_course|water_park|swimming_pool|recreation_ground)$/][natural !~ /^(beach|bare_rock|peak)$/][amenity !~ /^(pub|restaurant|swimming_pool)$/][landuse !~ /^(recreation_ground|piste|farm|farmland)$/][barrier !~ /^(wall|retaining_wall)$/][!"piste:type"] {
throwWarning: tr("sport without physical feature");
assertMatch: "node sport=tennis";
assertNoMatch: "node sport=tennis leisure=pitch";
diff --git a/data/validator/deprecated.mapcss b/data/validator/deprecated.mapcss
index e9ee5f1..b350c3c 100644
--- a/data/validator/deprecated.mapcss
+++ b/data/validator/deprecated.mapcss
@@ -390,4 +390,24 @@ way[sidewalk=yes] {
*[crossing=unknown],
*[foot=unknown] {
throwWarning: tr("Unspecific tag {0}", "{0.tag}");
+}
+
+/* unclear definition, see #11183 */
+*[sport=skiing][!piste:type] {
+ throwWarning: tr("Definition of {0} is unclear", "{0.tag}");
+ suggestAlternative: {1.key};
+}
+
+/* see #11223 */
+*[waterway=wadi] {
+ throwWarning: tr("{0} is deprecated", "{0.tag}");
+ suggestAlternative: "{0.key}=* + intermittent=yes";
+ suggestAlternative: "natural=valley";
+}
+
+/* see #10346 */
+way[oneway=1] {
+ throwWarning: tr("{0} is deprecated", "{0.tag}");
+ suggestAlternative: "oneway=yes";
+ fixAdd: "oneway=yes";
}
\ No newline at end of file
diff --git a/data/validator/geometry.mapcss b/data/validator/geometry.mapcss
index bb23aed..296d221 100644
--- a/data/validator/geometry.mapcss
+++ b/data/validator/geometry.mapcss
@@ -5,6 +5,8 @@ node[sidewalk],
node[footway],
node[man_made=embankment],
node[man_made=groyne],
+node[man_made=cutline],
+node[cutline],
node[aerialway=cable_car],
node[aerialway=gondola],
node[aerialway=chair_lift],
@@ -29,12 +31,12 @@ node[railway=disused],
node[railway=abandoned],
node[waterway=river],
node[waterway=canal],
-node[waterway=wadi],
node[waterway=stream],
node[waterway=ditch],
node[waterway=drain],
node[natural=coastline],
node[natural=ridge],
+node[natural=valley],
node[natural=tree_row] {
throwWarning: tr("{0} on a node. Should be used on a way.", "{0.tag}");
assertMatch: "node oneway=-1";
@@ -63,6 +65,7 @@ node[man_made=bridge],
node[man_made=breakwater],
node[aeroway=apron],
node[power=plant],
+node[building:part],
node[source:outline] {
throwWarning: tr("{0} on a node. Should be drawn as an area.", "{0.tag}");
}
diff --git a/i18n/launchpad.pl b/i18n/launchpad.pl
index fe0696a..aa182c5 100755
--- a/i18n/launchpad.pl
+++ b/i18n/launchpad.pl
@@ -17,11 +17,11 @@ $pwd = '';
my %lang = map {$_ => 1} (
"ast", "bg", "ca", "cs", "da", "de", "el", "en_AU", "en_GB",
"es", "et", "fi", "fr", "gl", "hu", "id",
-"it", "ja", "km", "nl", "pl", "pt", "pt_BR", "ru", "sk",
+"it", "ja", "km", "lt", "nl", "pl", "pt", "pt_BR", "ru", "sk",
"sv", "uk", "zh_CN", "zh_TW"
);
-my $revision = '$Revision: 31033 $';
+my $revision = '$Revision: 31071 $';
$revision =~ s/^.*?(\d+).*$/$1/;
my $agent = "JOSM_Launchpad/1.$revision";
diff --git a/i18n/po/af.po b/i18n/po/af.po
index 1b0ce50..465dbf2 100644
--- a/i18n/po/af.po
+++ b/i18n/po/af.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-04 03:32+0100\n"
+"POT-Creation-Date: 2015-04-01 03:33+0200\n"
"PO-Revision-Date: 2011-10-13 02:39+0000\n"
"Last-Translator: Grant Slater <Unknown>\n"
"Language-Team: Afrikaans <af at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-03-04 04:31+0000\n"
-"X-Generator: Launchpad (build 17361)\n"
+"X-Launchpad-Export-Date: 2015-04-01 04:30+0000\n"
+"X-Generator: Launchpad (build 17413)\n"
"Language: af\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -1696,9 +1696,15 @@ msgstr ""
msgid "Markers from {0}"
msgstr ""
+msgid "Download OSM Notes"
+msgstr ""
+
msgid "Downloading Notes"
msgstr ""
+msgid "Notes"
+msgstr ""
+
msgid "Download Compressed OSM Change"
msgstr ""
@@ -6109,6 +6115,9 @@ msgstr ""
msgid "Customize the style"
msgstr ""
+msgid "List of notes"
+msgstr ""
+
msgid "Add comment"
msgstr ""
@@ -7428,9 +7437,6 @@ 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 ""
@@ -15682,9 +15688,6 @@ msgstr ""
msgid "stadium"
msgstr ""
-msgid "Select sport:"
-msgstr ""
-
msgid "Sport"
msgstr ""
@@ -15805,19 +15808,19 @@ msgid "rugby_union"
msgstr ""
msgctxt "sport"
-msgid "shooting"
+msgid "running"
msgstr ""
msgctxt "sport"
-msgid "skateboard"
+msgid "shooting"
msgstr ""
msgctxt "sport"
-msgid "skating"
+msgid "skateboard"
msgstr ""
msgctxt "sport"
-msgid "skiing"
+msgid "skating"
msgstr ""
msgctxt "sport"
@@ -16145,6 +16148,30 @@ msgstr ""
msgid "Toll"
msgstr ""
+msgid "Is the water body intermittent (disappears seasonally)?"
+msgstr ""
+
+msgid "culvert"
+msgstr ""
+
+msgid "Water access rules:"
+msgstr ""
+
+msgid "Ship"
+msgstr ""
+
+msgid "designated"
+msgstr ""
+
+msgid "Boat"
+msgstr ""
+
+msgid "Motorboat"
+msgstr ""
+
+msgid "Canoe"
+msgstr ""
+
msgid "Streets"
msgstr ""
@@ -16360,9 +16387,6 @@ msgstr ""
msgid "official"
msgstr ""
-msgid "designated"
-msgstr ""
-
msgid "Vehicles per type"
msgstr ""
@@ -16752,6 +16776,9 @@ msgstr ""
msgid "Pedestrian Crossing"
msgstr ""
+msgid "In case of traffic signals:"
+msgstr ""
+
msgid "Traffic Calming"
msgstr ""
@@ -16998,15 +17025,12 @@ msgstr ""
msgid "Stream"
msgstr ""
-msgid "Wadi"
+msgid "River"
msgstr ""
msgid "Canal"
msgstr ""
-msgid "River"
-msgstr ""
-
msgid "Spring"
msgstr ""
@@ -17072,9 +17096,6 @@ msgstr ""
msgid "Salt Water"
msgstr ""
-msgid "Is the water body intermittent (disappears seasonally)?"
-msgstr ""
-
msgid "Coastline"
msgstr ""
@@ -17914,6 +17935,9 @@ msgstr ""
msgid "Tactile Paving"
msgstr ""
+msgid "incorrect"
+msgstr ""
+
msgid "Bus Platform"
msgstr ""
@@ -18076,6 +18100,9 @@ msgstr ""
msgid "Microbrewery"
msgstr ""
+msgid "Outdoor seating"
+msgstr ""
+
msgid "Fast Food"
msgstr ""
@@ -18670,13 +18697,13 @@ msgstr ""
msgid "Collection times"
msgstr ""
-msgid "11:30"
+msgid "Mo-Sa 09:00"
msgstr ""
-msgid "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
+msgid "Mo-Fr 17:30; Sa 12:00"
msgstr ""
-msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; Su,PH off"
+msgid "Mo-Fr 15:00,19:00; Sa 15:10; Su 10:30"
msgstr ""
msgid "Drive through"
@@ -18935,6 +18962,15 @@ msgstr ""
msgid "Pitch"
msgstr ""
+msgid "artificial_turf"
+msgstr ""
+
+msgid "decoturf"
+msgstr ""
+
+msgid "tartan"
+msgstr ""
+
msgid "Racetrack"
msgstr ""
@@ -19042,6 +19078,12 @@ msgstr ""
msgid "skitour"
msgstr ""
+msgid "sled"
+msgstr ""
+
+msgid "sleigh"
+msgstr ""
+
msgid "snow_park"
msgstr ""
@@ -19294,6 +19336,10 @@ msgctxt "building"
msgid "construction"
msgstr ""
+msgctxt "building"
+msgid "Levels"
+msgstr ""
+
msgid "Residential Building"
msgstr ""
@@ -19329,6 +19375,16 @@ msgctxt "building"
msgid "farm"
msgstr ""
+msgid "Building part"
+msgstr ""
+
+msgctxt "building"
+msgid "Skipped Levels"
+msgstr ""
+
+msgid "Skipped height (meters)"
+msgstr ""
+
msgid "Entrance"
msgstr ""
@@ -21062,22 +21118,28 @@ msgstr ""
msgid "scoria"
msgstr ""
-msgid "Cave Entrance"
+msgid "Ridge"
msgstr ""
-msgid "The entrance to a cave."
+msgid "A mountain or hill ridge."
msgstr ""
-msgid "Island"
+msgid "Valley"
msgstr ""
-msgid "Islet"
+msgid "A low area between hills."
msgstr ""
-msgid "Ridge"
+msgid "Cave Entrance"
msgstr ""
-msgid "A mountain or hill ridge."
+msgid "The entrance to a cave."
+msgstr ""
+
+msgid "Island"
+msgstr ""
+
+msgid "Islet"
msgstr ""
msgid "Nature"
@@ -21107,6 +21169,37 @@ msgstr ""
msgid "Forest"
msgstr ""
+msgid "Cutline"
+msgstr ""
+
+msgctxt "cutline"
+msgid "border"
+msgstr ""
+
+msgctxt "cutline"
+msgid "firebreak"
+msgstr ""
+
+msgctxt "cutline"
+msgid "hunting"
+msgstr ""
+
+msgctxt "cutline"
+msgid "loggingmachine"
+msgstr ""
+
+msgctxt "cutline"
+msgid "pipeline"
+msgstr ""
+
+msgctxt "cutline"
+msgid "piste"
+msgstr ""
+
+msgctxt "cutline"
+msgid "section"
+msgstr ""
+
msgid "Grassland"
msgstr ""
@@ -22040,6 +22133,9 @@ msgstr ""
msgid "Unspecific tag {0}"
msgstr ""
+msgid "Definition of {0} is unclear"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -27401,7 +27497,7 @@ msgstr ""
msgid "No object selected"
msgstr ""
-msgid "SeaMap Editor"
+msgid "SeaChart Editor"
msgstr ""
msgid "Seamark Inspector"
@@ -27473,6 +27569,9 @@ msgstr ""
msgid "Merge Nearby Nodes Threshold"
msgstr ""
+msgid "SeaMap Editor"
+msgstr ""
+
msgid "AutoSave LiveData"
msgstr ""
diff --git a/i18n/po/am.po b/i18n/po/am.po
index 996aa3b..6a4cdce 100644
--- a/i18n/po/am.po
+++ b/i18n/po/am.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-04 03:32+0100\n"
+"POT-Creation-Date: 2015-04-01 03:33+0200\n"
"PO-Revision-Date: 2010-03-30 12:09+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: Amharic <am at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2015-03-04 04:32+0000\n"
-"X-Generator: Launchpad (build 17361)\n"
+"X-Launchpad-Export-Date: 2015-04-01 04:31+0000\n"
+"X-Generator: Launchpad (build 17413)\n"
"Language: am\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -1696,9 +1696,15 @@ msgstr ""
msgid "Markers from {0}"
msgstr ""
+msgid "Download OSM Notes"
+msgstr ""
+
msgid "Downloading Notes"
msgstr ""
+msgid "Notes"
+msgstr ""
+
msgid "Download Compressed OSM Change"
msgstr ""
@@ -6109,6 +6115,9 @@ msgstr ""
msgid "Customize the style"
msgstr ""
+msgid "List of notes"
+msgstr ""
+
msgid "Add comment"
msgstr ""
@@ -7428,9 +7437,6 @@ 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 ""
@@ -15682,9 +15688,6 @@ msgstr ""
msgid "stadium"
msgstr ""
-msgid "Select sport:"
-msgstr ""
-
msgid "Sport"
msgstr ""
@@ -15805,19 +15808,19 @@ msgid "rugby_union"
msgstr ""
msgctxt "sport"
-msgid "shooting"
+msgid "running"
msgstr ""
msgctxt "sport"
-msgid "skateboard"
+msgid "shooting"
msgstr ""
msgctxt "sport"
-msgid "skating"
+msgid "skateboard"
msgstr ""
msgctxt "sport"
-msgid "skiing"
+msgid "skating"
msgstr ""
msgctxt "sport"
@@ -16145,6 +16148,30 @@ msgstr ""
msgid "Toll"
msgstr ""
+msgid "Is the water body intermittent (disappears seasonally)?"
+msgstr ""
+
+msgid "culvert"
+msgstr ""
+
+msgid "Water access rules:"
+msgstr ""
+
+msgid "Ship"
+msgstr ""
+
+msgid "designated"
+msgstr ""
+
+msgid "Boat"
+msgstr ""
+
+msgid "Motorboat"
+msgstr ""
+
+msgid "Canoe"
+msgstr ""
+
msgid "Streets"
msgstr ""
@@ -16360,9 +16387,6 @@ msgstr ""
msgid "official"
msgstr ""
-msgid "designated"
-msgstr ""
-
msgid "Vehicles per type"
msgstr ""
@@ -16752,6 +16776,9 @@ msgstr ""
msgid "Pedestrian Crossing"
msgstr ""
+msgid "In case of traffic signals:"
+msgstr ""
+
msgid "Traffic Calming"
msgstr ""
@@ -16998,15 +17025,12 @@ msgstr ""
msgid "Stream"
msgstr ""
-msgid "Wadi"
+msgid "River"
msgstr ""
msgid "Canal"
msgstr ""
-msgid "River"
-msgstr ""
-
msgid "Spring"
msgstr ""
@@ -17072,9 +17096,6 @@ msgstr ""
msgid "Salt Water"
msgstr ""
-msgid "Is the water body intermittent (disappears seasonally)?"
-msgstr ""
-
msgid "Coastline"
msgstr ""
@@ -17914,6 +17935,9 @@ msgstr ""
msgid "Tactile Paving"
msgstr ""
+msgid "incorrect"
+msgstr ""
+
msgid "Bus Platform"
msgstr ""
@@ -18076,6 +18100,9 @@ msgstr ""
msgid "Microbrewery"
msgstr ""
+msgid "Outdoor seating"
+msgstr ""
+
msgid "Fast Food"
msgstr ""
@@ -18670,13 +18697,13 @@ msgstr ""
msgid "Collection times"
msgstr ""
-msgid "11:30"
+msgid "Mo-Sa 09:00"
msgstr ""
-msgid "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
+msgid "Mo-Fr 17:30; Sa 12:00"
msgstr ""
-msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; Su,PH off"
+msgid "Mo-Fr 15:00,19:00; Sa 15:10; Su 10:30"
msgstr ""
msgid "Drive through"
@@ -18935,6 +18962,15 @@ msgstr ""
msgid "Pitch"
msgstr ""
+msgid "artificial_turf"
+msgstr ""
+
+msgid "decoturf"
+msgstr ""
+
+msgid "tartan"
+msgstr ""
+
msgid "Racetrack"
msgstr ""
@@ -19042,6 +19078,12 @@ msgstr ""
msgid "skitour"
msgstr ""
+msgid "sled"
+msgstr ""
+
+msgid "sleigh"
+msgstr ""
+
msgid "snow_park"
msgstr ""
@@ -19294,6 +19336,10 @@ msgctxt "building"
msgid "construction"
msgstr ""
+msgctxt "building"
+msgid "Levels"
+msgstr ""
+
msgid "Residential Building"
msgstr ""
@@ -19329,6 +19375,16 @@ msgctxt "building"
msgid "farm"
msgstr ""
+msgid "Building part"
+msgstr ""
+
+msgctxt "building"
+msgid "Skipped Levels"
+msgstr ""
+
+msgid "Skipped height (meters)"
+msgstr ""
+
msgid "Entrance"
msgstr ""
@@ -21062,22 +21118,28 @@ msgstr ""
msgid "scoria"
msgstr ""
-msgid "Cave Entrance"
+msgid "Ridge"
msgstr ""
-msgid "The entrance to a cave."
+msgid "A mountain or hill ridge."
msgstr ""
-msgid "Island"
+msgid "Valley"
msgstr ""
-msgid "Islet"
+msgid "A low area between hills."
msgstr ""
-msgid "Ridge"
+msgid "Cave Entrance"
msgstr ""
-msgid "A mountain or hill ridge."
+msgid "The entrance to a cave."
+msgstr ""
+
+msgid "Island"
+msgstr ""
+
+msgid "Islet"
msgstr ""
msgid "Nature"
@@ -21107,6 +21169,37 @@ msgstr ""
msgid "Forest"
msgstr ""
+msgid "Cutline"
+msgstr ""
+
+msgctxt "cutline"
+msgid "border"
+msgstr ""
+
+msgctxt "cutline"
+msgid "firebreak"
+msgstr ""
+
+msgctxt "cutline"
+msgid "hunting"
+msgstr ""
+
+msgctxt "cutline"
+msgid "loggingmachine"
+msgstr ""
+
+msgctxt "cutline"
+msgid "pipeline"
+msgstr ""
+
+msgctxt "cutline"
+msgid "piste"
+msgstr ""
+
+msgctxt "cutline"
+msgid "section"
+msgstr ""
+
msgid "Grassland"
msgstr ""
@@ -22040,6 +22133,9 @@ msgstr ""
msgid "Unspecific tag {0}"
msgstr ""
+msgid "Definition of {0} is unclear"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -27401,7 +27497,7 @@ msgstr ""
msgid "No object selected"
msgstr ""
-msgid "SeaMap Editor"
+msgid "SeaChart Editor"
msgstr ""
msgid "Seamark Inspector"
@@ -27473,6 +27569,9 @@ msgstr ""
msgid "Merge Nearby Nodes Threshold"
msgstr ""
+msgid "SeaMap Editor"
+msgstr ""
+
msgid "AutoSave LiveData"
msgstr ""
diff --git a/i18n/po/ar.po b/i18n/po/ar.po
index 79dfd2e..608a763 100644
--- a/i18n/po/ar.po
+++ b/i18n/po/ar.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-04 03:32+0100\n"
+"POT-Creation-Date: 2015-04-01 03:33+0200\n"
"PO-Revision-Date: 2013-03-30 14:17+0000\n"
"Last-Translator: Chdoula <chdoula at gmail.com>\n"
"Language-Team: Arabic <ar at li.org>\n"
@@ -16,8 +16,8 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n % 100 >= "
"3 && n % 100 <= 10 ? 3 : n % 100 >= 11 && n % 100 <= 99 ? 4 : 5;\n"
-"X-Launchpad-Export-Date: 2015-03-04 04:32+0000\n"
-"X-Generator: Launchpad (build 17361)\n"
+"X-Launchpad-Export-Date: 2015-04-01 04:32+0000\n"
+"X-Generator: Launchpad (build 17413)\n"
"Language: ar\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -1702,9 +1702,15 @@ msgstr "تمّ تنزيل معطيات جهاز نظام تحديد المواق
msgid "Markers from {0}"
msgstr ""
+msgid "Download OSM Notes"
+msgstr ""
+
msgid "Downloading Notes"
msgstr ""
+msgid "Notes"
+msgstr "الملاحظات"
+
msgid "Download Compressed OSM Change"
msgstr ""
@@ -6136,6 +6142,9 @@ msgstr ""
msgid "Customize the style"
msgstr ""
+msgid "List of notes"
+msgstr ""
+
msgid "Add comment"
msgstr ""
@@ -7455,9 +7464,6 @@ 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 ""
@@ -15722,9 +15728,6 @@ msgstr "مركز/نادي رياضي"
msgid "stadium"
msgstr "مدرج ألعاب رياضية"
-msgid "Select sport:"
-msgstr ""
-
msgid "Sport"
msgstr "رياضة"
@@ -15845,19 +15848,19 @@ msgid "rugby_union"
msgstr ""
msgctxt "sport"
-msgid "shooting"
+msgid "running"
msgstr ""
msgctxt "sport"
-msgid "skateboard"
+msgid "shooting"
msgstr ""
msgctxt "sport"
-msgid "skating"
+msgid "skateboard"
msgstr ""
msgctxt "sport"
-msgid "skiing"
+msgid "skating"
msgstr ""
msgctxt "sport"
@@ -16185,6 +16188,30 @@ msgstr ""
msgid "Toll"
msgstr ""
+msgid "Is the water body intermittent (disappears seasonally)?"
+msgstr ""
+
+msgid "culvert"
+msgstr ""
+
+msgid "Water access rules:"
+msgstr ""
+
+msgid "Ship"
+msgstr ""
+
+msgid "designated"
+msgstr ""
+
+msgid "Boat"
+msgstr ""
+
+msgid "Motorboat"
+msgstr ""
+
+msgid "Canoe"
+msgstr ""
+
msgid "Streets"
msgstr ""
@@ -16400,9 +16427,6 @@ msgstr ""
msgid "official"
msgstr ""
-msgid "designated"
-msgstr ""
-
msgid "Vehicles per type"
msgstr ""
@@ -16792,6 +16816,9 @@ msgstr "إتجاه عقارب الساعة"
msgid "Pedestrian Crossing"
msgstr "تقاطع مشاة"
+msgid "In case of traffic signals:"
+msgstr ""
+
msgid "Traffic Calming"
msgstr ""
@@ -17038,15 +17065,12 @@ msgstr ""
msgid "Stream"
msgstr "جدول نهر"
-msgid "Wadi"
-msgstr ""
+msgid "River"
+msgstr "نهر"
msgid "Canal"
msgstr "قناة"
-msgid "River"
-msgstr "نهر"
-
msgid "Spring"
msgstr "نبع"
@@ -17112,9 +17136,6 @@ msgstr ""
msgid "Salt Water"
msgstr ""
-msgid "Is the water body intermittent (disappears seasonally)?"
-msgstr ""
-
msgid "Coastline"
msgstr "شاطئ"
@@ -17954,6 +17975,9 @@ msgstr "موقف محطة حافلة نقل جماعي"
msgid "Tactile Paving"
msgstr ""
+msgid "incorrect"
+msgstr ""
+
msgid "Bus Platform"
msgstr ""
@@ -18116,6 +18140,9 @@ msgstr ""
msgid "Microbrewery"
msgstr ""
+msgid "Outdoor seating"
+msgstr ""
+
msgid "Fast Food"
msgstr "وجبات سريعة"
@@ -18710,13 +18737,13 @@ msgstr "صندوق بريد"
msgid "Collection times"
msgstr ""
-msgid "11:30"
+msgid "Mo-Sa 09:00"
msgstr ""
-msgid "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
+msgid "Mo-Fr 17:30; Sa 12:00"
msgstr ""
-msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; Su,PH off"
+msgid "Mo-Fr 15:00,19:00; Sa 15:10; Su 10:30"
msgstr ""
msgid "Drive through"
@@ -18975,6 +19002,15 @@ msgstr "مركز/نادي رياضي"
msgid "Pitch"
msgstr ""
+msgid "artificial_turf"
+msgstr ""
+
+msgid "decoturf"
+msgstr ""
+
+msgid "tartan"
+msgstr ""
+
msgid "Racetrack"
msgstr ""
@@ -19082,6 +19118,12 @@ msgstr "شمالي"
msgid "skitour"
msgstr ""
+msgid "sled"
+msgstr ""
+
+msgid "sleigh"
+msgstr ""
+
msgid "snow_park"
msgstr ""
@@ -19334,6 +19376,10 @@ msgctxt "building"
msgid "construction"
msgstr ""
+msgctxt "building"
+msgid "Levels"
+msgstr ""
+
msgid "Residential Building"
msgstr ""
@@ -19369,6 +19415,16 @@ msgctxt "building"
msgid "farm"
msgstr ""
+msgid "Building part"
+msgstr ""
+
+msgctxt "building"
+msgid "Skipped Levels"
+msgstr ""
+
+msgid "Skipped height (meters)"
+msgstr ""
+
msgid "Entrance"
msgstr ""
@@ -21102,6 +21158,18 @@ msgstr ""
msgid "scoria"
msgstr ""
+msgid "Ridge"
+msgstr ""
+
+msgid "A mountain or hill ridge."
+msgstr ""
+
+msgid "Valley"
+msgstr ""
+
+msgid "A low area between hills."
+msgstr ""
+
msgid "Cave Entrance"
msgstr "مدخل كهف"
@@ -21114,12 +21182,6 @@ msgstr "جزيرة"
msgid "Islet"
msgstr ""
-msgid "Ridge"
-msgstr ""
-
-msgid "A mountain or hill ridge."
-msgstr ""
-
msgid "Nature"
msgstr ""
@@ -21147,6 +21209,37 @@ msgstr ""
msgid "Forest"
msgstr "غابة"
+msgid "Cutline"
+msgstr ""
+
+msgctxt "cutline"
+msgid "border"
+msgstr ""
+
+msgctxt "cutline"
+msgid "firebreak"
+msgstr ""
+
+msgctxt "cutline"
+msgid "hunting"
+msgstr ""
+
+msgctxt "cutline"
+msgid "loggingmachine"
+msgstr ""
+
+msgctxt "cutline"
+msgid "pipeline"
+msgstr ""
+
+msgctxt "cutline"
+msgid "piste"
+msgstr ""
+
+msgctxt "cutline"
+msgid "section"
+msgstr ""
+
msgid "Grassland"
msgstr ""
@@ -22080,6 +22173,9 @@ msgstr ""
msgid "Unspecific tag {0}"
msgstr ""
+msgid "Definition of {0} is unclear"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -27441,7 +27537,7 @@ msgstr ""
msgid "No object selected"
msgstr ""
-msgid "SeaMap Editor"
+msgid "SeaChart Editor"
msgstr ""
msgid "Seamark Inspector"
@@ -27513,6 +27609,9 @@ msgstr ""
msgid "Merge Nearby Nodes Threshold"
msgstr ""
+msgid "SeaMap Editor"
+msgstr ""
+
msgid "AutoSave LiveData"
msgstr ""
diff --git a/i18n/po/ast.po b/i18n/po/ast.po
index d33a0ae..46686f2 100644
--- a/i18n/po/ast.po
+++ b/i18n/po/ast.po
@@ -7,16 +7,16 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-04 03:32+0100\n"
-"PO-Revision-Date: 2015-03-02 19:59+0000\n"
-"Last-Translator: Xuacu Saturio <xuacusk8 at gmail.com>\n"
+"POT-Creation-Date: 2015-04-01 03:33+0200\n"
+"PO-Revision-Date: 2015-03-26 12:59+0000\n"
+"Last-Translator: Dirk Stöcker <launchpad at dstoecker.de>\n"
"Language-Team: Asturian <ast at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-03-04 04:33+0000\n"
-"X-Generator: Launchpad (build 17361)\n"
+"X-Launchpad-Export-Date: 2015-04-01 04:33+0000\n"
+"X-Generator: Launchpad (build 17413)\n"
"Language: ast\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -1271,13 +1271,13 @@ msgid "Download notes from the note search API"
msgstr "Descargar notes de la API de gueta de notes"
msgid "Search the OSM API for notes containing words:"
-msgstr "Guetar na API d'OSM por notes que contengan les palabres:"
+msgstr "Guetar na API d’OSM por notes que contengan les palabres:"
msgid "Search for notes"
msgstr "Guetar notes"
msgid "You must enter a search term"
-msgstr "Tienes d'escribir el términu a guetar"
+msgstr "Tienes d’escribir el términu a guetar"
msgid "Select All"
msgstr "Esbillar too"
@@ -1833,9 +1833,15 @@ msgstr "Datos GPX descargaos"
msgid "Markers from {0}"
msgstr "Marcadores dende {0}"
+msgid "Download OSM Notes"
+msgstr ""
+
msgid "Downloading Notes"
msgstr "Descarga de Notes"
+msgid "Notes"
+msgstr "Billetes"
+
msgid "Download Compressed OSM Change"
msgstr "Descargar cambeos a OSM estruyíos"
@@ -4190,8 +4196,8 @@ msgid ""
"With the currently used mappaint style the style for inner way equals the "
"multipolygon style"
msgstr ""
-"Col estilu de mappaint usáu anguaño, l'estilu de la via interior ye igual "
-"que'l del multipolígonu"
+"Col estilu de mappaint usáu anguaño, l’estilu de la via interior ye igual "
+"que’l del multipolígonu"
msgid "Style for outer way mismatches"
msgstr "Estilu pa vía esterna non compatible"
@@ -4200,7 +4206,7 @@ msgid ""
"With the currently used mappaint style(s) the style for outer way mismatches "
"polygon"
msgstr ""
-"Col estilu(os) de mappaint n'usu anguaño, l'estilu de la via esterior nun "
+"Col estilu(os) de mappaint n’usu anguaño, l’estilu de la via esterior nun "
"casa col polígonu"
msgid "Area style on outer way"
@@ -4920,7 +4926,7 @@ msgid "/PATH/TO/JOSM/USERDATA"
msgstr "/PATH/TO/JOSM/USERDATA"
msgid "Set the user data directory"
-msgstr "Afitar el direutoriu de datos d'usuariu"
+msgstr "Afitar el direutoriu de datos d’usuariu"
msgid "/PATH/TO/JOSM/CACHE "
msgstr "/PATH/TO/JOSM/CACHE "
@@ -5241,7 +5247,7 @@ msgid "Last change date"
msgstr "Data del últimu cambiu"
msgid "Select note sorting method"
-msgstr "Escoyer el métodu d'ordenación de notes"
+msgstr "Escoyer el métodu d’ordenación de notes"
msgid "Click to cancel the current operation"
msgstr "Faga clic p''atayar la operación actual"
@@ -6687,6 +6693,9 @@ msgstr "Estilu de axustes"
msgid "Customize the style"
msgstr "Personaliza l''estilu"
+msgid "List of notes"
+msgstr ""
+
msgid "Add comment"
msgstr "Amestar comentariu"
@@ -6936,7 +6945,7 @@ msgid "Discussion"
msgstr "Alderique"
msgid "Display the public discussion around this changeset"
-msgstr "Amosar l'alderique publicu d'esti conxuntu de cambios"
+msgstr "Amosar l’alderique publicu d’esti conxuntu de cambios"
msgid "Changeset Management Dialog"
msgstr "Diálogu d''alministración de conxuntos de cambeos"
@@ -7141,7 +7150,7 @@ msgstr ""
"de datos actual"
msgid "Update changeset discussion"
-msgstr "Anovar l'alderique del conxuntu de cambios"
+msgstr "Anovar l’alderique del conxuntu de cambios"
msgid "Update the changeset discussion from the OSM server"
msgstr ""
@@ -8132,9 +8141,6 @@ 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 ""
@@ -17463,9 +17469,6 @@ msgstr "Polideportivu"
msgid "stadium"
msgstr "Estadiu"
-msgid "Select sport:"
-msgstr "Escoyer deporte:"
-
msgid "Sport"
msgstr "Deporte"
@@ -17586,6 +17589,10 @@ msgid "rugby_union"
msgstr "xunión de rugby"
msgctxt "sport"
+msgid "running"
+msgstr ""
+
+msgctxt "sport"
msgid "shooting"
msgstr "tiru"
@@ -17598,10 +17605,6 @@ msgid "skating"
msgstr "patinaxe"
msgctxt "sport"
-msgid "skiing"
-msgstr "esquí"
-
-msgctxt "sport"
msgid "soccer"
msgstr "fútbol"
@@ -17926,6 +17929,30 @@ msgstr "Pesu máximu (t)"
msgid "Toll"
msgstr "Peaxe"
+msgid "Is the water body intermittent (disappears seasonally)?"
+msgstr "¿Ye la masa d''agua intermitente (sumi estacionalmente)?"
+
+msgid "culvert"
+msgstr ""
+
+msgid "Water access rules:"
+msgstr ""
+
+msgid "Ship"
+msgstr ""
+
+msgid "designated"
+msgstr "autorizáu"
+
+msgid "Boat"
+msgstr ""
+
+msgid "Motorboat"
+msgstr ""
+
+msgid "Canoe"
+msgstr ""
+
msgid "Streets"
msgstr "Cais"
@@ -18143,9 +18170,6 @@ msgstr "Restricciones en mou de tresporte"
msgid "official"
msgstr "oficial"
-msgid "designated"
-msgstr "autorizáu"
-
msgid "Vehicles per type"
msgstr "Vehículos per tipu"
@@ -18549,6 +18573,9 @@ msgstr "aguyes del reló"
msgid "Pedestrian Crossing"
msgstr "Pasu de peatones"
+msgid "In case of traffic signals:"
+msgstr ""
+
msgid "Traffic Calming"
msgstr "Calmu de tráficu"
@@ -18796,15 +18823,12 @@ msgstr "Acequia"
msgid "Stream"
msgstr "Regueru o regatu"
-msgid "Wadi"
-msgstr "Uadi"
+msgid "River"
+msgstr "Ríu"
msgid "Canal"
msgstr "Canal"
-msgid "River"
-msgstr "Ríu"
-
msgid "Spring"
msgstr "Fonte o manantial"
@@ -18872,9 +18896,6 @@ msgstr "ríu"
msgid "Salt Water"
msgstr "Agua Salao"
-msgid "Is the water body intermittent (disappears seasonally)?"
-msgstr "¿Ye la masa d''agua intermitente (sumi estacionalmente)?"
-
msgid "Coastline"
msgstr "Llínea de mariña"
@@ -19723,6 +19744,9 @@ msgstr "Parada d''autobús"
msgid "Tactile Paving"
msgstr "Pavimentu táctil"
+msgid "incorrect"
+msgstr ""
+
msgid "Bus Platform"
msgstr "Andén d''autobús"
@@ -19885,6 +19909,9 @@ msgstr "sushi"
msgid "Microbrewery"
msgstr "Cervecería artesanal"
+msgid "Outdoor seating"
+msgstr ""
+
msgid "Fast Food"
msgstr "Establecimientu de comida rápida"
@@ -20481,14 +20508,14 @@ msgstr "Buzón de correos"
msgid "Collection times"
msgstr "Horarios de recueya"
-msgid "11:30"
-msgstr "11:30"
+msgid "Mo-Sa 09:00"
+msgstr ""
-msgid "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
-msgstr "Llu-Vi 15:00,17:45,19:00,23:00; Sá 15:10; Do 10:30,23:00"
+msgid "Mo-Fr 17:30; Sa 12:00"
+msgstr ""
-msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; Su,PH off"
-msgstr "Llu-Vi 09:00-12:00,17:15; Sá 14:00; Do,festivos zarráu"
+msgid "Mo-Fr 15:00,19:00; Sa 15:10; Su 10:30"
+msgstr ""
msgid "Drive through"
msgstr "Utilizable dende''l volante"
@@ -20746,6 +20773,15 @@ msgstr "Polideportivu"
msgid "Pitch"
msgstr "Cancha de xuegu"
+msgid "artificial_turf"
+msgstr ""
+
+msgid "decoturf"
+msgstr ""
+
+msgid "tartan"
+msgstr ""
+
msgid "Racetrack"
msgstr "Pista de carreres"
@@ -20853,6 +20889,12 @@ msgstr "nórdicu"
msgid "skitour"
msgstr "esquí de travesía"
+msgid "sled"
+msgstr ""
+
+msgid "sleigh"
+msgstr ""
+
msgid "snow_park"
msgstr "parque de snowboard"
@@ -21105,6 +21147,10 @@ msgctxt "building"
msgid "construction"
msgstr "en construcción"
+msgctxt "building"
+msgid "Levels"
+msgstr ""
+
msgid "Residential Building"
msgstr "Edificiu de viviendes"
@@ -21140,6 +21186,16 @@ msgctxt "building"
msgid "farm"
msgstr "granxa"
+msgid "Building part"
+msgstr ""
+
+msgctxt "building"
+msgid "Skipped Levels"
+msgstr ""
+
+msgid "Skipped height (meters)"
+msgstr ""
+
msgid "Entrance"
msgstr "Entrada"
@@ -22881,6 +22937,18 @@ msgstr "Volcán n''escudu"
msgid "scoria"
msgstr "escoria"
+msgid "Ridge"
+msgstr "dosal centroocéanica"
+
+msgid "A mountain or hill ridge."
+msgstr "Un monte o cuetu na dorsal centrooceánica"
+
+msgid "Valley"
+msgstr ""
+
+msgid "A low area between hills."
+msgstr ""
+
msgid "Cave Entrance"
msgstr "Entrá de cueva"
@@ -22893,12 +22961,6 @@ msgstr "Islla"
msgid "Islet"
msgstr "Isllote"
-msgid "Ridge"
-msgstr "dosal centroocéanica"
-
-msgid "A mountain or hill ridge."
-msgstr "Un monte o cuetu na dorsal centrooceánica"
-
msgid "Nature"
msgstr "Natural"
@@ -22926,6 +22988,37 @@ msgstr "Área forestada onde la producción de lleña nun apodera l''usu."
msgid "Forest"
msgstr "Plantíu forestal"
+msgid "Cutline"
+msgstr ""
+
+msgctxt "cutline"
+msgid "border"
+msgstr ""
+
+msgctxt "cutline"
+msgid "firebreak"
+msgstr ""
+
+msgctxt "cutline"
+msgid "hunting"
+msgstr ""
+
+msgctxt "cutline"
+msgid "loggingmachine"
+msgstr ""
+
+msgctxt "cutline"
+msgid "pipeline"
+msgstr ""
+
+msgctxt "cutline"
+msgid "piste"
+msgstr ""
+
+msgctxt "cutline"
+msgid "section"
+msgstr ""
+
msgid "Grassland"
msgstr "Pradería"
@@ -23879,6 +23972,9 @@ msgstr ""
msgid "Unspecific tag {0}"
msgstr ""
+msgid "Definition of {0} is unclear"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -29705,8 +29801,8 @@ msgstr "Grabar arquivu SDS"
msgid "No object selected"
msgstr ""
-msgid "SeaMap Editor"
-msgstr "Editor SeaMap"
+msgid "SeaChart Editor"
+msgstr ""
msgid "Seamark Inspector"
msgstr ""
@@ -29791,6 +29887,9 @@ msgstr "Factor de distancia"
msgid "Merge Nearby Nodes Threshold"
msgstr "Estragal de Combinación de Nodos Allegaos"
+msgid "SeaMap Editor"
+msgstr "Editor SeaMap"
+
msgid "AutoSave LiveData"
msgstr "Autograbar LiveData"
diff --git a/i18n/po/az.po b/i18n/po/az.po
index 0eee6b4..423972c 100644
--- a/i18n/po/az.po
+++ b/i18n/po/az.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL at ADDRESS>\n"
-"POT-Creation-Date: 2015-03-04 03:32+0100\n"
+"POT-Creation-Date: 2015-04-01 03:33+0200\n"
"PO-Revision-Date: 2013-01-12 17:56+0000\n"
"Last-Translator: iAZISS <iss-sash at mail.ru>\n"
"Language-Team: Azerbaijani <az at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-03-04 04:33+0000\n"
-"X-Generator: Launchpad (build 17361)\n"
+"X-Launchpad-Export-Date: 2015-04-01 04:33+0000\n"
+"X-Generator: Launchpad (build 17413)\n"
msgid "{0}: option ''{1}'' is ambiguous"
msgstr ""
@@ -1695,9 +1695,15 @@ msgstr ""
msgid "Markers from {0}"
msgstr ""
+msgid "Download OSM Notes"
+msgstr ""
+
msgid "Downloading Notes"
msgstr ""
+msgid "Notes"
+msgstr ""
+
msgid "Download Compressed OSM Change"
msgstr ""
@@ -6108,6 +6114,9 @@ msgstr ""
msgid "Customize the style"
msgstr ""
+msgid "List of notes"
+msgstr ""
+
msgid "Add comment"
msgstr ""
@@ -7427,9 +7436,6 @@ 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 ""
@@ -15681,9 +15687,6 @@ msgstr ""
msgid "stadium"
msgstr ""
-msgid "Select sport:"
-msgstr ""
-
msgid "Sport"
msgstr ""
@@ -15804,19 +15807,19 @@ msgid "rugby_union"
msgstr ""
msgctxt "sport"
-msgid "shooting"
+msgid "running"
msgstr ""
msgctxt "sport"
-msgid "skateboard"
+msgid "shooting"
msgstr ""
msgctxt "sport"
-msgid "skating"
+msgid "skateboard"
msgstr ""
msgctxt "sport"
-msgid "skiing"
+msgid "skating"
msgstr ""
msgctxt "sport"
@@ -16144,6 +16147,30 @@ msgstr ""
msgid "Toll"
msgstr ""
+msgid "Is the water body intermittent (disappears seasonally)?"
+msgstr ""
+
+msgid "culvert"
+msgstr ""
+
+msgid "Water access rules:"
+msgstr ""
+
+msgid "Ship"
+msgstr ""
+
+msgid "designated"
+msgstr ""
+
+msgid "Boat"
+msgstr ""
+
+msgid "Motorboat"
+msgstr ""
+
+msgid "Canoe"
+msgstr ""
+
msgid "Streets"
msgstr ""
@@ -16359,9 +16386,6 @@ msgstr ""
msgid "official"
msgstr ""
-msgid "designated"
-msgstr ""
-
msgid "Vehicles per type"
msgstr ""
@@ -16751,6 +16775,9 @@ msgstr ""
msgid "Pedestrian Crossing"
msgstr ""
+msgid "In case of traffic signals:"
+msgstr ""
+
msgid "Traffic Calming"
msgstr ""
@@ -16997,15 +17024,12 @@ msgstr ""
msgid "Stream"
msgstr ""
-msgid "Wadi"
+msgid "River"
msgstr ""
msgid "Canal"
msgstr ""
-msgid "River"
-msgstr ""
-
msgid "Spring"
msgstr ""
@@ -17071,9 +17095,6 @@ msgstr ""
msgid "Salt Water"
msgstr ""
-msgid "Is the water body intermittent (disappears seasonally)?"
-msgstr ""
-
msgid "Coastline"
msgstr ""
@@ -17913,6 +17934,9 @@ msgstr ""
msgid "Tactile Paving"
msgstr ""
+msgid "incorrect"
+msgstr ""
+
msgid "Bus Platform"
msgstr ""
@@ -18075,6 +18099,9 @@ msgstr ""
msgid "Microbrewery"
msgstr ""
+msgid "Outdoor seating"
+msgstr ""
+
msgid "Fast Food"
msgstr ""
@@ -18669,13 +18696,13 @@ msgstr ""
msgid "Collection times"
msgstr ""
-msgid "11:30"
+msgid "Mo-Sa 09:00"
msgstr ""
-msgid "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
+msgid "Mo-Fr 17:30; Sa 12:00"
msgstr ""
-msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; Su,PH off"
+msgid "Mo-Fr 15:00,19:00; Sa 15:10; Su 10:30"
msgstr ""
msgid "Drive through"
@@ -18934,6 +18961,15 @@ msgstr ""
msgid "Pitch"
msgstr ""
+msgid "artificial_turf"
+msgstr ""
+
+msgid "decoturf"
+msgstr ""
+
+msgid "tartan"
+msgstr ""
+
msgid "Racetrack"
msgstr ""
@@ -19041,6 +19077,12 @@ msgstr ""
msgid "skitour"
msgstr ""
+msgid "sled"
+msgstr ""
+
+msgid "sleigh"
+msgstr ""
+
msgid "snow_park"
msgstr ""
@@ -19293,6 +19335,10 @@ msgctxt "building"
msgid "construction"
msgstr ""
+msgctxt "building"
+msgid "Levels"
+msgstr ""
+
msgid "Residential Building"
msgstr ""
@@ -19328,6 +19374,16 @@ msgctxt "building"
msgid "farm"
msgstr ""
+msgid "Building part"
+msgstr ""
+
+msgctxt "building"
+msgid "Skipped Levels"
+msgstr ""
+
+msgid "Skipped height (meters)"
+msgstr ""
+
msgid "Entrance"
msgstr ""
@@ -21061,22 +21117,28 @@ msgstr ""
msgid "scoria"
msgstr ""
-msgid "Cave Entrance"
+msgid "Ridge"
msgstr ""
-msgid "The entrance to a cave."
+msgid "A mountain or hill ridge."
msgstr ""
-msgid "Island"
+msgid "Valley"
msgstr ""
-msgid "Islet"
+msgid "A low area between hills."
msgstr ""
-msgid "Ridge"
+msgid "Cave Entrance"
msgstr ""
-msgid "A mountain or hill ridge."
+msgid "The entrance to a cave."
+msgstr ""
+
+msgid "Island"
+msgstr ""
+
+msgid "Islet"
msgstr ""
msgid "Nature"
@@ -21106,6 +21168,37 @@ msgstr ""
msgid "Forest"
msgstr ""
+msgid "Cutline"
+msgstr ""
+
+msgctxt "cutline"
+msgid "border"
+msgstr ""
+
+msgctxt "cutline"
+msgid "firebreak"
+msgstr ""
+
+msgctxt "cutline"
+msgid "hunting"
+msgstr ""
+
+msgctxt "cutline"
+msgid "loggingmachine"
+msgstr ""
+
+msgctxt "cutline"
+msgid "pipeline"
+msgstr ""
+
+msgctxt "cutline"
+msgid "piste"
+msgstr ""
+
+msgctxt "cutline"
+msgid "section"
+msgstr ""
+
msgid "Grassland"
msgstr ""
@@ -22039,6 +22132,9 @@ msgstr ""
msgid "Unspecific tag {0}"
msgstr ""
+msgid "Definition of {0} is unclear"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -27400,7 +27496,7 @@ msgstr ""
msgid "No object selected"
msgstr ""
-msgid "SeaMap Editor"
+msgid "SeaChart Editor"
msgstr ""
msgid "Seamark Inspector"
@@ -27472,6 +27568,9 @@ msgstr ""
msgid "Merge Nearby Nodes Threshold"
msgstr ""
+msgid "SeaMap Editor"
+msgstr ""
+
msgid "AutoSave LiveData"
msgstr ""
diff --git a/i18n/po/be.po b/i18n/po/be.po
index abd243e..3488766 100644
--- a/i18n/po/be.po
+++ b/i18n/po/be.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-04 03:32+0100\n"
+"POT-Creation-Date: 2015-04-01 03:33+0200\n"
"PO-Revision-Date: 2013-07-08 12:07+0000\n"
"Last-Translator: Andrew West <2thewest at gmail.com>\n"
"Language-Team: Belarusian <i18n at mova.org>\n"
@@ -19,8 +19,8 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-"X-Launchpad-Export-Date: 2015-03-04 04:34+0000\n"
-"X-Generator: Launchpad (build 17361)\n"
+"X-Launchpad-Export-Date: 2015-04-01 04:34+0000\n"
+"X-Generator: Launchpad (build 17413)\n"
"Language: be\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -1799,9 +1799,15 @@ msgstr "Запампаваныя дадзеныя GPX"
msgid "Markers from {0}"
msgstr "Маркеры з {0}"
+msgid "Download OSM Notes"
+msgstr ""
+
msgid "Downloading Notes"
msgstr ""
+msgid "Notes"
+msgstr ""
+
msgid "Download Compressed OSM Change"
msgstr ""
@@ -6283,6 +6289,9 @@ msgstr ""
msgid "Customize the style"
msgstr ""
+msgid "List of notes"
+msgstr ""
+
msgid "Add comment"
msgstr ""
@@ -7602,9 +7611,6 @@ 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 ""
@@ -15865,9 +15871,6 @@ msgstr ""
msgid "stadium"
msgstr ""
-msgid "Select sport:"
-msgstr ""
-
msgid "Sport"
msgstr ""
@@ -15988,19 +15991,19 @@ msgid "rugby_union"
msgstr ""
msgctxt "sport"
-msgid "shooting"
+msgid "running"
msgstr ""
msgctxt "sport"
-msgid "skateboard"
+msgid "shooting"
msgstr ""
msgctxt "sport"
-msgid "skating"
+msgid "skateboard"
msgstr ""
msgctxt "sport"
-msgid "skiing"
+msgid "skating"
msgstr ""
msgctxt "sport"
@@ -16328,6 +16331,30 @@ msgstr ""
msgid "Toll"
msgstr ""
+msgid "Is the water body intermittent (disappears seasonally)?"
+msgstr ""
+
+msgid "culvert"
+msgstr ""
+
+msgid "Water access rules:"
+msgstr ""
+
+msgid "Ship"
+msgstr ""
+
+msgid "designated"
+msgstr ""
+
+msgid "Boat"
+msgstr ""
+
+msgid "Motorboat"
+msgstr ""
+
+msgid "Canoe"
+msgstr ""
+
msgid "Streets"
msgstr ""
@@ -16543,9 +16570,6 @@ msgstr ""
msgid "official"
msgstr ""
-msgid "designated"
-msgstr ""
-
msgid "Vehicles per type"
msgstr ""
@@ -16935,6 +16959,9 @@ msgstr ""
msgid "Pedestrian Crossing"
msgstr ""
+msgid "In case of traffic signals:"
+msgstr ""
+
msgid "Traffic Calming"
msgstr ""
@@ -17181,15 +17208,12 @@ msgstr ""
msgid "Stream"
msgstr ""
-msgid "Wadi"
+msgid "River"
msgstr ""
msgid "Canal"
msgstr ""
-msgid "River"
-msgstr ""
-
msgid "Spring"
msgstr ""
@@ -17255,9 +17279,6 @@ msgstr ""
msgid "Salt Water"
msgstr ""
-msgid "Is the water body intermittent (disappears seasonally)?"
-msgstr ""
-
msgid "Coastline"
msgstr ""
@@ -18097,6 +18118,9 @@ msgstr ""
msgid "Tactile Paving"
msgstr ""
+msgid "incorrect"
+msgstr ""
+
msgid "Bus Platform"
msgstr ""
@@ -18259,6 +18283,9 @@ msgstr ""
msgid "Microbrewery"
msgstr ""
+msgid "Outdoor seating"
+msgstr ""
+
msgid "Fast Food"
msgstr ""
@@ -18853,13 +18880,13 @@ msgstr ""
msgid "Collection times"
msgstr ""
-msgid "11:30"
+msgid "Mo-Sa 09:00"
msgstr ""
-msgid "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
+msgid "Mo-Fr 17:30; Sa 12:00"
msgstr ""
-msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; Su,PH off"
+msgid "Mo-Fr 15:00,19:00; Sa 15:10; Su 10:30"
msgstr ""
msgid "Drive through"
@@ -19118,6 +19145,15 @@ msgstr ""
msgid "Pitch"
msgstr ""
+msgid "artificial_turf"
+msgstr ""
+
+msgid "decoturf"
+msgstr ""
+
+msgid "tartan"
+msgstr ""
+
msgid "Racetrack"
msgstr ""
@@ -19225,6 +19261,12 @@ msgstr ""
msgid "skitour"
msgstr ""
+msgid "sled"
+msgstr ""
+
+msgid "sleigh"
+msgstr ""
+
msgid "snow_park"
msgstr ""
@@ -19477,6 +19519,10 @@ msgctxt "building"
msgid "construction"
msgstr ""
+msgctxt "building"
+msgid "Levels"
+msgstr ""
+
msgid "Residential Building"
msgstr ""
@@ -19512,6 +19558,16 @@ msgctxt "building"
msgid "farm"
msgstr ""
+msgid "Building part"
+msgstr ""
+
+msgctxt "building"
+msgid "Skipped Levels"
+msgstr ""
+
+msgid "Skipped height (meters)"
+msgstr ""
+
msgid "Entrance"
msgstr ""
@@ -21245,22 +21301,28 @@ msgstr ""
msgid "scoria"
msgstr ""
-msgid "Cave Entrance"
+msgid "Ridge"
msgstr ""
-msgid "The entrance to a cave."
+msgid "A mountain or hill ridge."
msgstr ""
-msgid "Island"
+msgid "Valley"
msgstr ""
-msgid "Islet"
+msgid "A low area between hills."
msgstr ""
-msgid "Ridge"
+msgid "Cave Entrance"
msgstr ""
-msgid "A mountain or hill ridge."
+msgid "The entrance to a cave."
+msgstr ""
+
+msgid "Island"
+msgstr ""
+
+msgid "Islet"
msgstr ""
msgid "Nature"
@@ -21290,6 +21352,37 @@ msgstr ""
msgid "Forest"
msgstr ""
+msgid "Cutline"
+msgstr ""
+
+msgctxt "cutline"
+msgid "border"
+msgstr ""
+
+msgctxt "cutline"
+msgid "firebreak"
+msgstr ""
+
+msgctxt "cutline"
+msgid "hunting"
+msgstr ""
+
+msgctxt "cutline"
+msgid "loggingmachine"
+msgstr ""
+
+msgctxt "cutline"
+msgid "pipeline"
+msgstr ""
+
+msgctxt "cutline"
+msgid "piste"
+msgstr ""
+
+msgctxt "cutline"
+msgid "section"
+msgstr ""
+
msgid "Grassland"
msgstr ""
@@ -22223,6 +22316,9 @@ msgstr ""
msgid "Unspecific tag {0}"
msgstr ""
+msgid "Definition of {0} is unclear"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -27588,7 +27684,7 @@ msgstr ""
msgid "No object selected"
msgstr ""
-msgid "SeaMap Editor"
+msgid "SeaChart Editor"
msgstr ""
msgid "Seamark Inspector"
@@ -27660,6 +27756,9 @@ msgstr ""
msgid "Merge Nearby Nodes Threshold"
msgstr ""
+msgid "SeaMap Editor"
+msgstr ""
+
msgid "AutoSave LiveData"
msgstr ""
diff --git a/i18n/po/bg.po b/i18n/po/bg.po
index aa8a624..3f6d363 100644
--- a/i18n/po/bg.po
+++ b/i18n/po/bg.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-04 03:32+0100\n"
+"POT-Creation-Date: 2015-04-01 03:33+0200\n"
"PO-Revision-Date: 2015-02-21 01:31+0000\n"
"Last-Translator: pl <Unknown>\n"
"Language-Team: Bulgarian <bg at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-03-04 04:36+0000\n"
-"X-Generator: Launchpad (build 17361)\n"
+"X-Launchpad-Export-Date: 2015-04-01 04:36+0000\n"
+"X-Generator: Launchpad (build 17413)\n"
"Language: bg\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -1785,9 +1785,15 @@ msgstr "Свалени GPX данни"
msgid "Markers from {0}"
msgstr "Маркери от {0}"
+msgid "Download OSM Notes"
+msgstr ""
+
msgid "Downloading Notes"
msgstr "Сваляне на Бележки"
+msgid "Notes"
+msgstr "Банкноти"
+
msgid "Download Compressed OSM Change"
msgstr ""
@@ -6272,6 +6278,9 @@ msgstr ""
msgid "Customize the style"
msgstr ""
+msgid "List of notes"
+msgstr ""
+
msgid "Add comment"
msgstr ""
@@ -7595,9 +7604,6 @@ 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 ""
@@ -15997,9 +16003,6 @@ msgstr "спортен център"
msgid "stadium"
msgstr "стадион"
-msgid "Select sport:"
-msgstr ""
-
msgid "Sport"
msgstr "Спорт"
@@ -16120,6 +16123,10 @@ msgid "rugby_union"
msgstr ""
msgctxt "sport"
+msgid "running"
+msgstr ""
+
+msgctxt "sport"
msgid "shooting"
msgstr "Стрелба"
@@ -16132,10 +16139,6 @@ msgid "skating"
msgstr "Фигурно пързаляне"
msgctxt "sport"
-msgid "skiing"
-msgstr "Ски"
-
-msgctxt "sport"
msgid "soccer"
msgstr "Футбол"
@@ -16460,6 +16463,30 @@ msgstr "Макс. маса (т)"
msgid "Toll"
msgstr "Пътна такса"
+msgid "Is the water body intermittent (disappears seasonally)?"
+msgstr ""
+
+msgid "culvert"
+msgstr ""
+
+msgid "Water access rules:"
+msgstr ""
+
+msgid "Ship"
+msgstr ""
+
+msgid "designated"
+msgstr "предназначен"
+
+msgid "Boat"
+msgstr ""
+
+msgid "Motorboat"
+msgstr ""
+
+msgid "Canoe"
+msgstr ""
+
msgid "Streets"
msgstr "Автомобилни"
@@ -16675,9 +16702,6 @@ msgstr "Ограничения"
msgid "official"
msgstr ""
-msgid "designated"
-msgstr "предназначен"
-
msgid "Vehicles per type"
msgstr ""
@@ -17067,6 +17091,9 @@ msgstr "по часовниковата стрелка"
msgid "Pedestrian Crossing"
msgstr "Пешеходна пътека"
+msgid "In case of traffic signals:"
+msgstr ""
+
msgid "Traffic Calming"
msgstr "Забавяне на скоростта"
@@ -17313,15 +17340,12 @@ msgstr ""
msgid "Stream"
msgstr "Поток"
-msgid "Wadi"
-msgstr ""
+msgid "River"
+msgstr "Река"
msgid "Canal"
msgstr "Канал"
-msgid "River"
-msgstr "Река"
-
msgid "Spring"
msgstr "Извор"
@@ -17387,9 +17411,6 @@ msgstr ""
msgid "Salt Water"
msgstr ""
-msgid "Is the water body intermittent (disappears seasonally)?"
-msgstr ""
-
msgid "Coastline"
msgstr "Крайбрежие"
@@ -18229,6 +18250,9 @@ msgstr "Автобусна спирка"
msgid "Tactile Paving"
msgstr "Настилка за слепи хора"
+msgid "incorrect"
+msgstr ""
+
msgid "Bus Platform"
msgstr "Автобусна платформа"
@@ -18391,6 +18415,9 @@ msgstr "суши"
msgid "Microbrewery"
msgstr ""
+msgid "Outdoor seating"
+msgstr ""
+
msgid "Fast Food"
msgstr "Заведение за бързо хранене"
@@ -18985,14 +19012,14 @@ msgstr "Пощенска кутия"
msgid "Collection times"
msgstr ""
-msgid "11:30"
-msgstr "11:30"
+msgid "Mo-Sa 09:00"
+msgstr ""
-msgid "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
-msgstr "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
+msgid "Mo-Fr 17:30; Sa 12:00"
+msgstr ""
-msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; Su,PH off"
-msgstr "Mo-Fr 09:00-12:00,17:15; Sa 14:00; Su,PH off"
+msgid "Mo-Fr 15:00,19:00; Sa 15:10; Su 10:30"
+msgstr ""
msgid "Drive through"
msgstr ""
@@ -19250,6 +19277,15 @@ msgstr "Спортен център"
msgid "Pitch"
msgstr "Игрище"
+msgid "artificial_turf"
+msgstr ""
+
+msgid "decoturf"
+msgstr ""
+
+msgid "tartan"
+msgstr ""
+
msgid "Racetrack"
msgstr "Състезателна писта"
@@ -19357,6 +19393,12 @@ msgstr "нордическа"
msgid "skitour"
msgstr ""
+msgid "sled"
+msgstr ""
+
+msgid "sleigh"
+msgstr ""
+
msgid "snow_park"
msgstr "Зимен парк"
@@ -19609,6 +19651,10 @@ msgctxt "building"
msgid "construction"
msgstr "в строеж"
+msgctxt "building"
+msgid "Levels"
+msgstr ""
+
msgid "Residential Building"
msgstr "Жилищна сграда"
@@ -19644,6 +19690,16 @@ msgctxt "building"
msgid "farm"
msgstr "ферма"
+msgid "Building part"
+msgstr ""
+
+msgctxt "building"
+msgid "Skipped Levels"
+msgstr ""
+
+msgid "Skipped height (meters)"
+msgstr ""
+
msgid "Entrance"
msgstr "Вход"
@@ -21377,6 +21433,18 @@ msgstr ""
msgid "scoria"
msgstr ""
+msgid "Ridge"
+msgstr ""
+
+msgid "A mountain or hill ridge."
+msgstr ""
+
+msgid "Valley"
+msgstr ""
+
+msgid "A low area between hills."
+msgstr ""
+
msgid "Cave Entrance"
msgstr "Пещерен вход"
@@ -21389,12 +21457,6 @@ msgstr "Остров"
msgid "Islet"
msgstr "Скала"
-msgid "Ridge"
-msgstr ""
-
-msgid "A mountain or hill ridge."
-msgstr ""
-
msgid "Nature"
msgstr "Природа"
@@ -21422,6 +21484,37 @@ msgstr ""
msgid "Forest"
msgstr "Гора"
+msgid "Cutline"
+msgstr ""
+
+msgctxt "cutline"
+msgid "border"
+msgstr ""
+
+msgctxt "cutline"
+msgid "firebreak"
+msgstr ""
+
+msgctxt "cutline"
+msgid "hunting"
+msgstr ""
+
+msgctxt "cutline"
+msgid "loggingmachine"
+msgstr ""
+
+msgctxt "cutline"
+msgid "pipeline"
+msgstr ""
+
+msgctxt "cutline"
+msgid "piste"
+msgstr ""
+
+msgctxt "cutline"
+msgid "section"
+msgstr ""
+
msgid "Grassland"
msgstr "Поляна/трева"
@@ -22357,6 +22450,9 @@ msgstr ""
msgid "Unspecific tag {0}"
msgstr "Неопределен етикет {0}"
+msgid "Definition of {0} is unclear"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr "{0} за точка. Трябва да се ползва за път."
@@ -27768,8 +27864,8 @@ msgstr ""
msgid "No object selected"
msgstr ""
-msgid "SeaMap Editor"
-msgstr "SeaMap Редактор"
+msgid "SeaChart Editor"
+msgstr ""
msgid "Seamark Inspector"
msgstr ""
@@ -27840,6 +27936,9 @@ msgstr ""
msgid "Merge Nearby Nodes Threshold"
msgstr ""
+msgid "SeaMap Editor"
+msgstr "SeaMap Редактор"
+
msgid "AutoSave LiveData"
msgstr "Автоматичен запис на данни на живо"
diff --git a/i18n/po/bn.po b/i18n/po/bn.po
index eb72cd2..92ca523 100644
--- a/i18n/po/bn.po
+++ b/i18n/po/bn.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-04 03:32+0100\n"
+"POT-Creation-Date: 2015-04-01 03:33+0200\n"
"PO-Revision-Date: 2013-06-13 16:28+0000\n"
"Last-Translator: Md Alamgir <alamgircu at hotmail.com>\n"
"Language-Team: Bengali <bn at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-03-04 04:35+0000\n"
-"X-Generator: Launchpad (build 17361)\n"
+"X-Launchpad-Export-Date: 2015-04-01 04:34+0000\n"
+"X-Generator: Launchpad (build 17413)\n"
"Language: bn\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -1699,9 +1699,15 @@ msgstr ""
msgid "Markers from {0}"
msgstr ""
+msgid "Download OSM Notes"
+msgstr ""
+
msgid "Downloading Notes"
msgstr ""
+msgid "Notes"
+msgstr ""
+
msgid "Download Compressed OSM Change"
msgstr ""
@@ -6112,6 +6118,9 @@ msgstr ""
msgid "Customize the style"
msgstr ""
+msgid "List of notes"
+msgstr ""
+
msgid "Add comment"
msgstr ""
@@ -7431,9 +7440,6 @@ 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 ""
@@ -15685,9 +15691,6 @@ msgstr ""
msgid "stadium"
msgstr ""
-msgid "Select sport:"
-msgstr ""
-
msgid "Sport"
msgstr ""
@@ -15808,19 +15811,19 @@ msgid "rugby_union"
msgstr ""
msgctxt "sport"
-msgid "shooting"
+msgid "running"
msgstr ""
msgctxt "sport"
-msgid "skateboard"
+msgid "shooting"
msgstr ""
msgctxt "sport"
-msgid "skating"
+msgid "skateboard"
msgstr ""
msgctxt "sport"
-msgid "skiing"
+msgid "skating"
msgstr ""
msgctxt "sport"
@@ -16148,6 +16151,30 @@ msgstr ""
msgid "Toll"
msgstr ""
+msgid "Is the water body intermittent (disappears seasonally)?"
+msgstr ""
+
+msgid "culvert"
+msgstr ""
+
+msgid "Water access rules:"
+msgstr ""
+
+msgid "Ship"
+msgstr ""
+
+msgid "designated"
+msgstr ""
+
+msgid "Boat"
+msgstr ""
+
+msgid "Motorboat"
+msgstr ""
+
+msgid "Canoe"
+msgstr ""
+
msgid "Streets"
msgstr ""
@@ -16363,9 +16390,6 @@ msgstr ""
msgid "official"
msgstr ""
-msgid "designated"
-msgstr ""
-
msgid "Vehicles per type"
msgstr ""
@@ -16755,6 +16779,9 @@ msgstr ""
msgid "Pedestrian Crossing"
msgstr ""
+msgid "In case of traffic signals:"
+msgstr ""
+
msgid "Traffic Calming"
msgstr ""
@@ -17001,15 +17028,12 @@ msgstr ""
msgid "Stream"
msgstr ""
-msgid "Wadi"
+msgid "River"
msgstr ""
msgid "Canal"
msgstr ""
-msgid "River"
-msgstr ""
-
msgid "Spring"
msgstr ""
@@ -17075,9 +17099,6 @@ msgstr ""
msgid "Salt Water"
msgstr ""
-msgid "Is the water body intermittent (disappears seasonally)?"
-msgstr ""
-
msgid "Coastline"
msgstr ""
@@ -17917,6 +17938,9 @@ msgstr ""
msgid "Tactile Paving"
msgstr ""
+msgid "incorrect"
+msgstr ""
+
msgid "Bus Platform"
msgstr ""
@@ -18079,6 +18103,9 @@ msgstr ""
msgid "Microbrewery"
msgstr ""
+msgid "Outdoor seating"
+msgstr ""
+
msgid "Fast Food"
msgstr ""
@@ -18673,13 +18700,13 @@ msgstr ""
msgid "Collection times"
msgstr ""
-msgid "11:30"
+msgid "Mo-Sa 09:00"
msgstr ""
-msgid "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
+msgid "Mo-Fr 17:30; Sa 12:00"
msgstr ""
-msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; Su,PH off"
+msgid "Mo-Fr 15:00,19:00; Sa 15:10; Su 10:30"
msgstr ""
msgid "Drive through"
@@ -18938,6 +18965,15 @@ msgstr ""
msgid "Pitch"
msgstr ""
+msgid "artificial_turf"
+msgstr ""
+
+msgid "decoturf"
+msgstr ""
+
+msgid "tartan"
+msgstr ""
+
msgid "Racetrack"
msgstr ""
@@ -19045,6 +19081,12 @@ msgstr ""
msgid "skitour"
msgstr ""
+msgid "sled"
+msgstr ""
+
+msgid "sleigh"
+msgstr ""
+
msgid "snow_park"
msgstr ""
@@ -19297,6 +19339,10 @@ msgctxt "building"
msgid "construction"
msgstr ""
+msgctxt "building"
+msgid "Levels"
+msgstr ""
+
msgid "Residential Building"
msgstr ""
@@ -19332,6 +19378,16 @@ msgctxt "building"
msgid "farm"
msgstr ""
+msgid "Building part"
+msgstr ""
+
+msgctxt "building"
+msgid "Skipped Levels"
+msgstr ""
+
+msgid "Skipped height (meters)"
+msgstr ""
+
msgid "Entrance"
msgstr ""
@@ -21065,22 +21121,28 @@ msgstr ""
msgid "scoria"
msgstr ""
-msgid "Cave Entrance"
+msgid "Ridge"
msgstr ""
-msgid "The entrance to a cave."
+msgid "A mountain or hill ridge."
msgstr ""
-msgid "Island"
+msgid "Valley"
msgstr ""
-msgid "Islet"
+msgid "A low area between hills."
msgstr ""
-msgid "Ridge"
+msgid "Cave Entrance"
msgstr ""
-msgid "A mountain or hill ridge."
+msgid "The entrance to a cave."
+msgstr ""
+
+msgid "Island"
+msgstr ""
+
+msgid "Islet"
msgstr ""
msgid "Nature"
@@ -21110,6 +21172,37 @@ msgstr ""
msgid "Forest"
msgstr ""
+msgid "Cutline"
+msgstr ""
+
+msgctxt "cutline"
+msgid "border"
+msgstr ""
+
+msgctxt "cutline"
+msgid "firebreak"
+msgstr ""
+
+msgctxt "cutline"
+msgid "hunting"
+msgstr ""
+
+msgctxt "cutline"
+msgid "loggingmachine"
+msgstr ""
+
+msgctxt "cutline"
+msgid "pipeline"
+msgstr ""
+
+msgctxt "cutline"
+msgid "piste"
+msgstr ""
+
+msgctxt "cutline"
+msgid "section"
+msgstr ""
+
msgid "Grassland"
msgstr ""
@@ -22043,6 +22136,9 @@ msgstr ""
msgid "Unspecific tag {0}"
msgstr ""
+msgid "Definition of {0} is unclear"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -27404,7 +27500,7 @@ msgstr ""
msgid "No object selected"
msgstr ""
-msgid "SeaMap Editor"
+msgid "SeaChart Editor"
msgstr ""
msgid "Seamark Inspector"
@@ -27476,6 +27572,9 @@ msgstr ""
msgid "Merge Nearby Nodes Threshold"
msgstr ""
+msgid "SeaMap Editor"
+msgstr ""
+
msgid "AutoSave LiveData"
msgstr ""
diff --git a/i18n/po/br.po b/i18n/po/br.po
index 951ff2f..7ee96ab 100644
--- a/i18n/po/br.po
+++ b/i18n/po/br.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-04 03:32+0100\n"
+"POT-Creation-Date: 2015-04-01 03:33+0200\n"
"PO-Revision-Date: 2011-10-17 12:11+0000\n"
"Last-Translator: Fulup <Unknown>\n"
"Language-Team: Breton <br at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2015-03-04 04:36+0000\n"
-"X-Generator: Launchpad (build 17361)\n"
+"X-Launchpad-Export-Date: 2015-04-01 04:35+0000\n"
+"X-Generator: Launchpad (build 17413)\n"
"Language: br\n"
msgid "License"
@@ -1696,9 +1696,15 @@ msgstr ""
msgid "Markers from {0}"
msgstr ""
+msgid "Download OSM Notes"
+msgstr ""
+
msgid "Downloading Notes"
msgstr ""
+msgid "Notes"
+msgstr ""
+
msgid "Download Compressed OSM Change"
msgstr ""
@@ -6109,6 +6115,9 @@ msgstr ""
msgid "Customize the style"
msgstr ""
+msgid "List of notes"
+msgstr ""
+
msgid "Add comment"
msgstr ""
@@ -7428,9 +7437,6 @@ 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 ""
@@ -15682,9 +15688,6 @@ msgstr ""
msgid "stadium"
msgstr ""
-msgid "Select sport:"
-msgstr ""
-
msgid "Sport"
msgstr ""
@@ -15805,19 +15808,19 @@ msgid "rugby_union"
msgstr ""
msgctxt "sport"
-msgid "shooting"
+msgid "running"
msgstr ""
msgctxt "sport"
-msgid "skateboard"
+msgid "shooting"
msgstr ""
msgctxt "sport"
-msgid "skating"
+msgid "skateboard"
msgstr ""
msgctxt "sport"
-msgid "skiing"
+msgid "skating"
msgstr ""
msgctxt "sport"
@@ -16145,6 +16148,30 @@ msgstr ""
msgid "Toll"
msgstr ""
+msgid "Is the water body intermittent (disappears seasonally)?"
+msgstr ""
+
+msgid "culvert"
+msgstr ""
+
+msgid "Water access rules:"
+msgstr ""
+
+msgid "Ship"
+msgstr ""
+
+msgid "designated"
+msgstr ""
+
+msgid "Boat"
+msgstr ""
+
+msgid "Motorboat"
+msgstr ""
+
+msgid "Canoe"
+msgstr ""
+
msgid "Streets"
msgstr ""
@@ -16360,9 +16387,6 @@ msgstr ""
msgid "official"
msgstr ""
-msgid "designated"
-msgstr ""
-
msgid "Vehicles per type"
msgstr ""
@@ -16752,6 +16776,9 @@ msgstr ""
msgid "Pedestrian Crossing"
msgstr ""
+msgid "In case of traffic signals:"
+msgstr ""
+
msgid "Traffic Calming"
msgstr ""
@@ -16998,15 +17025,12 @@ msgstr ""
msgid "Stream"
msgstr ""
-msgid "Wadi"
+msgid "River"
msgstr ""
msgid "Canal"
msgstr ""
-msgid "River"
-msgstr ""
-
msgid "Spring"
msgstr ""
@@ -17072,9 +17096,6 @@ msgstr ""
msgid "Salt Water"
msgstr ""
-msgid "Is the water body intermittent (disappears seasonally)?"
-msgstr ""
-
msgid "Coastline"
msgstr ""
@@ -17914,6 +17935,9 @@ msgstr ""
msgid "Tactile Paving"
msgstr ""
+msgid "incorrect"
+msgstr ""
+
msgid "Bus Platform"
msgstr ""
@@ -18076,6 +18100,9 @@ msgstr ""
msgid "Microbrewery"
msgstr ""
+msgid "Outdoor seating"
+msgstr ""
+
msgid "Fast Food"
msgstr ""
@@ -18670,13 +18697,13 @@ msgstr ""
msgid "Collection times"
msgstr ""
-msgid "11:30"
+msgid "Mo-Sa 09:00"
msgstr ""
-msgid "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
+msgid "Mo-Fr 17:30; Sa 12:00"
msgstr ""
-msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; Su,PH off"
+msgid "Mo-Fr 15:00,19:00; Sa 15:10; Su 10:30"
msgstr ""
msgid "Drive through"
@@ -18935,6 +18962,15 @@ msgstr ""
msgid "Pitch"
msgstr ""
+msgid "artificial_turf"
+msgstr ""
+
+msgid "decoturf"
+msgstr ""
+
+msgid "tartan"
+msgstr ""
+
msgid "Racetrack"
msgstr ""
@@ -19042,6 +19078,12 @@ msgstr ""
msgid "skitour"
msgstr ""
+msgid "sled"
+msgstr ""
+
+msgid "sleigh"
+msgstr ""
+
msgid "snow_park"
msgstr ""
@@ -19294,6 +19336,10 @@ msgctxt "building"
msgid "construction"
msgstr ""
+msgctxt "building"
+msgid "Levels"
+msgstr ""
+
msgid "Residential Building"
msgstr ""
@@ -19329,6 +19375,16 @@ msgctxt "building"
msgid "farm"
msgstr ""
+msgid "Building part"
+msgstr ""
+
+msgctxt "building"
+msgid "Skipped Levels"
+msgstr ""
+
+msgid "Skipped height (meters)"
+msgstr ""
+
msgid "Entrance"
msgstr ""
@@ -21062,22 +21118,28 @@ msgstr ""
msgid "scoria"
msgstr ""
-msgid "Cave Entrance"
+msgid "Ridge"
msgstr ""
-msgid "The entrance to a cave."
+msgid "A mountain or hill ridge."
msgstr ""
-msgid "Island"
+msgid "Valley"
msgstr ""
-msgid "Islet"
+msgid "A low area between hills."
msgstr ""
-msgid "Ridge"
+msgid "Cave Entrance"
msgstr ""
-msgid "A mountain or hill ridge."
+msgid "The entrance to a cave."
+msgstr ""
+
+msgid "Island"
+msgstr ""
+
+msgid "Islet"
msgstr ""
msgid "Nature"
@@ -21107,6 +21169,37 @@ msgstr ""
msgid "Forest"
msgstr ""
+msgid "Cutline"
+msgstr ""
+
+msgctxt "cutline"
+msgid "border"
+msgstr ""
+
+msgctxt "cutline"
+msgid "firebreak"
+msgstr ""
+
+msgctxt "cutline"
+msgid "hunting"
+msgstr ""
+
+msgctxt "cutline"
+msgid "loggingmachine"
+msgstr ""
+
+msgctxt "cutline"
+msgid "pipeline"
+msgstr ""
+
+msgctxt "cutline"
+msgid "piste"
+msgstr ""
+
+msgctxt "cutline"
+msgid "section"
+msgstr ""
+
msgid "Grassland"
msgstr ""
@@ -22040,6 +22133,9 @@ msgstr ""
msgid "Unspecific tag {0}"
msgstr ""
+msgid "Definition of {0} is unclear"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -27401,7 +27497,7 @@ msgstr ""
msgid "No object selected"
msgstr ""
-msgid "SeaMap Editor"
+msgid "SeaChart Editor"
msgstr ""
msgid "Seamark Inspector"
@@ -27473,6 +27569,9 @@ msgstr ""
msgid "Merge Nearby Nodes Threshold"
msgstr ""
+msgid "SeaMap Editor"
+msgstr ""
+
msgid "AutoSave LiveData"
msgstr ""
diff --git a/i18n/po/bs.po b/i18n/po/bs.po
index 958efdb..94c64f9 100644
--- a/i18n/po/bs.po
+++ b/i18n/po/bs.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-04 03:32+0100\n"
+"POT-Creation-Date: 2015-04-01 03:33+0200\n"
"PO-Revision-Date: 2012-11-03 23:07+0000\n"
"Last-Translator: Alen Mahovic <eyeofthestorm at windowslive.com>\n"
"Language-Team: Bosnian <bs at li.org>\n"
@@ -16,8 +16,8 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2015-03-04 04:35+0000\n"
-"X-Generator: Launchpad (build 17361)\n"
+"X-Launchpad-Export-Date: 2015-04-01 04:35+0000\n"
+"X-Generator: Launchpad (build 17413)\n"
"Language: bs\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -1699,9 +1699,15 @@ msgstr ""
msgid "Markers from {0}"
msgstr ""
+msgid "Download OSM Notes"
+msgstr ""
+
msgid "Downloading Notes"
msgstr ""
+msgid "Notes"
+msgstr ""
+
msgid "Download Compressed OSM Change"
msgstr ""
@@ -6112,6 +6118,9 @@ msgstr ""
msgid "Customize the style"
msgstr ""
+msgid "List of notes"
+msgstr ""
+
msgid "Add comment"
msgstr ""
@@ -7431,9 +7440,6 @@ 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 ""
@@ -15685,9 +15691,6 @@ msgstr ""
msgid "stadium"
msgstr ""
-msgid "Select sport:"
-msgstr ""
-
msgid "Sport"
msgstr ""
@@ -15808,19 +15811,19 @@ msgid "rugby_union"
msgstr ""
msgctxt "sport"
-msgid "shooting"
+msgid "running"
msgstr ""
msgctxt "sport"
-msgid "skateboard"
+msgid "shooting"
msgstr ""
msgctxt "sport"
-msgid "skating"
+msgid "skateboard"
msgstr ""
msgctxt "sport"
-msgid "skiing"
+msgid "skating"
msgstr ""
msgctxt "sport"
@@ -16148,6 +16151,30 @@ msgstr ""
msgid "Toll"
msgstr ""
+msgid "Is the water body intermittent (disappears seasonally)?"
+msgstr ""
+
+msgid "culvert"
+msgstr ""
+
+msgid "Water access rules:"
+msgstr ""
+
+msgid "Ship"
+msgstr ""
+
+msgid "designated"
+msgstr ""
+
+msgid "Boat"
+msgstr ""
+
+msgid "Motorboat"
+msgstr ""
+
+msgid "Canoe"
+msgstr ""
+
msgid "Streets"
msgstr ""
@@ -16363,9 +16390,6 @@ msgstr ""
msgid "official"
msgstr ""
-msgid "designated"
-msgstr ""
-
msgid "Vehicles per type"
msgstr ""
@@ -16755,6 +16779,9 @@ msgstr ""
msgid "Pedestrian Crossing"
msgstr ""
+msgid "In case of traffic signals:"
+msgstr ""
+
msgid "Traffic Calming"
msgstr ""
@@ -17001,15 +17028,12 @@ msgstr ""
msgid "Stream"
msgstr ""
-msgid "Wadi"
+msgid "River"
msgstr ""
msgid "Canal"
msgstr ""
-msgid "River"
-msgstr ""
-
msgid "Spring"
msgstr ""
@@ -17075,9 +17099,6 @@ msgstr ""
msgid "Salt Water"
msgstr ""
-msgid "Is the water body intermittent (disappears seasonally)?"
-msgstr ""
-
msgid "Coastline"
msgstr ""
@@ -17917,6 +17938,9 @@ msgstr ""
msgid "Tactile Paving"
msgstr ""
+msgid "incorrect"
+msgstr ""
+
msgid "Bus Platform"
msgstr ""
@@ -18079,6 +18103,9 @@ msgstr ""
msgid "Microbrewery"
msgstr ""
+msgid "Outdoor seating"
+msgstr ""
+
msgid "Fast Food"
msgstr ""
@@ -18673,13 +18700,13 @@ msgstr ""
msgid "Collection times"
msgstr ""
-msgid "11:30"
+msgid "Mo-Sa 09:00"
msgstr ""
-msgid "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
+msgid "Mo-Fr 17:30; Sa 12:00"
msgstr ""
-msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; Su,PH off"
+msgid "Mo-Fr 15:00,19:00; Sa 15:10; Su 10:30"
msgstr ""
msgid "Drive through"
@@ -18938,6 +18965,15 @@ msgstr ""
msgid "Pitch"
msgstr ""
+msgid "artificial_turf"
+msgstr ""
+
+msgid "decoturf"
+msgstr ""
+
+msgid "tartan"
+msgstr ""
+
msgid "Racetrack"
msgstr ""
@@ -19045,6 +19081,12 @@ msgstr ""
msgid "skitour"
msgstr ""
+msgid "sled"
+msgstr ""
+
+msgid "sleigh"
+msgstr ""
+
msgid "snow_park"
msgstr ""
@@ -19297,6 +19339,10 @@ msgctxt "building"
msgid "construction"
msgstr ""
+msgctxt "building"
+msgid "Levels"
+msgstr ""
+
msgid "Residential Building"
msgstr ""
@@ -19332,6 +19378,16 @@ msgctxt "building"
msgid "farm"
msgstr ""
+msgid "Building part"
+msgstr ""
+
+msgctxt "building"
+msgid "Skipped Levels"
+msgstr ""
+
+msgid "Skipped height (meters)"
+msgstr ""
+
msgid "Entrance"
msgstr ""
@@ -21065,22 +21121,28 @@ msgstr ""
msgid "scoria"
msgstr ""
-msgid "Cave Entrance"
+msgid "Ridge"
msgstr ""
-msgid "The entrance to a cave."
+msgid "A mountain or hill ridge."
msgstr ""
-msgid "Island"
+msgid "Valley"
msgstr ""
-msgid "Islet"
+msgid "A low area between hills."
msgstr ""
-msgid "Ridge"
+msgid "Cave Entrance"
msgstr ""
-msgid "A mountain or hill ridge."
+msgid "The entrance to a cave."
+msgstr ""
+
+msgid "Island"
+msgstr ""
+
+msgid "Islet"
msgstr ""
msgid "Nature"
@@ -21110,6 +21172,37 @@ msgstr ""
msgid "Forest"
msgstr ""
+msgid "Cutline"
+msgstr ""
+
+msgctxt "cutline"
+msgid "border"
+msgstr ""
+
+msgctxt "cutline"
+msgid "firebreak"
+msgstr ""
+
+msgctxt "cutline"
+msgid "hunting"
+msgstr ""
+
+msgctxt "cutline"
+msgid "loggingmachine"
+msgstr ""
+
+msgctxt "cutline"
+msgid "pipeline"
+msgstr ""
+
+msgctxt "cutline"
+msgid "piste"
+msgstr ""
+
+msgctxt "cutline"
+msgid "section"
+msgstr ""
+
msgid "Grassland"
msgstr ""
@@ -22043,6 +22136,9 @@ msgstr ""
msgid "Unspecific tag {0}"
msgstr ""
+msgid "Definition of {0} is unclear"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -27404,7 +27500,7 @@ msgstr ""
msgid "No object selected"
msgstr ""
-msgid "SeaMap Editor"
+msgid "SeaChart Editor"
msgstr ""
msgid "Seamark Inspector"
@@ -27476,6 +27572,9 @@ msgstr ""
msgid "Merge Nearby Nodes Threshold"
msgstr ""
+msgid "SeaMap Editor"
+msgstr ""
+
msgid "AutoSave LiveData"
msgstr ""
diff --git a/i18n/po/ca.po b/i18n/po/ca.po
index 8908558..79e39c9 100644
--- a/i18n/po/ca.po
+++ b/i18n/po/ca.po
@@ -7,16 +7,16 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-04 03:32+0100\n"
-"PO-Revision-Date: 2015-02-25 07:57+0000\n"
+"POT-Creation-Date: 2015-04-01 03:33+0200\n"
+"PO-Revision-Date: 2015-03-27 07:51+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: 2015-03-04 04:37+0000\n"
-"X-Generator: Launchpad (build 17361)\n"
+"X-Launchpad-Export-Date: 2015-04-01 04:36+0000\n"
+"X-Generator: Launchpad (build 17413)\n"
"Language: ca\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -1852,9 +1852,15 @@ msgstr "Dades GPX baixades"
msgid "Markers from {0}"
msgstr "Marcadors de {0}"
+msgid "Download OSM Notes"
+msgstr "Descarrega les notes d''OSM"
+
msgid "Downloading Notes"
msgstr "S''estan baixant les notes"
+msgid "Notes"
+msgstr "Notes"
+
msgid "Download Compressed OSM Change"
msgstr "Baixa modificacions OSM comprimides"
@@ -4235,6 +4241,8 @@ msgid ""
"With the currently used mappaint style(s) the style for outer way mismatches "
"polygon"
msgstr ""
+"Amb l''estil o els estils que són en ús l''estil de la via exterior no "
+"coincideix amb el del polígon"
msgid "Area style on outer way"
msgstr "Estil d''àrea a la via externa"
@@ -6724,6 +6732,9 @@ msgstr "Configuracions d''estil"
msgid "Customize the style"
msgstr "Personalitza l''estil"
+msgid "List of notes"
+msgstr "Llista de notes"
+
msgid "Add comment"
msgstr "Afegeix un comentari"
@@ -8175,9 +8186,6 @@ msgstr "Dades GPS"
msgid "Select to download GPS traces in the selected download area."
msgstr "Baixar 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 baixada."
@@ -11117,7 +11125,7 @@ msgid "color"
msgstr "color"
msgid "toolbar"
-msgstr "barra d''eines"
+msgstr "barra d’eines"
msgid "imagery"
msgstr "imatgeria"
@@ -15755,7 +15763,7 @@ msgid "Waymarked Trails: Horse Riding"
msgstr "Waymarked Trails: Cavall"
msgid "Waymarked Trails: Winter Sports"
-msgstr "Waymarked Trails: Esports d'hivern"
+msgstr "Waymarked Trails: Esports d’hivern"
msgid "OSM Inspector: Geometry"
msgstr "Inspector OSM: Geometria"
@@ -16262,10 +16270,10 @@ msgid "Slovakia Historic Maps"
msgstr "Mapes històrics d''Eslovàquia"
msgid "RABA-KGZ: Slovenia farmland use"
-msgstr ""
+msgstr "RABA-KGZ: Eslovènia usos del sòl"
msgid "RABA-KGZ: Slovenia built-up areas"
-msgstr ""
+msgstr "RABA-KGZ: Eslovènia àrees edificades"
msgid "South Africa CD:NGI Aerial"
msgstr "Sud-àfrica CD:NGI Aeri"
@@ -17540,9 +17548,6 @@ msgstr "centre_esports"
msgid "stadium"
msgstr "estadi"
-msgid "Select sport:"
-msgstr "Seleccioneu esport:"
-
msgid "Sport"
msgstr "Esport"
@@ -17663,6 +17668,10 @@ msgid "rugby_union"
msgstr "rugbi a 15"
msgctxt "sport"
+msgid "running"
+msgstr "s’està executant"
+
+msgctxt "sport"
msgid "shooting"
msgstr "tir"
@@ -17675,10 +17684,6 @@ msgid "skating"
msgstr "patinatge"
msgctxt "sport"
-msgid "skiing"
-msgstr "esquí"
-
-msgctxt "sport"
msgid "soccer"
msgstr "futbol"
@@ -18003,6 +18008,30 @@ msgstr "Màx. pes (tones)"
msgid "Toll"
msgstr "Peatge"
+msgid "Is the water body intermittent (disappears seasonally)?"
+msgstr "El cos d''aigua és intermintent? (desapareix estacionalment?)"
+
+msgid "culvert"
+msgstr "canonada"
+
+msgid "Water access rules:"
+msgstr "Regles per l’accés a l’aigua:"
+
+msgid "Ship"
+msgstr "Vaixell"
+
+msgid "designated"
+msgstr "designat"
+
+msgid "Boat"
+msgstr "Barca"
+
+msgid "Motorboat"
+msgstr "Barca a motot"
+
+msgid "Canoe"
+msgstr "Canoa"
+
msgid "Streets"
msgstr "Carrers"
@@ -18223,9 +18252,6 @@ msgstr "Restriccions del mode de transport"
msgid "official"
msgstr "oficial"
-msgid "designated"
-msgstr "designat"
-
msgid "Vehicles per type"
msgstr "Vehicles per tipus"
@@ -18629,6 +18655,9 @@ msgstr "sentit de les agulles del rellotge"
msgid "Pedestrian Crossing"
msgstr "Pas de vianants"
+msgid "In case of traffic signals:"
+msgstr "Es el cas de senyals de trànsit:"
+
msgid "Traffic Calming"
msgstr "Pacificació del trànsit"
@@ -18878,15 +18907,12 @@ msgstr "Sèquia"
msgid "Stream"
msgstr "Rierol"
-msgid "Wadi"
-msgstr "Riera / Torrent / Rambla"
+msgid "River"
+msgstr "Riu"
msgid "Canal"
msgstr "Canal"
-msgid "River"
-msgstr "Riu"
-
msgid "Spring"
msgstr "Font / Brollador"
@@ -18952,9 +18978,6 @@ msgstr "riu"
msgid "Salt Water"
msgstr "Aigua salada"
-msgid "Is the water body intermittent (disappears seasonally)?"
-msgstr "El cos d''aigua és intermintent? (desapareix estacionalment?)"
-
msgid "Coastline"
msgstr "Línia costanera"
@@ -19581,7 +19604,7 @@ msgid "Public Bicycle Repair Station"
msgstr "Estació pública de reparació de bicicletes"
msgid "Chain tool"
-msgstr ""
+msgstr "Eina de cadenes"
msgid "Public Transport"
msgstr "Transport públic"
@@ -19805,6 +19828,9 @@ msgstr "Parada d''autobús"
msgid "Tactile Paving"
msgstr "Paviment tàctil"
+msgid "incorrect"
+msgstr "incorrecte"
+
msgid "Bus Platform"
msgstr "Andana de l''estació d''autobusos"
@@ -19836,7 +19862,7 @@ msgid "Apron"
msgstr "Estacionament"
msgid "Plane Parking Position"
-msgstr ""
+msgstr "Posició aparcament avió"
msgid "Hangar"
msgstr "Hangar"
@@ -19967,6 +19993,9 @@ msgstr "sushi"
msgid "Microbrewery"
msgstr "Microcerveseria"
+msgid "Outdoor seating"
+msgstr "Seients a l''aire lliure"
+
msgid "Fast Food"
msgstr "Menjar ràpid"
@@ -20432,7 +20461,7 @@ msgid "Police"
msgstr "Comissaria de Policia"
msgid "Ranger Station"
-msgstr ""
+msgstr "Estació de Rangers (USA)"
msgid "Fire Station"
msgstr "Parc de Bombers"
@@ -20563,14 +20592,14 @@ msgstr "Bústia"
msgid "Collection times"
msgstr "Horari de recollida"
-msgid "11:30"
-msgstr "11:30"
+msgid "Mo-Sa 09:00"
+msgstr "Mo-Sa 09:00"
-msgid "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
-msgstr "dl-dv 15:00,17:45,19:00,23:00; ds 15:10; dg 10:30,23:00"
+msgid "Mo-Fr 17:30; Sa 12:00"
+msgstr "Mo-Fr 17:30; Sa 12:00"
-msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; Su,PH off"
-msgstr "dl-dv 09:00-12:00,17:15; ds 14:00; dg i festius tancat"
+msgid "Mo-Fr 15:00,19:00; Sa 15:10; Su 10:30"
+msgstr "Mo-Fr 15:00,19:00; Sa 15:10; Su 10:30"
msgid "Drive through"
msgstr "Accés a servei amb cotxe (drive-through)"
@@ -20828,6 +20857,15 @@ msgstr "Pavelló poliesportiu"
msgid "Pitch"
msgstr "Pista poliesportiva"
+msgid "artificial_turf"
+msgstr "herba artificial"
+
+msgid "decoturf"
+msgstr "decoturf (superfície artificial de Decosystems)"
+
+msgid "tartan"
+msgstr "tartan"
+
msgid "Racetrack"
msgstr "Circuit"
@@ -20935,6 +20973,12 @@ msgstr "nòrdic"
msgid "skitour"
msgstr "esqui de muntanya"
+msgid "sled"
+msgstr "trineus"
+
+msgid "sleigh"
+msgstr "trineus arrossegats per animals"
+
msgid "snow_park"
msgstr "snow_park"
@@ -21187,6 +21231,10 @@ msgctxt "building"
msgid "construction"
msgstr "construcció"
+msgctxt "building"
+msgid "Levels"
+msgstr "Nivells"
+
msgid "Residential Building"
msgstr "Edifici residencial"
@@ -21222,6 +21270,16 @@ msgctxt "building"
msgid "farm"
msgstr "granja"
+msgid "Building part"
+msgstr "Part edifici"
+
+msgctxt "building"
+msgid "Skipped Levels"
+msgstr "Nivells omesos"
+
+msgid "Skipped height (meters)"
+msgstr "Alçada omesa (metres)"
+
msgid "Entrance"
msgstr "Entrada"
@@ -22086,7 +22144,7 @@ msgid "tubular"
msgstr "tubular"
msgid "solid"
-msgstr ""
+msgstr "sòlida"
msgid "steel"
msgstr "acer"
@@ -22248,7 +22306,7 @@ msgid "Incomplete tower"
msgstr "Torre incompleta"
msgid "Location transition"
-msgstr ""
+msgstr "Punt de transició"
msgid "Pole"
msgstr "Pal"
@@ -22959,6 +23017,18 @@ msgstr "volcà escut"
msgid "scoria"
msgstr "escòria"
+msgid "Ridge"
+msgstr "Serralada"
+
+msgid "A mountain or hill ridge."
+msgstr "Una cadena de muntanyes o de turons."
+
+msgid "Valley"
+msgstr "Vall"
+
+msgid "A low area between hills."
+msgstr "Una vall entre muntanyes."
+
msgid "Cave Entrance"
msgstr "Entrada de la cova"
@@ -22971,12 +23041,6 @@ msgstr "Illa"
msgid "Islet"
msgstr "Illot"
-msgid "Ridge"
-msgstr "Serralada"
-
-msgid "A mountain or hill ridge."
-msgstr "Una cadena de muntanyes o de turons."
-
msgid "Nature"
msgstr "Natura"
@@ -23004,6 +23068,37 @@ msgstr "Bosc on la producció de fusta no és un ús dominant."
msgid "Forest"
msgstr "Plantació forestal"
+msgid "Cutline"
+msgstr "Línia de tall"
+
+msgctxt "cutline"
+msgid "border"
+msgstr "frontera"
+
+msgctxt "cutline"
+msgid "firebreak"
+msgstr "tallafoc"
+
+msgctxt "cutline"
+msgid "hunting"
+msgstr "caça"
+
+msgctxt "cutline"
+msgid "loggingmachine"
+msgstr "màquina enregistrament"
+
+msgctxt "cutline"
+msgid "pipeline"
+msgstr "canonada"
+
+msgctxt "cutline"
+msgid "piste"
+msgstr "pista"
+
+msgctxt "cutline"
+msgid "section"
+msgstr "secció"
+
msgid "Grassland"
msgstr "Prada"
@@ -23608,7 +23703,7 @@ msgid "mindistance"
msgstr "distanciamin"
msgid "check"
-msgstr ""
+msgstr "comprova"
msgid "Max. height (meters, only if enforcement=maxheight)"
msgstr "Màx. alçada (metres, només quan la sanció=alçadamax)"
@@ -23968,6 +24063,9 @@ msgstr ""
msgid "Unspecific tag {0}"
msgstr "Etiqueta no especificada {0}"
+msgid "Definition of {0} is unclear"
+msgstr "La definició de {0} no és clara"
+
msgid "{0} on a node. Should be used on a way."
msgstr "{0} a un node. Ha de ser utilitzat a una via."
@@ -29821,8 +29919,8 @@ msgstr "Enregistrar el fitxer SDS"
msgid "No object selected"
msgstr "No hi ha cap objecte seleccionat"
-msgid "SeaMap Editor"
-msgstr "Editor de cartes nàutiques"
+msgid "SeaChart Editor"
+msgstr "Editor SeaChart"
msgid "Seamark Inspector"
msgstr "Seamark Inspector"
@@ -29907,6 +30005,9 @@ msgstr "Factor de distància"
msgid "Merge Nearby Nodes Threshold"
msgstr "Llindar per fusionar nodes propers"
+msgid "SeaMap Editor"
+msgstr "Editor de cartes nàutiques"
+
msgid "AutoSave LiveData"
msgstr "Desament automàtic de LiveData"
diff --git a/i18n/po/ca at valencia.po b/i18n/po/ca at valencia.po
index ee76aad..f2dd7fd 100644
--- a/i18n/po/ca at valencia.po
+++ b/i18n/po/ca at valencia.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-04 03:32+0100\n"
+"POT-Creation-Date: 2015-04-01 03:33+0200\n"
"PO-Revision-Date: 2013-10-22 10:01+0000\n"
"Last-Translator: pitort <pitort at eclipso.eu>\n"
"Language-Team: el_libre - - www.catmidia.cat\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-03-04 05:07+0000\n"
-"X-Generator: Launchpad (build 17361)\n"
+"X-Launchpad-Export-Date: 2015-04-01 05:06+0000\n"
+"X-Generator: Launchpad (build 17413)\n"
"Language: ca at valencia\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -1842,9 +1842,15 @@ msgstr "Dades GPX baixades"
msgid "Markers from {0}"
msgstr "Marcadors de {0}"
+msgid "Download OSM Notes"
+msgstr ""
+
msgid "Downloading Notes"
msgstr ""
+msgid "Notes"
+msgstr "Notes"
+
msgid "Download Compressed OSM Change"
msgstr "Descarrega modificacions OSM comprimides"
@@ -6597,6 +6603,9 @@ msgstr ""
msgid "Customize the style"
msgstr ""
+msgid "List of notes"
+msgstr ""
+
msgid "Add comment"
msgstr ""
@@ -8046,9 +8055,6 @@ 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 ""
@@ -17346,9 +17352,6 @@ msgstr "centre_esports"
msgid "stadium"
msgstr "estadi"
-msgid "Select sport:"
-msgstr "Seleccioneu esport:"
-
msgid "Sport"
msgstr "Esport"
@@ -17469,6 +17472,10 @@ msgid "rugby_union"
msgstr "rugbi a 15"
msgctxt "sport"
+msgid "running"
+msgstr ""
+
+msgctxt "sport"
msgid "shooting"
msgstr "tir"
@@ -17481,10 +17488,6 @@ msgid "skating"
msgstr "patinatge"
msgctxt "sport"
-msgid "skiing"
-msgstr "esquí"
-
-msgctxt "sport"
msgid "soccer"
msgstr "futbol"
@@ -17809,6 +17812,30 @@ msgstr "Màx. pes (tones)"
msgid "Toll"
msgstr "Peatge"
+msgid "Is the water body intermittent (disappears seasonally)?"
+msgstr ""
+
+msgid "culvert"
+msgstr ""
+
+msgid "Water access rules:"
+msgstr ""
+
+msgid "Ship"
+msgstr ""
+
+msgid "designated"
+msgstr "designat"
+
+msgid "Boat"
+msgstr ""
+
+msgid "Motorboat"
+msgstr ""
+
+msgid "Canoe"
+msgstr ""
+
msgid "Streets"
msgstr "Carrers"
@@ -18024,9 +18051,6 @@ msgstr "Restriccions del mode de transport"
msgid "official"
msgstr "oficial"
-msgid "designated"
-msgstr "designat"
-
msgid "Vehicles per type"
msgstr "Vehicles per tipus"
@@ -18430,6 +18454,9 @@ msgstr "sentit de les agulles del rellotge"
msgid "Pedestrian Crossing"
msgstr "Pas de vianants"
+msgid "In case of traffic signals:"
+msgstr ""
+
msgid "Traffic Calming"
msgstr "Pacificació del trànsit"
@@ -18677,15 +18704,12 @@ msgstr "Sèquia"
msgid "Stream"
msgstr "Riera / Torrent"
-msgid "Wadi"
-msgstr "uadi"
+msgid "River"
+msgstr "Riu"
msgid "Canal"
msgstr "Canal"
-msgid "River"
-msgstr "Riu"
-
msgid "Spring"
msgstr "Font / Brollador"
@@ -18751,9 +18775,6 @@ msgstr "riu"
msgid "Salt Water"
msgstr ""
-msgid "Is the water body intermittent (disappears seasonally)?"
-msgstr ""
-
msgid "Coastline"
msgstr "Línia costanera"
@@ -19595,6 +19616,9 @@ msgstr "Parada d''autobús"
msgid "Tactile Paving"
msgstr "Paviment tàctil"
+msgid "incorrect"
+msgstr ""
+
msgid "Bus Platform"
msgstr "Andana de l''estació d''autobusos"
@@ -19757,6 +19781,9 @@ msgstr "sushi"
msgid "Microbrewery"
msgstr "Microcerveseria"
+msgid "Outdoor seating"
+msgstr ""
+
msgid "Fast Food"
msgstr "Menjar ràpid"
@@ -20351,13 +20378,13 @@ msgstr "Bústia"
msgid "Collection times"
msgstr "Horari de recollida"
-msgid "11:30"
+msgid "Mo-Sa 09:00"
msgstr ""
-msgid "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
+msgid "Mo-Fr 17:30; Sa 12:00"
msgstr ""
-msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; Su,PH off"
+msgid "Mo-Fr 15:00,19:00; Sa 15:10; Su 10:30"
msgstr ""
msgid "Drive through"
@@ -20616,6 +20643,15 @@ msgstr "Pavelló poliesportiu"
msgid "Pitch"
msgstr "Pista poliesportiva"
+msgid "artificial_turf"
+msgstr ""
+
+msgid "decoturf"
+msgstr ""
+
+msgid "tartan"
+msgstr ""
+
msgid "Racetrack"
msgstr "Circuit"
@@ -20723,6 +20759,12 @@ msgstr "nòrdic"
msgid "skitour"
msgstr "esqui de muntanya"
+msgid "sled"
+msgstr ""
+
+msgid "sleigh"
+msgstr ""
+
msgid "snow_park"
msgstr "snow_park"
@@ -20975,6 +21017,10 @@ msgctxt "building"
msgid "construction"
msgstr ""
+msgctxt "building"
+msgid "Levels"
+msgstr ""
+
msgid "Residential Building"
msgstr "Edifici residencial"
@@ -21010,6 +21056,16 @@ msgctxt "building"
msgid "farm"
msgstr "granja"
+msgid "Building part"
+msgstr ""
+
+msgctxt "building"
+msgid "Skipped Levels"
+msgstr ""
+
+msgid "Skipped height (meters)"
+msgstr ""
+
msgid "Entrance"
msgstr "Entrada"
@@ -22743,6 +22799,18 @@ msgstr ""
msgid "scoria"
msgstr ""
+msgid "Ridge"
+msgstr ""
+
+msgid "A mountain or hill ridge."
+msgstr ""
+
+msgid "Valley"
+msgstr ""
+
+msgid "A low area between hills."
+msgstr ""
+
msgid "Cave Entrance"
msgstr "Entrada de la cova"
@@ -22755,12 +22823,6 @@ msgstr "Illa"
msgid "Islet"
msgstr "Illot"
-msgid "Ridge"
-msgstr ""
-
-msgid "A mountain or hill ridge."
-msgstr ""
-
msgid "Nature"
msgstr "Natura"
@@ -22788,6 +22850,37 @@ msgstr ""
msgid "Forest"
msgstr "Plantació forestal"
+msgid "Cutline"
+msgstr ""
+
+msgctxt "cutline"
+msgid "border"
+msgstr ""
+
+msgctxt "cutline"
+msgid "firebreak"
+msgstr ""
+
+msgctxt "cutline"
+msgid "hunting"
+msgstr ""
+
+msgctxt "cutline"
+msgid "loggingmachine"
+msgstr ""
+
+msgctxt "cutline"
+msgid "pipeline"
+msgstr ""
+
+msgctxt "cutline"
+msgid "piste"
+msgstr ""
+
+msgctxt "cutline"
+msgid "section"
+msgstr ""
+
msgid "Grassland"
msgstr "Prada"
@@ -23721,6 +23814,9 @@ msgstr ""
msgid "Unspecific tag {0}"
msgstr ""
+msgid "Definition of {0} is unclear"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -29548,8 +29644,8 @@ msgstr "Enregistrar el fitxer SDS"
msgid "No object selected"
msgstr ""
-msgid "SeaMap Editor"
-msgstr "Editor de cartes nàutiques"
+msgid "SeaChart Editor"
+msgstr ""
msgid "Seamark Inspector"
msgstr ""
@@ -29635,6 +29731,9 @@ msgstr "Factor de distància"
msgid "Merge Nearby Nodes Threshold"
msgstr "Llindar per fusionar nodes propers"
+msgid "SeaMap Editor"
+msgstr "Editor de cartes nàutiques"
+
msgid "AutoSave LiveData"
msgstr "Desament automàtic de LiveData"
diff --git a/i18n/po/cs.po b/i18n/po/cs.po
index 32e41a4..5162e9f 100644
--- a/i18n/po/cs.po
+++ b/i18n/po/cs.po
@@ -7,16 +7,16 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-04 03:32+0100\n"
-"PO-Revision-Date: 2015-02-26 12:40+0000\n"
+"POT-Creation-Date: 2015-04-01 03:33+0200\n"
+"PO-Revision-Date: 2015-03-27 11:28+0000\n"
"Last-Translator: Dalibor Jelínek <launchpad.net at dalibor.cz>\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: 2015-03-04 04:37+0000\n"
-"X-Generator: Launchpad (build 17361)\n"
+"X-Launchpad-Export-Date: 2015-04-01 04:37+0000\n"
+"X-Generator: Launchpad (build 17413)\n"
"Language: cs\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -1835,9 +1835,15 @@ msgstr "Stažená GPX data"
msgid "Markers from {0}"
msgstr "Značky z {0}"
+msgid "Download OSM Notes"
+msgstr "Stáhnout poznámky z OSM"
+
msgid "Downloading Notes"
msgstr "Stahuji poznámky"
+msgid "Notes"
+msgstr "Poznámky"
+
msgid "Download Compressed OSM Change"
msgstr "Stáhnout komprimovanou změnu OSM"
@@ -6670,6 +6676,9 @@ msgstr "Nastavení stylu"
msgid "Customize the style"
msgstr "Upravit styl"
+msgid "List of notes"
+msgstr "Seznam poznámek"
+
msgid "Add comment"
msgstr "Přidat komentář"
@@ -8086,9 +8095,6 @@ 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í."
@@ -14874,8 +14880,8 @@ msgid ""
"<html>Failed to download data. Its format is either unsupported, ill-formed, "
"and/or inconsistent.<br><br>Details (untranslated): {0}</html>"
msgstr ""
-"<html>Nepodarilo sa stiahnuť dáta. Ich formát je buď nepodporovaný, chybný, "
-"a / alebo nekonzistentný.<br><br>Detaily (nepreložené): {0}</html>"
+"<html>Nepodařilo se stáhnout data. Formát je buď nepodporovaný, chybný, a / "
+"nebo nekonzistentní.<br><br>Detaily (nepreloženo): {0}</html>"
msgid "<html>Failed to download data.<br><br>Details: {0}</html>"
msgstr "<html>Nepodařilo se stáhnout data.<br><br>Detaily: {0}</html>"
@@ -17329,9 +17335,6 @@ msgstr "sportovní centrum"
msgid "stadium"
msgstr "stadion"
-msgid "Select sport:"
-msgstr "Zvolte sport:"
-
msgid "Sport"
msgstr "Sport"
@@ -17452,6 +17455,10 @@ msgid "rugby_union"
msgstr "ragby patnáctkové (rugby union)"
msgctxt "sport"
+msgid "running"
+msgstr "běh"
+
+msgctxt "sport"
msgid "shooting"
msgstr "sportovní střelba"
@@ -17464,10 +17471,6 @@ msgid "skating"
msgstr "bruslení"
msgctxt "sport"
-msgid "skiing"
-msgstr "lyžování"
-
-msgctxt "sport"
msgid "soccer"
msgstr "fotbal"
@@ -17792,6 +17795,30 @@ msgstr "Max. hmotnost (tun)"
msgid "Toll"
msgstr "Poplatek"
+msgid "Is the water body intermittent (disappears seasonally)?"
+msgstr "Je tato vodní plocha nestálá (sezónně vysychá)?"
+
+msgid "culvert"
+msgstr "propustek"
+
+msgid "Water access rules:"
+msgstr "Pravidla pro přístup k vodě:"
+
+msgid "Ship"
+msgstr "Loď"
+
+msgid "designated"
+msgstr "vyhrazeno (designated)"
+
+msgid "Boat"
+msgstr "Loď"
+
+msgid "Motorboat"
+msgstr "Motorový člun"
+
+msgid "Canoe"
+msgstr "Kánoe"
+
msgid "Streets"
msgstr "Silnice a ulice"
@@ -18011,9 +18038,6 @@ msgstr "Omezení druhů dopravy"
msgid "official"
msgstr "úředně vyhrazeno (official)"
-msgid "designated"
-msgstr "vyhrazeno (designated)"
-
msgid "Vehicles per type"
msgstr "Vozidla podle typu"
@@ -18417,6 +18441,9 @@ msgstr "po směru hodinových ručiček"
msgid "Pedestrian Crossing"
msgstr "Přechod pro chodce"
+msgid "In case of traffic signals:"
+msgstr "V případě semaforu:"
+
msgid "Traffic Calming"
msgstr "Zpomalovací retardér"
@@ -18665,15 +18692,12 @@ msgstr "Strouha"
msgid "Stream"
msgstr "Potok"
-msgid "Wadi"
-msgstr "Vádí"
+msgid "River"
+msgstr "Řeka"
msgid "Canal"
msgstr "Plavební kanál"
-msgid "River"
-msgstr "Řeka"
-
msgid "Spring"
msgstr "Pramen"
@@ -18739,9 +18763,6 @@ msgstr "rieka (river)"
msgid "Salt Water"
msgstr "Slaná voda"
-msgid "Is the water body intermittent (disappears seasonally)?"
-msgstr "Je tato vodní plocha nestálá (sezónně vysychá)?"
-
msgid "Coastline"
msgstr "Linie pobřeží"
@@ -19586,6 +19607,9 @@ msgstr "Zastávka autobusu"
msgid "Tactile Paving"
msgstr "Hmatová dlažba"
+msgid "incorrect"
+msgstr "nesprávně"
+
msgid "Bus Platform"
msgstr "Nástupiště autobusu"
@@ -19748,6 +19772,9 @@ msgstr "suši"
msgid "Microbrewery"
msgstr "Minipivovar"
+msgid "Outdoor seating"
+msgstr "Venkovní sezení"
+
msgid "Fast Food"
msgstr "Rychlé občersvení"
@@ -20342,14 +20369,14 @@ msgstr "Poštovní schránka"
msgid "Collection times"
msgstr "Čas výběru"
-msgid "11:30"
-msgstr "11:30"
+msgid "Mo-Sa 09:00"
+msgstr "Mo-Sa 09:00"
-msgid "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
-msgstr "po-pá 15:00,17:45,19:00,23:00; so 15:10; ne 10:30,23:00"
+msgid "Mo-Fr 17:30; Sa 12:00"
+msgstr "Mo-Fr 17:30; Sa 12:00"
-msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; Su,PH off"
-msgstr "po-pá 09:00-12:00,17:15; so 14:00; ne,svátek nevybírá se"
+msgid "Mo-Fr 15:00,19:00; Sa 15:10; Su 10:30"
+msgstr "Mo-Fr 15:00,19:00; Sa 15:10; Su 10:30"
msgid "Drive through"
msgstr "Použitelná z auta (drive through)"
@@ -20607,6 +20634,15 @@ msgstr "Sportovní centrum"
msgid "Pitch"
msgstr "Hřiště"
+msgid "artificial_turf"
+msgstr "umělý trávník"
+
+msgid "decoturf"
+msgstr "DecoTurf"
+
+msgid "tartan"
+msgstr "Tartan"
+
msgid "Racetrack"
msgstr "Závodní trať"
@@ -20714,6 +20750,12 @@ msgstr "běh na lyžích (nordic)"
msgid "skitour"
msgstr "skialpinismus"
+msgid "sled"
+msgstr "sáně"
+
+msgid "sleigh"
+msgstr "tažené sáně"
+
msgid "snow_park"
msgstr "snow park"
@@ -20966,6 +21008,10 @@ msgctxt "building"
msgid "construction"
msgstr "ve výstavbě"
+msgctxt "building"
+msgid "Levels"
+msgstr "Patra"
+
msgid "Residential Building"
msgstr "Obytná budova"
@@ -21001,6 +21047,16 @@ msgctxt "building"
msgid "farm"
msgstr "farma"
+msgid "Building part"
+msgstr "Část budovy"
+
+msgctxt "building"
+msgid "Skipped Levels"
+msgstr "Vynechaná patra"
+
+msgid "Skipped height (meters)"
+msgstr "Vynechaná výška (metry)"
+
msgid "Entrance"
msgstr "Vchod"
@@ -22736,6 +22792,18 @@ msgstr "štítová"
msgid "scoria"
msgstr "struskový kužel"
+msgid "Ridge"
+msgstr "Hřbet"
+
+msgid "A mountain or hill ridge."
+msgstr "Horský hřbet"
+
+msgid "Valley"
+msgstr "Údolí"
+
+msgid "A low area between hills."
+msgstr "Nízko ležící oblast mezi kopci."
+
msgid "Cave Entrance"
msgstr "Vstup do jeskyně"
@@ -22748,12 +22816,6 @@ msgstr "Ostrov"
msgid "Islet"
msgstr "Ostrůvek"
-msgid "Ridge"
-msgstr "Hřbet"
-
-msgid "A mountain or hill ridge."
-msgstr "Horský hřbet"
-
msgid "Nature"
msgstr "Příroda"
@@ -22781,6 +22843,37 @@ msgstr "Lesní porost, kde hlavním účelem není těžba dřeva."
msgid "Forest"
msgstr "Les"
+msgid "Cutline"
+msgstr "Průsek"
+
+msgctxt "cutline"
+msgid "border"
+msgstr "hraniční"
+
+msgctxt "cutline"
+msgid "firebreak"
+msgstr "protipožární"
+
+msgctxt "cutline"
+msgid "hunting"
+msgstr "lovecký"
+
+msgctxt "cutline"
+msgid "loggingmachine"
+msgstr "po těžařském stroji"
+
+msgctxt "cutline"
+msgid "pipeline"
+msgstr "pro potrubí"
+
+msgctxt "cutline"
+msgid "piste"
+msgstr "pro lyžařskou dráhu"
+
+msgctxt "cutline"
+msgid "section"
+msgstr "pro rozdělení na části"
+
msgid "Grassland"
msgstr "Neudržovaná louka"
@@ -23738,6 +23831,9 @@ msgstr ""
msgid "Unspecific tag {0}"
msgstr "Nekonkrétní značka {0}"
+msgid "Definition of {0} is unclear"
+msgstr "Definice {0} je nejasná"
+
msgid "{0} on a node. Should be used on a way."
msgstr "{0} na uzlu. Mělo by být použito na cestě."
@@ -29506,8 +29602,8 @@ msgstr "Uložit SDS soubor"
msgid "No object selected"
msgstr "Žádný vybraný objekt"
-msgid "SeaMap Editor"
-msgstr "SeaMap Editor"
+msgid "SeaChart Editor"
+msgstr "SeaChart Editor"
msgid "Seamark Inspector"
msgstr "Seamark Inspector"
@@ -29591,6 +29687,9 @@ msgstr "Faktor vzdálenosti"
msgid "Merge Nearby Nodes Threshold"
msgstr "Práh sloučení blízkých uzlů"
+msgid "SeaMap Editor"
+msgstr "SeaMap Editor"
+
msgid "AutoSave LiveData"
msgstr "Automatické ukládání LiveData"
diff --git a/i18n/po/cy.po b/i18n/po/cy.po
index d1618e8..51b6eff 100644
--- a/i18n/po/cy.po
+++ b/i18n/po/cy.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-04 03:32+0100\n"
+"POT-Creation-Date: 2015-04-01 03:33+0200\n"
"PO-Revision-Date: 2009-07-17 21:45+0000\n"
"Last-Translator: iggy23 <Unknown>\n"
"Language-Team: Welsh <cy at li.org>\n"
@@ -16,8 +16,8 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : (n != 8 && n != 11) ? "
"2 : 3;\n"
-"X-Launchpad-Export-Date: 2015-03-04 05:03+0000\n"
-"X-Generator: Launchpad (build 17361)\n"
+"X-Launchpad-Export-Date: 2015-04-01 05:02+0000\n"
+"X-Generator: Launchpad (build 17413)\n"
"Language: cy\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -1697,9 +1697,15 @@ msgstr ""
msgid "Markers from {0}"
msgstr ""
+msgid "Download OSM Notes"
+msgstr ""
+
msgid "Downloading Notes"
msgstr ""
+msgid "Notes"
+msgstr ""
+
msgid "Download Compressed OSM Change"
msgstr ""
@@ -6110,6 +6116,9 @@ msgstr ""
msgid "Customize the style"
msgstr ""
+msgid "List of notes"
+msgstr ""
+
msgid "Add comment"
msgstr ""
@@ -7429,9 +7438,6 @@ 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 ""
@@ -15683,9 +15689,6 @@ msgstr ""
msgid "stadium"
msgstr ""
-msgid "Select sport:"
-msgstr ""
-
msgid "Sport"
msgstr ""
@@ -15806,19 +15809,19 @@ msgid "rugby_union"
msgstr ""
msgctxt "sport"
-msgid "shooting"
+msgid "running"
msgstr ""
msgctxt "sport"
-msgid "skateboard"
+msgid "shooting"
msgstr ""
msgctxt "sport"
-msgid "skating"
+msgid "skateboard"
msgstr ""
msgctxt "sport"
-msgid "skiing"
+msgid "skating"
msgstr ""
msgctxt "sport"
@@ -16146,6 +16149,30 @@ msgstr ""
msgid "Toll"
msgstr ""
+msgid "Is the water body intermittent (disappears seasonally)?"
+msgstr ""
+
+msgid "culvert"
+msgstr ""
+
+msgid "Water access rules:"
+msgstr ""
+
+msgid "Ship"
+msgstr ""
+
+msgid "designated"
+msgstr ""
+
+msgid "Boat"
+msgstr ""
+
+msgid "Motorboat"
+msgstr ""
+
+msgid "Canoe"
+msgstr ""
+
msgid "Streets"
msgstr ""
@@ -16361,9 +16388,6 @@ msgstr ""
msgid "official"
msgstr ""
-msgid "designated"
-msgstr ""
-
msgid "Vehicles per type"
msgstr ""
@@ -16753,6 +16777,9 @@ msgstr ""
msgid "Pedestrian Crossing"
msgstr ""
+msgid "In case of traffic signals:"
+msgstr ""
+
msgid "Traffic Calming"
msgstr ""
@@ -16999,15 +17026,12 @@ msgstr ""
msgid "Stream"
msgstr ""
-msgid "Wadi"
+msgid "River"
msgstr ""
msgid "Canal"
msgstr ""
-msgid "River"
-msgstr ""
-
msgid "Spring"
msgstr ""
@@ -17073,9 +17097,6 @@ msgstr ""
msgid "Salt Water"
msgstr ""
-msgid "Is the water body intermittent (disappears seasonally)?"
-msgstr ""
-
msgid "Coastline"
msgstr ""
@@ -17915,6 +17936,9 @@ msgstr ""
msgid "Tactile Paving"
msgstr ""
+msgid "incorrect"
+msgstr ""
+
msgid "Bus Platform"
msgstr ""
@@ -18077,6 +18101,9 @@ msgstr ""
msgid "Microbrewery"
msgstr ""
+msgid "Outdoor seating"
+msgstr ""
+
msgid "Fast Food"
msgstr ""
@@ -18671,13 +18698,13 @@ msgstr ""
msgid "Collection times"
msgstr ""
-msgid "11:30"
+msgid "Mo-Sa 09:00"
msgstr ""
-msgid "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
+msgid "Mo-Fr 17:30; Sa 12:00"
msgstr ""
-msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; Su,PH off"
+msgid "Mo-Fr 15:00,19:00; Sa 15:10; Su 10:30"
msgstr ""
msgid "Drive through"
@@ -18936,6 +18963,15 @@ msgstr ""
msgid "Pitch"
msgstr ""
+msgid "artificial_turf"
+msgstr ""
+
+msgid "decoturf"
+msgstr ""
+
+msgid "tartan"
+msgstr ""
+
msgid "Racetrack"
msgstr ""
@@ -19043,6 +19079,12 @@ msgstr ""
msgid "skitour"
msgstr ""
+msgid "sled"
+msgstr ""
+
+msgid "sleigh"
+msgstr ""
+
msgid "snow_park"
msgstr ""
@@ -19295,6 +19337,10 @@ msgctxt "building"
msgid "construction"
msgstr ""
+msgctxt "building"
+msgid "Levels"
+msgstr ""
+
msgid "Residential Building"
msgstr ""
@@ -19330,6 +19376,16 @@ msgctxt "building"
msgid "farm"
msgstr ""
+msgid "Building part"
+msgstr ""
+
+msgctxt "building"
+msgid "Skipped Levels"
+msgstr ""
+
+msgid "Skipped height (meters)"
+msgstr ""
+
msgid "Entrance"
msgstr ""
@@ -21063,22 +21119,28 @@ msgstr ""
msgid "scoria"
msgstr ""
-msgid "Cave Entrance"
+msgid "Ridge"
msgstr ""
-msgid "The entrance to a cave."
+msgid "A mountain or hill ridge."
msgstr ""
-msgid "Island"
+msgid "Valley"
msgstr ""
-msgid "Islet"
+msgid "A low area between hills."
msgstr ""
-msgid "Ridge"
+msgid "Cave Entrance"
msgstr ""
-msgid "A mountain or hill ridge."
+msgid "The entrance to a cave."
+msgstr ""
+
+msgid "Island"
+msgstr ""
+
+msgid "Islet"
msgstr ""
msgid "Nature"
@@ -21108,6 +21170,37 @@ msgstr ""
msgid "Forest"
msgstr ""
+msgid "Cutline"
+msgstr ""
+
+msgctxt "cutline"
+msgid "border"
+msgstr ""
+
+msgctxt "cutline"
+msgid "firebreak"
+msgstr ""
+
+msgctxt "cutline"
+msgid "hunting"
+msgstr ""
+
+msgctxt "cutline"
+msgid "loggingmachine"
+msgstr ""
+
+msgctxt "cutline"
+msgid "pipeline"
+msgstr ""
+
+msgctxt "cutline"
+msgid "piste"
+msgstr ""
+
+msgctxt "cutline"
+msgid "section"
+msgstr ""
+
msgid "Grassland"
msgstr ""
@@ -22041,6 +22134,9 @@ msgstr ""
msgid "Unspecific tag {0}"
msgstr ""
+msgid "Definition of {0} is unclear"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -27402,7 +27498,7 @@ msgstr ""
msgid "No object selected"
msgstr ""
-msgid "SeaMap Editor"
+msgid "SeaChart Editor"
msgstr ""
msgid "Seamark Inspector"
@@ -27474,6 +27570,9 @@ msgstr ""
msgid "Merge Nearby Nodes Threshold"
msgstr ""
+msgid "SeaMap Editor"
+msgstr ""
+
msgid "AutoSave LiveData"
msgstr ""
diff --git a/i18n/po/da.po b/i18n/po/da.po
index cfb2a57..f8acc49 100644
--- a/i18n/po/da.po
+++ b/i18n/po/da.po
@@ -8,16 +8,16 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-04 03:32+0100\n"
-"PO-Revision-Date: 2015-03-03 17:53+0000\n"
+"POT-Creation-Date: 2015-04-01 03:33+0200\n"
+"PO-Revision-Date: 2015-03-30 18:56+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: 2015-03-04 04:38+0000\n"
-"X-Generator: Launchpad (build 17361)\n"
+"X-Launchpad-Export-Date: 2015-04-01 04:37+0000\n"
+"X-Generator: Launchpad (build 17413)\n"
"Language: da_DK\n"
"X-Poedit-SourceCharset: utf-8\n"
@@ -426,10 +426,10 @@ msgid "Please select something to copy."
msgstr "Vælg venligst noget at kopiere."
msgid "Copy Coordinates"
-msgstr "Kopiér koordinater"
+msgstr "Kopier koordinater"
msgid "Copy coordinates of selected nodes to clipboard."
-msgstr "Kopiere de valgte punkters koordinater til udklipsholderen."
+msgstr "Kopier de valgte punkters koordinater til udklipsholderen."
msgid "Create Circle"
msgstr "Opret cirkel"
@@ -509,10 +509,10 @@ msgid "Download objects referring to one of the selected objects"
msgstr "Hent objekter, som refererer til et af de valgte objekter"
msgid "Duplicate"
-msgstr "Duplikér"
+msgstr "Dupliker"
msgid "Duplicate selection by copy and immediate paste."
-msgstr "Duplikér markering ved kopiering og umiddelbar indsættelse"
+msgstr "Dupliker markering ved kopiering og umiddelbar indsættelse"
msgid "Exit"
msgstr "Afslut"
@@ -1616,7 +1616,7 @@ msgid "Did not find an object with id {0} in the current dataset"
msgstr "Fandt ikke et objekt med id {0} i det aktuelle datasæt"
msgid "Update selection"
-msgstr "Opdatér det markerede"
+msgstr "Opdater det markerede"
msgid ""
"Updates the currently selected objects from the server (re-downloads data)"
@@ -1828,9 +1828,15 @@ msgstr "Downloadede GPX-data"
msgid "Markers from {0}"
msgstr "Markører fra {0}"
+msgid "Download OSM Notes"
+msgstr "Download OSM noter"
+
msgid "Downloading Notes"
msgstr "Downloader noter"
+msgid "Notes"
+msgstr "Noter"
+
msgid "Download Compressed OSM Change"
msgstr "Download komprimeret OSM ændring"
@@ -3824,16 +3830,16 @@ msgid "Running test {0}"
msgstr "Kører test {0}"
msgid "E-mail address contains non-ascii characters"
-msgstr "E-mail adresse indeholder ikke-ASCII-tegn"
+msgstr "E-mailadresse indeholder ikke-ASCII-tegn"
msgid "E-mail address is invalid"
-msgstr "E-mail adresse er ugyldig"
+msgstr "E-mailadresse er ugyldig"
msgid "E-mail address contains an invalid username: {0}"
-msgstr "E-mail adresse indeholder et ugyldigt brugernavn: {0}"
+msgstr "E-mailadresse indeholder et ugyldigt brugernavn: {0}"
msgid "E-mail address contains an invalid domain: {0}"
-msgstr "E-mail adresse indeholder et ugyldigt domæne: {0}"
+msgstr "E-mailadresse indeholder et ugyldigt domæne: {0}"
msgid "URL contains non-ascii characters"
msgstr "URL indeholder ikke-ASCII-tegn"
@@ -4437,7 +4443,7 @@ msgid "Fix tags"
msgstr "Ret tags"
msgid "Could not find element type"
-msgstr "Kunne ikke finde element-typen"
+msgstr "Kunne ikke finde elementtypen"
msgid "Incorrect number of parameters"
msgstr "Ugyldigt antal parametre"
@@ -4512,31 +4518,31 @@ msgid "Unclosed way"
msgstr "Uafsluttet vej"
msgid "natural type {0}"
-msgstr "natur-type {0}"
+msgstr "naturtype {0}"
msgid "landuse type {0}"
-msgstr "Type af landanvendelse {0}"
+msgstr "landanvendelsestype {0}"
msgid "amenities type {0}"
-msgstr "facilitets-type {0}"
+msgstr "facilitetstype {0}"
msgid "sport type {0}"
-msgstr "sport-type {0}"
+msgstr "sportstype {0}"
msgid "tourism type {0}"
-msgstr "turisme-type {0}"
+msgstr "turismetype {0}"
msgid "shop type {0}"
msgstr "butikstype {0}"
msgid "leisure type {0}"
-msgstr "rekreations-type {0}"
+msgstr "rekreationstype {0}"
msgid "waterway type {0}"
-msgstr "vandvejs-type {0}"
+msgstr "vandvejstype {0}"
msgid "boundary type {0}"
-msgstr "grænse type {0}"
+msgstr "grænsetype {0}"
msgid "building"
msgstr "bygning"
@@ -4917,7 +4923,7 @@ msgid "Updating plugins"
msgstr "Opdaterer udvidelser"
msgid "Installing updated plugins"
-msgstr "Installerer opdaterede plugins"
+msgstr "Installerer opdaterede udvidelser"
msgid "Loading early plugins"
msgstr "Henter indledende udvidelser"
@@ -5506,7 +5512,7 @@ msgstr "> top"
msgid "Copy my selected nodes to the start of the merged node list"
msgstr ""
-"Kopiér mine markerede punkter til starten af den sammenlagte liste over "
+"Kopier mine markerede punkter til starten af den sammenlagte liste over "
"punkter"
msgid "> bottom"
@@ -5514,7 +5520,7 @@ msgstr "> bund"
msgid "Copy my selected elements to the end of the list of merged elements."
msgstr ""
-"Kopiér mine markerede elementer til enden af den sammenlagte liste over "
+"Kopier mine markerede elementer til enden af den sammenlagte liste over "
"elementer"
msgid "> before"
@@ -5524,7 +5530,7 @@ msgid ""
"Copy my selected elements before the first selected element in the list of "
"merged elements."
msgstr ""
-"Kopiér mine markerede elementer ind før det første markerede element i "
+"Kopier mine markerede elementer ind før det første markerede element i "
"listen over sammenlagte elementer."
msgid "> after"
@@ -5534,7 +5540,7 @@ msgid ""
"Copy my selected elements after the first selected element in the list of "
"merged elements."
msgstr ""
-"Kopiér mine markerede elementer ind efter det første markerede element i "
+"Kopier mine markerede elementer ind efter det første markerede element i "
"listen over sammenlagte elementer."
msgid "< top"
@@ -5543,7 +5549,7 @@ msgstr "< top"
msgid ""
"Copy their selected element to the start of the list of merged elements."
msgstr ""
-"Kopiér deres markerede element til starten af listen over sammenlagte "
+"Kopier deres markerede element til starten af listen over sammenlagte "
"elementer."
msgid "< bottom"
@@ -5552,7 +5558,7 @@ msgstr "< bund"
msgid ""
"Copy their selected elements to the end of the list of merged elements."
msgstr ""
-"Kopiér deres markerede elementer til enden af listen over sammenlagte "
+"Kopier deres markerede elementer til enden af listen over sammenlagte "
"elementer."
msgid "< before"
@@ -5562,7 +5568,7 @@ msgid ""
"Copy their selected elements before the first selected element in the list "
"of merged elements."
msgstr ""
-"Kopiér deres markerede elementer ind før det første markerede element i "
+"Kopier deres markerede elementer ind før det første markerede element i "
"listen over sammenlagte elementer."
msgid "< after"
@@ -5572,14 +5578,14 @@ msgid ""
"Copy their selected element after the first selected element in the list of "
"merged elements"
msgstr ""
-"Kopiér deres markerede element ind efter det første markerede element i "
+"Kopier deres markerede element ind efter det første markerede element i "
"listen over sammenlagte elementer."
msgid "Copy all my elements to the target"
-msgstr "Kopiér alle mine elementer til målet"
+msgstr "Kopier alle mine elementer til målet"
msgid "Copy all their elements to the target"
-msgstr "Kopiér alle deres elementer til målet"
+msgstr "Kopier alle deres elementer til målet"
msgid "Up"
msgstr "Op"
@@ -6578,6 +6584,9 @@ msgstr ""
msgid "Customize the style"
msgstr ""
+msgid "List of notes"
+msgstr "Liste over noter"
+
msgid "Add comment"
msgstr "Tilføj kommentar"
@@ -6638,6 +6647,9 @@ 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 ""
+"Objekt ID’er kan være adskilt af komma eller mellemrum.<br/>Eksempler: "
+"{0}<br/>I blandet tilstand, angives objekter sådan her: {1}<br/>({2} står "
+"for <i>punkt</i>, {3} for <i>vej</i>, og {4} for <i>relation</i>)"
msgid ""
"Invalid ID list specified\n"
@@ -7404,7 +7416,7 @@ msgid "Paste the value of the selected tag from clipboard"
msgstr "Indsæt værdien af det markerede tag fra udklipsholderen"
msgid "Copy Value"
-msgstr "Kopiér værdi"
+msgstr "Kopier værdi"
msgid "Copy the value of the selected tag to clipboard"
msgstr "Kopier værdien fra det markerede tag til udklipsholderen"
@@ -7995,9 +8007,6 @@ msgstr "Rå GPS-data"
msgid "Select to download GPS traces in the selected download area."
msgstr "Vælg for at downloade GPS-spor i det valgte område."
-msgid "Notes"
-msgstr "Noter"
-
msgid "Select to download notes in the selected download area."
msgstr "Vælg for at downloade noter i det valgte området."
@@ -8854,7 +8863,7 @@ msgid "Actions To Take"
msgstr "Handlinger der skal foretages"
msgid "Update objects"
-msgstr "Opdatér objekter"
+msgstr "Opdater objekter"
msgid "Initializing nodes to update ..."
msgstr "Initialiserer punkter der skal opdateres ..."
@@ -10657,7 +10666,7 @@ msgid "Save the preferences and close the dialog"
msgstr "Gem indstillingerne og luk dialogen"
msgid "Download plugins"
-msgstr "Download plugins"
+msgstr "Download udvidelser"
msgid "You have to restart JOSM for some settings to take effect."
msgstr "Du skal genstarte JOSM for at nogle af ændringerne træder i kraft."
@@ -11858,8 +11867,8 @@ msgid ""
"Please click on <strong>Download list</strong> to download and display a "
"list of available plugins."
msgstr ""
-"Klik venligst på <strong>Download liste</strong> for at downloade og vise en "
-"liste over tilgængelige plugins."
+"Klik på <strong>Download liste</strong> for at downloade og vise en liste "
+"over tilgængelige udvidelser."
msgid "Plugin {0} is still required by this plugin:"
msgid_plural "Plugin {0} is still required by these {1} plugins:"
@@ -11886,14 +11895,15 @@ msgstr[1] ""
msgid "Downloading the following plugin has <strong>failed</strong>:"
msgid_plural ""
"Downloading the following {0} plugins has <strong>failed</strong>:"
-msgstr[0] "Download af den følgende plugin er <strong>fejlet</strong>:"
-msgstr[1] "Download af de følgende {0} plugins er <strong>fejlet</strong>:"
+msgstr[0] "Download af den følgende udvidelse er <strong>fejlet</strong>:"
+msgstr[1] ""
+"Download af de følgende {0} udvidelser er <strong>fejlet</strong>:"
msgid "Please restart JOSM to activate the downloaded plugins."
msgstr "Genstart JOSM for at aktivere de hentede udvidelser."
msgid "Update plugins"
-msgstr "Opdatér udvidelser"
+msgstr "Opdater udvidelser"
msgid "Search:"
msgstr "Søg:"
@@ -11914,10 +11924,10 @@ msgid "Download list"
msgstr "Download liste"
msgid "Download the list of available plugins"
-msgstr "Download listen over tilgængelige plugins"
+msgstr "Download listen over tilgængelige udvidelser"
msgid "Update the selected plugins"
-msgstr "Opdatér de markerede plugins"
+msgstr "Opdater de markerede udvidelser"
msgid ""
"All installed plugins are up to date. JOSM does not have to download newer "
@@ -11933,7 +11943,7 @@ msgid "Configure sites..."
msgstr "Konfigurér steder..."
msgid "Configure the list of sites where plugins are downloaded from"
-msgstr "Konfigurér listen over steder hvorfra plugins bliver downloadet"
+msgstr "Konfigurer listen over steder hvorfra udvidelser bliver downloadet"
msgid "Add JOSM Plugin description URL."
msgstr "Tilføj JOSM-udvidelsers beskrivelses-URL."
@@ -13793,19 +13803,19 @@ msgid "local file"
msgstr "lokal fil"
msgid "Link to a GPX file on your local disk."
-msgstr ""
+msgstr "Link til en GPX-fil på din lokale disk."
msgid "include"
msgstr "inkludér"
msgid "Include GPX data in the .joz session file."
-msgstr ""
+msgstr "Inkluderer GPX data i .joz session fil."
msgid "No file association"
msgstr "Ingen fil-association"
msgid "GPX data will be included in the session file."
-msgstr ""
+msgstr "GPX data vil blive inkluderet i session filen."
msgid ""
"Version ''{0}'' of meta data for gpx track layer is not supported. Expected: "
@@ -13953,7 +13963,7 @@ msgid "integrated into main program"
msgstr "integreret i hovedprogrammet"
msgid "replaced by new {0} plugin"
-msgstr "erstattet af det nye {0} plugin"
+msgstr "erstattet af den nye {0} udvidelse"
msgid "no longer required"
msgstr "ikke længere krævet"
@@ -13962,9 +13972,9 @@ msgid "The following plugin is no longer necessary and has been deactivated:"
msgid_plural ""
"The following plugins are no longer necessary and have been deactivated:"
msgstr[0] ""
-"Det følgende plugin er ikke længere nødvendigt og er blevet deaktiveret:"
+"Den følgende udvidelse er ikke længere nødvendigt og er blevet deaktiveret:"
msgstr[1] ""
-"De følgende plugins er ikke længere nødvendige og er blevet deaktiveret:"
+"De følgende udvidelser er ikke længere nødvendige og er blevet deaktiveret:"
msgid ""
"<html>Loading of the plugin \"{0}\" was requested.<br>This plugin is no "
@@ -13976,7 +13986,7 @@ msgstr ""
"deaktiveres.<br>Slet fra indstillinger?</html>"
msgid "Plugin update"
-msgstr ""
+msgstr "Udvidelsesopdatering"
msgid ""
"You updated your JOSM software.<br>To prevent problems the plugins should be "
@@ -13989,13 +13999,13 @@ msgid "Last plugin update more than {0} days ago."
msgstr "Seneste udvidelsesopdatering var mere end {0} dage siden."
msgid "Click to update the activated plugins"
-msgstr "Klik for at opdatere de aktiverede plugins"
+msgstr "Klik for at opdatere de aktiverede udvidelser"
msgid "Skip update"
msgstr "Spring over opdatering"
msgid "Click to skip updating the activated plugins"
-msgstr "Klik for springe over opdatering af aktiverede plugins"
+msgstr "Klik for springe over opdatering af aktiverede udvidelser"
msgid ""
"Skipping plugin update after JOSM upgrade. Automatic update at startup is "
@@ -14053,7 +14063,7 @@ msgid "Could not load plugin {0}. Delete from preferences?"
msgstr "Kunne ikke indlæse udvidelsen {0}. Fjern fra indstillinger?"
msgid "loading plugin ''{0}'' (version {1})"
-msgstr "indlæser plugin \"{0}\" (version {1})"
+msgstr "indlæser udvidelse \"{0}\" (version {1})"
msgid ""
"<html>Could not load plugin {0} because the plugin<br>main class ''{1}'' was "
@@ -14073,8 +14083,8 @@ msgstr "Indlæser udvidelsen \"{0}\"..."
msgid "JOSM could not find information about the following plugin:"
msgid_plural "JOSM could not find information about the following plugins:"
-msgstr[0] "JOSM kunne ikke finde informationer for følgende plugin:"
-msgstr[1] "JOSM kunne ikke finde informationer for følgende plugins:"
+msgstr[0] "JOSM kunne ikke finde informationer for denne udvidelse:"
+msgstr[1] "JOSM kunne ikke finde informationer for disse udvidelser:"
msgid "The plugin is not going to be loaded."
msgid_plural "The plugins are not going to be loaded."
@@ -14147,7 +14157,7 @@ msgid ""
msgstr ""
msgid "Update plugin"
-msgstr ""
+msgstr "Opdaterer udvidelse"
msgid "Click to update the plugin ''{0}''"
msgstr ""
@@ -14324,7 +14334,7 @@ msgid ""
"You should also update your plugins. If neither of those help please file a "
"bug report in our bugtracker using this link:"
msgstr ""
-"Du bør også opdatere dine plugins. Hvis intet af dette hjælper, så opret "
+"Du bør også opdatere dine udvidelser. Hvis intet af dette hjælper, så opret "
"venligst en fejlrapport i vores fejlrapporteringssystem ved hjælp af dette "
"link:"
@@ -14345,7 +14355,7 @@ msgstr ""
"informationerne nedenunder på denne URL:"
msgid "(The text has already been copied to your clipboard.)"
-msgstr "(teksten er allerede kopieret til til din udklipsholder.)"
+msgstr "(Teksten er allerede kopieret til din udklipsholder.)"
msgid "You have encountered a bug in JOSM"
msgstr "Du er stødt på en fejl i JOSM"
@@ -16347,7 +16357,7 @@ msgid "Plugin for importing spatial referenced images"
msgstr ""
msgid "Import vector graphics (SVG)"
-msgstr "Importér vektorgrafik (SVG)"
+msgstr "Importer vektorgrafik (SVG)"
msgid ""
"Extra information about current layer objects pop ups - currently GPX "
@@ -16431,8 +16441,8 @@ msgid ""
"Disallow using JOSM forever (WARNING: this plugin prevents JOSM from loading "
"and is hard to rid of)"
msgstr ""
-"Forbyd at bruge JOSM for evigt (ADVARSEL: Dette plugin forhindrer JOSM "
-"starter og er svært at slippe af med)"
+"Forbyd brug af JOSM for evigt (ADVARSEL: Denne udvidelse forhindrer JOSM "
+"starter og er svær at slippe af med)"
msgid "Convert data from Open Data portals to OSM layer"
msgstr "Konverter data fra Open Data portaler til OSM lag"
@@ -16461,7 +16471,7 @@ msgid "Import/export OSM data in PBF format"
msgstr "Import/export OSM data i PBF format"
msgid "Import PDF file and convert to ways."
-msgstr "Importér PDF fil og konverter til veje."
+msgstr "Importer PDF-fil og konverter til veje."
msgid ""
"Write gps position info to the image file header. Run this feature from the "
@@ -16500,14 +16510,14 @@ msgstr "tilføjer projektioner fra Proj4J"
msgid ""
"This plugin simplifies the mapping and editing of public transport routes."
msgstr ""
-"Denne plugin simplificerer kortlægningen og redigeringen af offentlige "
+"Denne udvidelse simplificerer kortlægningen og redigeringen af offentlige "
"transport ruter."
msgid "Relation and multipolygon creating and editing panel."
msgstr "Panel til oprettelse og redigering af relationer og multipolygoner."
msgid "Plugin for reverting changesets"
-msgstr "Plugin for tilbageførelse af rettesæt"
+msgstr "Udvidelse for tilbageførelse af rettesæt"
msgid ""
"Plugin for tagging of objects based on a selection of road signs. The dialog "
@@ -16699,49 +16709,49 @@ msgid "excellent"
msgstr "fremragende"
msgid "Thin Rollers: rollerblade, skateboard"
-msgstr ""
+msgstr "Smalle ruller: rulleskøjter, skateboard"
msgid "good"
msgstr "god"
msgid "Thin Wheels: racing bike"
-msgstr ""
+msgstr "Smalle hjul: racercykel"
msgid "intermediate"
msgstr "øvet"
msgid "Wheels: city bike, wheelchair, scooter"
-msgstr ""
+msgstr "Hjul: bycykel, kørestol, scooter"
msgid "bad"
msgstr "dårlig"
msgid "Robust Wheels: trekking bike, car, rickshaw"
-msgstr ""
+msgstr "Robuste hjul: turcykel, bil, rickshaw"
msgid "very_bad"
msgstr "meget dårlig"
msgid "High Clearance: light duty off-road vehicle"
-msgstr ""
+msgstr "Stor frihøjde: lette terrængående køretøj"
msgid "horrible"
msgstr "forfærdelig"
msgid "Off-Road: heavy duty off-road vehicle"
-msgstr ""
+msgstr "Udenfor vej: kraftige terrængående køretøj"
msgid "very_horrible"
msgstr "meget forfærdelig"
msgid "Specialized off-road: tractor, ATV"
-msgstr ""
+msgstr "Specialiseret udenfor vej: traktor, ATV"
msgid "impassable"
msgstr "ufremkommelige"
msgid "No wheeled vehicle"
-msgstr ""
+msgstr "Intet køretøj med hjul"
msgctxt "riding"
msgid "pitch"
@@ -17008,9 +17018,6 @@ msgstr "sportshal"
msgid "stadium"
msgstr "stadion"
-msgid "Select sport:"
-msgstr "Vælg sport:"
-
msgid "Sport"
msgstr "Sport"
@@ -17131,6 +17138,10 @@ msgid "rugby_union"
msgstr "15-mands-rugby"
msgctxt "sport"
+msgid "running"
+msgstr ""
+
+msgctxt "sport"
msgid "shooting"
msgstr "skydning"
@@ -17143,10 +17154,6 @@ msgid "skating"
msgstr "skøjteløb"
msgctxt "sport"
-msgid "skiing"
-msgstr "skisport"
-
-msgctxt "sport"
msgid "soccer"
msgstr "fodbold"
@@ -17471,6 +17478,30 @@ msgstr "Maks. vægt (ton)"
msgid "Toll"
msgstr "Betalingsanlæg"
+msgid "Is the water body intermittent (disappears seasonally)?"
+msgstr "Er vandområdet uregelmæssigt (forsvinder sæsonmæssigt)?"
+
+msgid "culvert"
+msgstr ""
+
+msgid "Water access rules:"
+msgstr "Vand adgangsregler:"
+
+msgid "Ship"
+msgstr "Skib"
+
+msgid "designated"
+msgstr "designeret"
+
+msgid "Boat"
+msgstr "Båd"
+
+msgid "Motorboat"
+msgstr "Motorbåd"
+
+msgid "Canoe"
+msgstr "Kano"
+
msgid "Streets"
msgstr "Veje"
@@ -17520,7 +17551,7 @@ msgid "Bicycle Road"
msgstr "Cykelgade"
msgid "Highway type"
-msgstr "Vej-type"
+msgstr "Vejtype"
msgctxt "Highway"
msgid "residential"
@@ -17690,9 +17721,6 @@ msgstr "Transportformsrestriktioner"
msgid "official"
msgstr "officielt"
-msgid "designated"
-msgstr "designeret"
-
msgid "Vehicles per type"
msgstr "Køretøjer per type"
@@ -18082,6 +18110,9 @@ msgstr "med uret"
msgid "Pedestrian Crossing"
msgstr "Fodgængerfelt"
+msgid "In case of traffic signals:"
+msgstr "I tilfælde af trafiksignaler:"
+
msgid "Traffic Calming"
msgstr "Trafikdæmpning"
@@ -18095,7 +18126,7 @@ msgid "choker"
msgstr "indsnævring"
msgid "cushion"
-msgstr ""
+msgstr "pude"
msgid "hump"
msgstr "hump"
@@ -18104,7 +18135,7 @@ msgid "rumble_strip"
msgstr "rumlestriber"
msgid "table"
-msgstr ""
+msgstr "hævet flade"
msgid "Passing Place"
msgstr "Vigested"
@@ -18330,15 +18361,12 @@ msgstr "Grøft"
msgid "Stream"
msgstr "Bæk"
-msgid "Wadi"
-msgstr "Tørt flodleje"
+msgid "River"
+msgstr "Flod"
msgid "Canal"
msgstr "Kanal"
-msgid "River"
-msgstr "Flod"
-
msgid "Spring"
msgstr "Udspring"
@@ -18404,9 +18432,6 @@ msgstr "flod"
msgid "Salt Water"
msgstr ""
-msgid "Is the water body intermittent (disappears seasonally)?"
-msgstr ""
-
msgid "Coastline"
msgstr "Kystlinje"
@@ -18653,7 +18678,7 @@ msgid "Number of people per chair"
msgstr "Antal personer per stol"
msgid "Has bubble?"
-msgstr ""
+msgstr "Har kabine?"
msgid "Gondola"
msgstr "Gondollift"
@@ -18674,24 +18699,26 @@ msgid ""
"drag_lift (general type - use only if exact type (see values below) is "
"unknown)"
msgstr ""
+"træklift (generel type - brugs kun, hvis nøjagtig type (se værdier under) er "
+"ukendt)"
msgid "t-bar"
-msgstr ""
+msgstr "t-stang"
msgid "j-bar"
-msgstr ""
+msgstr "j-stang"
msgid "platter"
-msgstr ""
+msgstr "tallerken"
msgid "rope_tow"
-msgstr ""
+msgstr "rebtræk"
msgid "Magic Carpet"
msgstr "Tæppelift"
msgid "Goods"
-msgstr "Varer"
+msgstr "Varelift"
msgctxt "aerialway"
msgid "Station"
@@ -18704,7 +18731,7 @@ msgid "Parking"
msgstr "Parkering"
msgid "Park and Ride"
-msgstr "Parkér og kør"
+msgstr "Parker og kør"
msgid "bus"
msgstr "bus"
@@ -18770,7 +18797,7 @@ msgid "Citgo"
msgstr "Citgo"
msgid "Eni"
-msgstr ""
+msgstr "Eni"
msgid "Esso"
msgstr "Esso"
@@ -18803,7 +18830,7 @@ msgid "Shell"
msgstr "Shell"
msgid "Socar"
-msgstr ""
+msgstr "Socar"
msgid "Statoil"
msgstr "Statoil"
@@ -18827,7 +18854,7 @@ msgid "With shop"
msgstr "Med butik"
msgid "convenience"
-msgstr ""
+msgstr "dagligvarer"
msgid "kiosk"
msgstr "kiosk"
@@ -19246,6 +19273,9 @@ msgstr "Busstop"
msgid "Tactile Paving"
msgstr ""
+msgid "incorrect"
+msgstr ""
+
msgid "Bus Platform"
msgstr "Bus-platform"
@@ -19277,14 +19307,14 @@ msgid "Apron"
msgstr "Forplads"
msgid "Plane Parking Position"
-msgstr ""
+msgstr "Flyholdeplads"
msgid "Hangar"
msgstr "Hangar"
msgctxt "building"
msgid "hangar"
-msgstr ""
+msgstr "hangar"
msgctxt "building"
msgid "yes"
@@ -19408,6 +19438,9 @@ msgstr "sushi"
msgid "Microbrewery"
msgstr "Mikrobryggeri"
+msgid "Outdoor seating"
+msgstr ""
+
msgid "Fast Food"
msgstr "Fastfood"
@@ -20004,14 +20037,14 @@ msgstr "Postkasse"
msgid "Collection times"
msgstr "Tømningstidspunkt"
-msgid "11:30"
-msgstr "11:30"
+msgid "Mo-Sa 09:00"
+msgstr ""
-msgid "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
-msgstr "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
+msgid "Mo-Fr 17:30; Sa 12:00"
+msgstr ""
-msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; Su,PH off"
-msgstr "Mo-Fr 09:00-12:00,17:15; Sa 14:00; Su,PH off"
+msgid "Mo-Fr 15:00,19:00; Sa 15:10; Su 10:30"
+msgstr ""
msgid "Drive through"
msgstr "Køre igennem"
@@ -20269,6 +20302,15 @@ msgstr "Idrætscenter"
msgid "Pitch"
msgstr "Bane"
+msgid "artificial_turf"
+msgstr ""
+
+msgid "decoturf"
+msgstr ""
+
+msgid "tartan"
+msgstr ""
+
msgid "Racetrack"
msgstr "Væddeløbsbane"
@@ -20376,6 +20418,12 @@ msgstr "skiløb"
msgid "skitour"
msgstr ""
+msgid "sled"
+msgstr ""
+
+msgid "sleigh"
+msgstr ""
+
msgid "snow_park"
msgstr ""
@@ -20545,7 +20593,7 @@ msgstr "sportshal"
msgctxt "aerialway"
msgid "track"
-msgstr ""
+msgstr "spor"
msgid "RC Car"
msgstr "Radiostyret bil"
@@ -20628,9 +20676,13 @@ msgctxt "building"
msgid "construction"
msgstr ""
-msgid "Residential Building"
+msgctxt "building"
+msgid "Levels"
msgstr ""
+msgid "Residential Building"
+msgstr "Boligbebyggelse"
+
msgctxt "building"
msgid "residential"
msgstr "beboelse"
@@ -20663,6 +20715,16 @@ msgctxt "building"
msgid "farm"
msgstr ""
+msgid "Building part"
+msgstr "Bygningsdel"
+
+msgctxt "building"
+msgid "Skipped Levels"
+msgstr ""
+
+msgid "Skipped height (meters)"
+msgstr ""
+
msgid "Entrance"
msgstr "Indgang"
@@ -22139,7 +22201,7 @@ msgid "toys"
msgstr "legetøj"
msgid "vouchers"
-msgstr ""
+msgstr "gavekort"
msgid "Payment Methods"
msgstr "Betalingsmetoder"
@@ -22389,13 +22451,25 @@ msgid "extinct"
msgstr "uddød"
msgid "stratovolcano"
-msgstr ""
+msgstr "keglevulkan"
msgid "shield"
-msgstr ""
+msgstr "kuppelvulkan"
msgid "scoria"
-msgstr ""
+msgstr "eksplosionsvulkan"
+
+msgid "Ridge"
+msgstr "Højderyg"
+
+msgid "A mountain or hill ridge."
+msgstr "En bjergryg eller bakkeshøjderyg."
+
+msgid "Valley"
+msgstr "Dal"
+
+msgid "A low area between hills."
+msgstr "Lavt område mellem bakkerne."
msgid "Cave Entrance"
msgstr "Huleindgang"
@@ -22409,12 +22483,6 @@ msgstr "Ø"
msgid "Islet"
msgstr "Holm"
-msgid "Ridge"
-msgstr ""
-
-msgid "A mountain or hill ridge."
-msgstr ""
-
msgid "Nature"
msgstr "Natur"
@@ -22437,11 +22505,42 @@ msgid "Wood"
msgstr "Naturskov"
msgid "Woodland where timber production does not dominate use."
-msgstr ""
+msgstr "Skov hvor træproduktion ikke dominere brug."
msgid "Forest"
msgstr "Skov"
+msgid "Cutline"
+msgstr "Snitlinje"
+
+msgctxt "cutline"
+msgid "border"
+msgstr "ejerskabsgrænse"
+
+msgctxt "cutline"
+msgid "firebreak"
+msgstr "brandbælte"
+
+msgctxt "cutline"
+msgid "hunting"
+msgstr "jagtgrænse"
+
+msgctxt "cutline"
+msgid "loggingmachine"
+msgstr "skovningsmaskinespor"
+
+msgctxt "cutline"
+msgid "pipeline"
+msgstr "underjordisk rørledning"
+
+msgctxt "cutline"
+msgid "piste"
+msgstr "skiløbspiste"
+
+msgctxt "cutline"
+msgid "section"
+msgstr "vedligeholdelsessektion"
+
msgid "Grassland"
msgstr "Græsland"
@@ -22449,24 +22548,26 @@ msgid ""
"Where vegetation is dominated by grasses (Poaceae) and other herbaceous (non-"
"woody) plants. Excludes cultivated areas and wetlands."
msgstr ""
+"Når vegetationen er domineret af græsser (Græsfamilien) og andre urteagtige "
+"(ikke-træagtige) planter. Omfatter ikke dyrkede arealer og vådområder."
msgid "pampas"
-msgstr ""
+msgstr "pampas"
msgid "prairie"
msgstr "prærie"
msgid "puszta"
-msgstr ""
+msgstr "puszta"
msgid "savanna"
msgstr "savanne"
msgid "steppe"
-msgstr ""
+msgstr "steppe"
msgid "veld"
-msgstr ""
+msgstr "veld"
msgid "Nature Reserve"
msgstr "Naturreservat"
@@ -22475,7 +22576,7 @@ msgid "Scree"
msgstr "Ur"
msgid "An accumulation of loose rocks."
-msgstr ""
+msgstr "En ophobning af løse sten."
msgid "Fell"
msgstr "Fjeldområde"
@@ -22524,9 +22625,11 @@ msgid ""
"A notable rock or group of rocks, with at least one of them firmly attached "
"to the underlying bedrock."
msgstr ""
+"En bemærkelsesværdig sten eller gruppe af sten, hvor mindst en af dem er "
+"fast forbundet med det underliggende fundament."
msgid "Tourism attraction"
-msgstr ""
+msgstr "Turistattraktion"
msgid "Stone"
msgstr "Fritliggende sten"
@@ -22617,10 +22720,10 @@ msgid "Construction Area"
msgstr "Byggeplads"
msgid "Brownfield"
-msgstr ""
+msgstr "Tidligere bebygget grund"
msgid "Greenfield"
-msgstr ""
+msgstr "Ny byggegrund"
msgid "Landfill"
msgstr "Losseplads"
@@ -22632,28 +22735,28 @@ msgid "Annotation"
msgstr "Henvisning"
msgid "Alternative name"
-msgstr ""
+msgstr "Alternativt navn"
msgid "Historical name"
-msgstr ""
+msgstr "Historisk navn"
msgid "Local name"
-msgstr ""
+msgstr "Lokalt navn"
msgid "Regional name"
-msgstr ""
+msgstr "Regionalt navn"
msgid "National name"
-msgstr ""
+msgstr "Nationalt navn"
msgid "International name"
-msgstr ""
+msgstr "Internationalt navn"
msgid "Official name"
-msgstr ""
+msgstr "Officielt navn"
msgid "Common name abbreviation"
-msgstr ""
+msgstr "Forkortet navn"
msgid "House number"
msgstr "Husnummer"
@@ -22662,7 +22765,7 @@ msgid "Street name"
msgstr "Vejnavn"
msgid "Place name"
-msgstr ""
+msgstr "Stednavn"
msgid "City name"
msgstr "Bynavn"
@@ -22674,17 +22777,17 @@ msgid "House name"
msgstr "Husnavn"
msgid "Subdistrict"
-msgstr ""
+msgstr "Underdistrikt"
msgid "District"
-msgstr ""
+msgstr "Distrikt"
msgid "Province"
-msgstr ""
+msgstr "Provins"
msgctxt "addr:"
msgid "State"
-msgstr ""
+msgstr "Stat"
msgid "AL"
msgstr "AL"
@@ -22876,33 +22979,35 @@ msgid "potential"
msgstr ""
msgid "Contact (Common Schema)"
-msgstr ""
+msgstr "Kontakt (Almindeligt skema)"
msgid "Fax Number"
-msgstr "Fax-nummer"
+msgstr "Faxnummer"
msgid "Email Address"
-msgstr "E-mail adresse"
+msgstr "E-mailadresse"
msgid "Image"
msgstr "Billede"
msgid "Contact (Schema with ''contact:*'' Prefix)"
-msgstr ""
+msgstr "Kontakt (Skema med ''contact:*'' præfiks)"
msgctxt "description=*"
msgid "A short text with additional information."
-msgstr ""
+msgstr "En kort tekst med yderligere oplysninger."
msgctxt "description=*"
msgid ""
"It might be viewable to the end user (perhaps using a search system or a map "
"with pop-ups)."
msgstr ""
+"Den kan være synlige for slutbrugeren (måske ved hjælp af et søgesystem "
+"eller et kort med pop-ops)."
msgctxt "note=*, fixme=*, description=*"
msgid "Similar but different tags:"
-msgstr ""
+msgstr "Lignende, men forskellige tags:"
msgctxt "the tag note=*"
msgid "Note"
@@ -22969,16 +23074,16 @@ msgid "Site name"
msgstr ""
msgid "where to place the label"
-msgstr ""
+msgstr "hvor etiketten placeres"
msgid "perimeter of the site"
-msgstr ""
+msgstr "omkreds af stedet"
msgid "entrances to the site, on the perimeter"
-msgstr ""
+msgstr "indgange til stedet, på omkredsen"
msgid "members of site"
-msgstr ""
+msgstr "medlemmer af stedet"
msgid "Turn Restriction"
msgstr "Svingbegrænsning"
@@ -23383,6 +23488,9 @@ msgstr ""
msgid "Unspecific tag {0}"
msgstr ""
+msgid "Definition of {0} is unclear"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr "{0} på et punkt. Bør bruges på en vej."
@@ -26633,7 +26741,7 @@ msgid "Lakewalker Plugin Preferences"
msgstr ""
msgid "A plugin to trace water bodies on Landsat imagery."
-msgstr "En udvidelse at optegne vandflader på Landsat billeder med."
+msgstr "En udvidelse til optegning af vandflader på Landsat billeder."
msgid ""
"Maximum number of segments allowed in each generated way. Default 250."
@@ -27578,10 +27686,10 @@ msgid "Bottom left (min) corner:"
msgstr ""
msgid "PDF X and Y"
-msgstr ""
+msgstr "PDF X og Y"
msgid "East and North"
-msgstr ""
+msgstr "Øst og Nord"
msgid "Top right (max) corner:"
msgstr ""
@@ -27599,22 +27707,22 @@ msgid "Loading..."
msgstr "Henter..."
msgid "PDF file preview"
-msgstr ""
+msgstr "Forhåndsvisning af PDF-fil"
msgid "Loaded"
msgstr "Indlæst"
msgid "Imported PDF: "
-msgstr ""
+msgstr "Importeret PDF: "
msgid "Please select exactly one node."
-msgstr ""
+msgstr "Vælg præcis en node."
msgid "PDF files"
-msgstr "PDF filer"
+msgstr "PDF-filer"
msgid "OSM files"
-msgstr "OSM filer"
+msgstr "OSM-filer"
msgid "Preparing"
msgstr "Forbereder"
@@ -27683,10 +27791,10 @@ msgid " "
msgstr " "
msgid "Import PDF file"
-msgstr "Importer PDF fil"
+msgstr "Importer PDF-fil"
msgid "Import PDF file."
-msgstr "Importer PDF fil."
+msgstr "Importer PDF-fil."
msgid "Import PDF"
msgstr "Importer PDF"
@@ -27701,7 +27809,7 @@ msgid "Encrypted documents not supported."
msgstr ""
msgid "The PDF file must have exactly one page."
-msgstr ""
+msgstr "PDF-filen skal have præcis en side."
msgid "Read error: "
msgstr "Læsefejl: "
@@ -28821,17 +28929,17 @@ msgstr "Gem SDS fil"
msgid "No object selected"
msgstr ""
-msgid "SeaMap Editor"
+msgid "SeaChart Editor"
msgstr ""
msgid "Seamark Inspector"
-msgstr ""
+msgstr "Sømærke inspektør"
msgid "Select only one object"
-msgstr ""
+msgstr "Vælg kun et objekt"
msgid "Select a map object"
-msgstr ""
+msgstr "Vælg et kort objekt"
msgid "Simplify Area"
msgstr "Simplificer område"
@@ -28893,6 +29001,9 @@ msgstr ""
msgid "Merge Nearby Nodes Threshold"
msgstr ""
+msgid "SeaMap Editor"
+msgstr "Søkort editor"
+
msgid "AutoSave LiveData"
msgstr ""
@@ -28945,8 +29056,8 @@ msgid ""
"Launch your default software for sending an email to the selected contact "
"address"
msgstr ""
-"Start dit standard-e-mail-program for at sende en e-mail til de valgte "
-"kontaktadresser"
+"Start dit standard e-mailprogram for at sende en e-mail til den valgte "
+"kontaktadresse"
msgid "Edit tags"
msgstr "Ret tags"
@@ -29541,7 +29652,7 @@ msgid "To:"
msgstr "Til:"
msgid "Vias:"
-msgstr ""
+msgstr "Via’er:"
msgid "Copy to the clipboard"
msgstr "Kopier til udklipsholder"
@@ -29818,18 +29929,20 @@ msgid "Select in current data layer"
msgstr "Marker i det aktuelle datalag"
msgid "Zoom to the currently selected turn restrictions"
-msgstr ""
+msgstr "Zoom til de aktuelt valgte svingbegrænsninger"
msgid "An OSM plugin for editing turn restrictions."
-msgstr "Et OSM plugin til redigering af svingbegrænsninger."
+msgstr "En OSM udvidelse til redigering af svingbegrænsninger."
msgid ""
"Development of the turn restriction plugin was sponsored by <a "
"href=\"http://www.skobbler.de\">skobbler GmbH</a>."
msgstr ""
+"Udvikling af svingbegrænsningsudvidelsen er sponsoreret af <a "
+"href=\"http://www.skobbler.de\">skobbler GmbH</a>."
msgid "Configure the preferences for the turnrestrictions plugin"
-msgstr ""
+msgstr "Konfigurer indstillinger for svingbegrænsningsudvidelsen"
msgid "Sponsor"
msgstr "Sponsor"
@@ -29850,7 +29963,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 "Vælg det sæt af vejskilte ikoner, der skal bruges i plugin."
+msgstr "Vælg det sæt af vejskilte ikoner, der skal bruges i udvidelse."
msgid ""
"Warning: the preference with key ''{0}'' has an unsupported value ''{1}''. "
diff --git a/i18n/po/de.po b/i18n/po/de.po
index fd06bf4..870063b 100644
--- a/i18n/po/de.po
+++ b/i18n/po/de.po
@@ -7,16 +7,16 @@ msgid ""
msgstr ""
"Project-Id-Version: de\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-04 03:32+0100\n"
-"PO-Revision-Date: 2015-03-03 22:26+0000\n"
-"Last-Translator: Klumbumbus <Unknown>\n"
+"POT-Creation-Date: 2015-04-01 03:33+0200\n"
+"PO-Revision-Date: 2015-03-28 10:22+0000\n"
+"Last-Translator: Ettore Atalan <atalanttore at googlemail.com>\n"
"Language-Team: JOSM\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-03-04 04:41+0000\n"
-"X-Generator: Launchpad (build 17361)\n"
+"X-Launchpad-Export-Date: 2015-04-01 04:41+0000\n"
+"X-Generator: Launchpad (build 17413)\n"
"Language: de\n"
"X-Poedit-SearchPath-0: .\n"
"X-Poedit-Basepath: /home/simon/src/josm.all/i18n\n"
@@ -254,7 +254,7 @@ msgid "Add layers"
msgstr "Ebenen hinzufügen"
msgid "Invalid service URL."
-msgstr "Ungültige Service-URL."
+msgstr "Ungültige Dienst-URL."
msgid "WMS Error"
msgstr "WMS-Fehler"
@@ -504,7 +504,7 @@ msgid "Download object..."
msgstr "Objekt herunterladen …"
msgid "Download OSM object by ID."
-msgstr "OSM-Objekt mittels ID herunterladen."
+msgstr "OSM-Objekt mittels Kennung herunterladen."
msgid "Download parent ways/relations..."
msgstr "Elternrelationen, -linien herunterladen …"
@@ -823,7 +823,7 @@ msgid "Visit Homepage"
msgstr "Webseite besuchen"
msgid "WMS URL or Image ID:"
-msgstr "WMS-URL oder Bild-ID:"
+msgstr "WMS-URL oder Bildkennung:"
msgid "Add Rectified Image"
msgstr "Berichtigtes Bild hinzufügen"
@@ -836,7 +836,7 @@ msgstr ""
"zugeordnet werden. Bitte versuchen Sie es erneut."
msgid "No valid WMS URL or id"
-msgstr "Keine gültige WMS-URL oder ID"
+msgstr "Keine gültige WMS-URL oder Kennung"
msgid "Merge layer"
msgstr "Ebene vereinigen"
@@ -1285,17 +1285,16 @@ msgid "Save the current data to a new file."
msgstr "Aktuelle Daten in einer neuen Datei speichern."
msgid "Search Notes..."
-msgstr "Suche Anmerkungen …"
+msgstr "OSM-Hinweise suchen…"
msgid "Download notes from the note search API"
-msgstr "Anmerkungen von der Such-API herunterladen"
+msgstr "Hinweise von der Such-API herunterladen"
msgid "Search the OSM API for notes containing words:"
-msgstr ""
-"Die OSM-API nach Anmerkungen durchsuchen, die diese Wörter enthalten:"
+msgstr "Die OSM-API nach Hinweisen durchsuchen, die diese Wörter enthalten:"
msgid "Search for notes"
-msgstr "Nach Anmerkungen suchen"
+msgstr "Suche nach Hinweisen"
msgid "You must enter a search term"
msgstr "Bitte einen Suchbegriff eingeben"
@@ -1652,7 +1651,7 @@ msgid "No current dataset found"
msgstr "Aktueller Datensatz wurde nicht gefunden"
msgid "Did not find an object with id {0} in the current dataset"
-msgstr "Kein Objekt mit der ID {0} im aktuellen Datensatz gefunden"
+msgstr "Kein Objekt mit der Kennung {0} im aktuellen Datensatz gefunden"
msgid "Update selection"
msgstr "Auswahl aktualisieren"
@@ -1708,13 +1707,13 @@ 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"
+msgstr "Hinweisänderungen zum Server hochladen"
msgid "Upload notes"
-msgstr "Anmerkungen aktualisieren"
+msgstr "Hinweise hochladen"
msgid "Uploading notes to server"
-msgstr "Anmerkungen werden zum Server hochgeladen"
+msgstr "Hinweise werden zum Server hochgeladen"
msgid "Upload selection"
msgstr "Auswahl hochladen"
@@ -1872,9 +1871,15 @@ msgstr "Heruntergeladene GPS-Daten"
msgid "Markers from {0}"
msgstr "Wegpunkte von {0}"
+msgid "Download OSM Notes"
+msgstr "OSM-Hinweise herunterladen"
+
msgid "Downloading Notes"
msgstr "Hinweise werden heruntergeladen"
+msgid "Notes"
+msgstr "OSM-Hinweise"
+
msgid "Download Compressed OSM Change"
msgstr "Komprimierte OSM-Änderung herunterladen"
@@ -2007,21 +2012,21 @@ msgid "Add note mode"
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"
+msgstr "Auf den Ort klicken, wo ein neuer Hinweis hinzugefügt werden soll"
msgid "Create new note"
msgstr "Neuen Hinweis erstellen"
msgid "Create note"
-msgstr "Anmerkung erstellen"
+msgstr "OSM-Hinweis erstellen"
msgid "Enter a detailed comment to create a note"
msgstr ""
-"Geben Sie einen detaillierten Kommentar zum Erstellen einer Anmerkung ein"
+"Geben Sie einen detaillierten Kommentar zum Erstellen eines Hinweises ein"
msgid "You must enter a comment to create a new note"
msgstr ""
-"Sie müssen einen Kommentar zum Erstellen einer neuen Anmerkung eingeben"
+"Sie müssen einen Kommentar zum Erstellen eines neuen Hinweises eingeben"
msgid "Delete Mode"
msgstr "Löschmodus"
@@ -2230,8 +2235,8 @@ msgstr ""
msgid "Add a new node to way"
msgid_plural "Add a new node to {0} ways"
-msgstr[0] "Einen neuen Knotenpunkt zum Weg hinzufügen"
-msgstr[1] "Einen neuen Knotenpunkt zu {0} Wegen hinzufügen"
+msgstr[0] "Einen neuen Punkt zum Weg hinzufügen"
+msgstr[1] "Einen neuen Punkt zu {0} Wegen hinzufügen"
msgid "Cannot delete node that is referenced by multiple objects"
msgstr "Kann von mehreren Objekten verwendeten Punkt nicht löschen"
@@ -2526,7 +2531,7 @@ msgid ""
"\n"
" {0}"
msgstr ""
-"Suchausdruck ist ungültig:\n"
+"Suchausdruck ist nicht gültig:\n"
"\n"
" {0}"
@@ -2582,7 +2587,8 @@ msgstr ""
"<b>user:anonymous</b> - Objekte, die von anonymen Nutzern verändert wurden"
msgid "<b>id:</b>... - objects with given ID (0 for new objects)"
-msgstr "<b>id:</b>... - Objekte mit der angegebenen ID (0 für neue Objekte)"
+msgstr ""
+"<b>id:</b>... - Objekte mit der angegebenen Kennung (0 für neue Objekte)"
msgid ""
"<b>version:</b>... - objects with given version (0 objects without an "
@@ -2595,8 +2601,8 @@ msgid ""
"<b>changeset:</b>... - objects with given changeset ID (0 objects without an "
"assigned changeset)"
msgstr ""
-"<b>changeset:</b>... - Objekt mit angegebener Nummer des Änderungssatzes (0 "
-"für Objekte ohne Änderungssatz)"
+"<b>changeset:</b>... - Objekt mit angegebener Änderungssatzkennung (0 für "
+"Objekte ohne Änderungssatz)"
msgid ""
"<b>nodes:</b>... - objects with given number of nodes (<b>nodes:</b>count, "
@@ -2784,13 +2790,13 @@ msgid "objects changed by user"
msgstr "Von dem Nutzer geänderte Objeke"
msgid "objects with given ID"
-msgstr "Objekte mit dieser ID"
+msgstr "Objekte mit der gegebenen Kennung"
msgid "objects with given version"
msgstr "Objekte mit der gegebenen Version"
msgid "objects with given changeset ID"
-msgstr "Objekte mit der gegebenen Änderungssatznummer"
+msgstr "Objekte mit der gegebenen Änderungssatzkennung"
msgid "objects with last modification timestamp within range"
msgstr "Objekte mit dem letzten Änderungsdatum innerhalb des Zeitraums"
@@ -2912,10 +2918,10 @@ msgid "Expecting <i>min</i>/<i>max</i> after ''timestamp''"
msgstr "Angaben <i>min</i>/<i>max</i> hinter ''timestamp'' erwartet"
msgid "Range of primitive ids expected"
-msgstr "Bereich von Objektnummern erwartet"
+msgstr "Bereich von Objektkennungen erwartet"
msgid "Range of changeset ids expected"
-msgstr "Bereich von Änderungssatznummern erwartet"
+msgstr "Bereich von Änderungssatzkennungen erwartet"
msgid "Range of versions expected"
msgstr "Bereich von Versionsnummern erwartet"
@@ -3000,13 +3006,13 @@ msgid "Cycling dependencies"
msgstr "Gegenseitige Abhängigkeiten"
msgid "Uploading modified notes"
-msgstr "Geänderte Anmerkungen werden hochgeladen"
+msgstr "Geänderte Hinweise werden hochgeladen"
msgid "Note {0} failed: {1}"
-msgstr "Anmerkung {0} fehlgeschlagen: {1}"
+msgstr "OSM-Hinweis {0} fehlgeschlagen: {1}"
msgid "Notes failed to upload"
-msgstr "Anmerkungen konnten nicht hochgeladen werden"
+msgstr "Hinweise konnten nicht hochgeladen werden"
msgid ""
"The following are results of automatic validation. Try fixing these, but be "
@@ -3263,7 +3269,7 @@ msgid "Resolve conflicts in coordinates in {0}"
msgstr "Koordinatenkonflikte für {0} auflösen"
msgid "Cannot resolve undecided conflict."
-msgstr "Kann unentschiedenen Konflikt nicht auflösen"
+msgstr "Kann unentschiedenen Konflikt nicht auflösen."
msgid "Resolve conflicts in deleted state in {0}"
msgstr "Konflikte im Löschstatus für {0} auflösen"
@@ -3580,7 +3586,7 @@ msgstr ""
"werden"
msgid "ID > 0 expected. Got {0}."
-msgstr "ID >= 0 erwartet, jedoch {0} erhalten."
+msgstr "Kennung >= 0 erwartet, jedoch {0} erhalten."
msgid "Version > 0 expected. Got {0}."
msgstr "Version > 0 erwartet, jedoch {0} erhalten."
@@ -3589,11 +3595,11 @@ msgid ""
"Cannot assign a changesetId > 0 to a new primitive. Value of changesetId is "
"{0}"
msgstr ""
-"Neuen Objekten kann keine Änderungssatz-Nummer > 0 zugewiesen werden. "
-"Änderungssatz-Nummer ist {0}"
+"Neuen Objekten kann keine Änderungssatzkennung > 0 zugewiesen werden. Wert "
+"der Änderungssatzkennung ist {0}"
msgid "A primitive with ID = 0 cannot be invisible."
-msgstr "Ein Objekt mit ID=0 darf nicht unsichtbar sein."
+msgstr "Ein Objekt mit Kennung = 0 darf nicht unsichtbar sein."
msgid ""
"Unable to add primitive {0} to the dataset because it is already included"
@@ -3612,34 +3618,35 @@ msgstr ""
msgid "Missing merge target for way with id {0}"
msgstr ""
-"Beim Zusammenführen wurde die Ziel-Linie für die Linie mit ID {0} nicht "
-"gefunden"
+"Beim Zusammenführen wurde die Ziel-Linie für die Linie mit der Kennung {0} "
+"nicht gefunden"
msgid ""
"Object of type {0} with id {1} was marked to be deleted, but it''s missing "
"in the source dataset"
msgstr ""
-"Objekt des Typs {0} mit der ID {1} wurde zum Löschen vorgemerkt, fehlt aber "
-"im Quelldatensatz"
+"Objekt des Typs {0} mit der Kennung {1} wurde zum Löschen vorgemerkt, fehlt "
+"aber im Quelldatensatz"
msgid "Missing merge target for node with id {0}"
msgstr ""
-"Beim Zusammenführen wurde der Zielpunkt für den Punkt mit ID {0} nicht "
-"gefunden"
+"Beim Zusammenführen wurde der Zielpunkt für den Punkt mit der Kennung {0} "
+"nicht gefunden"
msgid "Missing merge target for relation with id {0}"
msgstr ""
-"Beim Zusammenführen wurde die Ziel-Relation für die Relation mit ID {0} "
-"nicht gefunden"
+"Beim Zusammenführen wurde die Ziel-Relation für die Relation mit der Kennung "
+"{0} nicht gefunden"
msgid "Missing merge target of type {0} with id {1}"
msgstr ""
-"Beim Zusammenführen wurde das Ziel-Objekt vom Type {0} für das Objekt mit ID "
-"{1} nicht gefunden"
+"Beim Zusammenführen wurde das Ziel-Objekt vom Type {0} für das Objekt mit "
+"der Kennung {1} nicht gefunden"
msgid "Conflict in ''visible'' attribute for object of type {0} with id {1}"
msgstr ""
-"Konflikt im Sichtbarkeitsattribut für das Objekt des Typs {0} mit der ID {1}"
+"Konflikt im Sichtbarkeitsattribut für das Objekt des Typs {0} mit der der "
+"Kennung {1}"
msgid "Merging data..."
msgstr "Daten vereinen …"
@@ -3665,8 +3672,8 @@ msgstr ""
msgid ""
"Cannot merge primitives with different ids. This id is {0}, the other is {1}"
msgstr ""
-"Zwei Objekte mit unterschiedlichen IDs können nicht zusammengeführt werden. "
-"Die ID des Objekts ist {0}, die ID des anderen {1}"
+"Zwei Objekte mit unterschiedlichen Kennungen können nicht zusammengeführt "
+"werden. Die Kennung dieses Objekts ist {0}, die Kennung des anderen {1}"
msgid "node"
msgid_plural "nodes"
@@ -3716,8 +3723,8 @@ msgstr "Kompletter Punkt {0} mit ungültigen Koordinaten in Linie {1}"
msgid ""
"Cannot compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
msgstr ""
-"Das Objekt mit der ID \"{0}\" kann nicht mit dem Objekt mit der ID \"{1}\" "
-"verglichen werden."
+"Das Objekt mit der Kennung \"{0}\" kann nicht mit dem Objekt mit der Kennung "
+"\"{1}\" verglichen werden."
msgid "Parameter {0} not in range 0..{1}. Got ''{2}''."
msgstr "Parameter {0} außerhalb des Bereichs 0..{1}: Wert ist {2}"
@@ -3914,13 +3921,13 @@ msgstr ""
" \"{1}\""
msgid "validation error"
-msgstr "Datenprüfung: Fehler"
+msgstr "Validierungsfehler"
msgid "validation warning"
-msgstr "Datenprüfung: Warnung"
+msgstr "Validierungswarnung"
msgid "validation other"
-msgstr "Datenprüfung: Andere"
+msgstr "Andere Validierung"
msgid "Running test {0}"
msgstr "Test {0} ausführen"
@@ -3991,13 +3998,12 @@ msgstr "Prüft auf Fehler im Bezug auf API-Anforderungen"
msgid ""
"Way contains more than {0} nodes. It should be replaced by a multipolygon"
msgstr ""
-"Weg enthält mehr als {0} Knotenpunkte. Er sollte durch ein Multipolygon "
-"ersetzt werden"
+"Weg enthält mehr als {0} Punkte. Er sollte durch ein Multipolygon ersetzt "
+"werden"
msgid "Way contains more than {0} nodes. It should be split or simplified"
msgstr ""
-"Weg enthält mehr als {0} Knotenpunkte. Er sollte aufgeteilt oder vereinfacht "
-"werden"
+"Weg enthält mehr als {0} Punkte. Er sollte aufgeteilt oder vereinfacht werden"
msgid "Barriers and entrances"
msgstr "Barrieren und Eingänge"
@@ -4318,7 +4324,7 @@ msgid "Unexpected token:"
msgstr "Unerwartete Kennung:"
msgid "Unexpected token (school holiday parser):"
-msgstr "Unerwartete Kennung (Schulfeiertage-Parser):"
+msgstr "Unerwartetes Merkmal (Schulfeiertage-Parser):"
msgid "Unexpected token in number range:"
msgstr "Unerwartete Kennung im Nummernbereich:"
@@ -4336,7 +4342,7 @@ msgid "Unexpected token in year range:"
msgstr "Unerwartete Kennung im Jahresbereich:"
msgid "Invalid/unsupported syntax."
-msgstr "ungültige oder nicht unterstützte Syntax"
+msgstr "Ungültige/nicht unterstützte Syntax."
msgid "Overlapping ways"
msgstr "Überlappende Linien"
@@ -4491,10 +4497,10 @@ msgid "Tags with empty values"
msgstr "Merkmale mit leerem Wert"
msgid "Invalid property key"
-msgstr "Ungültiger Schlüssel"
+msgstr "Ungültiger Eigenschaftsschlüssel"
msgid "Invalid white space in property key"
-msgstr "Ungültiger Leerraum in Schlüssel"
+msgstr "Ungültiger Leerraum in Eigenschaftsschlüssel"
msgid "Property values start or end with white space"
msgstr "Werte beginnen oder enden mit Leerraum"
@@ -4521,13 +4527,17 @@ msgid "Check property keys."
msgstr "Schlüssel prüfen."
msgid "Validate that property keys are valid checking against list of words."
-msgstr "Schlüssel durch Abgleich mit einer Liste auf Gültigkeit prüfen."
+msgstr ""
+"Eigenschaftsschlüssel durch Abgleich mit einer Liste von Wörtern auf "
+"Gültigkeit prüfen."
msgid "Use complex property checker."
msgstr "Komplexen Eigenschaftsprüfer verwenden"
msgid "Validate property values and tags using complex rules."
-msgstr "Gültigkeit von Werten und Schlüsseln anhand komplexer Regeln prüfen."
+msgstr ""
+"Gültigkeit von Eigenschaftswerten und Schlüsseln anhand komplexer Regeln "
+"prüfen."
msgid "TagChecker source"
msgstr "Datenquelle für Merkmalsprüfer"
@@ -4539,7 +4549,8 @@ msgid "Check property values."
msgstr "Werte überprüfen."
msgid "Validate that property values are valid checking against presets."
-msgstr "Prüft die Gültigkeit von Werten anhand von Objektvorlagen."
+msgstr ""
+"Prüft die Gültigkeit von Eigenschaftswerten anhand von Objektvorlagen."
msgid "Check for FIXMES."
msgstr "Auf Korrekturnotizen prüfen."
@@ -4571,7 +4582,7 @@ msgid "Turnrestrictions"
msgstr "Abbiegerestriktionen"
msgid "This test checks if turnrestrictions are valid."
-msgstr "Dieser Test überprüft, ob Abbiegebeschränkungen zulässig sind."
+msgstr "Dieser Test überprüft, ob Abbiegebeschränkungen gültig sind."
msgid "Unknown role"
msgstr "Unbekannte Rolle"
@@ -4781,7 +4792,7 @@ msgid "Do not show again (remembers choice)"
msgstr "Nicht noch einmal zeigen (speichert Auswahl)"
msgid " [id: {0}]"
-msgstr " [ID: {0}]"
+msgstr " [Kennung: {0}]"
msgid "incomplete"
msgstr "unvollständig"
@@ -4857,8 +4868,7 @@ msgid "Authentication Failed"
msgstr "Authentifizierung fehlgeschlagen"
msgid "Access to redacted version ''{0}'' of {1} {2} is forbidden."
-msgstr ""
-"Zugriff auf redacted/redigierte Version ''{0}'' von {1} {2} ist untersagt."
+msgstr "Zugriff auf redigierte Version ''{0}'' von {1} {2} ist untersagt."
msgid "Authorisation Failed"
msgstr "Autorisierung fehlgeschlagen"
@@ -5192,7 +5202,7 @@ msgid "Do not hide toolbar"
msgstr "Werkzeugleiste nicht ausblenden"
msgid "Hide this button"
-msgstr "Diesen Button verbergen"
+msgstr "Diese Schaltfläche ausblenden"
msgid "Click the arrow at the bottom to show it again."
msgstr "Zum erneuten Anzeigen den unteren Pfeil anklicken"
@@ -5201,7 +5211,7 @@ msgid "Hide edit toolbar"
msgstr "Werkzeugleiste »Bearbeiten« ausblenden"
msgid "Hide or show this toggle button"
-msgstr "Anzeigen oder Verbergen dieses Buttons"
+msgstr "Diese Umschaltschaltfläche ausblenden oder anzeigen"
msgid "Move right"
msgstr "Nach rechts verschieben"
@@ -5298,7 +5308,7 @@ msgid "Last change date"
msgstr "Letztes Erstellungsdatum"
msgid "Select note sorting method"
-msgstr "Anmerkungssortierverfahren auswählen"
+msgstr "Hinweissortierverfahren auswählen"
msgid "Click to cancel the current operation"
msgstr "Klicken Sie, um die aktuelle Aufgabe abzubrechen"
@@ -5824,7 +5834,7 @@ msgid "Keep their coordinates"
msgstr "Server-Koordinaten behalten"
msgid "Undecide conflict between different coordinates"
-msgstr "Nicht aufgelöster Konflikt durch unterschiedliche Koordinaten."
+msgstr "Nicht aufgelöster Konflikt durch unterschiedliche Koordinaten"
msgid "Keep my deleted state"
msgstr "Löschstatus der lokalen Daten behalten"
@@ -5833,7 +5843,7 @@ msgid "Keep their deleted state"
msgstr "Löschstatus der Server-Daten behalten"
msgid "Undecide conflict between deleted state"
-msgstr "Nicht aufgelöster Konflikt durch unterschiedlichen Löschstatus."
+msgstr "Nicht aufgelöster Konflikt durch unterschiedlichen Löschstatus"
msgid "Primitive"
msgstr "Objekt"
@@ -5859,7 +5869,7 @@ msgid "Value"
msgstr "Wert"
msgid "Cannot apply undecided tag merge item."
-msgstr "Unentschiedenes Merkmalselement kann nicht angewendet werden."
+msgstr "Unentschiedenes Merkmalselement kann nicht angewendet werden"
msgid "My version (local dataset)"
msgstr "Meine Version (lokale Daten)"
@@ -5977,7 +5987,7 @@ msgid "sum"
msgstr "Summe"
msgid "Please decide which values to keep"
-msgstr "Bitte entscheiden Sie, welche Werte behalten werden sollen."
+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"
@@ -5998,7 +6008,7 @@ msgid "Tag collection does not include the selected value ''{0}''."
msgstr "Merkmalssammlung enthält nicht den gewählten Wert \"{0}\""
msgid "Not decided yet."
-msgstr "Noch ohne Lösung"
+msgstr "Noch nicht entschieden."
msgid "Tags from nodes"
msgstr "Merkmale von Punkten"
@@ -6049,10 +6059,10 @@ msgid "Keep this relation member for the target object"
msgstr "Behalte dieses Relationselement für das Ziel-Objekt"
msgid "Undecided"
-msgstr "Ungelöst."
+msgstr "Ungelöst"
msgid "Not decided yet"
-msgstr "Noch ohne Lösung"
+msgstr "Noch nicht entschieden"
msgid "Role:"
msgstr "Rolle:"
@@ -6289,7 +6299,7 @@ msgid "Resolve conflicts for ''{0}''"
msgstr "Konflikte lösen für ''{0}''"
msgid "Filter objects and hide/disable them."
-msgstr "Objekte filtern und verbergen/deaktivieren."
+msgstr "Objekte filtern und diese ausblenden/deaktivieren."
msgid "Enable filter"
msgstr "Filter aktivieren"
@@ -6298,10 +6308,10 @@ msgid "Multikey: {0}"
msgstr "Mehrfachtaste: {0}"
msgid "Hide filter"
-msgstr "Filter verstecken"
+msgstr "Filter ausblenden"
msgid "Hiding filter"
-msgstr "Filter verstecken"
+msgstr "Filter wird ausgeblendet"
msgid "Inverse filter"
msgstr "Filter invertieren"
@@ -6328,7 +6338,7 @@ msgid "Move filter down."
msgstr "Filter nach unten verschieben"
msgid "Filter Hidden:{0} Disabled:{1}"
-msgstr "Filter: Versteckt:{0} Aus:{1}"
+msgstr "Filter: Ausgeblendet:{0} Deaktiviert:{1}"
msgid "Error in filter"
msgstr "Fehler im Filter"
@@ -6374,7 +6384,7 @@ msgstr "<h2>Filter aktiv</h2>"
msgid "<p><b>{0}</b> object hidden"
msgid_plural "<p><b>{0}</b> objects hidden"
-msgstr[0] "<p><b>{0}</b> Objekt versteckt"
+msgstr[0] "<p><b>{0}</b> Objekt ausgeblendet"
msgstr[1] "<p><b>{0}</b> Objekte versteckt"
msgid "<b>{0}</b> object disabled"
@@ -6414,7 +6424,7 @@ msgid "modified"
msgstr "verändert"
msgid "filtered/hidden"
-msgstr "gefiltert/versteckt"
+msgstr "gefiltert/ausgeblendet"
msgid "filtered/disabled"
msgstr "gefiltert/deaktiviert"
@@ -6522,7 +6532,7 @@ msgstr ""
"Liste der generierten Stile:\n"
msgid "The 2 selected objects have identical style caches."
-msgstr "Die 2 gewählten Objekte haben identische Stil-Speicher."
+msgstr "Die 2 ausgewählten Objekte haben identische Stilspeicher."
msgid "The 2 selected objects have different style caches."
msgstr "Die 2 gewählten Objekte haben verschiedene Stil-Speicher."
@@ -6530,8 +6540,8 @@ msgstr "Die 2 gewählten Objekte haben verschiedene Stil-Speicher."
msgid ""
"Warning: The 2 selected objects have equal, but not identical style caches."
msgstr ""
-"Warnung: Die 2 gewählten Objekte haben gleiche, aber nicht identische Stil-"
-"Speicher."
+"Warnung: Die 2 ausgewählten Objekte haben gleiche, aber nicht identische "
+"Stilspeicher."
msgid "xml"
msgstr "XML"
@@ -6599,13 +6609,13 @@ msgid "Delete the selected layers."
msgstr "Ausgewählte Ebenen löschen."
msgid "Show/hide"
-msgstr "Einblenden/Ausblenden"
+msgstr "Anzeigen/Ausblenden"
msgid "Toggle visible state of the selected layer."
msgstr "Sichtbarkeit der Ebene umschalten."
msgid "Show/hide layer"
-msgstr "Ebene anzeigen/verstecken"
+msgstr "Ebene anzeigen/ausblenden"
msgid "Opacity"
msgstr "Transparenz"
@@ -6635,10 +6645,11 @@ msgid "Copy {1} of {0}"
msgstr "Kopie {1} von {0}"
msgid "layer is currently visible (click to hide layer)"
-msgstr "Ebene ist zur Zeit sichtbar (zum Ausblenden anklicken)"
+msgstr "Ebene ist zur Zeit sichtbar (klicken Sie, um die Ebene auszublenden)"
msgid "layer is currently hidden (click to show layer)"
-msgstr "Ebene ist zur Zeit ausgeblendet (zum Einblenden anklicken)"
+msgstr ""
+"Ebene ist zur Zeit ausgeblendet (klicken Sie, um die Ebene anzuzeigen)"
msgid "this layer is the active layer"
msgstr "diese Ebene ist die aktive Ebene"
@@ -6743,14 +6754,17 @@ msgstr "Zeichenstil-Einstellungen"
msgid "Customize the style"
msgstr "Stil anpassen"
+msgid "List of notes"
+msgstr "Liste von OSM-Hinweisen"
+
msgid "Add comment"
-msgstr "Kommentar hinzufügen"
+msgstr "Hinweis hinzufügen"
msgid "Comment"
msgstr "Kommentar"
msgid "Comment on note"
-msgstr "Anmerkung kommentieren"
+msgstr "Hinweis kommentieren"
msgid "Add comment to note:"
msgstr "Kommentar zu Hinweis hinzufügen:"
@@ -6777,7 +6791,7 @@ msgid "Reopen note with message:"
msgstr "Hinweis mit Nachricht erneut öffnen:"
msgid "Sort notes"
-msgstr "Anmerkungen sortieren"
+msgstr "Hinweise sortieren"
msgid "Sort"
msgstr "Sortieren"
@@ -6793,17 +6807,17 @@ msgid "Choose the OSM object type"
msgstr "OSM Objekttypen auswählen"
msgid "Object ID:"
-msgstr "Objekt-ID:"
+msgstr "Objektkennung:"
msgid "Enter the ID of the object that should be downloaded"
-msgstr "ID des herunterzuladenden Objekts eingeben"
+msgstr "Geben Sie die Kennung des zu herunterladenden Objekts ein"
msgid ""
"Object IDs can be separated by comma or space.<br/>Examples: {0}<br/>In "
"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 ""
-"Objekt-IDs können durch ein Komma oder Leerzeichen getrennt "
+"Objektkennungen können durch ein Komma oder Leerzeichen getrennt "
"werden.<br/>Beispiele: {0}<br/>Im gemischten Modus geben Sie Objekte wie "
"folgt an: {1}<br/>({2} steht für <i>Punkt</i>, {3} für <i>Linie</i>, {4} für "
"<i>Relation</i>)"
@@ -6812,7 +6826,7 @@ msgid ""
"Invalid ID list specified\n"
"Cannot continue."
msgstr ""
-"Ungültige ID-Liste angegeben\n"
+"Ungültige Kennungsliste angegeben\n"
"Es kann nicht fortgefahren werden."
msgid "Relations"
@@ -6870,7 +6884,7 @@ msgid "Dynamic"
msgstr "Dynamisch"
msgid "Always hidden"
-msgstr "Immer versteckt"
+msgstr "Immer ausgeblendet"
msgid "Toggle dynamic buttons"
msgstr "Dynamische Schaltflächen umschalten"
@@ -7060,7 +7074,7 @@ msgid "Closed"
msgstr "Geschlossen"
msgid "ID"
-msgstr "ID"
+msgstr "Kennung"
msgid "Open"
msgstr "Offen"
@@ -7154,7 +7168,7 @@ msgid "Name"
msgstr "Name"
msgid "ID:"
-msgstr "ID:"
+msgstr "Kennung:"
msgid "Comment:"
msgstr "Kommentar:"
@@ -7222,15 +7236,15 @@ msgid "closed"
msgstr "geschlossen"
msgid "Changeset ID: "
-msgstr "Änderungssatz-Nummer: "
+msgstr "Änderungssatzkennung: "
msgid "Enter a changeset id"
-msgstr "Eine Änderungssatz-Nummer eingeben"
+msgstr "Geben Sie eine Änderungssatzkennung ein"
msgid ""
"Download the changeset with the specified id, including the changeset content"
msgstr ""
-"Den Änderungssatz mit der angegebenen Nummer inklusive bearbeiteter Objekte "
+"Den Änderungssatz mit der angegebenen Kennung inklusive bearbeiteter Objekte "
"herunterladen"
msgid "Select changesets owned by specific users"
@@ -7300,7 +7314,7 @@ msgid "Please enter a non-empty user name"
msgstr "Bitte einen Nutzernamen eingeben"
msgid "Invalid user name"
-msgstr "Ungültiger Nutzername"
+msgstr "Ungültiger Benutzername"
msgid "Date: "
msgstr "Datum: "
@@ -7329,8 +7343,8 @@ msgid ""
"Cannot build changeset query with time based restrictions. Input is not "
"valid."
msgstr ""
-"Kann keine Anfrage nach Änderungssätzen formulieren. Die Eingaben sind "
-"ungültig."
+"Kann keine Anfrage nach Änderungssätzen formulieren. Eingabe ist nicht "
+"gültig."
msgid ""
"<html>Please enter valid date/time values to restrict<br>the query to a "
@@ -7362,8 +7376,8 @@ msgstr "Ungültiges Koordinatenfenster"
msgid ""
"The current value is not a valid user ID. Please enter an integer value > 0"
msgstr ""
-"Der Wert ist keine gültige Benutzernummer. Bitte geben Sie eine positive "
-"Ganzzahl ein."
+"Der aktuelle Wert ist keine gültige Benutzerkennung. Bitte geben Sie eine "
+"positive Ganzzahl ein."
msgid "Please enter an integer value > 0"
msgstr "Bitte geben Sie eine positive Ganzzahl ein"
@@ -7488,7 +7502,7 @@ msgid "Querying and downloading changesets"
msgstr "Änderungssätze werden gesucht und heruntergeladen"
msgid "Determine user id for current user..."
-msgstr "Benzuternummer des aktuellen Benutzers herausfinden …"
+msgstr "Benzuterkennung des aktuellen Benutzers herausfinden …"
msgid "Query and download changesets ..."
msgstr "Änderungssätze suchen und herunterladen …"
@@ -8193,21 +8207,19 @@ msgid "OpenStreetMap data"
msgstr "OpenStreetMap-Daten"
msgid "Select to download OSM data in the selected download area."
-msgstr "Auswählen, um OSM-Datenobjekte im ausgewählten Ladebereich zu laden."
+msgstr ""
+"Auswählen, um OSM-Datenobjekte im ausgewählten Ladebereich herunterzuladen."
msgid "Raw GPS data"
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 "Anmerkungen"
+msgstr ""
+"Auswählen, um GPS-Spuren im ausgewählten Ladebereich herunterzuladen."
msgid "Select to download notes in the selected download area."
msgstr ""
-"Wählen Sie Anmerkungen im ausgewählten Herunterladebereich zum Herunterladen "
-"aus."
+"Auswählen, um OSM-Hinweise im ausgewählten Ladebereich herunterzuladen."
msgid "Download as new layer"
msgstr "Als neue Ebene laden"
@@ -8263,7 +8275,7 @@ msgid ""
msgstr ""
"<html>Weder <strong>{0}</strong> noch <strong>{1}</strong> noch "
"<strong>{2}</strong> ist aktiviert.<br>Bitte entweder OSM-Daten, GPX-Daten, "
-"Anmerkungen oder mehrere davon zum Herunterladen auswählen.</html>"
+"OSM-Hinweise oder mehrere davon zum Herunterladen auswählen.</html>"
msgid "Download referrers (parent relations)"
msgstr "Verweise herunterladen (Eltern-Relationen)"
@@ -8453,8 +8465,9 @@ msgstr ""
msgid ""
"Failed to set reference. Reference ID {0} does not match history ID {1}."
msgstr ""
-"Setzen eines Referenzobjekts ist fehlgeschlagen. Die ID {0} des "
-"Referenzobjekts stimmt nicht mit der ID {1} der Objektgeschichte überein."
+"Festlegen eines Referenzobjekts ist fehlgeschlagen. Die Kennung {0} des "
+"Referenzobjekts stimmt nicht mit der Kennung {1} der Objektgeschichte "
+"überein."
msgid ""
"Failed to set reference. Reference version {0} not available in history."
@@ -8561,15 +8574,15 @@ msgstr "B"
msgid ""
"Failed to update primitive with id {0} because current edit layer is null"
msgstr ""
-"Das Objekt Nr. {0} konnte nicht aktualisiert werden, weil keine aktuelle "
-"Ebene definiert ist"
+"Das Objekt mit der Kennung {0} konnte nicht aktualisiert werden, weil keine "
+"aktuelle Ebene definiert ist"
msgid ""
"Failed to update primitive with id {0} because current edit layer does not "
"include such a primitive"
msgstr ""
-"Das Objekt Nr. {0} konnte nicht aktualisiert werden, weil die aktuelle Ebene "
-"kein solches Objekt enthält"
+"Das Objekt mit der Kennung {0} konnte nicht aktualisiert werden, weil die "
+"aktuelle Ebene kein solches Objekt enthält"
msgid "Synchronize node {0} only"
msgstr "Nur Punkte {0} synchronisieren"
@@ -8595,7 +8608,7 @@ msgid ""
msgstr ""
"<html>Hochladen <strong>fehlgeschlagen</strong>, da der Server eine neuere "
"Version<br>von einem Ihrer Punkte, Linien oder Relationen hat.<br>Der "
-"Konflikt wird durch ein Objekt vom Typ <strong>{0}</strong> mit ID "
+"Konflikt wird durch ein Objekt vom Typ <strong>{0}</strong> mit der Kennung "
"<strong>{1}</strong> ausgelöst.<br>Der Server hat Version {2}, Ihre Version "
"ist {3}.<br>Wählen Sie <strong>{4}</strong>, um dieses Objekt zu "
"synchronisieren.<br>Wählen Sie <strong>{5}</strong>, um den kompletten "
@@ -8684,7 +8697,7 @@ msgid "Enter a source"
msgstr "Quelle eingeben"
msgid "Changeset id:"
-msgstr "Änderungssatz-Nummer:"
+msgstr "Änderungssatzkennung:"
msgid "Created at:"
msgstr "Erstellt am:"
@@ -8785,8 +8798,8 @@ msgid ""
"Authenticating at the OSM API ''{0}'' failed. Please enter a valid username "
"and a valid password."
msgstr ""
-"Die Anmeldung beim OSM-Server ''{0}'' ist fehlgeschlagen. Geben Sie bitte "
-"einen gültigen Benutzernamen und das richtige Kennwort ein."
+"Die Anmeldung beim OSM-Server ''{0}'' ist fehlgeschlagen. Bitte geben Sie "
+"einen gültigen Benutzernamen und das richtige Passwort ein."
msgid "Please enter the user name of your account"
msgstr "Benutzernamen Ihres Zugangs eingeben"
@@ -8798,8 +8811,8 @@ msgid ""
"Authenticating at the host ''{0}'' failed. Please enter a valid username and "
"a valid password."
msgstr ""
-"Die Anmeldung beim Server ''{0}'' ist fehlgeschlagen. Geben Sie bitte einen "
-"gültigen Benutzernamen und das richtige Kennwort ein."
+"Die Anmeldung beim Server ''{0}'' ist fehlgeschlagen. Bitte geben Sie einen "
+"gültigen Benutzernamen und ein gültiges Passwort ein."
msgid "Please enter the user name for authenticating at your proxy server"
msgstr ""
@@ -8812,8 +8825,8 @@ msgid ""
"Authenticating at the HTTP proxy ''{0}'' failed. Please enter a valid "
"username and a valid password."
msgstr ""
-"Authentifizierung beim HTTP-Proxy ''{0}'' schlug fehl. Bitte gültigen "
-"Benutzernamen und Passwort eingeben."
+"Authentifizierung beim HTTP-Proxy ''{0}'' ist fehlgeschlagen. Bitte geben "
+"Sie einen gültigen Benutzernamen und ein gültiges Passwort ein."
msgid ""
"Warning: depending on the authentication method the proxy server uses the "
@@ -8847,8 +8860,8 @@ msgid ""
"Cannot download file ''{0}''. Its download link ''{1}'' is not a valid URL. "
"Skipping download."
msgstr ""
-"Datei ''{0}'' konnte nicht heruntergeladen werden, da der Link ''{1}'' keine "
-"gültige URL ist. Herunterladen wird übersprungen."
+"Datei ''{0}'' kann nicht heruntergeladen werden. Der Link ''{1}'' ist keine "
+"gültige URL. Herunterladen wird übersprungen."
msgid ""
"Could not retrieve the list of your open changesets because<br>JOSM does not "
@@ -8861,7 +8874,7 @@ msgstr ""
"Recht<br>die Identität des Benutzers zu kennen, in dessen Name Sie arbeiten."
msgid "Missing user identity"
-msgstr "Fehlende Nutzeridentität"
+msgstr "Fehlende Benutzeridentität"
msgid ""
"Failed to retrieve user infos for the current JOSM user. Exception was: {0}"
@@ -8890,8 +8903,8 @@ msgid ""
"does not know an object with the requested id."
msgstr ""
"Der Server antwortete mit dem Antwortcode 404.<br>Dies bedeutet "
-"normalerweise, dass der Server ein Objekt mit der angeforderten ID nicht "
-"kennt."
+"normalerweise, dass der Server ein Objekt mit der angeforderten Kennung "
+"nicht kennt."
msgid "missing objects:"
msgstr "fehlende Objekte:"
@@ -9508,8 +9521,8 @@ msgstr "Beschreibung: {0}"
msgid "{0} track"
msgid_plural "{0} tracks"
-msgstr[0] "{0} Track"
-msgstr[1] "{0} Tracks"
+msgstr[0] "{0} Spur"
+msgstr[1] "{0} Spuren"
msgid "Description"
msgstr "Beschreibung"
@@ -9575,13 +9588,13 @@ msgid "Save Layer"
msgstr "Ebene speichern"
msgid "Note"
-msgstr "Kommentar"
+msgstr "Hinweis"
msgid "Notes layer"
-msgstr "Anmerkungsebene"
+msgstr "Hinweisebene"
msgid "Total notes:"
-msgstr "Anmerkungen insgesamt:"
+msgstr "Hinweise insgesamt:"
msgid "Changes need uploading?"
msgstr "Änderungen erfordern Hochladen?"
@@ -9732,10 +9745,10 @@ msgid "EPSG:4326 and Mercator projection are supported"
msgstr "EPSG:4326 und Mercator-Projektion werden unterstützt"
msgid "Validation errors"
-msgstr "Ergebnisse der Datenprüfung"
+msgstr "Validierungsfehler"
msgid "No validation errors"
-msgstr "Keine Fehler gefunden"
+msgstr "Keine Validierungsfehler"
msgid "Blank Layer"
msgstr "Leere Ebene"
@@ -9841,7 +9854,7 @@ msgid "Invalid date"
msgstr "Ungültiges Datum"
msgid "<No GPX track loaded yet>"
-msgstr "<Bisher keine GPS-Daten geladen>"
+msgstr "<Bisher keine GPS-Spuren geladen>"
msgid "GPX track: "
msgstr "GPS-Spur: "
@@ -9908,7 +9921,7 @@ msgid_plural ""
"<html>Matched <b>{0}</b> of <b>{1}</b> photos to GPX track.</html>"
msgstr[0] "<html><b>{0}</b> von <b>{1}</b> Bild an GPS-Spur angepaßt.</html>"
msgstr[1] ""
-"<html><b>{0}</b> von <b>{1}</b> Bildern an GPS-Spur angepaßt.</html>"
+"<html><b>{0}</b> von <b>{1}</b> Bildern an GPS-Spur angepasst.</html>"
msgid "Timezone: {0}"
msgstr "Zeitzone: {0}"
@@ -9955,10 +9968,10 @@ msgid "GPX Track has no time information"
msgstr "GPS-Spur enthält keine Zeitinformationen"
msgid "You should select a GPX track"
-msgstr "Wählen Sie eine GPS-Spur"
+msgstr "Sie sollten eine GPS-Spur auswählen"
msgid "No selected GPX track"
-msgstr "Keine GPS-Spur gewählt"
+msgstr "Keine ausgewählte GPS-Spur"
msgid ""
"Error while parsing timezone.\n"
@@ -10142,7 +10155,7 @@ msgstr ""
"werden.</html>"
msgid "Set track visibility for {0}"
-msgstr "Sichtbarkeit der Spuren auf {0} setzen"
+msgstr "Sichtbarkeit der Spuren auf {0} festlegen"
msgid "Show all"
msgstr "Alle zeigen"
@@ -10158,7 +10171,7 @@ msgid ""
"harmful.<br>If you want to upload traces, look here:</html>"
msgstr ""
"<html>Das Hochladen unbearbeiteter GPS-Daten wird als schädlich "
-"angesehen.<br>Informationen zum Hochladen von Tracks finden Sie hier:</html>"
+"angesehen.<br>Informationen zum Hochladen von Spuren finden Sie hier:</html>"
msgid "Customize track drawing"
msgstr "Spur-Anzeige anpassen"
@@ -10200,7 +10213,7 @@ msgid "waypoints only"
msgstr "Nur Wegpunkte"
msgid "track and waypoints"
-msgstr "GPS-Spur und Wegpunkte"
+msgstr "Spur und Wegpunkte"
msgid "Click to download"
msgstr "Zum herunterladen klicken"
@@ -10209,7 +10222,7 @@ msgid "Click to cancel"
msgstr "Zum Abbrechen klicken"
msgid "Download from OSM along this track"
-msgstr "OSM-Daten entlang der GPS-Spur herunterladen"
+msgstr "OSM-Daten entlang dieser Spur herunterladen"
msgid "Calculating Download Area"
msgstr "Gebiet zum Herunterladen berechnen"
@@ -10303,7 +10316,7 @@ msgid "Markers From Named Points"
msgstr "Marken von benannten Punkten"
msgid "Named Trackpoints from {0}"
-msgstr "Benannte GPS-Punkte von {0}"
+msgstr "Benannte Spurpunkte von {0}"
msgid "gps marker"
msgstr "GPS-Markierung"
@@ -10351,21 +10364,21 @@ msgid ""
"You need to have paused audio at the point on the track where you want the "
"marker."
msgstr ""
-"Sie müssen die Tonwiedergabe an der Stelle der GPS-Spur pausieren, an der "
-"die Marke eingefügt werden soll."
+"Sie müssen die Tonwiedergabe an der Stelle der Spur pausieren, an der die "
+"Marke eingefügt werden soll."
msgid ""
"You need to drag the play head near to the GPX track whose associated sound "
"track you were playing (after the first marker)."
msgstr ""
-"Die Abspielposition muss in die Nähe der GPS-Spur bewegt werden, deren "
+"Die Abspielposition muss in die Nähe der GPX-Spur bewegt werden, deren "
"Aufnahme abgespielt werden soll (nach der ersten Marke)."
msgid ""
"You need to SHIFT-drag the play head onto an audio marker or onto the track "
"point where you want to synchronize."
msgstr ""
-"Die Abspielposition muss mit gedrückter SHIFT-Taste auf die zu "
+"Die Abspielposition muss mit gedrückter UMSCHALT-Taste auf die zu "
"sychronisierende Audio-Marke oder den Wegpunkt bewegt werden."
msgid "Unable to create new audio marker."
@@ -10676,7 +10689,7 @@ msgid ""
"your behalf (<a href=\"{0}\">more info...</a>)."
msgstr ""
"Mittels OAuth gestatten Sie JOSM das Hochladen von Kartendaten und GPS-"
-"Tracks in Ihrem Namen (<a href=\"{0}\">Weitere Informationen …</a>)."
+"Spuren in Ihrem Namen (<a href=\"{0}\">Weitere Informationen …</a>)."
msgid "Please select an authorization procedure: "
msgstr "Bitte wählen Sie eine Autorisierungsmethode: "
@@ -10735,20 +10748,20 @@ msgstr ""
"Auswählen, um JOSM das Hochladen von Kartendaten in Ihrem Namen zu erlauben"
msgid "Allow to upload GPS traces"
-msgstr "Hochladen von GPS-Tracks erlauben"
+msgstr "Hochladen von GPS-Spuren erlauben"
msgid "Select to grant JOSM the right to upload GPS traces on your behalf"
msgstr ""
-"Auswählen, um JOSM das Hochladen von GPS-Tracks in Ihrem Namen zu erlauben"
+"Auswählen, um JOSM das Hochladen von GPS-Spuren in Ihrem Namen zu erlauben"
msgid "Allow to download your private GPS traces"
-msgstr "Herunterladen Ihrer privaten GPS-Tracks erlauben"
+msgstr "Herunterladen Ihrer privaten GPS-Spuren erlauben"
msgid ""
"Select to grant JOSM the right to download your private GPS traces into JOSM "
"layers"
msgstr ""
-"Auswählen, um JOSM das Herunterladen Ihrer privaten GPS-Tracks in JOSM-"
+"Auswählen, um JOSM das Herunterladen Ihrer privaten GPS-Spuren in JOSM-"
"Ebenen zu erlauben"
msgid "Allow to read your preferences"
@@ -10768,11 +10781,10 @@ msgstr ""
"erlauben"
msgid "Allow modifications of notes"
-msgstr "Ändern von Fehlermeldungen (Notes) erlauben"
+msgstr "Ändern von Hinweisen erlauben"
msgid "Select to grant JOSM the right to modify notes on your behalf"
-msgstr ""
-"Auswählen, um JOSM das Ändern von Fehlermeldungen (Notes) zu erlauben"
+msgstr "Auswählen, um JOSM das Ändern von Hinweisen zu erlauben"
msgid "Retrieving OAuth Access Token..."
msgstr "OAuth-Zugriffskennung abrufen …"
@@ -10875,8 +10887,8 @@ msgid ""
"''{3}''.</html>"
msgstr ""
"<html>Zugriffskennung \"{0}\" erfolgreich für den Zugang zum OSM-Server "
-"\"{1}\" eingesetzt.<br>Sie greifen als Benutzer \"{2}\" mit der ID \",{3}\" "
-"auf den OSM-Server zu.</html>"
+"\"{1}\" eingesetzt.<br>Sie greifen als Benutzer \"{2}\" mit der Kennung "
+"\",{3}\" auf den OSM-Server zu.</html>"
msgid "Success"
msgstr "Erfolgreich"
@@ -11274,17 +11286,17 @@ msgid "Explicit waypoints with valid timestamps."
msgstr "Explizite Wegpunkte mit gültigen Zeitstempeln."
msgid "Explicit waypoints with time estimated from track position."
-msgstr "Explizite Wegpunkte mit Zeitschätzung aus GPS-Position."
+msgstr "Explizite Wegpunkte mit Zeitschätzung aus Spurposition."
msgid "Named trackpoints."
-msgstr "Benannte GPS-Punkte"
+msgstr "Benannte Spurpunkte."
msgid "Modified times (time stamps) of audio files."
msgstr "Modifizierte Zeiten (Zeitstempel) der Audiodateien."
msgid "Start of track (will always do this if no other markers available)."
msgstr ""
-"GPS-Spuranfang (wird immer genutzt, wenn keine anderen Marken verfügbar)."
+"Spuranfang (wird immer genutzt, wenn keine anderen Marken verfügbar)."
msgid "Show or hide the audio menu entry on the main menu bar."
msgstr "Den Audio-Eintrag im Hauptmenü anzeigen oder verbergen."
@@ -11312,15 +11324,15 @@ msgid ""
"Automatically create audio markers from trackpoints (rather than explicit "
"waypoints) with names or descriptions."
msgstr ""
-"Automatisch Audio-Marken aus GPS-Punkten mit Namen oder Beschreibungen "
+"Automatisch Audio-Marken aus Spurpunkten mit Namen oder Beschreibungen "
"erzeugen (anstatt explizit aus Wegpunkten)."
msgid ""
"Create audio markers at the position on the track corresponding to the "
"modified time of each audio WAV file imported."
msgstr ""
-"Audio-Marken an der zur modifizierten Zeit jeder importierten Audiodatei "
-"gehörenden Position der GPS-Spur erstellen."
+"Audio-Marken an der zur modifizierten Zeit jeder importierten WAV-Audiodatei "
+"gehörenden Position der Spur erstellen."
msgid ""
"The number of seconds to jump forward or back when the relevant button is "
@@ -11343,7 +11355,7 @@ msgid ""
"Playback starts this number of seconds before (or after, if negative) the "
"audio track position requested"
msgstr ""
-"Die Wiedergabe startet so viele Sekunden vor der angegebenen Position "
+"Die Wiedergabe startet so viele Sekunden vor der angegebenen Spurposition "
"(negative Werte für später)"
msgid "Lead-in time (seconds)"
@@ -11649,36 +11661,36 @@ msgid ""
"All points and track segments will have the same color. Can be customized in "
"Layer Manager."
msgstr ""
-"Alle Punkte und GPS-Spuren haben die gleiche Farbe. Kann in der "
-"Ebenenübersicht angepasst werden."
+"Alle Punkte und Spuren haben die gleiche Farbe. Kann in der Ebenenübersicht "
+"angepasst werden."
msgid "Colors points and track segments by velocity."
-msgstr "Punkte und GPS-Spuren nach Geschwindigkeit einfärben."
+msgstr "Punkte und Spuren nach Geschwindigkeit einfärben."
msgid "Colors points and track segments by direction."
-msgstr "Färbt Punkte und Linienabschnitte anhand der Fahrtrichtung."
+msgstr "Färbt Punkte und Spurabschnitte anhand der Fahrtrichtung."
msgid ""
"Colors points and track segments by dilution of position (HDOP). Your "
"capture device needs to log that information."
msgstr ""
-"Punkte und GPS-Spuren anhand der Positionsverschlechterung (HDOP) färben. "
-"Ihr GPS-Empfänger muss diese Information aufzeichnen."
+"Punkte und Spuren anhand der Positionsverschlechterung (HDOP) färben. Ihr "
+"GPS-Empfänger muss diese Information aufzeichnen."
msgid "Colors points and track segments by its timestamp."
-msgstr "Punkte und Linienabschnitte anhand des Zeitstempels färben."
+msgstr "Punkte und Spurabschnitte anhand des Zeitstempels färben."
msgid "Allows to tune the track coloring for different average speeds."
msgstr ""
-"Erlaubt die Feineinstellung der GPS-Spur-Einfärbung für verschiedene "
+"Erlaubt die Feineinstellung der Spureinfärbung für verschiedene "
"Durchschnittsgeschwindigkeiten."
msgid "Track and Point Coloring"
-msgstr "Färbung von GPS-Spuren und Punkten"
+msgstr "Färbung von Spuren und Punkten"
msgid "Colors points and track segments by data limits."
msgstr ""
-"Färbung der Punkte und Linienabschnitte mittels der Datengrenzwerte anpassen."
+"Färbung der Punkte und Spurabschnitte mittels der Datengrenzwerte anpassen."
msgid "Waypoint labelling"
msgstr "Wegpunkt-Beschriftung"
@@ -11699,7 +11711,7 @@ msgid "Show splash screen at startup"
msgstr "Startbild anzeigen"
msgid "Show object ID in selection lists"
-msgstr "Objektnummer in Auswahllisten anzeigen"
+msgstr "Objektkennung in Auswahllisten anzeigen"
msgid "Show localized name in selection lists"
msgstr "Übersetzte Namen in Auswahllisten anzeigen"
@@ -11868,7 +11880,7 @@ msgid "TMS Settings"
msgstr "TMS-Einstellungen"
msgid "Imagery providers"
-msgstr "Bilddienste"
+msgstr "Bildanbieter"
msgid "Offset bookmarks"
msgstr "Versatz-Lesezeichen"
@@ -12577,7 +12589,7 @@ msgstr ""
"Schreibweise und führen Sie eine erneute Prüfung durch.</html>"
msgid "Invalid API URL"
-msgstr "Ungültige API URL"
+msgstr "Ungültige API-URL"
msgid ""
"<html>Failed to build URL ''{0}'' for validating the OSM API "
@@ -12621,7 +12633,7 @@ msgid "Authentication"
msgstr "Authentifizierung"
msgid "Configure your identity and how to authenticate at the OSM server"
-msgstr "Identität und Authentifizierung am OSM-Server festlegen"
+msgstr "Konfigurieren Sie Ihre Identität und Authentifizierung am OSM-Server"
msgid "Use Basic Authentication"
msgstr "Verwende Basisauthentifizierung"
@@ -12716,10 +12728,10 @@ msgid "Test the API URL"
msgstr "API-URL testen"
msgid "The API URL is valid."
-msgstr "Die API URL ist gültig."
+msgstr "Die API-URL ist gültig."
msgid "Validation failed. The API URL seems to be invalid."
-msgstr "Überprüfung fehlgeschlagen. Die API-URL scheint ungültig."
+msgstr "Überprüfung fehlgeschlagen. Die API-URL scheint ungültig zu sein."
msgid "OSM API URL must not be empty. Please enter the OSM API URL."
msgstr "OSM-API-URL darf nicht leer sein. Bitte OSM-API-URL eingeben."
@@ -13178,8 +13190,8 @@ msgid ""
"The current value is not a valid changeset ID. Please enter an integer value "
"> 0"
msgstr ""
-"Dieser Wert ist keine gültige Nummer für einen Änderungssatz. Bitte geben "
-"Sie eine positive Ganzzahl ein."
+"Der aktuelle Wert ist keine gültige Änderungssatzkennung. Bitte geben Sie "
+"einen Ganzzahlwert > 0 ein."
msgid "Add a new source to the list."
msgstr "Eine neue Quelle zur Liste hinzufügen."
@@ -13193,8 +13205,8 @@ msgstr "Ausgewählte Quelle aus der Liste entfernen."
msgid ""
"The current value is not a valid OSM ID. Please enter an integer value > 0"
msgstr ""
-"Der aktuelle Wert ist keine gültige OSM-ID. Bitte einen Ganzzahlwert > 1 "
-"eingeben"
+"Der aktuelle Wert ist keine gültige OSM-Kennung. Bitte geben Sie einen "
+"Ganzzahlwert > 0 ein."
msgid "false: the property is explicitly switched off"
msgstr "falsch: Diese Eigenschaft wurde explizit ausgeschaltet"
@@ -13254,8 +13266,8 @@ msgstr ""
msgid ""
"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
msgstr ""
-"Die Linie mit der externen ID ''{0}'' enthält einen nicht vorhandenen Punkt "
-"mit externer ID ''{1}''."
+"Die Linie mit der externen Kennung ''{0}'' enthält einen nicht vorhandenen "
+"Punkt mit der externen Kennung ''{1}''."
msgid "Deleted node {0} is part of way {1}"
msgstr "Gelöschter Punkt {0} ist Teil der Linie {1}"
@@ -13271,8 +13283,8 @@ msgid ""
"Relation with external id ''{0}'' refers to a missing primitive with "
"external id ''{1}''."
msgstr ""
-"Die Relation mit externer ID ''{0}'' verweist auf ein fehlendes Objekt mit "
-"externer ID ''{1}''."
+"Die Relation mit der externen Kennung ''{0}'' verweist auf ein fehlendes "
+"Objekt mit der externen Kennung ''{1}''."
msgid "Deleted member {0} is used by relation {1}"
msgstr "Gelöschtes Element {0} wird in der Relation {1} verwendet"
@@ -13442,8 +13454,8 @@ msgid ""
"Note: GPL is not compatible with the OSM license. Do not upload GPL licensed "
"tracks."
msgstr ""
-"Achtung: Die GPL ist nicht konform zur OSM-Lizenz. Keine GPS-Spuren, welche "
-"unter der GPL stehen, hochladen."
+"Anmerkung: Die GPL ist nicht kompatibel mit der OSM-Lizenz. Laden Sie keine "
+"GPL-lizenzierten Spuren hoch."
msgid "GPS track description"
msgstr "Beschreibung der GPS-Spur"
@@ -13506,7 +13518,7 @@ msgstr ""
"verfügbar sein."
msgid "Parse error: invalid document structure for GPX document."
-msgstr "Fehler: ungültige Dokumentenstruktur in GPX-Dokument"
+msgstr "Parser-Fehler: ungültige Dokumentenstruktur in GPX-Dokument."
msgid "(at line {0}, column {1})"
msgstr "(in Zeile {0}, Spalte {1})"
@@ -13546,8 +13558,8 @@ msgstr "{0} nicht verfügbar (Offline-Modus)"
msgid ""
"No primitive with id {0} in local dataset. Cannot infer primitive type."
msgstr ""
-"Im lokalem Datensatz ist kein Objekt mit der ID {0} vorhanden. Der Typ kann "
-"daher nicht bestimmt werden."
+"Im lokalem Datensatz ist kein Objekt mit der Kennung {0} vorhanden. Der Typ "
+"kann daher nicht bestimmt werden."
msgid "Fetching a package of nodes from ''{0}''"
msgstr "Mehrere Punkte von \"{0}\" abrufen"
@@ -13574,16 +13586,18 @@ msgid "Downloading OSM data..."
msgstr "OSM-Daten herunterladen …"
msgid "Fetching node with id {0} from ''{1}''"
-msgstr "Punkt mit der ID {0} von \"{1}\" abrufen"
+msgstr "Knotenpunkt mit der Kennung {0} von \"{1}\" wird abgerufen"
msgid "Fetching way with id {0} from ''{1}''"
-msgstr "Linie mit der ID {0} von \"{1}\" abrufen"
+msgstr "Linie mit der Kennung {0} von \"{1}\" wird abgerufen"
msgid "Fetching relation with id {0} from ''{1}''"
-msgstr "Relation mit der ID {0} von \"{1}\" abrufen"
+msgstr "Relation mit der Kennung {0} von \"{1}\" wird abgerufen"
msgid "Server replied with response code 404 for id {0}. Skipping."
-msgstr "ID \"{0}\" ausgelassen wegen Serverantwort Nummer 404"
+msgstr ""
+"Server gab den Antwortcode 404 für die Kennung \"{0}\" zurück. Wird "
+"übersprungen."
msgid "NMEA-0183 Files"
msgstr "NMEA-0183-Dateien"
@@ -13610,7 +13624,7 @@ msgid "NMEA import failure!"
msgstr "NMEA-Einlesen fehlgeschlagen!"
msgid "Note Files"
-msgstr "Anmerkungsdateien"
+msgstr "OSM-Hinweisdateien"
msgid "OSM API"
msgstr "OSM API"
@@ -13640,7 +13654,8 @@ msgstr ""
"wird."
msgid "Unexpected format of ID replied by the server. Got ''{0}''."
-msgstr "Unerwartetes Format der ID vom Server erhalten. Wert ist \"{0}\""
+msgstr ""
+"Unerwartetes Format der Kennung vom Server erhalten. \"{0}\" erhalten."
msgid ""
"Unexpected format of new version of modified primitive ''{0}''. Got ''{1}''."
@@ -13655,7 +13670,7 @@ msgid "Successfully opened changeset {0}"
msgstr "Änderungssatz {0} erfolgreich geöffnet"
msgid "Changeset ID > 0 expected. Got {0}."
-msgstr "Nummer > 0 für den Änderungssatz erwartet. Wert {0} erhalten."
+msgstr "Änderungssatzkennung > 0 erwartet. {0} erhalten."
msgid "Updating changeset..."
msgstr "Änderungssatz aktualisieren …"
@@ -13690,19 +13705,18 @@ msgstr ""
msgid "ID of current changeset > 0 required. Current ID is {0}."
msgstr ""
-"ID > 0 für den aktuellen Änderungssatz erwartet. Der aktuelle Wert der ID "
-"ist {0}."
+"Kennung des aktuellen Änderungssatzes > 0 erwartet. Aktuelle Kennung ist {0}."
msgid "Open changeset expected. Got closed changeset with id {0}."
msgstr ""
-"Offenen Änderungssatz erwartet, aber geschlossenen Änderungssatz mit ID {0} "
-"erhalten."
+"Offenen Änderungssatz erwartet, aber geschlossenen Änderungssatz mit Kennung "
+"{0} erhalten."
msgid "Note upload failed"
-msgstr "Noteupload fehlgeschlagen"
+msgstr "Hochladen von Hinweisen fehlgeschlagen"
msgid "Error parsing note response from server"
-msgstr "Fehler beim Parsen der Anmerkungsrückmeldung vom Server"
+msgstr "Fehler beim Parsen der Hinweisrückmeldung vom Server"
msgid "Error encoding string: {0}"
msgstr "Fehlerkodierungszeichenkette: {0}"
@@ -13876,14 +13890,14 @@ msgstr ""
"Dieses wird ignoriert."
msgid "Illegal object with ID=0."
-msgstr "Illegales Objekt mit id=0"
+msgstr "Illegales Objekt mit Kennung=0."
msgid ""
"Illegal value for attribute ''version'' on OSM primitive with ID {0}. Got "
"{1}."
msgstr ""
-"Ungültiger Wert \"{1}\" des Attributs ''version'' für das Objekt mit der ID "
-"{0}."
+"Ungültiger Wert \"{1}\" des Attributs ''version'' für das Objekt mit der "
+"Kennung {0}."
msgid ""
"Normalizing value of attribute ''version'' of element {0} to {2}, API "
@@ -13897,7 +13911,8 @@ msgid "Unknown or unsupported API version. Got {0}."
msgstr "Unbekannte oder nicht unterstützte API-Version. Erhaltener Wert: {0}"
msgid "Missing attribute ''version'' on OSM primitive with ID {0}."
-msgstr "Das Attribut ''version'' für das OSM Element mit der ID {0} fehlt"
+msgstr ""
+"Das Attribut ''version'' für das OSM-Element mit der Kennung {0} fehlt."
msgid ""
"Illegal value for attribute ''changeset'' on new object {1}. Got {0}. "
@@ -13997,13 +14012,18 @@ msgid "Starting to upload with one request per primitive ..."
msgstr "Hochladen mit einer Anfrage pro Objekt beginnen …"
msgid "{0}% ({1}/{2}), {3} left. Uploading node ''{4}'' (id: {5})"
-msgstr "{0}% ({1}/{2}), {3} verbleiben. Punkt ''{4}'' (id: {5}) hochladen"
+msgstr ""
+"{0}% ({1}/{2}), {3} verbleiben. Knotenpunkt ''{4}'' (Kennung: {5}) wird "
+"hochgeladen"
msgid "{0}% ({1}/{2}), {3} left. Uploading way ''{4}'' (id: {5})"
-msgstr "{0}% ({1}/{2}), {3} verbleiben. Linie ''{4}'' (id: {5}) hochladen"
+msgstr ""
+"{0}% ({1}/{2}), {3} verbleiben. Linie ''{4}'' (Kennung: {5}) wird hochgeladen"
msgid "{0}% ({1}/{2}), {3} left. Uploading relation ''{4}'' (id: {5})"
-msgstr "{0}% ({1}/{2}), {3} verbleiben. Relation ''{4}'' (id: {5}) hochladen"
+msgstr ""
+"{0}% ({1}/{2}), {3} verbleiben. Relation ''{4}'' (Kennung: {5}) wird "
+"hochgeladen"
msgid "Starting to upload in one request ..."
msgstr "Übertragung in einer Anfrage wird gestartet …"
@@ -14023,7 +14043,7 @@ msgid "Uploading data ..."
msgstr "Übertragung zum Server …"
msgid "Unexpected id 0 for osm primitive found"
-msgstr "Unerwartete Id 0 für OSM-Primitive gefunden."
+msgstr "Unerwartete Kennung 0 für OSM-Primitive gefunden"
msgid "OSM Server Files zip compressed"
msgstr "OSM-Server-Dateien (zip-komprimiert)"
@@ -14066,7 +14086,7 @@ msgstr "Fügt geprüfte Merkmale zu ausgewählten Objekten hinzu"
msgid "Shift+Enter: Add all tags to selected objects"
msgstr ""
-"Umschalt+Return: alle Merkmale zu den ausgewählten Objekten hinzufügen"
+"Umschalt+Eingabe: alle Merkmale zu den ausgewählten Objekten hinzufügen"
msgid "Assume"
msgstr "Annehmen"
@@ -14187,8 +14207,8 @@ msgid ""
"Remote Control has been asked to load objects (specified by their id) from "
"the API."
msgstr ""
-"Die Fernsteuerung wurde aufgefordert, Objekte (festgelegt durch ihre ID) aus "
-"der API zu laden."
+"Die Fernsteuerung wurde aufgefordert, Objekte (festgelegt durch ihre "
+"Kennung) aus der API zu laden."
msgid "Remote Control has been asked to open a local file."
msgstr "Die Fernsteuerung wurde aufgefordert, eine lokale Datei zu öffnen."
@@ -14238,7 +14258,7 @@ msgid ""
"Version ''{0}'' of meta data for gpx track layer is not supported. Expected: "
"0.1"
msgstr ""
-"Version ''{0}'' der Metadaten für die Ebene der GPS-Spuren wird nicht "
+"Version ''{0}'' der Metadaten für die Ebene der GPX-Spuren wird nicht "
"unterstützt. Erwartet: 0.1"
msgid "File name expected for layer no. {0}"
@@ -14370,8 +14390,8 @@ msgid ""
"Cannot download plugin ''{0}''. Its download link ''{1}'' is not a valid "
"URL. Skipping download."
msgstr ""
-"Das Plugin {0} kann nicht heruntergeladen werden, da der Link ''{1}'' "
-"ungültig ist. Das Herunterladen wird übersprungen."
+"Das Plugin {0} kann nicht heruntergeladen werden, da der Link ''{1}'' keine "
+"gültige URL ist. Das Herunterladen wird übersprungen."
msgid "Failed to create plugin directory ''{0}''"
msgstr "Erstellen des Plugin-Verzeichnisses ''{0}'' fehlgeschlagen"
@@ -14629,7 +14649,7 @@ msgid ""
"change it later)"
msgstr ""
"Nicht wieder fragen und Entscheidung speichern (unter Einstellungen->Plugins "
-"änderbar)"
+"später änderbar)"
msgid "Invalid jar file ''{0}''"
msgstr "Ungültige JAR-Datei ''{0}''"
@@ -15366,7 +15386,7 @@ msgid ""
"Preference with key ''{0}'' does not provide an int value for ''{1}''. Got "
"{2}. Cannot restore window geometry from preferences."
msgstr ""
-"Einstellung mit Schlüssel \"{0}\" liefert keine Ganzzahl für \"{1}\", "
+"Einstellung mit Schlüssel \"{0}\" liefert keinen Ganzzahlwert für \"{1}\", "
"sondern {2}. Fenstergröße kann nicht aus den Einstellungen geladen werden."
msgid ""
@@ -15789,22 +15809,22 @@ msgid "QA No Address"
msgstr "Qualitätssicherung keine Adressen"
msgid "Waymarked Trails: Hiking"
-msgstr "Waymarked Trails: Wanderwege"
+msgstr "Markierte Pfade: Wanderwege"
msgid "Waymarked Trails: Cycling"
-msgstr "Waymarked Trails: Radwege"
+msgstr "Markierte Pfade: Radwege"
msgid "Waymarked Trails: MTB"
-msgstr "Waymarked Trails: Mountainbike-Routen"
+msgstr "Markierte Pfade: Mountainbike-Routen"
msgid "Waymarked Trails: Skating"
-msgstr "Waymarked Trails: Inline-Skating"
+msgstr "Markierte Pfade: Inline-Skating"
msgid "Waymarked Trails: Horse Riding"
-msgstr "Waymarked Trails: Reiten"
+msgstr "Markierte Pfade: Reiten"
msgid "Waymarked Trails: Winter Sports"
-msgstr "Waymarked Trails: Wintersportpisten"
+msgstr "Markierte Pfade: Wintersportpisten"
msgid "OSM Inspector: Geometry"
msgstr "OSM Inspector: Geometry"
@@ -16786,7 +16806,7 @@ msgstr ""
"Derzeit unterstützt: TangoGPS, Garmin Trainings Center TCX."
msgid "Download your GPX tracks from openstreetmap.org"
-msgstr "Eigene GPS-Tracks von openstreetmap.org herunterladen"
+msgstr "Laden Sie Ihre GPX-Spuren von openstreetmap.org herunter"
msgid ""
"This plugin directly upload GPS Traces from current active layer in JOSM to "
@@ -16806,7 +16826,7 @@ msgstr ""
"schnell zu löschen."
msgid "Shows the elevation profile and some statistical data of a GPX track."
-msgstr "Höhenprofil und statistische Daten eines GPS-Tracks anzeigen."
+msgstr "Höhenprofil und statistische Daten einer GPX-Spur anzeigen."
msgid "Handling of French EPCIs (boundary=local_authority)"
msgstr "Bearbeitung von französischen EPCIs (boundary=local_authority)"
@@ -16846,7 +16866,7 @@ msgstr ""
"Ausbreitungsrichtungen zu bestimmen."
msgid "Allows to filter out unnecessary GPS tracks"
-msgstr "Filtert nicht benötigte GPS-Spuren"
+msgstr "Ermöglicht das Ausfiltern nicht benötigter GPS-Spuren"
msgid "Visualizes routing information as a routing graph."
msgstr "Visualisiert Routeninformationen als Routengraph."
@@ -16895,7 +16915,7 @@ msgid ""
"trackpoint info"
msgstr ""
"Aufklappende Zusatzinformationen über die aktuelle Ebene - momentan GPX-"
-"Wegpunktinformationen"
+"Spurpunktinformationen"
msgid "A helper for IRS satellite adjustment."
msgstr "Eine Hilfe zum Ausrichten von IRS-Satellitenbildern."
@@ -17187,8 +17207,8 @@ msgid ""
"georeferenced video against a GPS track, to use it for identify visible "
"objects."
msgstr ""
-"(Dieses Plugin befindet sich noch in der Entwicklung.) Verbindet und "
-"synchronisiert ein koordinatenbezogenes Video mit einem GPS Track, um "
+"(Dieses Plugin befindet sich derzeit noch in der Entwicklung!!!) Verbindet "
+"und synchronisiert ein koordinatenbezogenes Video mit einer GPS-Spur, um "
"sichtbare Objekte zu identifizieren."
msgid ""
@@ -17338,7 +17358,7 @@ msgid "track"
msgstr "Reitbahn"
msgid "clay"
-msgstr "Lehm"
+msgstr "Lehm, Asche"
msgid "dirt"
msgstr "Dreck"
@@ -17396,7 +17416,7 @@ msgstr "Bürgersteig"
msgctxt "sidewalk"
msgid "both"
-msgstr "beidseits"
+msgstr "beidseitig"
msgctxt "sidewalk"
msgid "left"
@@ -17586,9 +17606,6 @@ msgstr "Sporthalle / Fitnesscenter"
msgid "stadium"
msgstr "Stadion"
-msgid "Select sport:"
-msgstr "Sport auswählen:"
-
msgid "Sport"
msgstr "Sport"
@@ -17709,6 +17726,10 @@ msgid "rugby_union"
msgstr "Rugby Union"
msgctxt "sport"
+msgid "running"
+msgstr "Laufsport"
+
+msgctxt "sport"
msgid "shooting"
msgstr "Schießen"
@@ -17721,10 +17742,6 @@ msgid "skating"
msgstr "Eislaufen"
msgctxt "sport"
-msgid "skiing"
-msgstr "Skifahren"
-
-msgctxt "sport"
msgid "soccer"
msgstr "Fußball"
@@ -18049,6 +18066,31 @@ msgstr "Max. Gewicht (Tonnen)"
msgid "Toll"
msgstr "Maut"
+msgid "Is the water body intermittent (disappears seasonally)?"
+msgstr ""
+"Tritt die Wasserfläche zeitweise auf (verschwindet je nach Jahreszeit)?"
+
+msgid "culvert"
+msgstr "Durchlass"
+
+msgid "Water access rules:"
+msgstr "Wasserzugangsbeschränkungen"
+
+msgid "Ship"
+msgstr "kommerziell eingesetzte Schiffe"
+
+msgid "designated"
+msgstr "Bezeichnete/vorgesehene Nutzungsart"
+
+msgid "Boat"
+msgstr "Boote/Schiffe ohne kommerzielle Nutzung"
+
+msgid "Motorboat"
+msgstr "Motorboote"
+
+msgid "Canoe"
+msgstr "Boote ohne Motor oder Segel"
+
msgid "Streets"
msgstr "Straßen"
@@ -18268,9 +18310,6 @@ msgstr "Transportarteinschränkung"
msgid "official"
msgstr "Offizielle Nutzungsart"
-msgid "designated"
-msgstr "Bezeichnete/vorgesehene Nutzungsart"
-
msgid "Vehicles per type"
msgstr "Fahrzeuge nach Typ"
@@ -18325,7 +18364,7 @@ msgstr "ja"
msgctxt "overtaking"
msgid "both"
-msgstr "beidseits"
+msgstr "beidseitig"
msgctxt "overtaking"
msgid "forward"
@@ -18674,6 +18713,9 @@ msgstr "Im Uhrzeigersinn"
msgid "Pedestrian Crossing"
msgstr "Fußgängerüberweg"
+msgid "In case of traffic signals:"
+msgstr "Bei Ampel:"
+
msgid "Traffic Calming"
msgstr "Verkehrsberuhigung"
@@ -18922,15 +18964,12 @@ msgstr "Wassergraben"
msgid "Stream"
msgstr "Bach"
-msgid "Wadi"
-msgstr "Wadi"
+msgid "River"
+msgstr "Fluss"
msgid "Canal"
msgstr "Kanal"
-msgid "River"
-msgstr "Fluss"
-
msgid "Spring"
msgstr "Quelle"
@@ -18947,7 +18986,7 @@ msgid "Weir"
msgstr "Wehr"
msgid "Dam"
-msgstr "Damm"
+msgstr "Staudamm/Staumauer"
msgid "Groyne"
msgstr "Buhne"
@@ -18997,10 +19036,6 @@ msgstr "Fluss"
msgid "Salt Water"
msgstr "Salzwasser"
-msgid "Is the water body intermittent (disappears seasonally)?"
-msgstr ""
-"Tritt die Wasserfläche zeitweise auf (verschwindet je nach Jahreszeit)?"
-
msgid "Coastline"
msgstr "Küstenlinie"
@@ -19306,7 +19341,7 @@ msgid "Parking"
msgstr "Parkplatz"
msgid "Park and Ride"
-msgstr "Park and Ride"
+msgstr "Parken und Reisen"
msgid "bus"
msgstr "Bus"
@@ -19444,7 +19479,7 @@ msgid "Bio Diesel"
msgstr "Bio Diesel"
msgid "Diesel (Gas To Liquid - ultimate diesel)"
-msgstr "Diesel (teilweise synthetisch, V-Power etc.)"
+msgstr "Diesel (Verflüssigtes Gas, Ultimate Diesel)"
msgid "Diesel for Heavy Good Vehicles"
msgstr "Diesel für LKW"
@@ -19849,6 +19884,9 @@ msgstr "Bushaltestelle"
msgid "Tactile Paving"
msgstr "Blindenleitbelag"
+msgid "incorrect"
+msgstr "fehlerhaft"
+
msgid "Bus Platform"
msgstr "Bussteig"
@@ -20011,6 +20049,9 @@ msgstr "Sushi"
msgid "Microbrewery"
msgstr "Hausbrauerei"
+msgid "Outdoor seating"
+msgstr "Sitzgelegenheiten im Freien"
+
msgid "Fast Food"
msgstr "Imbiss (Fast Food)"
@@ -20606,14 +20647,14 @@ msgstr "Briefkasten"
msgid "Collection times"
msgstr "Leerungszeiten"
-msgid "11:30"
-msgstr "11:30"
+msgid "Mo-Sa 09:00"
+msgstr "Mo-Sa 09:00"
-msgid "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
-msgstr "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
+msgid "Mo-Fr 17:30; Sa 12:00"
+msgstr "Mo-Fr 17:30; Sa 12:00"
-msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; Su,PH off"
-msgstr "Mo-Fr 09:00-12:00,17:15; Sa 14:00; Su,PH off"
+msgid "Mo-Fr 15:00,19:00; Sa 15:10; Su 10:30"
+msgstr "Mo-Fr 15:00,19:00; Sa 15:10; So 10:30"
msgid "Drive through"
msgstr "Durchfahrt"
@@ -20871,6 +20912,15 @@ msgstr "Sporthalle / Fitnesscenter"
msgid "Pitch"
msgstr "Spielfeld"
+msgid "artificial_turf"
+msgstr "Kunstrasen"
+
+msgid "decoturf"
+msgstr "DecoTurf"
+
+msgid "tartan"
+msgstr "Tartanbelag"
+
msgid "Racetrack"
msgstr "Rennbahn"
@@ -20978,6 +21028,12 @@ msgstr "Langlauf"
msgid "skitour"
msgstr "Skitour"
+msgid "sled"
+msgstr "Rodelhang"
+
+msgid "sleigh"
+msgstr "motorisierte oder Hundeschlitten"
+
msgid "snow_park"
msgstr "Schneepark"
@@ -21230,6 +21286,10 @@ msgctxt "building"
msgid "construction"
msgstr "Baustelle"
+msgctxt "building"
+msgid "Levels"
+msgstr "Stockwerke"
+
msgid "Residential Building"
msgstr "Wohngebäude"
@@ -21265,6 +21325,16 @@ msgctxt "building"
msgid "farm"
msgstr "Wohngebäude auf einem Bauernhof"
+msgid "Building part"
+msgstr "Gebäudeteil"
+
+msgctxt "building"
+msgid "Skipped Levels"
+msgstr "Ausgelassene Stockwerke"
+
+msgid "Skipped height (meters)"
+msgstr "Ausgelassene Höhe (Meter)"
+
msgid "Entrance"
msgstr "Eingang"
@@ -23002,6 +23072,18 @@ msgstr "Schild"
msgid "scoria"
msgstr "Schlacke"
+msgid "Ridge"
+msgstr "Höhenrücken"
+
+msgid "A mountain or hill ridge."
+msgstr "Ein Berg oder Hügelrücken."
+
+msgid "Valley"
+msgstr "Tal"
+
+msgid "A low area between hills."
+msgstr "Ein niedriger gelegenes Gebiet zwischen Bergen."
+
msgid "Cave Entrance"
msgstr "Höhleneingang"
@@ -23014,12 +23096,6 @@ msgstr "Insel"
msgid "Islet"
msgstr "Kleine Insel"
-msgid "Ridge"
-msgstr "Höhenrücken"
-
-msgid "A mountain or hill ridge."
-msgstr "Ein Berg oder Hügelrücken."
-
msgid "Nature"
msgstr "Natur"
@@ -23047,6 +23123,37 @@ msgstr "Waldgebiet, bei dem die Holzproduktion nicht im Vordergrund steht."
msgid "Forest"
msgstr "Forst"
+msgid "Cutline"
+msgstr "Schneise"
+
+msgctxt "cutline"
+msgid "border"
+msgstr "Besitzgrenze"
+
+msgctxt "cutline"
+msgid "firebreak"
+msgstr "Brandschutz"
+
+msgctxt "cutline"
+msgid "hunting"
+msgstr "Jagd"
+
+msgctxt "cutline"
+msgid "loggingmachine"
+msgstr "Holzerntemaschine"
+
+msgctxt "cutline"
+msgid "pipeline"
+msgstr "vergrabene Pipeline"
+
+msgctxt "cutline"
+msgid "piste"
+msgstr "Skipiste ohne Weg"
+
+msgctxt "cutline"
+msgid "section"
+msgstr "Waldstückgrenze"
+
msgid "Grassland"
msgstr "Wiese/Grünland/Weideland"
@@ -23947,7 +24054,7 @@ msgid "sport without physical feature"
msgstr "Sport ohne physische Merkmale"
msgid "{0} should be on the node where {1} and {2} intersect"
-msgstr "{0} sollte auf einem Knoten liegen, wo sich {1} und {2} schneiden"
+msgstr "{0} sollte auf einem Punkt liegen, wo sich {1} und {2} schneiden"
msgid "alternative name without {0}"
msgstr "alternativer Name ohne {0}"
@@ -24014,17 +24121,20 @@ msgstr ""
msgid "Unspecific tag {0}"
msgstr "Unspezifisches Merkmal {0}"
+msgid "Definition of {0} is unclear"
+msgstr "Definition von {0} ist unklar"
+
msgid "{0} on a node. Should be used on a way."
-msgstr "{0} auf einem Knotenpunkt. Sollte auf einer Linie verwendet werden."
+msgstr "{0} auf einem Punkt. Sollte auf einer Linie 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."
+msgstr "{0} auf einem Punkt. 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 on a node."
-msgstr "{0} auf einer Linie. Sollte auf einem Knotenpunkt verwendet werden."
+msgstr "{0} auf einer Linie. Sollte auf einem Punkt verwendet werden."
msgid "{0} on a way. Should be used in a relation"
msgstr "{0} auf einer Linie. Sollte in einer Relation verwendet werden"
@@ -24066,7 +24176,7 @@ msgid "wrong crossing tag on a way"
msgstr "Falsches Übergangs-Merkmal auf einem Weg"
msgid "Unnamed unclassified highway"
-msgstr "Unbenannte klassenlose Straße"
+msgstr "Unbenannte Verbindungsstraße"
msgid "highway without a reference"
msgstr "Straße ohne Referenznummer"
@@ -24120,8 +24230,7 @@ msgid "unusual {0} specification"
msgstr "ungewöhnliche Spezifikation von {0}"
msgid "unusual train track gauge; use mm with no separator"
-msgstr ""
-"Ungewöhnliche Spurweite; Bitte Einheit mm ohne Trennzeichen verwenden"
+msgstr "Ungewöhnliche Spurweite; Einheit mm ohne Trennzeichen verwenden"
msgid "unusual incline; use percentages/degrees or up/down"
msgstr "Ungewöhnliche Steigung; Bitte Angaben in Prozent/Grad oder up/down"
@@ -24181,7 +24290,7 @@ msgid "Hide icons at low zoom"
msgstr "Symbole bei niedrigen Zoomstufen ausblenden"
msgid "Less obtrusive node symbols at low zoom"
-msgstr "Weniger aufdringliche Knotenpunktsymbole bei niedrigen Zoomstufen"
+msgstr "Weniger aufdringliche Punktsymbole bei niedrigen Zoomstufen"
msgid "Display street labels (at high zoom)"
msgstr "Straßenbezeichnungen anzeigen (bei hohem Zoom)"
@@ -24344,7 +24453,7 @@ msgid "Download Track ..."
msgstr "Spur herunterladen …"
msgid "Download GPX track from openstreetmap.org"
-msgstr "GPX Spur von openstreetmap.org herunterladen"
+msgstr "GPX-Spur von openstreetmap.org herunterladen"
msgid ""
"Error occurred while parsing gpx file {0}. Only a part of the file will be "
@@ -24392,7 +24501,7 @@ msgid "Upload Traces"
msgstr "GPS-Spuren hochladen"
msgid "Defines the visibility of your trace for other OSM users."
-msgstr "Legt die Sichtbarkeit Ihrer GPS-Spur für andere OSM-Nutzer fest."
+msgstr "Legt die Sichtbarkeit Ihrer Spur für andere OSM-Nutzer fest."
msgid "http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces"
msgstr "http://wiki.openstreetmap.org/wiki/DE:Visibility_of_GPS_traces"
@@ -24410,7 +24519,7 @@ msgid "Please enter tags about your trace."
msgstr "Bitte Stichworte für die GPS-Spur angeben."
msgid "Selected track: {0}"
-msgstr "Gewählte GPS-Spur: {0}"
+msgstr "Ausgewählte Spur: {0}"
msgid "No GPX layer selected. Cannot upload a trace."
msgstr "Keine GPX-Ebene gewählt. Kann GPS-Spur nicht hochladen."
@@ -24435,13 +24544,13 @@ msgstr ""
"Hochladen fehlgeschlagen. Der Server hat folgene Meldung zurückgegeben: "
msgid "Uploading GPX track: {0}% ({1} of {2})"
-msgstr "GPS-Spur hochladen: {0}% ({1} von {2})"
+msgstr "GPX-Spur wird hochgeladen: {0}% ({1} von {2})"
msgid "No description provided. Please provide some description."
msgstr "Keine Beschreibung angegeben. Bitte Beschreibungstext ergänzen."
msgid "Uploading GPX Track"
-msgstr "GPS-Spur hochladen"
+msgstr "GPX-Spur wird hochgeladen"
msgid "Uploads traces to openstreetmap.org"
msgstr "GPS-Spuren zu openstreetmap.org hochladen"
@@ -25477,10 +25586,10 @@ msgid "show address dialog"
msgstr "Adressdialog anzeigen"
msgid "Merge nodes with neighbors"
-msgstr "Knotenpunkte mit Nachbarn zusammenführen"
+msgstr "Punkte mit Nachbarn zusammenführen"
msgid "merge nodes"
-msgstr "Knotenpunkte zusammenführen"
+msgstr "Punkte zusammenführen"
msgid "How often thinning operation should be applied (Default {0})."
msgstr ""
@@ -26381,7 +26490,7 @@ msgid " adding {0} {1}"
msgstr " hinzufügen von {0} {1}"
msgid "Layer for editing GPX tracks"
-msgstr "Ebene zum Ändern von GPS-Spuren"
+msgstr "Ebene zum Ändern von GPX-Spuren"
msgid "Convert to GPX layer with anonymised time"
msgstr "In GPX-Ebene mit anonymer Zeit konvertieren"
@@ -26390,7 +26499,7 @@ msgid "EditGpx"
msgstr "GPX-Ändern"
msgid "edit gpx tracks"
-msgstr "GPS-Spuren ändern"
+msgstr "GPX-Spuren bearbeiten"
msgid "Import path from GPX layer"
msgstr "Linie aus GPX-Ebene importieren"
@@ -27285,7 +27394,7 @@ msgid ""
"highlight tracks"
msgstr ""
"Die Maus bewegen, um Wegpunktinformationen für die aktuelle Ebene zu zeigen. "
-"SHIFT drücken, um Spuren hervorzuheben."
+"UMSCHALT drücken, um Spuren hervorzuheben."
msgid "Delete this"
msgstr "Dies löschen"
@@ -27297,7 +27406,7 @@ msgid "km/h"
msgstr "km/h"
msgid "Track name: "
-msgstr "Spur-Name: "
+msgstr "Spurname: "
msgid "Update IRS adjustment layer"
msgstr "IRS-Anpassungsebene aktualisieren"
@@ -28769,7 +28878,7 @@ msgid ""
"Click+drag photo, shift+click to position photo, control+click to set "
"direction."
msgstr ""
-"Fotos mit gedrückter Maustaste verschieben, mit Shift+Mausklick "
+"Fotos mit gedrückter Maustaste verschieben, mit Umschalttaste+Mausklick "
"positionieren oder Aufnahmerichtung mit Steuerung+Mausklick setzen."
msgid "Please load some photos."
@@ -29279,13 +29388,13 @@ msgid "Select GPX file"
msgstr "GPX-Datei auswählen"
msgid "The GPX file contained no tracks or waypoints."
-msgstr "Die GPX-Datei enthielt keine Wegstrecken oder Wegpunkte."
+msgstr "Die GPX-Datei enthielt keine Spuren oder Wegpunkte."
msgid "Create Stops from GPX"
msgstr "Haltestellen aus GPX erstellen"
msgid "Tracks in this GPX file:"
-msgstr "Wegstrecken aus dieser GPX-Datei:"
+msgstr "Spuren in dieser GPX-Datei:"
msgid "Detach"
msgstr "Abtrennen"
@@ -29297,8 +29406,8 @@ msgid ""
"The GPX file doesn''t contain valid trackpoints. Please use a GPX file that "
"has trackpoints."
msgstr ""
-"Die GPX-Datei enthält keine gültigen Streckenpunkte. Bitte verwenden Sie "
-"eine GPX-Datei mit Streckenpunkten."
+"Die GPX-Datei enthält keine gültigen Spurpunkte. Bitte verwenden Sie eine "
+"GPX-Datei mit Spurpunkten."
msgid "GPX File Trouble"
msgstr "GPX-Dateiproblem"
@@ -29488,7 +29597,7 @@ msgid "Way without ''inner'' or ''outer'' role found"
msgstr "Linie ohne Rolle ''inner'' oder ''outer'' gefunden"
msgid "Node without ''stop'' or ''platform'' role found"
-msgstr "Knoten ohne ''stop'' oder ''platform''-Rolle gefunden"
+msgstr "Punkt ohne ''stop''- oder ''platform''-Rolle gefunden"
msgid "Way platform without ''platform'' role found"
msgstr "Plattform-Linie ohne Rolle ''platform'' gefunden"
@@ -29832,8 +29941,8 @@ msgstr "SDS-Datei speichern"
msgid "No object selected"
msgstr "Kein Objekt ausgewählt"
-msgid "SeaMap Editor"
-msgstr "SeaMap-Bearbeitung"
+msgid "SeaChart Editor"
+msgstr "Seekarten-Editor"
msgid "Seamark Inspector"
msgstr "Schifffahrtszeichen-Inspektor (Seamark Inspector)"
@@ -29917,6 +30026,9 @@ msgstr "Distanzfaktor"
msgid "Merge Nearby Nodes Threshold"
msgstr "Schwellwert zum Vereinen naheliegender Punkte"
+msgid "SeaMap Editor"
+msgstr "SeaMap-Bearbeitung"
+
msgid "AutoSave LiveData"
msgstr "Live-Daten automatisch speichern"
diff --git a/i18n/po/de_DE.po b/i18n/po/de_DE.po
index 2a248cb..fcc3722 100644
--- a/i18n/po/de_DE.po
+++ b/i18n/po/de_DE.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-04 03:32+0100\n"
+"POT-Creation-Date: 2015-04-01 03:33+0200\n"
"PO-Revision-Date: 2011-07-10 12:32+0000\n"
"Last-Translator: ralekuja <Unknown>\n"
"Language-Team: German (Germany) <de_DE at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-03-04 05:06+0000\n"
-"X-Generator: Launchpad (build 17361)\n"
+"X-Launchpad-Export-Date: 2015-04-01 05:05+0000\n"
+"X-Generator: Launchpad (build 17413)\n"
"Language: \n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -1705,9 +1705,15 @@ msgstr ""
msgid "Markers from {0}"
msgstr ""
+msgid "Download OSM Notes"
+msgstr ""
+
msgid "Downloading Notes"
msgstr ""
+msgid "Notes"
+msgstr ""
+
msgid "Download Compressed OSM Change"
msgstr ""
@@ -6118,6 +6124,9 @@ msgstr ""
msgid "Customize the style"
msgstr ""
+msgid "List of notes"
+msgstr ""
+
msgid "Add comment"
msgstr ""
@@ -7437,9 +7446,6 @@ 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 ""
@@ -15694,9 +15700,6 @@ msgstr ""
msgid "stadium"
msgstr ""
-msgid "Select sport:"
-msgstr ""
-
msgid "Sport"
msgstr ""
@@ -15817,19 +15820,19 @@ msgid "rugby_union"
msgstr ""
msgctxt "sport"
-msgid "shooting"
+msgid "running"
msgstr ""
msgctxt "sport"
-msgid "skateboard"
+msgid "shooting"
msgstr ""
msgctxt "sport"
-msgid "skating"
+msgid "skateboard"
msgstr ""
msgctxt "sport"
-msgid "skiing"
+msgid "skating"
msgstr ""
msgctxt "sport"
@@ -16157,6 +16160,30 @@ msgstr ""
msgid "Toll"
msgstr ""
+msgid "Is the water body intermittent (disappears seasonally)?"
+msgstr ""
+
+msgid "culvert"
+msgstr ""
+
+msgid "Water access rules:"
+msgstr ""
+
+msgid "Ship"
+msgstr ""
+
+msgid "designated"
+msgstr ""
+
+msgid "Boat"
+msgstr ""
+
+msgid "Motorboat"
+msgstr ""
+
+msgid "Canoe"
+msgstr ""
+
msgid "Streets"
msgstr ""
@@ -16372,9 +16399,6 @@ msgstr ""
msgid "official"
msgstr ""
-msgid "designated"
-msgstr ""
-
msgid "Vehicles per type"
msgstr ""
@@ -16764,6 +16788,9 @@ msgstr ""
msgid "Pedestrian Crossing"
msgstr ""
+msgid "In case of traffic signals:"
+msgstr ""
+
msgid "Traffic Calming"
msgstr ""
@@ -17010,15 +17037,12 @@ msgstr ""
msgid "Stream"
msgstr ""
-msgid "Wadi"
+msgid "River"
msgstr ""
msgid "Canal"
msgstr ""
-msgid "River"
-msgstr ""
-
msgid "Spring"
msgstr ""
@@ -17084,9 +17108,6 @@ msgstr ""
msgid "Salt Water"
msgstr ""
-msgid "Is the water body intermittent (disappears seasonally)?"
-msgstr ""
-
msgid "Coastline"
msgstr ""
@@ -17926,6 +17947,9 @@ msgstr ""
msgid "Tactile Paving"
msgstr ""
+msgid "incorrect"
+msgstr ""
+
msgid "Bus Platform"
msgstr ""
@@ -18088,6 +18112,9 @@ msgstr ""
msgid "Microbrewery"
msgstr ""
+msgid "Outdoor seating"
+msgstr ""
+
msgid "Fast Food"
msgstr ""
@@ -18682,13 +18709,13 @@ msgstr ""
msgid "Collection times"
msgstr ""
-msgid "11:30"
+msgid "Mo-Sa 09:00"
msgstr ""
-msgid "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
+msgid "Mo-Fr 17:30; Sa 12:00"
msgstr ""
-msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; Su,PH off"
+msgid "Mo-Fr 15:00,19:00; Sa 15:10; Su 10:30"
msgstr ""
msgid "Drive through"
@@ -18947,6 +18974,15 @@ msgstr ""
msgid "Pitch"
msgstr ""
+msgid "artificial_turf"
+msgstr ""
+
+msgid "decoturf"
+msgstr ""
+
+msgid "tartan"
+msgstr ""
+
msgid "Racetrack"
msgstr ""
@@ -19054,6 +19090,12 @@ msgstr ""
msgid "skitour"
msgstr ""
+msgid "sled"
+msgstr ""
+
+msgid "sleigh"
+msgstr ""
+
msgid "snow_park"
msgstr ""
@@ -19306,6 +19348,10 @@ msgctxt "building"
msgid "construction"
msgstr ""
+msgctxt "building"
+msgid "Levels"
+msgstr ""
+
msgid "Residential Building"
msgstr ""
@@ -19341,6 +19387,16 @@ msgctxt "building"
msgid "farm"
msgstr ""
+msgid "Building part"
+msgstr ""
+
+msgctxt "building"
+msgid "Skipped Levels"
+msgstr ""
+
+msgid "Skipped height (meters)"
+msgstr ""
+
msgid "Entrance"
msgstr ""
@@ -21074,22 +21130,28 @@ msgstr ""
msgid "scoria"
msgstr ""
-msgid "Cave Entrance"
+msgid "Ridge"
msgstr ""
-msgid "The entrance to a cave."
+msgid "A mountain or hill ridge."
msgstr ""
-msgid "Island"
+msgid "Valley"
msgstr ""
-msgid "Islet"
+msgid "A low area between hills."
msgstr ""
-msgid "Ridge"
+msgid "Cave Entrance"
msgstr ""
-msgid "A mountain or hill ridge."
+msgid "The entrance to a cave."
+msgstr ""
+
+msgid "Island"
+msgstr ""
+
+msgid "Islet"
msgstr ""
msgid "Nature"
@@ -21119,6 +21181,37 @@ msgstr ""
msgid "Forest"
msgstr ""
+msgid "Cutline"
+msgstr ""
+
+msgctxt "cutline"
+msgid "border"
+msgstr ""
+
+msgctxt "cutline"
+msgid "firebreak"
+msgstr ""
+
+msgctxt "cutline"
+msgid "hunting"
+msgstr ""
+
+msgctxt "cutline"
+msgid "loggingmachine"
+msgstr ""
+
+msgctxt "cutline"
+msgid "pipeline"
+msgstr ""
+
+msgctxt "cutline"
+msgid "piste"
+msgstr ""
+
+msgctxt "cutline"
+msgid "section"
+msgstr ""
+
msgid "Grassland"
msgstr ""
@@ -22052,6 +22145,9 @@ msgstr ""
msgid "Unspecific tag {0}"
msgstr ""
+msgid "Definition of {0} is unclear"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -27417,7 +27513,7 @@ msgstr ""
msgid "No object selected"
msgstr ""
-msgid "SeaMap Editor"
+msgid "SeaChart Editor"
msgstr ""
msgid "Seamark Inspector"
@@ -27489,6 +27585,9 @@ msgstr ""
msgid "Merge Nearby Nodes Threshold"
msgstr ""
+msgid "SeaMap Editor"
+msgstr ""
+
msgid "AutoSave LiveData"
msgstr ""
diff --git a/i18n/po/el.po b/i18n/po/el.po
index e15ae25..bf7829d 100644
--- a/i18n/po/el.po
+++ b/i18n/po/el.po
@@ -7,16 +7,16 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-04 03:32+0100\n"
-"PO-Revision-Date: 2014-10-28 23:48+0000\n"
+"POT-Creation-Date: 2015-04-01 03:33+0200\n"
+"PO-Revision-Date: 2015-03-29 17:58+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: 2015-03-04 04:42+0000\n"
-"X-Generator: Launchpad (build 17361)\n"
+"X-Launchpad-Export-Date: 2015-04-01 04:42+0000\n"
+"X-Generator: Launchpad (build 17413)\n"
"Language: el\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -285,6 +285,8 @@ msgstr "Δεν μπορει να προσδιοριστεί το κέντρο τ
msgid ""
"One or more nodes involved in this action is outside of the downloaded area."
msgstr ""
+"Ένας ή περισσότεροι κόμβοι που εμπλέκονται σε αυτή τη δράση είναι έξω από "
+"την περιοχή που κατεβάσατε."
msgid "Align Nodes in Line"
msgstr "Ευθυγράμμιση κόμβων"
@@ -739,7 +741,7 @@ 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 ""
@@ -1256,7 +1258,7 @@ msgid "Save the current data to a new file."
msgstr "Αποθήκευση τρεχόντων δεδομένων σε νέο αρχείο."
msgid "Search Notes..."
-msgstr ""
+msgstr "Αναζήτηση σημειώσεων..."
msgid "Download notes from the note search API"
msgstr ""
@@ -1265,10 +1267,10 @@ msgid "Search the OSM API for notes containing words:"
msgstr ""
msgid "Search for notes"
-msgstr ""
+msgstr "Αναζήτηση για σημειώσεις"
msgid "You must enter a search term"
-msgstr ""
+msgstr "Θα πρέπει να εισάγετε έναν όρο αναζήτησης"
msgid "Select All"
msgstr "Επιλογή Όλων"
@@ -1557,15 +1559,15 @@ msgid "Disconnect Node from Way"
msgstr "Αποσύνδεση Κόμβου από Διαδρομή"
msgid "Disconnect nodes from a way they currently belong to"
-msgstr ""
+msgstr "Αποσύνδεση κόμβων από τη διαδρομή που τώρα ανήκουν"
msgid "Select at least one node to be disconnected."
-msgstr ""
+msgstr "Επιλέξτε τουλάχιστον έναν κόμβο προς αποσύνδεση."
msgid "Selected node cannot be disconnected from anything."
msgid_plural "Selected nodes cannot be disconnected from anything."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Ο επιλεγμένος κόμβος δεν μπορεί να αποσυνδεθεί από κάπου."
+msgstr[1] "Οι επιλεγμένοι κόμβοι δεν μπορούν να αποσυνδεθούν από κάπου."
msgid ""
"The affected way would disappear after disconnecting the selected node."
@@ -1644,7 +1646,7 @@ msgstr ""
"επιπέδου ''{0}''.<br>Πρέπει πρώτα να επιλυθούν.</html>"
msgid "Upload discouraged"
-msgstr ""
+msgstr "Η αποστολή αποθαρρύνεται"
msgid ""
"You are about to upload data from the layer ''{0}''.<br /><br />Sending data "
@@ -1666,10 +1668,10 @@ msgid "Upload note changes to server"
msgstr ""
msgid "Upload notes"
-msgstr ""
+msgstr "Αποστολή σημειώσεων"
msgid "Uploading notes to server"
-msgstr ""
+msgstr "Αποστολή σημειώσεων στον διακομιστή"
msgid "Upload selection"
msgstr "Αποστολή επιλογής"
@@ -1826,8 +1828,14 @@ msgstr "Λήψη Δεδομένων GPX"
msgid "Markers from {0}"
msgstr "Σημάδια από {0}"
+msgid "Download OSM Notes"
+msgstr "Λήψη σημειώσεων OSM"
+
msgid "Downloading Notes"
-msgstr ""
+msgstr "Λήψη σημειώσεων"
+
+msgid "Notes"
+msgstr "Σημειώσεις"
msgid "Download Compressed OSM Change"
msgstr ""
@@ -1951,25 +1959,25 @@ msgid "Error during download"
msgstr "Σφάλμα κατα τη διάρκεια της λήψης"
msgid "Add a new Note"
-msgstr ""
+msgstr "Προσθήκη νέας Σημείωσης"
msgid "Add note mode"
msgstr ""
msgid "Click the location where you wish to create a new note"
-msgstr ""
+msgstr "Πατήστε στην τοποθεσία που θέλετε να προσθέσετε μια νέα σημείωση"
msgid "Create new note"
-msgstr ""
+msgstr "Δημιουργία νέας σημείωσης"
msgid "Create note"
-msgstr ""
+msgstr "Δημιουργία σημείωσης"
msgid "Enter a detailed comment to create a note"
msgstr ""
msgid "You must enter a comment to create a new note"
-msgstr ""
+msgstr "Πρέπει να εισάγετε ένα σχόλιο για να δημιουργήσετε μια νέα σημείωση"
msgid "Delete Mode"
msgstr "Κατάσταση Διαγραφής"
@@ -2864,7 +2872,7 @@ msgid "Note {0} failed: {1}"
msgstr ""
msgid "Notes failed to upload"
-msgstr ""
+msgstr "Αποτυχία αποστολής των σημειώσεων"
msgid ""
"The following are results of automatic validation. Try fixing these, but be "
@@ -3814,7 +3822,7 @@ msgid "Crossing ways"
msgstr "Διασταυρούμενες διαδρομές"
msgid "Crossing buildings"
-msgstr ""
+msgstr "Διασταυρούμενα κτήρια"
msgid "Crossing waterways"
msgstr ""
@@ -6352,6 +6360,9 @@ msgstr ""
msgid "Customize the style"
msgstr ""
+msgid "List of notes"
+msgstr "Κατάλογος σημειώσεων"
+
msgid "Add comment"
msgstr ""
@@ -6386,7 +6397,7 @@ msgid "Reopen note with message:"
msgstr ""
msgid "Sort notes"
-msgstr ""
+msgstr "Ταξινόμηση σημειώσεων"
msgid "Sort"
msgstr "Ταξινόμηση"
@@ -7699,9 +7710,6 @@ 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 ""
@@ -8921,7 +8929,7 @@ msgid "Notes layer"
msgstr ""
msgid "Total notes:"
-msgstr ""
+msgstr "Σύνολο σημειώσεων:"
msgid "Changes need uploading?"
msgstr ""
@@ -12854,7 +12862,7 @@ msgid "Contacting Server..."
msgstr "Επικοινωνία με τον Διακομιστή..."
msgid "Downloading OSM notes..."
-msgstr ""
+msgstr "Λήψη σημειώσεων OSM"
msgid "Failed to open connection to API {0}."
msgstr ""
@@ -15563,7 +15571,7 @@ msgid "Import/export OSM data in PBF format"
msgstr ""
msgid "Import PDF file and convert to ways."
-msgstr ""
+msgstr "Εισαγωγή αρχείου PDF και μετατροπή σε διαδρομές."
msgid ""
"Write gps position info to the image file header. Run this feature from the "
@@ -16086,9 +16094,6 @@ msgstr "αθλητικό κέντρο"
msgid "stadium"
msgstr "στάδιο"
-msgid "Select sport:"
-msgstr ""
-
msgid "Sport"
msgstr "Άθλημα"
@@ -16209,19 +16214,19 @@ msgid "rugby_union"
msgstr ""
msgctxt "sport"
-msgid "shooting"
+msgid "running"
msgstr ""
msgctxt "sport"
-msgid "skateboard"
+msgid "shooting"
msgstr ""
msgctxt "sport"
-msgid "skating"
+msgid "skateboard"
msgstr ""
msgctxt "sport"
-msgid "skiing"
+msgid "skating"
msgstr ""
msgctxt "sport"
@@ -16549,6 +16554,30 @@ msgstr "Μεγ. βάρος (τόνοι)"
msgid "Toll"
msgstr "Διόδια"
+msgid "Is the water body intermittent (disappears seasonally)?"
+msgstr ""
+
+msgid "culvert"
+msgstr ""
+
+msgid "Water access rules:"
+msgstr ""
+
+msgid "Ship"
+msgstr ""
+
+msgid "designated"
+msgstr "Ορισμένη"
+
+msgid "Boat"
+msgstr ""
+
+msgid "Motorboat"
+msgstr ""
+
+msgid "Canoe"
+msgstr ""
+
msgid "Streets"
msgstr "Οδοί"
@@ -16764,9 +16793,6 @@ msgstr ""
msgid "official"
msgstr ""
-msgid "designated"
-msgstr "Ορισμένη"
-
msgid "Vehicles per type"
msgstr ""
@@ -17156,6 +17182,9 @@ msgstr "δεξιόστροφα"
msgid "Pedestrian Crossing"
msgstr "Διάβαση Πεζών"
+msgid "In case of traffic signals:"
+msgstr ""
+
msgid "Traffic Calming"
msgstr ""
@@ -17402,15 +17431,12 @@ msgstr "Χαντάκι"
msgid "Stream"
msgstr "Υδατόρρευμα"
-msgid "Wadi"
-msgstr ""
+msgid "River"
+msgstr "Ποταμός"
msgid "Canal"
msgstr "Κανάλι"
-msgid "River"
-msgstr "Ποταμός"
-
msgid "Spring"
msgstr "Πηγή"
@@ -17476,9 +17502,6 @@ msgstr ""
msgid "Salt Water"
msgstr ""
-msgid "Is the water body intermittent (disappears seasonally)?"
-msgstr ""
-
msgid "Coastline"
msgstr "Ακτογραμμή"
@@ -18318,6 +18341,9 @@ msgstr "Στάση Λεωφορείου"
msgid "Tactile Paving"
msgstr ""
+msgid "incorrect"
+msgstr ""
+
msgid "Bus Platform"
msgstr ""
@@ -18480,6 +18506,9 @@ msgstr "σούσι"
msgid "Microbrewery"
msgstr ""
+msgid "Outdoor seating"
+msgstr ""
+
msgid "Fast Food"
msgstr "Fast Food"
@@ -19074,13 +19103,13 @@ msgstr "Γραμματοκιβώτιο"
msgid "Collection times"
msgstr ""
-msgid "11:30"
+msgid "Mo-Sa 09:00"
msgstr ""
-msgid "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
+msgid "Mo-Fr 17:30; Sa 12:00"
msgstr ""
-msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; Su,PH off"
+msgid "Mo-Fr 15:00,19:00; Sa 15:10; Su 10:30"
msgstr ""
msgid "Drive through"
@@ -19094,7 +19123,7 @@ msgstr "Κέρματα"
msgctxt "payment"
msgid "Notes"
-msgstr ""
+msgstr "Χαρτονομίσματα"
msgid "Telephone cards"
msgstr "Τηλεκάρτες"
@@ -19339,6 +19368,15 @@ msgstr "Αθλητικό Κέντρο"
msgid "Pitch"
msgstr ""
+msgid "artificial_turf"
+msgstr ""
+
+msgid "decoturf"
+msgstr ""
+
+msgid "tartan"
+msgstr ""
+
msgid "Racetrack"
msgstr "Πίστα"
@@ -19446,6 +19484,12 @@ msgstr ""
msgid "skitour"
msgstr ""
+msgid "sled"
+msgstr ""
+
+msgid "sleigh"
+msgstr ""
+
msgid "snow_park"
msgstr ""
@@ -19698,6 +19742,10 @@ msgctxt "building"
msgid "construction"
msgstr ""
+msgctxt "building"
+msgid "Levels"
+msgstr ""
+
msgid "Residential Building"
msgstr ""
@@ -19733,6 +19781,16 @@ msgctxt "building"
msgid "farm"
msgstr ""
+msgid "Building part"
+msgstr ""
+
+msgctxt "building"
+msgid "Skipped Levels"
+msgstr ""
+
+msgid "Skipped height (meters)"
+msgstr ""
+
msgid "Entrance"
msgstr "Είσοδος"
@@ -21466,6 +21524,18 @@ msgstr ""
msgid "scoria"
msgstr ""
+msgid "Ridge"
+msgstr ""
+
+msgid "A mountain or hill ridge."
+msgstr ""
+
+msgid "Valley"
+msgstr ""
+
+msgid "A low area between hills."
+msgstr ""
+
msgid "Cave Entrance"
msgstr "Είσοδος σπηλαίου"
@@ -21478,12 +21548,6 @@ msgstr "Νησί"
msgid "Islet"
msgstr "Νησίδα"
-msgid "Ridge"
-msgstr ""
-
-msgid "A mountain or hill ridge."
-msgstr ""
-
msgid "Nature"
msgstr "Φύση"
@@ -21511,6 +21575,37 @@ msgstr ""
msgid "Forest"
msgstr "Δάσος"
+msgid "Cutline"
+msgstr ""
+
+msgctxt "cutline"
+msgid "border"
+msgstr ""
+
+msgctxt "cutline"
+msgid "firebreak"
+msgstr ""
+
+msgctxt "cutline"
+msgid "hunting"
+msgstr ""
+
+msgctxt "cutline"
+msgid "loggingmachine"
+msgstr ""
+
+msgctxt "cutline"
+msgid "pipeline"
+msgstr ""
+
+msgctxt "cutline"
+msgid "piste"
+msgstr ""
+
+msgctxt "cutline"
+msgid "section"
+msgstr ""
+
msgid "Grassland"
msgstr ""
@@ -22444,6 +22539,9 @@ msgstr ""
msgid "Unspecific tag {0}"
msgstr ""
+msgid "Definition of {0} is unclear"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -23766,7 +23864,7 @@ msgid "Street Name:"
msgstr "Όνομα Οδού:"
msgid "Big buildings mode"
-msgstr ""
+msgstr "Λειτουργία μεγάλων κτηρίων"
msgid "Rotate crosshair"
msgstr ""
@@ -23775,7 +23873,7 @@ msgid "Advanced settings"
msgstr "Προχωρημένες ρυθμίσεις"
msgid "Buildings tags:"
-msgstr ""
+msgstr "Ετικέτες κτηρίων:"
msgid "Cannot place building outside of the world."
msgstr ""
@@ -23784,7 +23882,7 @@ msgid "Create building"
msgstr ""
msgid "Set buildings size"
-msgstr ""
+msgstr "Ορισμός μεγέθους κτηρίων"
msgid "Use Address dialog"
msgstr ""
@@ -23796,7 +23894,7 @@ msgid "Use address nodes under buildings"
msgstr ""
msgid "Buildings width:"
-msgstr ""
+msgstr "Πλάτος κτηρίων:"
msgid "Length step:"
msgstr ""
@@ -23805,7 +23903,7 @@ msgid "Advanced..."
msgstr "Για προχωρημένους…"
msgid "Draw buildings"
-msgstr ""
+msgstr "Σχεδίαση κτηρίων"
msgid "Point on the corner of the building to start drawing"
msgstr ""
@@ -24063,7 +24161,7 @@ msgid "Sea, rivers, swimming pools."
msgstr ""
msgid "Buildings, covers, underground constructions."
-msgstr ""
+msgstr "Κτήρια, υπόστεγα, υπόγειες κατασκευές."
msgid "Symbols like cristian cross."
msgstr ""
@@ -26713,13 +26811,13 @@ msgid " "
msgstr ""
msgid "Import PDF file"
-msgstr ""
+msgstr "Εισαγωγή αρχείου PDF"
msgid "Import PDF file."
-msgstr ""
+msgstr "Εισαγωγή αρχείου PDF."
msgid "Import PDF"
-msgstr ""
+msgstr "Εισαγωγή PDF"
msgid " {0} objects so far"
msgstr ""
@@ -27839,7 +27937,7 @@ msgstr ""
msgid "No object selected"
msgstr ""
-msgid "SeaMap Editor"
+msgid "SeaChart Editor"
msgstr ""
msgid "Seamark Inspector"
@@ -27911,6 +28009,9 @@ msgstr ""
msgid "Merge Nearby Nodes Threshold"
msgstr ""
+msgid "SeaMap Editor"
+msgstr ""
+
msgid "AutoSave LiveData"
msgstr ""
diff --git a/i18n/po/en_AU.po b/i18n/po/en_AU.po
index 3f13ab3..d7ed8a3 100644
--- a/i18n/po/en_AU.po
+++ b/i18n/po/en_AU.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-04 03:32+0100\n"
+"POT-Creation-Date: 2015-04-01 03:33+0200\n"
"PO-Revision-Date: 2013-03-30 14:03+0000\n"
"Last-Translator: Dirk Stöcker <launchpad at dstoecker.de>\n"
"Language-Team: English (Australia) <en_AU at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-03-04 05:04+0000\n"
-"X-Generator: Launchpad (build 17361)\n"
+"X-Launchpad-Export-Date: 2015-04-01 05:03+0000\n"
+"X-Generator: Launchpad (build 17413)\n"
"Language: \n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -1737,9 +1737,15 @@ msgstr "Downloaded GPX Data"
msgid "Markers from {0}"
msgstr "Markers from {0}"
+msgid "Download OSM Notes"
+msgstr ""
+
msgid "Downloading Notes"
msgstr ""
+msgid "Notes"
+msgstr "Notes"
+
msgid "Download Compressed OSM Change"
msgstr ""
@@ -6250,6 +6256,9 @@ msgstr ""
msgid "Customize the style"
msgstr ""
+msgid "List of notes"
+msgstr ""
+
msgid "Add comment"
msgstr ""
@@ -7626,9 +7635,6 @@ 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 ""
@@ -16317,9 +16323,6 @@ msgstr "sports_centre"
msgid "stadium"
msgstr "stadium"
-msgid "Select sport:"
-msgstr ""
-
msgid "Sport"
msgstr "Sport"
@@ -16440,19 +16443,19 @@ msgid "rugby_union"
msgstr ""
msgctxt "sport"
-msgid "shooting"
+msgid "running"
msgstr ""
msgctxt "sport"
-msgid "skateboard"
+msgid "shooting"
msgstr ""
msgctxt "sport"
-msgid "skating"
+msgid "skateboard"
msgstr ""
msgctxt "sport"
-msgid "skiing"
+msgid "skating"
msgstr ""
msgctxt "sport"
@@ -16780,6 +16783,30 @@ msgstr "Max. weight (tonnes)"
msgid "Toll"
msgstr "Toll"
+msgid "Is the water body intermittent (disappears seasonally)?"
+msgstr ""
+
+msgid "culvert"
+msgstr ""
+
+msgid "Water access rules:"
+msgstr ""
+
+msgid "Ship"
+msgstr ""
+
+msgid "designated"
+msgstr "designated"
+
+msgid "Boat"
+msgstr ""
+
+msgid "Motorboat"
+msgstr ""
+
+msgid "Canoe"
+msgstr ""
+
msgid "Streets"
msgstr "Streets"
@@ -16995,9 +17022,6 @@ msgstr ""
msgid "official"
msgstr "official"
-msgid "designated"
-msgstr "designated"
-
msgid "Vehicles per type"
msgstr ""
@@ -17387,6 +17411,9 @@ msgstr "clockwise"
msgid "Pedestrian Crossing"
msgstr "Pedestrian Crossing"
+msgid "In case of traffic signals:"
+msgstr ""
+
msgid "Traffic Calming"
msgstr "Traffic Calming"
@@ -17633,15 +17660,12 @@ msgstr "Ditch"
msgid "Stream"
msgstr "Stream"
-msgid "Wadi"
-msgstr ""
+msgid "River"
+msgstr "River"
msgid "Canal"
msgstr "Canal"
-msgid "River"
-msgstr "River"
-
msgid "Spring"
msgstr "Spring"
@@ -17707,9 +17731,6 @@ msgstr ""
msgid "Salt Water"
msgstr ""
-msgid "Is the water body intermittent (disappears seasonally)?"
-msgstr ""
-
msgid "Coastline"
msgstr "Coastline"
@@ -18549,6 +18570,9 @@ msgstr "Bus Stop"
msgid "Tactile Paving"
msgstr "Tactile Paving"
+msgid "incorrect"
+msgstr ""
+
msgid "Bus Platform"
msgstr "Bus Platform"
@@ -18711,6 +18735,9 @@ msgstr "sushi"
msgid "Microbrewery"
msgstr ""
+msgid "Outdoor seating"
+msgstr ""
+
msgid "Fast Food"
msgstr "Fast Food"
@@ -19305,13 +19332,13 @@ msgstr "Post Box"
msgid "Collection times"
msgstr ""
-msgid "11:30"
+msgid "Mo-Sa 09:00"
msgstr ""
-msgid "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
+msgid "Mo-Fr 17:30; Sa 12:00"
msgstr ""
-msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; Su,PH off"
+msgid "Mo-Fr 15:00,19:00; Sa 15:10; Su 10:30"
msgstr ""
msgid "Drive through"
@@ -19570,6 +19597,15 @@ msgstr "Sports Centre"
msgid "Pitch"
msgstr "Pitch"
+msgid "artificial_turf"
+msgstr ""
+
+msgid "decoturf"
+msgstr ""
+
+msgid "tartan"
+msgstr ""
+
msgid "Racetrack"
msgstr "Racetrack"
@@ -19677,6 +19713,12 @@ msgstr "nordic"
msgid "skitour"
msgstr ""
+msgid "sled"
+msgstr ""
+
+msgid "sleigh"
+msgstr ""
+
msgid "snow_park"
msgstr "snow_park"
@@ -19929,6 +19971,10 @@ msgctxt "building"
msgid "construction"
msgstr ""
+msgctxt "building"
+msgid "Levels"
+msgstr ""
+
msgid "Residential Building"
msgstr ""
@@ -19964,6 +20010,16 @@ msgctxt "building"
msgid "farm"
msgstr ""
+msgid "Building part"
+msgstr ""
+
+msgctxt "building"
+msgid "Skipped Levels"
+msgstr ""
+
+msgid "Skipped height (meters)"
+msgstr ""
+
msgid "Entrance"
msgstr "Entrance"
@@ -21697,6 +21753,18 @@ msgstr ""
msgid "scoria"
msgstr ""
+msgid "Ridge"
+msgstr ""
+
+msgid "A mountain or hill ridge."
+msgstr ""
+
+msgid "Valley"
+msgstr ""
+
+msgid "A low area between hills."
+msgstr ""
+
msgid "Cave Entrance"
msgstr "Cave Entrance"
@@ -21709,12 +21777,6 @@ msgstr "Island"
msgid "Islet"
msgstr "Islet"
-msgid "Ridge"
-msgstr ""
-
-msgid "A mountain or hill ridge."
-msgstr ""
-
msgid "Nature"
msgstr ""
@@ -21742,6 +21804,37 @@ msgstr ""
msgid "Forest"
msgstr "Forest"
+msgid "Cutline"
+msgstr ""
+
+msgctxt "cutline"
+msgid "border"
+msgstr ""
+
+msgctxt "cutline"
+msgid "firebreak"
+msgstr ""
+
+msgctxt "cutline"
+msgid "hunting"
+msgstr ""
+
+msgctxt "cutline"
+msgid "loggingmachine"
+msgstr ""
+
+msgctxt "cutline"
+msgid "pipeline"
+msgstr ""
+
+msgctxt "cutline"
+msgid "piste"
+msgstr ""
+
+msgctxt "cutline"
+msgid "section"
+msgstr ""
+
msgid "Grassland"
msgstr ""
@@ -22675,6 +22768,9 @@ msgstr ""
msgid "Unspecific tag {0}"
msgstr ""
+msgid "Definition of {0} is unclear"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -28111,7 +28207,7 @@ msgstr ""
msgid "No object selected"
msgstr ""
-msgid "SeaMap Editor"
+msgid "SeaChart Editor"
msgstr ""
msgid "Seamark Inspector"
@@ -28183,6 +28279,9 @@ msgstr ""
msgid "Merge Nearby Nodes Threshold"
msgstr ""
+msgid "SeaMap Editor"
+msgstr ""
+
msgid "AutoSave LiveData"
msgstr "AutoSave LiveData"
diff --git a/i18n/po/en_CA.po b/i18n/po/en_CA.po
index 3333a9f..acfbd5b 100644
--- a/i18n/po/en_CA.po
+++ b/i18n/po/en_CA.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-04 03:32+0100\n"
+"POT-Creation-Date: 2015-04-01 03:33+0200\n"
"PO-Revision-Date: 2010-09-24 17:25+0000\n"
"Last-Translator: Johann Beda <Unknown>\n"
"Language-Team: English (Canada) <en_CA at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-03-04 05:06+0000\n"
-"X-Generator: Launchpad (build 17361)\n"
+"X-Launchpad-Export-Date: 2015-04-01 05:05+0000\n"
+"X-Generator: Launchpad (build 17413)\n"
"Language: \n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -1702,9 +1702,15 @@ msgstr ""
msgid "Markers from {0}"
msgstr ""
+msgid "Download OSM Notes"
+msgstr ""
+
msgid "Downloading Notes"
msgstr ""
+msgid "Notes"
+msgstr ""
+
msgid "Download Compressed OSM Change"
msgstr ""
@@ -6115,6 +6121,9 @@ msgstr ""
msgid "Customize the style"
msgstr ""
+msgid "List of notes"
+msgstr ""
+
msgid "Add comment"
msgstr ""
@@ -7434,9 +7443,6 @@ 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 ""
@@ -15688,9 +15694,6 @@ msgstr ""
msgid "stadium"
msgstr ""
-msgid "Select sport:"
-msgstr ""
-
msgid "Sport"
msgstr ""
@@ -15811,19 +15814,19 @@ msgid "rugby_union"
msgstr ""
msgctxt "sport"
-msgid "shooting"
+msgid "running"
msgstr ""
msgctxt "sport"
-msgid "skateboard"
+msgid "shooting"
msgstr ""
msgctxt "sport"
-msgid "skating"
+msgid "skateboard"
msgstr ""
msgctxt "sport"
-msgid "skiing"
+msgid "skating"
msgstr ""
msgctxt "sport"
@@ -16151,6 +16154,30 @@ msgstr ""
msgid "Toll"
msgstr ""
+msgid "Is the water body intermittent (disappears seasonally)?"
+msgstr ""
+
+msgid "culvert"
+msgstr ""
+
+msgid "Water access rules:"
+msgstr ""
+
+msgid "Ship"
+msgstr ""
+
+msgid "designated"
+msgstr ""
+
+msgid "Boat"
+msgstr ""
+
+msgid "Motorboat"
+msgstr ""
+
+msgid "Canoe"
+msgstr ""
+
msgid "Streets"
msgstr ""
@@ -16366,9 +16393,6 @@ msgstr ""
msgid "official"
msgstr ""
-msgid "designated"
-msgstr ""
-
msgid "Vehicles per type"
msgstr ""
@@ -16758,6 +16782,9 @@ msgstr ""
msgid "Pedestrian Crossing"
msgstr ""
+msgid "In case of traffic signals:"
+msgstr ""
+
msgid "Traffic Calming"
msgstr ""
@@ -17004,15 +17031,12 @@ msgstr ""
msgid "Stream"
msgstr ""
-msgid "Wadi"
+msgid "River"
msgstr ""
msgid "Canal"
msgstr ""
-msgid "River"
-msgstr ""
-
msgid "Spring"
msgstr ""
@@ -17078,9 +17102,6 @@ msgstr ""
msgid "Salt Water"
msgstr ""
-msgid "Is the water body intermittent (disappears seasonally)?"
-msgstr ""
-
msgid "Coastline"
msgstr ""
@@ -17920,6 +17941,9 @@ msgstr ""
msgid "Tactile Paving"
msgstr ""
+msgid "incorrect"
+msgstr ""
+
msgid "Bus Platform"
msgstr ""
@@ -18082,6 +18106,9 @@ msgstr ""
msgid "Microbrewery"
msgstr ""
+msgid "Outdoor seating"
+msgstr ""
+
msgid "Fast Food"
msgstr ""
@@ -18676,13 +18703,13 @@ msgstr ""
msgid "Collection times"
msgstr ""
-msgid "11:30"
+msgid "Mo-Sa 09:00"
msgstr ""
-msgid "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
+msgid "Mo-Fr 17:30; Sa 12:00"
msgstr ""
-msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; Su,PH off"
+msgid "Mo-Fr 15:00,19:00; Sa 15:10; Su 10:30"
msgstr ""
msgid "Drive through"
@@ -18941,6 +18968,15 @@ msgstr ""
msgid "Pitch"
msgstr ""
+msgid "artificial_turf"
+msgstr ""
+
+msgid "decoturf"
+msgstr ""
+
+msgid "tartan"
+msgstr ""
+
msgid "Racetrack"
msgstr ""
@@ -19048,6 +19084,12 @@ msgstr ""
msgid "skitour"
msgstr ""
+msgid "sled"
+msgstr ""
+
+msgid "sleigh"
+msgstr ""
+
msgid "snow_park"
msgstr ""
@@ -19300,6 +19342,10 @@ msgctxt "building"
msgid "construction"
msgstr ""
+msgctxt "building"
+msgid "Levels"
+msgstr ""
+
msgid "Residential Building"
msgstr ""
@@ -19335,6 +19381,16 @@ msgctxt "building"
msgid "farm"
msgstr ""
+msgid "Building part"
+msgstr ""
+
+msgctxt "building"
+msgid "Skipped Levels"
+msgstr ""
+
+msgid "Skipped height (meters)"
+msgstr ""
+
msgid "Entrance"
msgstr ""
@@ -21068,22 +21124,28 @@ msgstr ""
msgid "scoria"
msgstr ""
-msgid "Cave Entrance"
+msgid "Ridge"
msgstr ""
-msgid "The entrance to a cave."
+msgid "A mountain or hill ridge."
msgstr ""
-msgid "Island"
+msgid "Valley"
msgstr ""
-msgid "Islet"
+msgid "A low area between hills."
msgstr ""
-msgid "Ridge"
+msgid "Cave Entrance"
msgstr ""
-msgid "A mountain or hill ridge."
+msgid "The entrance to a cave."
+msgstr ""
+
+msgid "Island"
+msgstr ""
+
+msgid "Islet"
msgstr ""
msgid "Nature"
@@ -21113,6 +21175,37 @@ msgstr ""
msgid "Forest"
msgstr ""
+msgid "Cutline"
+msgstr ""
+
+msgctxt "cutline"
+msgid "border"
+msgstr ""
+
+msgctxt "cutline"
+msgid "firebreak"
+msgstr ""
+
+msgctxt "cutline"
+msgid "hunting"
+msgstr ""
+
+msgctxt "cutline"
+msgid "loggingmachine"
+msgstr ""
+
+msgctxt "cutline"
+msgid "pipeline"
+msgstr ""
+
+msgctxt "cutline"
+msgid "piste"
+msgstr ""
+
+msgctxt "cutline"
+msgid "section"
+msgstr ""
+
msgid "Grassland"
msgstr ""
@@ -22046,6 +22139,9 @@ msgstr ""
msgid "Unspecific tag {0}"
msgstr ""
+msgid "Definition of {0} is unclear"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -27407,7 +27503,7 @@ msgstr ""
msgid "No object selected"
msgstr ""
-msgid "SeaMap Editor"
+msgid "SeaChart Editor"
msgstr ""
msgid "Seamark Inspector"
@@ -27479,6 +27575,9 @@ msgstr ""
msgid "Merge Nearby Nodes Threshold"
msgstr ""
+msgid "SeaMap Editor"
+msgstr ""
+
msgid "AutoSave LiveData"
msgstr ""
diff --git a/i18n/po/en_GB.po b/i18n/po/en_GB.po
index 9bca039..a3a7238 100644
--- a/i18n/po/en_GB.po
+++ b/i18n/po/en_GB.po
@@ -10,16 +10,16 @@ msgid ""
msgstr ""
"Project-Id-Version: JOSM\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-04 03:32+0100\n"
-"PO-Revision-Date: 2015-03-02 12:05+0000\n"
-"Last-Translator: Dee-earlsoft <Unknown>\n"
+"POT-Creation-Date: 2015-04-01 03:33+0200\n"
+"PO-Revision-Date: 2015-03-17 02:18+0000\n"
+"Last-Translator: Robert Ancell <robert.ancell at canonical.com>\n"
"Language-Team: German <josm-dev at openstreetmap.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-03-04 05:04+0000\n"
-"X-Generator: Launchpad (build 17361)\n"
+"X-Launchpad-Export-Date: 2015-04-01 05:03+0000\n"
+"X-Generator: Launchpad (build 17413)\n"
"Language: de\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -1819,9 +1819,15 @@ msgstr "Downloaded GPX Data"
msgid "Markers from {0}"
msgstr "Markers from {0}"
+msgid "Download OSM Notes"
+msgstr "Download OSM Notes"
+
msgid "Downloading Notes"
msgstr "Downloading Notes"
+msgid "Notes"
+msgstr "Notes"
+
msgid "Download Compressed OSM Change"
msgstr "Download Compressed OSM Change"
@@ -4815,25 +4821,25 @@ msgid "options provided as Java system properties"
msgstr "options provided as Java system properties"
msgid "/PATH/TO/JOSM/PREF "
-msgstr ""
+msgstr "/PATH/TO/JOSM/PREF "
msgid "Set the preferences directory"
msgstr "Set the preferences directory"
msgid "/PATH/TO/JOSM/USERDATA"
-msgstr ""
+msgstr "/PATH/TO/JOSM/USERDATA"
msgid "Set the user data directory"
msgstr "Set the user data directory"
msgid "/PATH/TO/JOSM/CACHE "
-msgstr ""
+msgstr "/PATH/TO/JOSM/CACHE "
msgid "Set the cache directory"
msgstr "Set the cache directory"
msgid "/PATH/TO/JOSM/HOMEDIR "
-msgstr ""
+msgstr "/PATH/TO/JOSM/HOMEDIR "
msgid ""
"Relocate all 3 directories to homedir. Cache directory will be in "
@@ -6548,6 +6554,9 @@ msgstr "Style settings"
msgid "Customize the style"
msgstr "Customise the style"
+msgid "List of notes"
+msgstr "List of notes"
+
msgid "Add comment"
msgstr "Add comment"
@@ -7964,9 +7973,6 @@ 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 "Select to download notes in the selected download area."
@@ -15380,197 +15386,201 @@ msgid "SPW(allonie) 2009 aerial imagery"
msgstr "SPW(allonie) 2009 aerial imagery"
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 Roads"
msgid "Canvec"
-msgstr ""
+msgstr "Canvec"
msgid "British Columbia Mosaic"
-msgstr ""
+msgstr "British Columbia Mosaic"
msgid "Kelowna 2012"
-msgstr ""
+msgstr "Kelowna 2012"
msgid "Kelowna Roads overlay"
-msgstr ""
+msgstr "Kelowna Roads overlay"
msgid "Czech CUZK:KM"
-msgstr ""
+msgstr "Czech CUZK:KM"
msgid "Czech RUIAN budovy"
-msgstr ""
+msgstr "Czech RUIAN budovy"
msgid "Czech RUIAN parcely"
-msgstr ""
+msgstr "Czech RUIAN parcely"
msgid "Czech pLPIS"
-msgstr ""
+msgstr "Czech pLPIS"
msgid "Fugro (Denmark)"
-msgstr ""
+msgstr "Fugro (Denmark)"
msgid "Geodatastyrelsen (Denmark)"
-msgstr ""
+msgstr "Geodatastyrelsen (Denmark)"
msgid "Stevns (Denmark)"
-msgstr ""
+msgstr "Stevns (Denmark)"
msgid "Vejmidte (Denmark)"
-msgstr ""
+msgstr "Vejmidte (Denmark)"
msgid "Estonia Basemap (Maaamet)"
-msgstr ""
+msgstr "Estonia Basemap (Maaamet)"
msgid "Estonia Ortho (Maaamet)"
-msgstr ""
+msgstr "Estonia Ortho (Maaamet)"
msgid "Estonia Hillshade (Maaamet)"
-msgstr ""
+msgstr "Estonia Hillshade (Maaamet)"
msgid "Estonia Cadastre (Maaamet)"
-msgstr ""
+msgstr "Estonia Cadastre (Maaamet)"
msgid "Estonia Forestry (Maaamet)"
-msgstr ""
+msgstr "Estonia Forestry (Maaamet)"
msgid "Bordeaux - 2012"
-msgstr ""
+msgstr "Bordeaux - 2012"
msgid "Cadastre"
msgstr "Cadastre"
msgid "CRAIG - Auvergne 2013 - 25 cm"
-msgstr ""
+msgstr "CRAIG - Auvergne 2013 - 25 cm"
msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
-msgstr ""
+msgstr "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
msgid "GrandNancy Orthophotographie 2012"
-msgstr ""
+msgstr "GrandNancy Orthophotographie 2012"
msgid "Géobretagne - Brest 2010 - 10 cm"
-msgstr ""
+msgstr "Géobretagne - Brest 2010 - 10 cm"
msgid "Géobretagne - Morbihan 2010"
-msgstr ""
+msgstr "Géobretagne - Morbihan 2010"
msgid "Géolittoral - Orthophotos 2000"
-msgstr ""
+msgstr "Géolittoral - Orthophotos 2000"
msgid "Géolittoral V2 - Orthophotos 2010-2012"
-msgstr ""
+msgstr "Géolittoral V2 - Orthophotos 2010-2012"
msgid "Géolittoral - Sentiers"
-msgstr ""
+msgstr "Géolittoral - Sentiers"
msgid "Grand Lyon - Orthophotographie 2012 - 10cm"
-msgstr ""
+msgstr "Grand Lyon - Orthophotographie 2012 - 10cm"
msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
-msgstr ""
+msgstr "Loire-Atlantique - Orthophotos 2012 - 20 cm"
msgid "SIG L-R - Languedoc-Roussillon 2012 - 20 cm"
-msgstr ""
+msgstr "SIG L-R - Languedoc-Roussillon 2012 - 20 cm"
msgid "Toulouse - Orthophotoplan 2013"
-msgstr ""
+msgstr "Toulouse - Orthophotoplan 2013"
msgid "Toulouse - Orthophotoplan 2011"
-msgstr ""
+msgstr "Toulouse - Orthophotoplan 2011"
msgid "Toulouse - Orthophotoplan 2007"
-msgstr ""
+msgstr "Toulouse - Orthophotoplan 2007"
msgid "Tours - Orthophotos 2013"
-msgstr ""
+msgstr "Tours - Orthophotos 2013"
msgid "Tours - Orthophotos 2008-2010"
-msgstr ""
+msgstr "Tours - Orthophotos 2008-2010"
msgid "Tours - Orthophotos 2008"
-msgstr ""
+msgstr "Tours - Orthophotos 2008"
msgid ""
"Vercors - Réserve naturelle des Hauts-Plateaux du Vercors - Orthophotos 1999 "
"- 1 m"
msgstr ""
+"Vercors - Réserve naturelle des Hauts-Plateaux du Vercors - Orthophotos 1999 "
+"- 1 m"
msgid "Hike & Bike"
-msgstr ""
+msgstr "Hike & Bike"
msgid "OpenStreetMap (Sorbian Language)"
-msgstr ""
+msgstr "OpenStreetMap (Sorbian Language)"
msgid "Hamburg (40 cm)"
-msgstr ""
+msgstr "Hamburg (40 cm)"
msgid "Hamburg (20 cm)"
-msgstr ""
+msgstr "Hamburg (20 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 Luftbild (2013 6,25 cm)"
-msgstr ""
+msgstr "Erlangen Luftbild (2013 6,25 cm)"
msgid "Erlangen 2011 Luftbild (5,0 cm)"
-msgstr ""
+msgstr "Erlangen 2011 Luftbild (5,0 cm)"
msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
-msgstr ""
+msgstr "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
-msgstr ""
+msgstr "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
msgid "Physical DE - Physische Karte (Naturräume)"
-msgstr ""
+msgstr "Physical DE - Physische Karte (Naturräume)"
msgid "Physical DE:Harz - Physische Karte (Naturräume)"
-msgstr ""
+msgstr "Physical DE:Harz - Physische Karte (Naturräume)"
msgid ""
"Physical DE:Harz - Overlay für Bing (z.B. Deckkraft zw. 20 und 50 Prozent "
"nutzen)"
msgstr ""
+"Physical DE:Harz - Overlay für Bing (z.B. Deckkraft zw. 20 und 50 Prozent "
+"nutzen)"
msgid "Maps4BW (LGL-BW, www.lgl-bw.de)"
-msgstr ""
+msgstr "Maps4BW (LGL-BW, www.lgl-bw.de)"
msgid "NRW-Atlas: Automatisierte Liegenschaftskarte (Vektor)"
-msgstr ""
+msgstr "NRW-Atlas: Automatisierte Liegenschaftskarte (Vektor)"
msgid "NRW-Atlas: Automatisierte Liegenschaftskarte (Raster)"
-msgstr ""
+msgstr "NRW-Atlas: Automatisierte Liegenschaftskarte (Raster)"
msgid "NRW-Atlas: Digitale GrundKarte 1:5000"
-msgstr ""
+msgstr "NRW-Atlas: Digitale GrundKarte 1:5000"
msgid "NRW-Atlas: Luftbilder"
-msgstr ""
+msgstr "NRW-Atlas: Luftbilder"
msgid "NRW-Atlas: Topographische Karte 1:10000"
-msgstr ""
+msgstr "NRW-Atlas: Topographische Karte 1:10000"
msgid "Metropole Ruhr: Luftbilder (10 cm)"
-msgstr ""
+msgstr "Metropole Ruhr: Luftbilder (10 cm)"
msgid "Drone Imagery (Haiti)"
-msgstr ""
+msgstr "Drone Imagery (Haiti)"
msgid "Drone Imagery 2014 (Haiti)"
msgstr ""
@@ -17053,9 +17063,6 @@ msgstr "sports_centre"
msgid "stadium"
msgstr "stadium"
-msgid "Select sport:"
-msgstr "Select sport:"
-
msgid "Sport"
msgstr "Sport"
@@ -17176,6 +17183,10 @@ msgid "rugby_union"
msgstr "rugby_union"
msgctxt "sport"
+msgid "running"
+msgstr ""
+
+msgctxt "sport"
msgid "shooting"
msgstr "shooting"
@@ -17188,10 +17199,6 @@ msgid "skating"
msgstr "skating"
msgctxt "sport"
-msgid "skiing"
-msgstr "skiing"
-
-msgctxt "sport"
msgid "soccer"
msgstr "soccer"
@@ -17516,6 +17523,30 @@ msgstr "Max. weight (tonnes)"
msgid "Toll"
msgstr "Toll"
+msgid "Is the water body intermittent (disappears seasonally)?"
+msgstr "Is the water body intermittent (disappears seasonally)?"
+
+msgid "culvert"
+msgstr ""
+
+msgid "Water access rules:"
+msgstr ""
+
+msgid "Ship"
+msgstr ""
+
+msgid "designated"
+msgstr "designated"
+
+msgid "Boat"
+msgstr ""
+
+msgid "Motorboat"
+msgstr ""
+
+msgid "Canoe"
+msgstr ""
+
msgid "Streets"
msgstr "Streets"
@@ -17731,9 +17762,6 @@ msgstr "Transport mode restrictions"
msgid "official"
msgstr "official"
-msgid "designated"
-msgstr "designated"
-
msgid "Vehicles per type"
msgstr "Vehicles per type"
@@ -18134,6 +18162,9 @@ msgstr "clockwise"
msgid "Pedestrian Crossing"
msgstr "Pedestrian Crossing"
+msgid "In case of traffic signals:"
+msgstr ""
+
msgid "Traffic Calming"
msgstr "Traffic Calming"
@@ -18380,15 +18411,12 @@ msgstr "Ditch"
msgid "Stream"
msgstr "Stream"
-msgid "Wadi"
-msgstr ""
+msgid "River"
+msgstr "River"
msgid "Canal"
msgstr "Canal"
-msgid "River"
-msgstr "River"
-
msgid "Spring"
msgstr "Spring"
@@ -18456,9 +18484,6 @@ msgstr "river"
msgid "Salt Water"
msgstr "Salt Water"
-msgid "Is the water body intermittent (disappears seasonally)?"
-msgstr "Is the water body intermittent (disappears seasonally)?"
-
msgid "Coastline"
msgstr "Coastline"
@@ -19302,6 +19327,9 @@ msgstr "Bus Stop"
msgid "Tactile Paving"
msgstr "Tactile Paving"
+msgid "incorrect"
+msgstr ""
+
msgid "Bus Platform"
msgstr "Bus Platform"
@@ -19464,6 +19492,9 @@ msgstr "sushi"
msgid "Microbrewery"
msgstr "Microbrewery"
+msgid "Outdoor seating"
+msgstr ""
+
msgid "Fast Food"
msgstr "Fast Food"
@@ -20059,14 +20090,14 @@ msgstr "Post Box"
msgid "Collection times"
msgstr "Collection times"
-msgid "11:30"
-msgstr "11:30"
+msgid "Mo-Sa 09:00"
+msgstr ""
-msgid "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
-msgstr "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
+msgid "Mo-Fr 17:30; Sa 12:00"
+msgstr ""
-msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; Su,PH off"
-msgstr "Mo-Fr 09:00-12:00,17:15; Sa 14:00; Su,PH off"
+msgid "Mo-Fr 15:00,19:00; Sa 15:10; Su 10:30"
+msgstr ""
msgid "Drive through"
msgstr "Drive through"
@@ -20324,6 +20355,15 @@ msgstr "Sports Centre"
msgid "Pitch"
msgstr "Pitch"
+msgid "artificial_turf"
+msgstr ""
+
+msgid "decoturf"
+msgstr ""
+
+msgid "tartan"
+msgstr ""
+
msgid "Racetrack"
msgstr "Racetrack"
@@ -20431,6 +20471,12 @@ msgstr "nordic"
msgid "skitour"
msgstr "skitour"
+msgid "sled"
+msgstr ""
+
+msgid "sleigh"
+msgstr ""
+
msgid "snow_park"
msgstr "snow_park"
@@ -20683,6 +20729,10 @@ msgctxt "building"
msgid "construction"
msgstr ""
+msgctxt "building"
+msgid "Levels"
+msgstr ""
+
msgid "Residential Building"
msgstr ""
@@ -20718,6 +20768,16 @@ msgctxt "building"
msgid "farm"
msgstr ""
+msgid "Building part"
+msgstr ""
+
+msgctxt "building"
+msgid "Skipped Levels"
+msgstr ""
+
+msgid "Skipped height (meters)"
+msgstr ""
+
msgid "Entrance"
msgstr "Entrance"
@@ -22453,6 +22513,18 @@ msgstr ""
msgid "scoria"
msgstr ""
+msgid "Ridge"
+msgstr ""
+
+msgid "A mountain or hill ridge."
+msgstr ""
+
+msgid "Valley"
+msgstr ""
+
+msgid "A low area between hills."
+msgstr ""
+
msgid "Cave Entrance"
msgstr "Cave Entrance"
@@ -22465,12 +22537,6 @@ msgstr "Island"
msgid "Islet"
msgstr "Islet"
-msgid "Ridge"
-msgstr ""
-
-msgid "A mountain or hill ridge."
-msgstr ""
-
msgid "Nature"
msgstr ""
@@ -22498,6 +22564,37 @@ msgstr ""
msgid "Forest"
msgstr "Forest"
+msgid "Cutline"
+msgstr ""
+
+msgctxt "cutline"
+msgid "border"
+msgstr ""
+
+msgctxt "cutline"
+msgid "firebreak"
+msgstr ""
+
+msgctxt "cutline"
+msgid "hunting"
+msgstr ""
+
+msgctxt "cutline"
+msgid "loggingmachine"
+msgstr ""
+
+msgctxt "cutline"
+msgid "pipeline"
+msgstr ""
+
+msgctxt "cutline"
+msgid "piste"
+msgstr ""
+
+msgctxt "cutline"
+msgid "section"
+msgstr ""
+
msgid "Grassland"
msgstr ""
@@ -23435,6 +23532,9 @@ msgstr ""
msgid "Unspecific tag {0}"
msgstr ""
+msgid "Definition of {0} is unclear"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -28968,7 +29068,7 @@ msgstr ""
msgid "No object selected"
msgstr ""
-msgid "SeaMap Editor"
+msgid "SeaChart Editor"
msgstr ""
msgid "Seamark Inspector"
@@ -29052,6 +29152,9 @@ msgstr ""
msgid "Merge Nearby Nodes Threshold"
msgstr ""
+msgid "SeaMap Editor"
+msgstr ""
+
msgid "AutoSave LiveData"
msgstr "AutoSave LiveData"
@@ -30808,13 +30911,13 @@ msgid "Waypoint search"
msgstr ""
msgid "Search after waypoint. Click and move the map view to the waypoint."
-msgstr ""
+msgstr "Search after waypoint. Click and move the map view to the waypoint."
msgid "Way Select"
msgstr "Way Select"
msgid "Add names from Wikipedia"
-msgstr ""
+msgstr "Add names from Wikipedia"
msgid ""
"Fetches interwiki links from Wikipedia in order to add several name tags"
@@ -30824,12 +30927,14 @@ msgid ""
"Copies the {0} template to the system clipboard instantiated with the "
"coordinates of the first selected node"
msgstr ""
+"Copies the {0} template to the system clipboard instantiated with the "
+"coordinates of the first selected node"
msgid "Copy {0} template"
-msgstr ""
+msgstr "Copy {0} template"
msgid "Fetch Wikipedia articles with coordinates"
-msgstr ""
+msgstr "Fetch Wikipedia articles with coordinates"
msgid ""
"Double click on item to search for object with article name (and center "
@@ -30839,66 +30944,68 @@ msgstr ""
"coordinates)"
msgid "Available via WIWOSM server"
-msgstr ""
+msgstr "Available via WIWOSM server"
msgid "Available in local dataset"
-msgstr ""
+msgstr "Available in local dataset"
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 ""
+msgstr "Fetches all coordinates from Wikipedia in the current view"
msgid "coordinates"
-msgstr ""
+msgstr "coordinates"
msgid "Category"
-msgstr ""
+msgstr "Category"
msgid "Fetches a list of all Wikipedia articles of a category"
-msgstr ""
+msgstr "Fetches a list of all Wikipedia articles of a category"
msgid "Enter the Wikipedia category"
-msgstr ""
+msgstr "Enter the Wikipedia category"
msgid "Clipboard"
msgstr "Clipboard"
msgid "Pastes Wikipedia articles from the system clipboard"
-msgstr ""
+msgstr "Pastes Wikipedia articles from the system clipboard"
msgid "clipboard"
msgstr "clipboard"
msgid "Open Article"
-msgstr ""
+msgstr "Open Article"
msgid "Opens the Wikipedia article of the selected item in a browser"
-msgstr ""
+msgstr "Opens the Wikipedia article of the selected item in a browser"
msgid "Sets the default language for the Wikipedia articles"
-msgstr ""
+msgstr "Sets the default language for the Wikipedia articles"
msgid "Enter the Wikipedia language"
-msgstr ""
+msgstr "Enter the Wikipedia language"
msgid ""
"Adds a ''wikipedia'' tag corresponding to this article to the selected "
"objects"
msgstr ""
+"Adds a ''wikipedia'' tag corresponding to this article to the selected "
+"objects"
msgid "The Ultimate WMS Super-speed Turbo Challenge II"
-msgstr ""
+msgstr "The Ultimate WMS Super-speed Turbo Challenge II"
msgid "Go driving"
-msgstr ""
+msgstr "Go driving"
msgid "Drive a race car on this layer"
-msgstr ""
+msgstr "Drive a race car on this layer"
diff --git a/i18n/po/eo.po b/i18n/po/eo.po
index 74f5a2c..06047be 100644
--- a/i18n/po/eo.po
+++ b/i18n/po/eo.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-04 03:32+0100\n"
+"POT-Creation-Date: 2015-04-01 03:33+0200\n"
"PO-Revision-Date: 2012-10-03 21:33+0000\n"
"Last-Translator: Michael Moroni <michael.moroni at openmailbox.org>\n"
"Language-Team: Esperanto <eo at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-03-04 04:39+0000\n"
-"X-Generator: Launchpad (build 17361)\n"
+"X-Launchpad-Export-Date: 2015-04-01 04:38+0000\n"
+"X-Generator: Launchpad (build 17413)\n"
"Language: eo\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -1698,9 +1698,15 @@ msgstr ""
msgid "Markers from {0}"
msgstr ""
+msgid "Download OSM Notes"
+msgstr ""
+
msgid "Downloading Notes"
msgstr ""
+msgid "Notes"
+msgstr "Biletoj"
+
msgid "Download Compressed OSM Change"
msgstr ""
@@ -6111,6 +6117,9 @@ msgstr ""
msgid "Customize the style"
msgstr ""
+msgid "List of notes"
+msgstr ""
+
msgid "Add comment"
msgstr ""
@@ -7430,9 +7439,6 @@ 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 ""
@@ -15688,9 +15694,6 @@ msgstr ""
msgid "stadium"
msgstr ""
-msgid "Select sport:"
-msgstr ""
-
msgid "Sport"
msgstr "Sporto"
@@ -15811,19 +15814,19 @@ msgid "rugby_union"
msgstr ""
msgctxt "sport"
-msgid "shooting"
+msgid "running"
msgstr ""
msgctxt "sport"
-msgid "skateboard"
+msgid "shooting"
msgstr ""
msgctxt "sport"
-msgid "skating"
+msgid "skateboard"
msgstr ""
msgctxt "sport"
-msgid "skiing"
+msgid "skating"
msgstr ""
msgctxt "sport"
@@ -16151,6 +16154,30 @@ msgstr ""
msgid "Toll"
msgstr ""
+msgid "Is the water body intermittent (disappears seasonally)?"
+msgstr ""
+
+msgid "culvert"
+msgstr ""
+
+msgid "Water access rules:"
+msgstr ""
+
+msgid "Ship"
+msgstr ""
+
+msgid "designated"
+msgstr ""
+
+msgid "Boat"
+msgstr ""
+
+msgid "Motorboat"
+msgstr ""
+
+msgid "Canoe"
+msgstr ""
+
msgid "Streets"
msgstr ""
@@ -16366,9 +16393,6 @@ msgstr ""
msgid "official"
msgstr ""
-msgid "designated"
-msgstr ""
-
msgid "Vehicles per type"
msgstr ""
@@ -16758,6 +16782,9 @@ msgstr ""
msgid "Pedestrian Crossing"
msgstr ""
+msgid "In case of traffic signals:"
+msgstr ""
+
msgid "Traffic Calming"
msgstr ""
@@ -17004,15 +17031,12 @@ msgstr ""
msgid "Stream"
msgstr ""
-msgid "Wadi"
-msgstr ""
+msgid "River"
+msgstr "Rivero"
msgid "Canal"
msgstr ""
-msgid "River"
-msgstr "Rivero"
-
msgid "Spring"
msgstr ""
@@ -17078,9 +17102,6 @@ msgstr ""
msgid "Salt Water"
msgstr ""
-msgid "Is the water body intermittent (disappears seasonally)?"
-msgstr ""
-
msgid "Coastline"
msgstr ""
@@ -17920,6 +17941,9 @@ msgstr ""
msgid "Tactile Paving"
msgstr ""
+msgid "incorrect"
+msgstr ""
+
msgid "Bus Platform"
msgstr ""
@@ -18082,6 +18106,9 @@ msgstr ""
msgid "Microbrewery"
msgstr ""
+msgid "Outdoor seating"
+msgstr ""
+
msgid "Fast Food"
msgstr ""
@@ -18676,13 +18703,13 @@ msgstr ""
msgid "Collection times"
msgstr ""
-msgid "11:30"
+msgid "Mo-Sa 09:00"
msgstr ""
-msgid "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
+msgid "Mo-Fr 17:30; Sa 12:00"
msgstr ""
-msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; Su,PH off"
+msgid "Mo-Fr 15:00,19:00; Sa 15:10; Su 10:30"
msgstr ""
msgid "Drive through"
@@ -18941,6 +18968,15 @@ msgstr ""
msgid "Pitch"
msgstr ""
+msgid "artificial_turf"
+msgstr ""
+
+msgid "decoturf"
+msgstr ""
+
+msgid "tartan"
+msgstr ""
+
msgid "Racetrack"
msgstr ""
@@ -19048,6 +19084,12 @@ msgstr ""
msgid "skitour"
msgstr ""
+msgid "sled"
+msgstr ""
+
+msgid "sleigh"
+msgstr ""
+
msgid "snow_park"
msgstr ""
@@ -19300,6 +19342,10 @@ msgctxt "building"
msgid "construction"
msgstr ""
+msgctxt "building"
+msgid "Levels"
+msgstr ""
+
msgid "Residential Building"
msgstr ""
@@ -19335,6 +19381,16 @@ msgctxt "building"
msgid "farm"
msgstr ""
+msgid "Building part"
+msgstr ""
+
+msgctxt "building"
+msgid "Skipped Levels"
+msgstr ""
+
+msgid "Skipped height (meters)"
+msgstr ""
+
msgid "Entrance"
msgstr "Enirejo"
@@ -21068,22 +21124,28 @@ msgstr ""
msgid "scoria"
msgstr ""
-msgid "Cave Entrance"
+msgid "Ridge"
msgstr ""
-msgid "The entrance to a cave."
+msgid "A mountain or hill ridge."
msgstr ""
-msgid "Island"
+msgid "Valley"
msgstr ""
-msgid "Islet"
+msgid "A low area between hills."
msgstr ""
-msgid "Ridge"
+msgid "Cave Entrance"
msgstr ""
-msgid "A mountain or hill ridge."
+msgid "The entrance to a cave."
+msgstr ""
+
+msgid "Island"
+msgstr ""
+
+msgid "Islet"
msgstr ""
msgid "Nature"
@@ -21113,6 +21175,37 @@ msgstr ""
msgid "Forest"
msgstr "Arbaro"
+msgid "Cutline"
+msgstr ""
+
+msgctxt "cutline"
+msgid "border"
+msgstr ""
+
+msgctxt "cutline"
+msgid "firebreak"
+msgstr ""
+
+msgctxt "cutline"
+msgid "hunting"
+msgstr ""
+
+msgctxt "cutline"
+msgid "loggingmachine"
+msgstr ""
+
+msgctxt "cutline"
+msgid "pipeline"
+msgstr ""
+
+msgctxt "cutline"
+msgid "piste"
+msgstr ""
+
+msgctxt "cutline"
+msgid "section"
+msgstr ""
+
msgid "Grassland"
msgstr ""
@@ -22046,6 +22139,9 @@ msgstr ""
msgid "Unspecific tag {0}"
msgstr ""
+msgid "Definition of {0} is unclear"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -27407,7 +27503,7 @@ msgstr ""
msgid "No object selected"
msgstr ""
-msgid "SeaMap Editor"
+msgid "SeaChart Editor"
msgstr ""
msgid "Seamark Inspector"
@@ -27479,6 +27575,9 @@ msgstr ""
msgid "Merge Nearby Nodes Threshold"
msgstr ""
+msgid "SeaMap Editor"
+msgstr ""
+
msgid "AutoSave LiveData"
msgstr ""
diff --git a/i18n/po/es.po b/i18n/po/es.po
index 298a0a6..d855b71 100644
--- a/i18n/po/es.po
+++ b/i18n/po/es.po
@@ -7,16 +7,16 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-04 03:32+0100\n"
-"PO-Revision-Date: 2015-03-03 18:33+0000\n"
-"Last-Translator: mor <Unknown>\n"
+"POT-Creation-Date: 2015-04-01 03:33+0200\n"
+"PO-Revision-Date: 2015-03-25 11:36+0000\n"
+"Last-Translator: pertile <leopoldofederico at gmail.com>\n"
"Language-Team: Spanish <es at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-03-04 04:58+0000\n"
-"X-Generator: Launchpad (build 17361)\n"
+"X-Launchpad-Export-Date: 2015-04-01 04:57+0000\n"
+"X-Generator: Launchpad (build 17413)\n"
"Language: es\n"
"X-Language: es_ES\n"
"X-Source-Language: C\n"
@@ -1282,7 +1282,7 @@ msgid "Download notes from the note search API"
msgstr "Descargar notas desde la API de búsqueda de notas"
msgid "Search the OSM API for notes containing words:"
-msgstr ""
+msgstr "Buscar en la API de OSM notas que contengan las siguientes palabras:"
msgid "Search for notes"
msgstr "Buscar por notas"
@@ -1854,9 +1854,15 @@ msgstr "Datos GPX descargados"
msgid "Markers from {0}"
msgstr "Marcadores desde {0}"
+msgid "Download OSM Notes"
+msgstr "Descargar Notas de OSM:"
+
msgid "Downloading Notes"
msgstr "Descargando notas"
+msgid "Notes"
+msgstr "Notas"
+
msgid "Download Compressed OSM Change"
msgstr "Descargar cambios a OSM comprimidos"
@@ -4228,6 +4234,8 @@ msgid ""
"With the currently used mappaint style the style for inner way equals the "
"multipolygon style"
msgstr ""
+"Con el estilo de semiología cartográfica utilizado actualmente el estilo "
+"para las vías interiores es igual al estilo del multipolígono"
msgid "Style for outer way mismatches"
msgstr "Estilo para vía externa no compatible"
@@ -4236,6 +4244,8 @@ msgid ""
"With the currently used mappaint style(s) the style for outer way mismatches "
"polygon"
msgstr ""
+"Con el estilo de semiología cartográfica utilizado actualmente el estilo "
+"para las vías exteriores no coincide con el polígono"
msgid "Area style on outer way"
msgstr "Estilo de área en una vía exterior"
@@ -6740,6 +6750,9 @@ msgstr "Ajustes de estilo"
msgid "Customize the style"
msgstr "Personalizar el estilo"
+msgid "List of notes"
+msgstr "Lista de notas"
+
msgid "Add comment"
msgstr "Añadir comentario"
@@ -8210,9 +8223,6 @@ 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 "Notas"
-
msgid "Select to download notes in the selected download area."
msgstr ""
"Seleccione esta opción para descargar notas en el área de descarga "
@@ -17309,43 +17319,44 @@ msgid "excellent"
msgstr "excelente"
msgid "Thin Rollers: rollerblade, skateboard"
-msgstr ""
+msgstr "Rollers delgados: rollerblade, patineta"
msgid "good"
msgstr "buena"
msgid "Thin Wheels: racing bike"
-msgstr ""
+msgstr "Ruedas delgadas: bicicletas de carrera"
msgid "intermediate"
msgstr "intermedia"
msgid "Wheels: city bike, wheelchair, scooter"
-msgstr ""
+msgstr "Ruedas: bicicletas de ciudad, sillas de rueda, scooter"
msgid "bad"
msgstr "mala"
msgid "Robust Wheels: trekking bike, car, rickshaw"
-msgstr ""
+msgstr "Ruedas robustas: bicicletas de montaña, autos, carros"
msgid "very_bad"
msgstr "muy mala"
msgid "High Clearance: light duty off-road vehicle"
msgstr ""
+"Altura elevada y tracción trasera: vehículos livianos para fuera de pista"
msgid "horrible"
msgstr "pésima"
msgid "Off-Road: heavy duty off-road vehicle"
-msgstr ""
+msgstr "Off-Road: vehículos de tareas pesadas para fuera de pista"
msgid "very_horrible"
msgstr "muy pésima"
msgid "Specialized off-road: tractor, ATV"
-msgstr ""
+msgstr "Fuera de pista especializados: tractores, todo terreno"
msgid "impassable"
msgstr "instransitable"
@@ -17424,7 +17435,7 @@ msgid "Width (meters)"
msgstr "Anchura (metros)"
msgid "Sidewalk"
-msgstr "anden"
+msgstr "Arcén"
msgctxt "sidewalk"
msgid "both"
@@ -17619,9 +17630,6 @@ msgstr "Polideportivo"
msgid "stadium"
msgstr "Estadio"
-msgid "Select sport:"
-msgstr "Seleccionar deporte"
-
msgid "Sport"
msgstr "Deporte"
@@ -17742,6 +17750,10 @@ msgid "rugby_union"
msgstr "rugby unión"
msgctxt "sport"
+msgid "running"
+msgstr "correr (running)"
+
+msgctxt "sport"
msgid "shooting"
msgstr "tiro"
@@ -17754,10 +17766,6 @@ msgid "skating"
msgstr "patinaje"
msgctxt "sport"
-msgid "skiing"
-msgstr "Esquí"
-
-msgctxt "sport"
msgid "soccer"
msgstr "Fútbol"
@@ -17958,7 +17966,7 @@ msgid "mormon"
msgstr "mormón"
msgid "old_catholic"
-msgstr ""
+msgstr "católica antigua"
msgid "orthodox"
msgstr "ortodoxo"
@@ -18082,6 +18090,30 @@ msgstr "Peso máximo (t)"
msgid "Toll"
msgstr "Peaje"
+msgid "Is the water body intermittent (disappears seasonally)?"
+msgstr "¿Es la masa de agua intermitente (desaparece estacionalmente)?"
+
+msgid "culvert"
+msgstr "alcantarilla"
+
+msgid "Water access rules:"
+msgstr "Reglas de acceso al agua:"
+
+msgid "Ship"
+msgstr "Barco"
+
+msgid "designated"
+msgstr "autorizado"
+
+msgid "Boat"
+msgstr "Bote"
+
+msgid "Motorboat"
+msgstr "Lancha"
+
+msgid "Canoe"
+msgstr "Canoa"
+
msgid "Streets"
msgstr "Calles/Carreteras"
@@ -18292,6 +18324,8 @@ msgid ""
"Some road types already imply some access restrictions which should not be "
"set again."
msgstr ""
+"Algunos tipos de carretera implican restricciones que no deberían volver a "
+"fijarse."
msgid "No exit (cul-de-sac)"
msgstr "Sin salida (cul-de-sac)"
@@ -18302,9 +18336,6 @@ msgstr "Restricciones en el modo de transporte"
msgid "official"
msgstr "oficial"
-msgid "designated"
-msgstr "autorizado"
-
msgid "Vehicles per type"
msgstr "Vehículos por tipo"
@@ -18598,16 +18629,16 @@ msgid "manual"
msgstr "manual"
msgid "Handrail"
-msgstr ""
+msgstr "Baranda"
msgid "Left handrail"
-msgstr ""
+msgstr "Baranda a la izquierda"
msgid "Center handrail"
-msgstr ""
+msgstr "Baranda central"
msgid "Right handrail"
-msgstr ""
+msgstr "Barada a la derecha"
msgid "Waypoints"
msgstr "Nodos de Vía"
@@ -18708,6 +18739,9 @@ msgstr "agujas del reloj"
msgid "Pedestrian Crossing"
msgstr "Paso de peatones"
+msgid "In case of traffic signals:"
+msgstr "En el caso de semáforos:"
+
msgid "Traffic Calming"
msgstr "Calmado de tráfico"
@@ -18957,15 +18991,12 @@ msgstr "Acequia"
msgid "Stream"
msgstr "Arroyo o riachuelo"
-msgid "Wadi"
-msgstr "Uadi"
+msgid "River"
+msgstr "Río"
msgid "Canal"
msgstr "Canal"
-msgid "River"
-msgstr "Río"
-
msgid "Spring"
msgstr "Fuente o manantial"
@@ -19033,9 +19064,6 @@ msgstr "río"
msgid "Salt Water"
msgstr "Agua salada"
-msgid "Is the water body intermittent (disappears seasonally)?"
-msgstr "¿Es la masa de agua intermitente (desaparece estacionalmente)?"
-
msgid "Coastline"
msgstr "Línea de costa"
@@ -19522,7 +19550,7 @@ msgid "1/50 mix (mofa/moped)"
msgstr "mezcla 1/50 (ciclomotor)"
msgid "Fuel cards:"
-msgstr ""
+msgstr "Tarjetas de combustible:"
msgid "DKV"
msgstr "DKV"
@@ -19662,7 +19690,7 @@ msgid "Public Bicycle Repair Station"
msgstr "Estación Pública de Reparación de Bicicletas"
msgid "Chain tool"
-msgstr ""
+msgstr "Herramienta de cadena"
msgid "Public Transport"
msgstr "Transporte público"
@@ -19886,6 +19914,9 @@ msgstr "Parada de autobús"
msgid "Tactile Paving"
msgstr "Pavimento táctil"
+msgid "incorrect"
+msgstr "incorrecto"
+
msgid "Bus Platform"
msgstr "Andén de autobús"
@@ -19917,7 +19948,7 @@ msgid "Apron"
msgstr "Plataforma de estacionamiento"
msgid "Plane Parking Position"
-msgstr ""
+msgstr "Posición de estacionamiento de aviones"
msgid "Hangar"
msgstr "Hangar"
@@ -20048,6 +20079,9 @@ msgstr "sushi"
msgid "Microbrewery"
msgstr "Cervecería artesanal"
+msgid "Outdoor seating"
+msgstr "Mesas al aire libre"
+
msgid "Fast Food"
msgstr "Establecimiento de comida rápida"
@@ -20512,7 +20546,7 @@ msgid "Police"
msgstr "Policía"
msgid "Ranger Station"
-msgstr ""
+msgstr "Estación de guardaparque"
msgid "Fire Station"
msgstr "Parque de bomberos"
@@ -20645,14 +20679,14 @@ msgstr "Buzón de correos"
msgid "Collection times"
msgstr "Horarios de recolección"
-msgid "11:30"
-msgstr "11:30"
+msgid "Mo-Sa 09:00"
+msgstr "Mo-Sa 09:00"
-msgid "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
-msgstr "Lu-Vi 15:00,17:45,19:00,23:00; Sá 15:10; Do 10:30,23:00"
+msgid "Mo-Fr 17:30; Sa 12:00"
+msgstr "Mo-Fr 17:30; Sa 12:00"
-msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; Su,PH off"
-msgstr "Lu-Vi 09:00-12:00,17:15; Sá 14:00; Do,feriados cerrado"
+msgid "Mo-Fr 15:00,19:00; Sa 15:10; Su 10:30"
+msgstr "Mo-Fr 15:00,19:00; Sa 15:10; Su 10:30"
msgid "Drive through"
msgstr "Utilizable desde el volante"
@@ -20910,6 +20944,15 @@ msgstr "Polideportivo"
msgid "Pitch"
msgstr "Cancha de juego"
+msgid "artificial_turf"
+msgstr "Césped sintético"
+
+msgid "decoturf"
+msgstr "Decoturf (tipo de pista de tenis dura)"
+
+msgid "tartan"
+msgstr "Tartan (pista para competiciones de atletismo)"
+
msgid "Racetrack"
msgstr "Pista de carreras"
@@ -21017,6 +21060,12 @@ msgstr "nórdico"
msgid "skitour"
msgstr "esquí de travesía"
+msgid "sled"
+msgstr "Trineo"
+
+msgid "sleigh"
+msgstr "Sleigh (trineo para pasajeros)"
+
msgid "snow_park"
msgstr "parque de snowboard"
@@ -21269,6 +21318,10 @@ msgctxt "building"
msgid "construction"
msgstr "en construcción"
+msgctxt "building"
+msgid "Levels"
+msgstr "Niveles"
+
msgid "Residential Building"
msgstr "Edificio de viviendas"
@@ -21304,6 +21357,16 @@ msgctxt "building"
msgid "farm"
msgstr "granja"
+msgid "Building part"
+msgstr "Parte de edificio"
+
+msgctxt "building"
+msgid "Skipped Levels"
+msgstr "Niveles salteados"
+
+msgid "Skipped height (meters)"
+msgstr "Altura de los niveles salteados (metros)"
+
msgid "Entrance"
msgstr "Entrada"
@@ -22330,7 +22393,7 @@ msgid "Incomplete tower"
msgstr "Torre incompleta"
msgid "Location transition"
-msgstr ""
+msgstr "Transición de ubicación"
msgid "Pole"
msgstr "Poste"
@@ -22467,7 +22530,7 @@ msgstr "Lugar de culto"
msgctxt "building"
msgid "wayside_shrine"
-msgstr ""
+msgstr "Altar u oratorio sobre el camino"
msgid "Boundary Stone"
msgstr "Mojón"
@@ -22872,7 +22935,7 @@ msgid "Quick (au)"
msgstr "Quick (au)"
msgid "Cryptocurrencies"
-msgstr ""
+msgstr "Criptomoneda"
msgid "Bitcoin"
msgstr "Bitcoin"
@@ -23045,6 +23108,18 @@ msgstr "Volcán en escudo"
msgid "scoria"
msgstr "escoria"
+msgid "Ridge"
+msgstr "dorsal centroocéanica"
+
+msgid "A mountain or hill ridge."
+msgstr "Una montaña o cerro en la dorsal centrooceánica"
+
+msgid "Valley"
+msgstr "Valle"
+
+msgid "A low area between hills."
+msgstr "Un área baja entre cerros."
+
msgid "Cave Entrance"
msgstr "Entrada de cueva"
@@ -23057,12 +23132,6 @@ msgstr "Isla"
msgid "Islet"
msgstr "Islote"
-msgid "Ridge"
-msgstr "dorsal centroocéanica"
-
-msgid "A mountain or hill ridge."
-msgstr "Una montaña o cerro en la dorsal centrooceánica"
-
msgid "Nature"
msgstr "Natural"
@@ -23090,6 +23159,37 @@ msgstr "Área forestada donde la producción de leña no domina el uso."
msgid "Forest"
msgstr "Plantación forestal"
+msgid "Cutline"
+msgstr "Líneas de corte (interrupción lineal en un bosque)"
+
+msgctxt "cutline"
+msgid "border"
+msgstr "Límite"
+
+msgctxt "cutline"
+msgid "firebreak"
+msgstr "Cortafuegos"
+
+msgctxt "cutline"
+msgid "hunting"
+msgstr "Caza"
+
+msgctxt "cutline"
+msgid "loggingmachine"
+msgstr "Desmonte a máquina"
+
+msgctxt "cutline"
+msgid "pipeline"
+msgstr "tubería"
+
+msgctxt "cutline"
+msgid "piste"
+msgstr "Pista"
+
+msgctxt "cutline"
+msgid "section"
+msgstr "sección"
+
msgid "Grassland"
msgstr "Pradera"
@@ -23179,6 +23279,8 @@ msgid ""
"A notable rock or group of rocks, with at least one of them firmly attached "
"to the underlying bedrock."
msgstr ""
+"Una roca considerable o grupo de rocas, con al menos una de ellas firmemente "
+"adherida a la base rocosa subyacente."
msgid "Tourism attraction"
msgstr "Atracción turística"
@@ -24059,6 +24161,9 @@ msgstr ""
msgid "Unspecific tag {0}"
msgstr "Etiqueta sin especificar {0}"
+msgid "Definition of {0} is unclear"
+msgstr "La definición de {0} no es clara"
+
msgid "{0} on a node. Should be used on a way."
msgstr "{0} sobre un nodo. Debería ser utilizado sobre una vía."
@@ -24229,7 +24334,7 @@ msgid "Display street labels (at high zoom)"
msgstr "Mostrar etiquetas de calles (en niveles altos de acercamiento)"
msgid "Use alternative turn restriction icon set"
-msgstr ""
+msgstr "Utilizar el conjunto de íconos alternativos de restricción de giro"
msgid "OSM Export"
msgstr "Exportar a OSM"
@@ -29843,7 +29948,7 @@ msgid "Open a preferences dialog for SDS."
msgstr "Abrir un cuadro de diálogo de preferencias para SDS."
msgid "Separate Data Store"
-msgstr ""
+msgstr "Almacén de datos independiente"
msgid "Configures access to the Separate Data Store."
msgstr "Configurar acceso al Separate Data Store."
@@ -29909,8 +30014,8 @@ msgstr "Guardar archivo SDS"
msgid "No object selected"
msgstr "No se seleccionaron objetos."
-msgid "SeaMap Editor"
-msgstr "Editor SeaMap"
+msgid "SeaChart Editor"
+msgstr ""
msgid "Seamark Inspector"
msgstr "Seamark Inspector"
@@ -29995,6 +30100,9 @@ msgstr "Factor de Distancia"
msgid "Merge Nearby Nodes Threshold"
msgstr "Umbral de Combinación de Nodos Cercanos"
+msgid "SeaMap Editor"
+msgstr "Editor SeaMap"
+
msgid "AutoSave LiveData"
msgstr "Autograbar LiveData"
diff --git a/i18n/po/et.po b/i18n/po/et.po
index 2d9a97c..6046efb 100644
--- a/i18n/po/et.po
+++ b/i18n/po/et.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-04 03:32+0100\n"
+"POT-Creation-Date: 2015-04-01 03:33+0200\n"
"PO-Revision-Date: 2015-02-28 09:53+0000\n"
"Last-Translator: Margus Värton <margus at dakar.ee>\n"
"Language-Team: Estonian <et at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-03-04 04:39+0000\n"
-"X-Generator: Launchpad (build 17361)\n"
+"X-Launchpad-Export-Date: 2015-04-01 04:39+0000\n"
+"X-Generator: Launchpad (build 17413)\n"
"Language: et\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -1758,9 +1758,15 @@ msgstr "Alla laetud GPX andmed"
msgid "Markers from {0}"
msgstr "Markerid {0}"
+msgid "Download OSM Notes"
+msgstr ""
+
msgid "Downloading Notes"
msgstr ""
+msgid "Notes"
+msgstr "Märkused"
+
msgid "Download Compressed OSM Change"
msgstr ""
@@ -6202,6 +6208,9 @@ msgstr ""
msgid "Customize the style"
msgstr ""
+msgid "List of notes"
+msgstr ""
+
msgid "Add comment"
msgstr ""
@@ -7541,9 +7550,6 @@ 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 ""
@@ -15941,9 +15947,6 @@ msgstr "spordihall"
msgid "stadium"
msgstr "staadion"
-msgid "Select sport:"
-msgstr ""
-
msgid "Sport"
msgstr "Sport"
@@ -16064,19 +16067,19 @@ msgid "rugby_union"
msgstr ""
msgctxt "sport"
-msgid "shooting"
+msgid "running"
msgstr ""
msgctxt "sport"
-msgid "skateboard"
+msgid "shooting"
msgstr ""
msgctxt "sport"
-msgid "skating"
+msgid "skateboard"
msgstr ""
msgctxt "sport"
-msgid "skiing"
+msgid "skating"
msgstr ""
msgctxt "sport"
@@ -16404,6 +16407,30 @@ msgstr "Suurim mass (tonni)"
msgid "Toll"
msgstr ""
+msgid "Is the water body intermittent (disappears seasonally)?"
+msgstr "Kas veekogu on muutuv (sõltuvalt aastaajast)?"
+
+msgid "culvert"
+msgstr ""
+
+msgid "Water access rules:"
+msgstr ""
+
+msgid "Ship"
+msgstr ""
+
+msgid "designated"
+msgstr ""
+
+msgid "Boat"
+msgstr ""
+
+msgid "Motorboat"
+msgstr ""
+
+msgid "Canoe"
+msgstr ""
+
msgid "Streets"
msgstr "Tänavad"
@@ -16619,9 +16646,6 @@ msgstr ""
msgid "official"
msgstr ""
-msgid "designated"
-msgstr ""
-
msgid "Vehicles per type"
msgstr ""
@@ -17011,6 +17035,9 @@ msgstr ""
msgid "Pedestrian Crossing"
msgstr "Ülekäigurada"
+msgid "In case of traffic signals:"
+msgstr ""
+
msgid "Traffic Calming"
msgstr "Liikluse rahustamine"
@@ -17257,15 +17284,12 @@ msgstr "Kraav"
msgid "Stream"
msgstr "Oja"
-msgid "Wadi"
-msgstr "Vadi"
+msgid "River"
+msgstr "Jõgi"
msgid "Canal"
msgstr "Kanal"
-msgid "River"
-msgstr "Jõgi"
-
msgid "Spring"
msgstr "Allikas"
@@ -17331,9 +17355,6 @@ msgstr "jõgi"
msgid "Salt Water"
msgstr "Soolane vesi"
-msgid "Is the water body intermittent (disappears seasonally)?"
-msgstr "Kas veekogu on muutuv (sõltuvalt aastaajast)?"
-
msgid "Coastline"
msgstr "Rannik"
@@ -18173,6 +18194,9 @@ msgstr "Bussipeatus"
msgid "Tactile Paving"
msgstr "Taktiilsillutis"
+msgid "incorrect"
+msgstr ""
+
msgid "Bus Platform"
msgstr "Bussiplatvorm"
@@ -18335,6 +18359,9 @@ msgstr "sushi"
msgid "Microbrewery"
msgstr "Pisipruulikoda"
+msgid "Outdoor seating"
+msgstr ""
+
msgid "Fast Food"
msgstr "Kiirtoit"
@@ -18929,13 +18956,13 @@ msgstr "Postkast"
msgid "Collection times"
msgstr ""
-msgid "11:30"
+msgid "Mo-Sa 09:00"
msgstr ""
-msgid "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
+msgid "Mo-Fr 17:30; Sa 12:00"
msgstr ""
-msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; Su,PH off"
+msgid "Mo-Fr 15:00,19:00; Sa 15:10; Su 10:30"
msgstr ""
msgid "Drive through"
@@ -19194,6 +19221,15 @@ msgstr "Spordikeskus"
msgid "Pitch"
msgstr ""
+msgid "artificial_turf"
+msgstr ""
+
+msgid "decoturf"
+msgstr ""
+
+msgid "tartan"
+msgstr ""
+
msgid "Racetrack"
msgstr "Võidusõidurada"
@@ -19301,6 +19337,12 @@ msgstr "murdmaa"
msgid "skitour"
msgstr ""
+msgid "sled"
+msgstr ""
+
+msgid "sleigh"
+msgstr ""
+
msgid "snow_park"
msgstr "lumepark"
@@ -19553,6 +19595,10 @@ msgctxt "building"
msgid "construction"
msgstr ""
+msgctxt "building"
+msgid "Levels"
+msgstr ""
+
msgid "Residential Building"
msgstr ""
@@ -19588,6 +19634,16 @@ msgctxt "building"
msgid "farm"
msgstr ""
+msgid "Building part"
+msgstr ""
+
+msgctxt "building"
+msgid "Skipped Levels"
+msgstr ""
+
+msgid "Skipped height (meters)"
+msgstr ""
+
msgid "Entrance"
msgstr ""
@@ -21321,6 +21377,18 @@ msgstr ""
msgid "scoria"
msgstr ""
+msgid "Ridge"
+msgstr ""
+
+msgid "A mountain or hill ridge."
+msgstr ""
+
+msgid "Valley"
+msgstr ""
+
+msgid "A low area between hills."
+msgstr ""
+
msgid "Cave Entrance"
msgstr "Koobas"
@@ -21333,12 +21401,6 @@ msgstr "Saar"
msgid "Islet"
msgstr "Laid"
-msgid "Ridge"
-msgstr ""
-
-msgid "A mountain or hill ridge."
-msgstr ""
-
msgid "Nature"
msgstr "Loodus"
@@ -21366,6 +21428,37 @@ msgstr ""
msgid "Forest"
msgstr "Kultuurmets"
+msgid "Cutline"
+msgstr ""
+
+msgctxt "cutline"
+msgid "border"
+msgstr ""
+
+msgctxt "cutline"
+msgid "firebreak"
+msgstr ""
+
+msgctxt "cutline"
+msgid "hunting"
+msgstr ""
+
+msgctxt "cutline"
+msgid "loggingmachine"
+msgstr ""
+
+msgctxt "cutline"
+msgid "pipeline"
+msgstr ""
+
+msgctxt "cutline"
+msgid "piste"
+msgstr ""
+
+msgctxt "cutline"
+msgid "section"
+msgstr ""
+
msgid "Grassland"
msgstr ""
@@ -22299,6 +22392,9 @@ msgstr ""
msgid "Unspecific tag {0}"
msgstr ""
+msgid "Definition of {0} is unclear"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -27684,7 +27780,7 @@ msgstr ""
msgid "No object selected"
msgstr ""
-msgid "SeaMap Editor"
+msgid "SeaChart Editor"
msgstr ""
msgid "Seamark Inspector"
@@ -27756,6 +27852,9 @@ msgstr ""
msgid "Merge Nearby Nodes Threshold"
msgstr ""
+msgid "SeaMap Editor"
+msgstr ""
+
msgid "AutoSave LiveData"
msgstr ""
diff --git a/i18n/po/eu.po b/i18n/po/eu.po
index cb91cdf..24dcd15 100644
--- a/i18n/po/eu.po
+++ b/i18n/po/eu.po
@@ -7,23 +7,23 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-04 03:32+0100\n"
-"PO-Revision-Date: 2013-03-30 13:56+0000\n"
-"Last-Translator: Txopi <txopi at sindominio.net>\n"
+"POT-Creation-Date: 2015-04-01 03:33+0200\n"
+"PO-Revision-Date: 2015-03-09 16:55+0000\n"
+"Last-Translator: Asier Sarasua Garmendia <Unknown>\n"
"Language-Team: Basque <eu at li.org>\n"
"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: 2015-03-04 04:34+0000\n"
-"X-Generator: Launchpad (build 17361)\n"
+"X-Launchpad-Export-Date: 2015-04-01 04:34+0000\n"
+"X-Generator: Launchpad (build 17413)\n"
"Language: eu\n"
msgid "{0}: option ''{1}'' is ambiguous"
-msgstr ""
+msgstr "{0}: ''{1}'' aukera is anbiguoa da"
msgid "{0}: option ''--{1}'' does not allow an argument"
-msgstr ""
+msgstr "{0}: ''--{1}'' aukerak ez du argumentu bat onartzen"
msgid "{0}: option ''{1}{2}'' does not allow an argument"
msgstr ""
@@ -56,19 +56,19 @@ msgid "Opening link not supported on current platform (''{0}'')"
msgstr ""
msgid "ERROR: {0}"
-msgstr ""
+msgstr "ERROREA: {0}"
msgid "WARNING: {0}"
-msgstr ""
+msgstr "ABISUA: {0}"
msgid "INFO: {0}"
-msgstr ""
+msgstr "INFORMAZIOA: {0}"
msgid "DEBUG: {0}"
-msgstr ""
+msgstr "ARAZKETA: {0}"
msgid "Cause: "
-msgstr ""
+msgstr "Zergatia: "
msgid "Executing platform startup hook"
msgstr ""
@@ -234,22 +234,22 @@ msgid "Select image format for WMS layer"
msgstr ""
msgid "Select WMS layers"
-msgstr ""
+msgstr "Hautatu WMS geruzak"
msgid "Add layers"
-msgstr ""
+msgstr "Gehitu geruzak"
msgid "Invalid service URL."
msgstr ""
msgid "WMS Error"
-msgstr ""
+msgstr "WMS errorea"
msgid "Could not retrieve WMS layer list."
-msgstr ""
+msgstr "Ezin izan da WMS geruzen zerrenda atzitu"
msgid "Could not parse WMS layer list."
-msgstr ""
+msgstr "Ezin izan da WMS geruzen zerrenda analizatu"
msgid "Add Node..."
msgstr "Nodoa gehitu..."
@@ -270,13 +270,13 @@ msgid "Tool: {0}"
msgstr "Tresna: {0}"
msgid "Not enough nodes in selected ways."
-msgstr ""
+msgstr "Ez dago aski nodorik hautatutako bideetan."
msgid "Please select at least four nodes."
msgstr "Mesedez, aukeratu lau nodo gutxienez."
msgid "Cannot determine center of selected nodes."
-msgstr ""
+msgstr "Ezin da zehaztu hautatutako nodoen erdigunea."
msgid ""
"One or more nodes involved in this action is outside of the downloaded area."
@@ -292,13 +292,13 @@ msgid "Please select at least three nodes."
msgstr "Mesedez, aukera itzazu hiru nodo gutxienez"
msgid "Can not align a polygon. Abort."
-msgstr ""
+msgstr "Ezin da poligono bat lerrokatu. Abortatu."
msgid "Intersection of three or more ways can not be solved. Abort."
msgstr ""
msgid "Two parallels ways found. Abort."
-msgstr ""
+msgstr "Bi bide paralelo aurkitu dira. Abortatu."
msgid "data"
msgstr "datuak"
@@ -316,7 +316,7 @@ msgid "download"
msgstr "deskargatu"
msgid "problem"
-msgstr ""
+msgstr "arazoa"
msgid "previous"
msgstr "aurrekoa"
@@ -393,8 +393,8 @@ msgstr ""
msgid "Combine {0} way"
msgid_plural "Combine {0} ways"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Konbinatu bide {0}"
+msgstr[1] "Konbinatu {0} bide"
msgid "Please select at least two ways to combine."
msgstr "Aukeratu bateratzeko bi bide gutxienez."
@@ -503,22 +503,22 @@ msgid "Exit the application."
msgstr "Aplikaziotik irten"
msgid "Expert Mode"
-msgstr ""
+msgstr "Aditu modua"
msgid "Enable/disable expert mode"
-msgstr ""
+msgstr "Gaitu/desgaitu aditu modua"
msgid "Follow line"
-msgstr ""
+msgstr "Jarraitu lerroa"
msgid "Continues drawing a line that shares nodes with another line."
msgstr ""
msgid "Follow"
-msgstr ""
+msgstr "Jarraitu"
msgid "Fullscreen view"
-msgstr ""
+msgstr "Pantaila osoko ikuspegia"
msgid "Toggle fullscreen view"
msgstr "Txandakatu pantaila osoko ikuspegia"
@@ -545,7 +545,7 @@ msgid "Show history"
msgstr "Historia erakutsi"
msgid "History (web)"
-msgstr ""
+msgstr "Historia (web)"
msgid ""
"Display history information about OSM ways, nodes, or relations in web "
@@ -553,13 +553,13 @@ msgid ""
msgstr ""
msgid "New offset"
-msgstr ""
+msgstr "Desplazamendu berria"
msgid "Adjust the position of this imagery layer"
-msgstr ""
+msgstr "Doitu irudi-geruza honen kokapena"
msgid "Adjust imagery offset"
-msgstr ""
+msgstr "Doitu irudien desplazamendua"
msgid "OK"
msgstr "Ados"
@@ -572,7 +572,7 @@ msgid ""
msgstr ""
msgid "Offset: "
-msgstr ""
+msgstr "Desplazamendua: "
msgid "Bookmark name: "
msgstr ""
@@ -584,7 +584,7 @@ msgid "Offset bookmark already exists. Overwrite?"
msgstr ""
msgid "Advanced info"
-msgstr ""
+msgstr "Informazio aurreratua"
msgid ""
"Display advanced object information about OSM nodes, ways, or relations."
@@ -1769,9 +1769,15 @@ msgstr "GPX datuak deskargatuta"
msgid "Markers from {0}"
msgstr ""
+msgid "Download OSM Notes"
+msgstr ""
+
msgid "Downloading Notes"
msgstr ""
+msgid "Notes"
+msgstr "Oharrak"
+
msgid "Download Compressed OSM Change"
msgstr ""
@@ -6314,6 +6320,9 @@ msgstr ""
msgid "Customize the style"
msgstr ""
+msgid "List of notes"
+msgstr ""
+
msgid "Add comment"
msgstr ""
@@ -7634,9 +7643,6 @@ 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 ""
@@ -15942,9 +15948,6 @@ msgstr "kiroldegia"
msgid "stadium"
msgstr "estadioa"
-msgid "Select sport:"
-msgstr ""
-
msgid "Sport"
msgstr "Kirola"
@@ -16065,19 +16068,19 @@ msgid "rugby_union"
msgstr ""
msgctxt "sport"
-msgid "shooting"
+msgid "running"
msgstr ""
msgctxt "sport"
-msgid "skateboard"
+msgid "shooting"
msgstr ""
msgctxt "sport"
-msgid "skating"
+msgid "skateboard"
msgstr ""
msgctxt "sport"
-msgid "skiing"
+msgid "skating"
msgstr ""
msgctxt "sport"
@@ -16405,6 +16408,30 @@ msgstr "Gehienezko pixua (t)"
msgid "Toll"
msgstr "Ordainsaria"
+msgid "Is the water body intermittent (disappears seasonally)?"
+msgstr ""
+
+msgid "culvert"
+msgstr ""
+
+msgid "Water access rules:"
+msgstr ""
+
+msgid "Ship"
+msgstr ""
+
+msgid "designated"
+msgstr "baimendua"
+
+msgid "Boat"
+msgstr ""
+
+msgid "Motorboat"
+msgstr ""
+
+msgid "Canoe"
+msgstr ""
+
msgid "Streets"
msgstr "Kaleak"
@@ -16620,9 +16647,6 @@ msgstr ""
msgid "official"
msgstr "ofiziala"
-msgid "designated"
-msgstr "baimendua"
-
msgid "Vehicles per type"
msgstr ""
@@ -17012,6 +17036,9 @@ msgstr "erlojuaren norabidea"
msgid "Pedestrian Crossing"
msgstr "Oinezkoen pasabidea"
+msgid "In case of traffic signals:"
+msgstr ""
+
msgid "Traffic Calming"
msgstr "Trafikoaren arinketa"
@@ -17258,15 +17285,12 @@ msgstr "Erretena"
msgid "Stream"
msgstr "Errekastoa"
-msgid "Wadi"
-msgstr ""
+msgid "River"
+msgstr "Ibaia"
msgid "Canal"
msgstr "Kanala"
-msgid "River"
-msgstr "Ibaia"
-
msgid "Spring"
msgstr "Iturburua"
@@ -17332,9 +17356,6 @@ msgstr ""
msgid "Salt Water"
msgstr ""
-msgid "Is the water body intermittent (disappears seasonally)?"
-msgstr ""
-
msgid "Coastline"
msgstr "Kostaldea"
@@ -18174,6 +18195,9 @@ msgstr "Autobus-gelakua"
msgid "Tactile Paving"
msgstr "Ukimen-zola"
+msgid "incorrect"
+msgstr ""
+
msgid "Bus Platform"
msgstr "Autobusaren plataforma"
@@ -18336,6 +18360,9 @@ msgstr "sushi-a"
msgid "Microbrewery"
msgstr ""
+msgid "Outdoor seating"
+msgstr ""
+
msgid "Fast Food"
msgstr "Otordu lasterreko jatetxea"
@@ -18930,13 +18957,13 @@ msgstr "Gutunontzia"
msgid "Collection times"
msgstr ""
-msgid "11:30"
+msgid "Mo-Sa 09:00"
msgstr ""
-msgid "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
+msgid "Mo-Fr 17:30; Sa 12:00"
msgstr ""
-msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; Su,PH off"
+msgid "Mo-Fr 15:00,19:00; Sa 15:10; Su 10:30"
msgstr ""
msgid "Drive through"
@@ -19195,6 +19222,15 @@ msgstr "Kiroldegia"
msgid "Pitch"
msgstr "Kirol-zelaia"
+msgid "artificial_turf"
+msgstr ""
+
+msgid "decoturf"
+msgstr ""
+
+msgid "tartan"
+msgstr ""
+
msgid "Racetrack"
msgstr "Lasterketa-pista"
@@ -19302,6 +19338,12 @@ msgstr "nordikoa"
msgid "skitour"
msgstr ""
+msgid "sled"
+msgstr ""
+
+msgid "sleigh"
+msgstr ""
+
msgid "snow_park"
msgstr "snowboard parkea"
@@ -19554,6 +19596,10 @@ msgctxt "building"
msgid "construction"
msgstr ""
+msgctxt "building"
+msgid "Levels"
+msgstr ""
+
msgid "Residential Building"
msgstr ""
@@ -19589,6 +19635,16 @@ msgctxt "building"
msgid "farm"
msgstr ""
+msgid "Building part"
+msgstr ""
+
+msgctxt "building"
+msgid "Skipped Levels"
+msgstr ""
+
+msgid "Skipped height (meters)"
+msgstr ""
+
msgid "Entrance"
msgstr "Sarrera"
@@ -21322,6 +21378,18 @@ msgstr ""
msgid "scoria"
msgstr ""
+msgid "Ridge"
+msgstr ""
+
+msgid "A mountain or hill ridge."
+msgstr ""
+
+msgid "Valley"
+msgstr ""
+
+msgid "A low area between hills."
+msgstr ""
+
msgid "Cave Entrance"
msgstr "Kobazuloaren sarrera"
@@ -21334,12 +21402,6 @@ msgstr "Irla"
msgid "Islet"
msgstr "Irlatxoa"
-msgid "Ridge"
-msgstr ""
-
-msgid "A mountain or hill ridge."
-msgstr ""
-
msgid "Nature"
msgstr ""
@@ -21367,6 +21429,37 @@ msgstr ""
msgid "Forest"
msgstr "Basoa"
+msgid "Cutline"
+msgstr ""
+
+msgctxt "cutline"
+msgid "border"
+msgstr ""
+
+msgctxt "cutline"
+msgid "firebreak"
+msgstr ""
+
+msgctxt "cutline"
+msgid "hunting"
+msgstr ""
+
+msgctxt "cutline"
+msgid "loggingmachine"
+msgstr ""
+
+msgctxt "cutline"
+msgid "pipeline"
+msgstr ""
+
+msgctxt "cutline"
+msgid "piste"
+msgstr ""
+
+msgctxt "cutline"
+msgid "section"
+msgstr ""
+
msgid "Grassland"
msgstr ""
@@ -22300,6 +22393,9 @@ msgstr ""
msgid "Unspecific tag {0}"
msgstr ""
+msgid "Definition of {0} is unclear"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -27666,7 +27762,7 @@ msgstr ""
msgid "No object selected"
msgstr ""
-msgid "SeaMap Editor"
+msgid "SeaChart Editor"
msgstr ""
msgid "Seamark Inspector"
@@ -27738,6 +27834,9 @@ msgstr ""
msgid "Merge Nearby Nodes Threshold"
msgstr ""
+msgid "SeaMap Editor"
+msgstr ""
+
msgid "AutoSave LiveData"
msgstr ""
diff --git a/i18n/po/fa.po b/i18n/po/fa.po
index 0a0ac59..19c5531 100644
--- a/i18n/po/fa.po
+++ b/i18n/po/fa.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-04 03:32+0100\n"
+"POT-Creation-Date: 2015-04-01 03:33+0200\n"
"PO-Revision-Date: 2014-03-18 07:32+0000\n"
"Last-Translator: Saeed Ghazi Joolaee <Unknown>\n"
"Language-Team: Persian <fa at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2015-03-04 04:53+0000\n"
-"X-Generator: Launchpad (build 17361)\n"
+"X-Launchpad-Export-Date: 2015-04-01 04:53+0000\n"
+"X-Generator: Launchpad (build 17413)\n"
"Language: fa\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -1765,9 +1765,15 @@ msgstr ""
msgid "Markers from {0}"
msgstr ""
+msgid "Download OSM Notes"
+msgstr ""
+
msgid "Downloading Notes"
msgstr ""
+msgid "Notes"
+msgstr ""
+
msgid "Download Compressed OSM Change"
msgstr ""
@@ -6177,6 +6183,9 @@ msgstr ""
msgid "Customize the style"
msgstr ""
+msgid "List of notes"
+msgstr ""
+
msgid "Add comment"
msgstr ""
@@ -7496,9 +7505,6 @@ 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 ""
@@ -15755,9 +15761,6 @@ msgstr ""
msgid "stadium"
msgstr ""
-msgid "Select sport:"
-msgstr ""
-
msgid "Sport"
msgstr ""
@@ -15878,19 +15881,19 @@ msgid "rugby_union"
msgstr ""
msgctxt "sport"
-msgid "shooting"
+msgid "running"
msgstr ""
msgctxt "sport"
-msgid "skateboard"
+msgid "shooting"
msgstr ""
msgctxt "sport"
-msgid "skating"
+msgid "skateboard"
msgstr ""
msgctxt "sport"
-msgid "skiing"
+msgid "skating"
msgstr ""
msgctxt "sport"
@@ -16218,6 +16221,30 @@ msgstr ""
msgid "Toll"
msgstr ""
+msgid "Is the water body intermittent (disappears seasonally)?"
+msgstr ""
+
+msgid "culvert"
+msgstr ""
+
+msgid "Water access rules:"
+msgstr ""
+
+msgid "Ship"
+msgstr ""
+
+msgid "designated"
+msgstr ""
+
+msgid "Boat"
+msgstr ""
+
+msgid "Motorboat"
+msgstr ""
+
+msgid "Canoe"
+msgstr ""
+
msgid "Streets"
msgstr ""
@@ -16433,9 +16460,6 @@ msgstr ""
msgid "official"
msgstr ""
-msgid "designated"
-msgstr ""
-
msgid "Vehicles per type"
msgstr ""
@@ -16825,6 +16849,9 @@ msgstr ""
msgid "Pedestrian Crossing"
msgstr ""
+msgid "In case of traffic signals:"
+msgstr ""
+
msgid "Traffic Calming"
msgstr ""
@@ -17071,15 +17098,12 @@ msgstr ""
msgid "Stream"
msgstr ""
-msgid "Wadi"
+msgid "River"
msgstr ""
msgid "Canal"
msgstr ""
-msgid "River"
-msgstr ""
-
msgid "Spring"
msgstr ""
@@ -17145,9 +17169,6 @@ msgstr ""
msgid "Salt Water"
msgstr ""
-msgid "Is the water body intermittent (disappears seasonally)?"
-msgstr ""
-
msgid "Coastline"
msgstr ""
@@ -17987,6 +18008,9 @@ msgstr ""
msgid "Tactile Paving"
msgstr ""
+msgid "incorrect"
+msgstr ""
+
msgid "Bus Platform"
msgstr ""
@@ -18149,6 +18173,9 @@ msgstr ""
msgid "Microbrewery"
msgstr ""
+msgid "Outdoor seating"
+msgstr ""
+
msgid "Fast Food"
msgstr ""
@@ -18743,13 +18770,13 @@ msgstr ""
msgid "Collection times"
msgstr ""
-msgid "11:30"
+msgid "Mo-Sa 09:00"
msgstr ""
-msgid "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
+msgid "Mo-Fr 17:30; Sa 12:00"
msgstr ""
-msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; Su,PH off"
+msgid "Mo-Fr 15:00,19:00; Sa 15:10; Su 10:30"
msgstr ""
msgid "Drive through"
@@ -19008,6 +19035,15 @@ msgstr ""
msgid "Pitch"
msgstr ""
+msgid "artificial_turf"
+msgstr ""
+
+msgid "decoturf"
+msgstr ""
+
+msgid "tartan"
+msgstr ""
+
msgid "Racetrack"
msgstr ""
@@ -19115,6 +19151,12 @@ msgstr ""
msgid "skitour"
msgstr ""
+msgid "sled"
+msgstr ""
+
+msgid "sleigh"
+msgstr ""
+
msgid "snow_park"
msgstr ""
@@ -19367,6 +19409,10 @@ msgctxt "building"
msgid "construction"
msgstr ""
+msgctxt "building"
+msgid "Levels"
+msgstr ""
+
msgid "Residential Building"
msgstr ""
@@ -19402,6 +19448,16 @@ msgctxt "building"
msgid "farm"
msgstr ""
+msgid "Building part"
+msgstr ""
+
+msgctxt "building"
+msgid "Skipped Levels"
+msgstr ""
+
+msgid "Skipped height (meters)"
+msgstr ""
+
msgid "Entrance"
msgstr ""
@@ -21135,22 +21191,28 @@ msgstr ""
msgid "scoria"
msgstr ""
-msgid "Cave Entrance"
+msgid "Ridge"
msgstr ""
-msgid "The entrance to a cave."
+msgid "A mountain or hill ridge."
msgstr ""
-msgid "Island"
+msgid "Valley"
msgstr ""
-msgid "Islet"
+msgid "A low area between hills."
msgstr ""
-msgid "Ridge"
+msgid "Cave Entrance"
msgstr ""
-msgid "A mountain or hill ridge."
+msgid "The entrance to a cave."
+msgstr ""
+
+msgid "Island"
+msgstr ""
+
+msgid "Islet"
msgstr ""
msgid "Nature"
@@ -21180,6 +21242,37 @@ msgstr ""
msgid "Forest"
msgstr ""
+msgid "Cutline"
+msgstr ""
+
+msgctxt "cutline"
+msgid "border"
+msgstr ""
+
+msgctxt "cutline"
+msgid "firebreak"
+msgstr ""
+
+msgctxt "cutline"
+msgid "hunting"
+msgstr ""
+
+msgctxt "cutline"
+msgid "loggingmachine"
+msgstr ""
+
+msgctxt "cutline"
+msgid "pipeline"
+msgstr ""
+
+msgctxt "cutline"
+msgid "piste"
+msgstr ""
+
+msgctxt "cutline"
+msgid "section"
+msgstr ""
+
msgid "Grassland"
msgstr ""
@@ -22113,6 +22206,9 @@ msgstr ""
msgid "Unspecific tag {0}"
msgstr ""
+msgid "Definition of {0} is unclear"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -27474,7 +27570,7 @@ msgstr ""
msgid "No object selected"
msgstr ""
-msgid "SeaMap Editor"
+msgid "SeaChart Editor"
msgstr ""
msgid "Seamark Inspector"
@@ -27546,6 +27642,9 @@ msgstr ""
msgid "Merge Nearby Nodes Threshold"
msgstr ""
+msgid "SeaMap Editor"
+msgstr ""
+
msgid "AutoSave LiveData"
msgstr ""
diff --git a/i18n/po/fi.po b/i18n/po/fi.po
index 9aae582..e6cfba2 100644
--- a/i18n/po/fi.po
+++ b/i18n/po/fi.po
@@ -7,16 +7,16 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-04 03:32+0100\n"
-"PO-Revision-Date: 2015-02-27 16:42+0000\n"
-"Last-Translator: Lauri Kytömaa <Unknown>\n"
+"POT-Creation-Date: 2015-04-01 03:33+0200\n"
+"PO-Revision-Date: 2015-03-22 14:26+0000\n"
+"Last-Translator: manuska <manuska at gmail.com>\n"
"Language-Team: Finnish <fi at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-03-04 04:40+0000\n"
-"X-Generator: Launchpad (build 17361)\n"
+"X-Launchpad-Export-Date: 2015-04-01 04:40+0000\n"
+"X-Generator: Launchpad (build 17413)\n"
"Language: fi\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -118,6 +118,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>JOSM vaatii Java version {0}.</h2>Löydetty Java versio: {1}.<br>Voit "
+"<ul><li>päivittää Javan (JRE) tai</li><li>käyttää vanhempaa (Java {2} "
+"yhteensopivaa) JOSM-versiota.</li></ul>Lisää tietoa:"
msgid "Exit JOSM"
msgstr "Poistu JOSMista"
@@ -436,7 +439,7 @@ msgid "Those nodes are not in a circle. Aborting."
msgstr "Valituista solmuista ei voi muodostaa ympyrää."
msgid "Update multipolygon"
-msgstr ""
+msgstr "Päivitä multipolygoni"
msgid "Create multipolygon"
msgstr "Luo monimonikulmio"
@@ -1254,7 +1257,7 @@ msgid "Save the current data to a new file."
msgstr "Tallenna data uuteen tiedostoon."
msgid "Search Notes..."
-msgstr ""
+msgstr "Etsi karttailmoituksia..."
msgid "Download notes from the note search API"
msgstr ""
@@ -1263,7 +1266,7 @@ msgid "Search the OSM API for notes containing words:"
msgstr ""
msgid "Search for notes"
-msgstr ""
+msgstr "Etsi karttailmoituksia"
msgid "You must enter a search term"
msgstr ""
@@ -1670,10 +1673,10 @@ msgid "Upload note changes to server"
msgstr ""
msgid "Upload notes"
-msgstr ""
+msgstr "Lähetä karttailmoituksia"
msgid "Uploading notes to server"
-msgstr ""
+msgstr "Lähetetään karttailmoitukset palvelimelle"
msgid "Upload selection"
msgstr "Lähetä valinta"
@@ -1828,8 +1831,14 @@ msgstr "Ladattu GPX-data"
msgid "Markers from {0}"
msgstr "Merkinnät: {0}"
+msgid "Download OSM Notes"
+msgstr "Lataa karttailmoitukset"
+
msgid "Downloading Notes"
-msgstr ""
+msgstr "Ladataan karttailmoituksia"
+
+msgid "Notes"
+msgstr "Karttailmoitukset"
msgid "Download Compressed OSM Change"
msgstr "Lataa pakattu OsmChange-tiedosto"
@@ -1953,25 +1962,25 @@ msgid "Error during download"
msgstr "Virhe latauksen aikana"
msgid "Add a new Note"
-msgstr ""
+msgstr "Lisää karttailmoitus"
msgid "Add note mode"
msgstr ""
msgid "Click the location where you wish to create a new note"
-msgstr ""
+msgstr "Klikkaa kohtaa johon tahdot lisätä karttailmoituksen"
msgid "Create new note"
-msgstr ""
+msgstr "Luo karttailmoitus"
msgid "Create note"
-msgstr ""
+msgstr "Luo karttailmoitus"
msgid "Enter a detailed comment to create a note"
-msgstr ""
+msgstr "Lisää tarkka selitys luodaksesi karttailmoituksen"
msgid "You must enter a comment to create a new note"
-msgstr ""
+msgstr "Selitys on pakollinen uutta karttailmoitusta luotaessa"
msgid "Delete Mode"
msgstr "Poistotila"
@@ -2946,7 +2955,7 @@ msgid "Note {0} failed: {1}"
msgstr ""
msgid "Notes failed to upload"
-msgstr ""
+msgstr "Karttailmoitusten lähetys epäonnistui"
msgid ""
"The following are results of automatic validation. Try fixing these, but be "
@@ -6527,6 +6536,9 @@ msgstr ""
msgid "Customize the style"
msgstr ""
+msgid "List of notes"
+msgstr ""
+
msgid "Add comment"
msgstr ""
@@ -6561,7 +6573,7 @@ msgid "Reopen note with message:"
msgstr ""
msgid "Sort notes"
-msgstr ""
+msgstr "Järjestä karttailmoitukset"
msgid "Sort"
msgstr "Järjestä"
@@ -7942,9 +7954,6 @@ 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 ""
@@ -9257,10 +9266,10 @@ msgid "Note"
msgstr ""
msgid "Notes layer"
-msgstr ""
+msgstr "Karttailmoitustaso"
msgid "Total notes:"
-msgstr ""
+msgstr "Karttailmoituksia yhteensä:"
msgid "Changes need uploading?"
msgstr ""
@@ -10333,7 +10342,7 @@ msgid "Select to grant JOSM the right to write your server preferences"
msgstr ""
msgid "Allow modifications of notes"
-msgstr ""
+msgstr "Salli karttailmoitusten muokkaaminen"
msgid "Select to grant JOSM the right to modify notes on your behalf"
msgstr ""
@@ -16605,9 +16614,6 @@ msgstr "urheilukeskus"
msgid "stadium"
msgstr "stadion"
-msgid "Select sport:"
-msgstr ""
-
msgid "Sport"
msgstr "Urheilu"
@@ -16728,19 +16734,19 @@ msgid "rugby_union"
msgstr ""
msgctxt "sport"
-msgid "shooting"
+msgid "running"
msgstr ""
msgctxt "sport"
-msgid "skateboard"
+msgid "shooting"
msgstr ""
msgctxt "sport"
-msgid "skating"
+msgid "skateboard"
msgstr ""
msgctxt "sport"
-msgid "skiing"
+msgid "skating"
msgstr ""
msgctxt "sport"
@@ -17068,6 +17074,30 @@ msgstr "Maksimipaino (tonnia)"
msgid "Toll"
msgstr "Tietulli"
+msgid "Is the water body intermittent (disappears seasonally)?"
+msgstr ""
+
+msgid "culvert"
+msgstr ""
+
+msgid "Water access rules:"
+msgstr ""
+
+msgid "Ship"
+msgstr ""
+
+msgid "designated"
+msgstr ""
+
+msgid "Boat"
+msgstr ""
+
+msgid "Motorboat"
+msgstr ""
+
+msgid "Canoe"
+msgstr ""
+
msgid "Streets"
msgstr "Tiet"
@@ -17285,9 +17315,6 @@ msgstr "Tienkäyttäjäryhmiä koskevat kiellot"
msgid "official"
msgstr ""
-msgid "designated"
-msgstr ""
-
msgid "Vehicles per type"
msgstr "Ajoneuvoluokat"
@@ -17677,6 +17704,9 @@ msgstr "myötäpäivään"
msgid "Pedestrian Crossing"
msgstr "Suojatie"
+msgid "In case of traffic signals:"
+msgstr ""
+
msgid "Traffic Calming"
msgstr "Liikennehidastin"
@@ -17923,15 +17953,12 @@ msgstr "Oja"
msgid "Stream"
msgstr "Puro / oja"
-msgid "Wadi"
-msgstr ""
+msgid "River"
+msgstr "Joki"
msgid "Canal"
msgstr "Kanava"
-msgid "River"
-msgstr "Joki"
-
msgid "Spring"
msgstr "Lähde"
@@ -17997,9 +18024,6 @@ msgstr ""
msgid "Salt Water"
msgstr ""
-msgid "Is the water body intermittent (disappears seasonally)?"
-msgstr ""
-
msgid "Coastline"
msgstr "Rantaviiva"
@@ -18839,6 +18863,9 @@ msgstr "Linja-autopysäkki"
msgid "Tactile Paving"
msgstr ""
+msgid "incorrect"
+msgstr ""
+
msgid "Bus Platform"
msgstr "Bussipysäkin laituri"
@@ -19001,6 +19028,9 @@ msgstr ""
msgid "Microbrewery"
msgstr ""
+msgid "Outdoor seating"
+msgstr ""
+
msgid "Fast Food"
msgstr "Pikaruoka"
@@ -19595,13 +19625,13 @@ msgstr "Postilaatikko"
msgid "Collection times"
msgstr "Tyhjennysajat"
-msgid "11:30"
+msgid "Mo-Sa 09:00"
msgstr ""
-msgid "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
+msgid "Mo-Fr 17:30; Sa 12:00"
msgstr ""
-msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; Su,PH off"
+msgid "Mo-Fr 15:00,19:00; Sa 15:10; Su 10:30"
msgstr ""
msgid "Drive through"
@@ -19615,7 +19645,7 @@ msgstr "Kolikot"
msgctxt "payment"
msgid "Notes"
-msgstr ""
+msgstr "Setelit"
msgid "Telephone cards"
msgstr "Puhelinkortit"
@@ -19860,6 +19890,15 @@ msgstr "Urheilukeskus"
msgid "Pitch"
msgstr "Kenttä"
+msgid "artificial_turf"
+msgstr ""
+
+msgid "decoturf"
+msgstr ""
+
+msgid "tartan"
+msgstr ""
+
msgid "Racetrack"
msgstr "Kilparata"
@@ -19967,6 +20006,12 @@ msgstr ""
msgid "skitour"
msgstr ""
+msgid "sled"
+msgstr ""
+
+msgid "sleigh"
+msgstr ""
+
msgid "snow_park"
msgstr ""
@@ -20219,6 +20264,10 @@ msgctxt "building"
msgid "construction"
msgstr ""
+msgctxt "building"
+msgid "Levels"
+msgstr ""
+
msgid "Residential Building"
msgstr ""
@@ -20254,6 +20303,16 @@ msgctxt "building"
msgid "farm"
msgstr ""
+msgid "Building part"
+msgstr ""
+
+msgctxt "building"
+msgid "Skipped Levels"
+msgstr ""
+
+msgid "Skipped height (meters)"
+msgstr ""
+
msgid "Entrance"
msgstr "Sisäänkäynti / ovi"
@@ -21987,6 +22046,18 @@ msgstr ""
msgid "scoria"
msgstr ""
+msgid "Ridge"
+msgstr ""
+
+msgid "A mountain or hill ridge."
+msgstr ""
+
+msgid "Valley"
+msgstr ""
+
+msgid "A low area between hills."
+msgstr ""
+
msgid "Cave Entrance"
msgstr "Luolan suuaukko"
@@ -21999,12 +22070,6 @@ msgstr "Saari"
msgid "Islet"
msgstr ""
-msgid "Ridge"
-msgstr ""
-
-msgid "A mountain or hill ridge."
-msgstr ""
-
msgid "Nature"
msgstr ""
@@ -22032,6 +22097,37 @@ msgstr ""
msgid "Forest"
msgstr "Talousmetsä"
+msgid "Cutline"
+msgstr ""
+
+msgctxt "cutline"
+msgid "border"
+msgstr ""
+
+msgctxt "cutline"
+msgid "firebreak"
+msgstr ""
+
+msgctxt "cutline"
+msgid "hunting"
+msgstr ""
+
+msgctxt "cutline"
+msgid "loggingmachine"
+msgstr ""
+
+msgctxt "cutline"
+msgid "pipeline"
+msgstr ""
+
+msgctxt "cutline"
+msgid "piste"
+msgstr ""
+
+msgctxt "cutline"
+msgid "section"
+msgstr ""
+
msgid "Grassland"
msgstr ""
@@ -22976,6 +23072,9 @@ msgstr ""
msgid "Unspecific tag {0}"
msgstr ""
+msgid "Definition of {0} is unclear"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -28390,7 +28489,7 @@ msgstr ""
msgid "No object selected"
msgstr ""
-msgid "SeaMap Editor"
+msgid "SeaChart Editor"
msgstr ""
msgid "Seamark Inspector"
@@ -28462,6 +28561,9 @@ msgstr ""
msgid "Merge Nearby Nodes Threshold"
msgstr ""
+msgid "SeaMap Editor"
+msgstr ""
+
msgid "AutoSave LiveData"
msgstr ""
diff --git a/i18n/po/fil.po b/i18n/po/fil.po
index 958a0d7..88dbca4 100644
--- a/i18n/po/fil.po
+++ b/i18n/po/fil.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-04 03:32+0100\n"
+"POT-Creation-Date: 2015-04-01 03:33+0200\n"
"PO-Revision-Date: 2011-06-19 14:15+0000\n"
"Last-Translator: Anthony Balico <Unknown>\n"
"Language-Team: Filipino <fil at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2015-03-04 05:07+0000\n"
-"X-Generator: Launchpad (build 17361)\n"
+"X-Launchpad-Export-Date: 2015-04-01 05:06+0000\n"
+"X-Generator: Launchpad (build 17413)\n"
"Language: fil\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -1696,9 +1696,15 @@ msgstr ""
msgid "Markers from {0}"
msgstr ""
+msgid "Download OSM Notes"
+msgstr ""
+
msgid "Downloading Notes"
msgstr ""
+msgid "Notes"
+msgstr ""
+
msgid "Download Compressed OSM Change"
msgstr ""
@@ -6109,6 +6115,9 @@ msgstr ""
msgid "Customize the style"
msgstr ""
+msgid "List of notes"
+msgstr ""
+
msgid "Add comment"
msgstr ""
@@ -7428,9 +7437,6 @@ 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 ""
@@ -15682,9 +15688,6 @@ msgstr ""
msgid "stadium"
msgstr ""
-msgid "Select sport:"
-msgstr ""
-
msgid "Sport"
msgstr ""
@@ -15805,19 +15808,19 @@ msgid "rugby_union"
msgstr ""
msgctxt "sport"
-msgid "shooting"
+msgid "running"
msgstr ""
msgctxt "sport"
-msgid "skateboard"
+msgid "shooting"
msgstr ""
msgctxt "sport"
-msgid "skating"
+msgid "skateboard"
msgstr ""
msgctxt "sport"
-msgid "skiing"
+msgid "skating"
msgstr ""
msgctxt "sport"
@@ -16145,6 +16148,30 @@ msgstr ""
msgid "Toll"
msgstr ""
+msgid "Is the water body intermittent (disappears seasonally)?"
+msgstr ""
+
+msgid "culvert"
+msgstr ""
+
+msgid "Water access rules:"
+msgstr ""
+
+msgid "Ship"
+msgstr ""
+
+msgid "designated"
+msgstr ""
+
+msgid "Boat"
+msgstr ""
+
+msgid "Motorboat"
+msgstr ""
+
+msgid "Canoe"
+msgstr ""
+
msgid "Streets"
msgstr ""
@@ -16360,9 +16387,6 @@ msgstr ""
msgid "official"
msgstr ""
-msgid "designated"
-msgstr ""
-
msgid "Vehicles per type"
msgstr ""
@@ -16752,6 +16776,9 @@ msgstr ""
msgid "Pedestrian Crossing"
msgstr ""
+msgid "In case of traffic signals:"
+msgstr ""
+
msgid "Traffic Calming"
msgstr ""
@@ -16998,15 +17025,12 @@ msgstr ""
msgid "Stream"
msgstr ""
-msgid "Wadi"
+msgid "River"
msgstr ""
msgid "Canal"
msgstr ""
-msgid "River"
-msgstr ""
-
msgid "Spring"
msgstr ""
@@ -17072,9 +17096,6 @@ msgstr ""
msgid "Salt Water"
msgstr ""
-msgid "Is the water body intermittent (disappears seasonally)?"
-msgstr ""
-
msgid "Coastline"
msgstr ""
@@ -17914,6 +17935,9 @@ msgstr ""
msgid "Tactile Paving"
msgstr ""
+msgid "incorrect"
+msgstr ""
+
msgid "Bus Platform"
msgstr ""
@@ -18076,6 +18100,9 @@ msgstr ""
msgid "Microbrewery"
msgstr ""
+msgid "Outdoor seating"
+msgstr ""
+
msgid "Fast Food"
msgstr ""
@@ -18670,13 +18697,13 @@ msgstr ""
msgid "Collection times"
msgstr ""
-msgid "11:30"
+msgid "Mo-Sa 09:00"
msgstr ""
-msgid "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
+msgid "Mo-Fr 17:30; Sa 12:00"
msgstr ""
-msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; Su,PH off"
+msgid "Mo-Fr 15:00,19:00; Sa 15:10; Su 10:30"
msgstr ""
msgid "Drive through"
@@ -18935,6 +18962,15 @@ msgstr ""
msgid "Pitch"
msgstr ""
+msgid "artificial_turf"
+msgstr ""
+
+msgid "decoturf"
+msgstr ""
+
+msgid "tartan"
+msgstr ""
+
msgid "Racetrack"
msgstr ""
@@ -19042,6 +19078,12 @@ msgstr ""
msgid "skitour"
msgstr ""
+msgid "sled"
+msgstr ""
+
+msgid "sleigh"
+msgstr ""
+
msgid "snow_park"
msgstr ""
@@ -19294,6 +19336,10 @@ msgctxt "building"
msgid "construction"
msgstr ""
+msgctxt "building"
+msgid "Levels"
+msgstr ""
+
msgid "Residential Building"
msgstr ""
@@ -19329,6 +19375,16 @@ msgctxt "building"
msgid "farm"
msgstr ""
+msgid "Building part"
+msgstr ""
+
+msgctxt "building"
+msgid "Skipped Levels"
+msgstr ""
+
+msgid "Skipped height (meters)"
+msgstr ""
+
msgid "Entrance"
msgstr ""
@@ -21062,22 +21118,28 @@ msgstr ""
msgid "scoria"
msgstr ""
-msgid "Cave Entrance"
+msgid "Ridge"
msgstr ""
-msgid "The entrance to a cave."
+msgid "A mountain or hill ridge."
msgstr ""
-msgid "Island"
+msgid "Valley"
msgstr ""
-msgid "Islet"
+msgid "A low area between hills."
msgstr ""
-msgid "Ridge"
+msgid "Cave Entrance"
msgstr ""
-msgid "A mountain or hill ridge."
+msgid "The entrance to a cave."
+msgstr ""
+
+msgid "Island"
+msgstr ""
+
+msgid "Islet"
msgstr ""
msgid "Nature"
@@ -21107,6 +21169,37 @@ msgstr ""
msgid "Forest"
msgstr ""
+msgid "Cutline"
+msgstr ""
+
+msgctxt "cutline"
+msgid "border"
+msgstr ""
+
+msgctxt "cutline"
+msgid "firebreak"
+msgstr ""
+
+msgctxt "cutline"
+msgid "hunting"
+msgstr ""
+
+msgctxt "cutline"
+msgid "loggingmachine"
+msgstr ""
+
+msgctxt "cutline"
+msgid "pipeline"
+msgstr ""
+
+msgctxt "cutline"
+msgid "piste"
+msgstr ""
+
+msgctxt "cutline"
+msgid "section"
+msgstr ""
+
msgid "Grassland"
msgstr ""
@@ -22040,6 +22133,9 @@ msgstr ""
msgid "Unspecific tag {0}"
msgstr ""
+msgid "Definition of {0} is unclear"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -27401,7 +27497,7 @@ msgstr ""
msgid "No object selected"
msgstr ""
-msgid "SeaMap Editor"
+msgid "SeaChart Editor"
msgstr ""
msgid "Seamark Inspector"
@@ -27473,6 +27569,9 @@ msgstr ""
msgid "Merge Nearby Nodes Threshold"
msgstr ""
+msgid "SeaMap Editor"
+msgstr ""
+
msgid "AutoSave LiveData"
msgstr ""
diff --git a/i18n/po/fo.po b/i18n/po/fo.po
index 89ddadc..75e8d9d 100644
--- a/i18n/po/fo.po
+++ b/i18n/po/fo.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL at ADDRESS>\n"
-"POT-Creation-Date: 2015-03-04 03:32+0100\n"
+"POT-Creation-Date: 2015-04-01 03:33+0200\n"
"PO-Revision-Date: 2015-02-28 16:15+0000\n"
"Last-Translator: LiFo <Unknown>\n"
"Language-Team: Faroese <fo at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-03-04 04:39+0000\n"
-"X-Generator: Launchpad (build 17361)\n"
+"X-Launchpad-Export-Date: 2015-04-01 04:39+0000\n"
+"X-Generator: Launchpad (build 17413)\n"
msgid "{0}: option ''{1}'' is ambiguous"
msgstr "{0}: valmøguleiki ''{1}'' er tvítýddur"
@@ -1695,9 +1695,15 @@ msgstr ""
msgid "Markers from {0}"
msgstr ""
+msgid "Download OSM Notes"
+msgstr ""
+
msgid "Downloading Notes"
msgstr ""
+msgid "Notes"
+msgstr ""
+
msgid "Download Compressed OSM Change"
msgstr ""
@@ -6108,6 +6114,9 @@ msgstr ""
msgid "Customize the style"
msgstr ""
+msgid "List of notes"
+msgstr ""
+
msgid "Add comment"
msgstr ""
@@ -7427,9 +7436,6 @@ 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 ""
@@ -15681,9 +15687,6 @@ msgstr ""
msgid "stadium"
msgstr ""
-msgid "Select sport:"
-msgstr ""
-
msgid "Sport"
msgstr ""
@@ -15804,19 +15807,19 @@ msgid "rugby_union"
msgstr ""
msgctxt "sport"
-msgid "shooting"
+msgid "running"
msgstr ""
msgctxt "sport"
-msgid "skateboard"
+msgid "shooting"
msgstr ""
msgctxt "sport"
-msgid "skating"
+msgid "skateboard"
msgstr ""
msgctxt "sport"
-msgid "skiing"
+msgid "skating"
msgstr ""
msgctxt "sport"
@@ -16144,6 +16147,30 @@ msgstr ""
msgid "Toll"
msgstr ""
+msgid "Is the water body intermittent (disappears seasonally)?"
+msgstr ""
+
+msgid "culvert"
+msgstr ""
+
+msgid "Water access rules:"
+msgstr ""
+
+msgid "Ship"
+msgstr ""
+
+msgid "designated"
+msgstr ""
+
+msgid "Boat"
+msgstr ""
+
+msgid "Motorboat"
+msgstr ""
+
+msgid "Canoe"
+msgstr ""
+
msgid "Streets"
msgstr ""
@@ -16359,9 +16386,6 @@ msgstr ""
msgid "official"
msgstr ""
-msgid "designated"
-msgstr ""
-
msgid "Vehicles per type"
msgstr ""
@@ -16751,6 +16775,9 @@ msgstr ""
msgid "Pedestrian Crossing"
msgstr ""
+msgid "In case of traffic signals:"
+msgstr ""
+
msgid "Traffic Calming"
msgstr ""
@@ -16997,15 +17024,12 @@ msgstr ""
msgid "Stream"
msgstr ""
-msgid "Wadi"
+msgid "River"
msgstr ""
msgid "Canal"
msgstr ""
-msgid "River"
-msgstr ""
-
msgid "Spring"
msgstr ""
@@ -17071,9 +17095,6 @@ msgstr ""
msgid "Salt Water"
msgstr ""
-msgid "Is the water body intermittent (disappears seasonally)?"
-msgstr ""
-
msgid "Coastline"
msgstr ""
@@ -17913,6 +17934,9 @@ msgstr ""
msgid "Tactile Paving"
msgstr ""
+msgid "incorrect"
+msgstr ""
+
msgid "Bus Platform"
msgstr ""
@@ -18075,6 +18099,9 @@ msgstr ""
msgid "Microbrewery"
msgstr ""
+msgid "Outdoor seating"
+msgstr ""
+
msgid "Fast Food"
msgstr ""
@@ -18669,13 +18696,13 @@ msgstr ""
msgid "Collection times"
msgstr ""
-msgid "11:30"
+msgid "Mo-Sa 09:00"
msgstr ""
-msgid "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
+msgid "Mo-Fr 17:30; Sa 12:00"
msgstr ""
-msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; Su,PH off"
+msgid "Mo-Fr 15:00,19:00; Sa 15:10; Su 10:30"
msgstr ""
msgid "Drive through"
@@ -18934,6 +18961,15 @@ msgstr ""
msgid "Pitch"
msgstr ""
+msgid "artificial_turf"
+msgstr ""
+
+msgid "decoturf"
+msgstr ""
+
+msgid "tartan"
+msgstr ""
+
msgid "Racetrack"
msgstr ""
@@ -19041,6 +19077,12 @@ msgstr ""
msgid "skitour"
msgstr ""
+msgid "sled"
+msgstr ""
+
+msgid "sleigh"
+msgstr ""
+
msgid "snow_park"
msgstr ""
@@ -19293,6 +19335,10 @@ msgctxt "building"
msgid "construction"
msgstr ""
+msgctxt "building"
+msgid "Levels"
+msgstr ""
+
msgid "Residential Building"
msgstr ""
@@ -19328,6 +19374,16 @@ msgctxt "building"
msgid "farm"
msgstr ""
+msgid "Building part"
+msgstr ""
+
+msgctxt "building"
+msgid "Skipped Levels"
+msgstr ""
+
+msgid "Skipped height (meters)"
+msgstr ""
+
msgid "Entrance"
msgstr ""
@@ -21061,22 +21117,28 @@ msgstr ""
msgid "scoria"
msgstr ""
-msgid "Cave Entrance"
+msgid "Ridge"
msgstr ""
-msgid "The entrance to a cave."
+msgid "A mountain or hill ridge."
msgstr ""
-msgid "Island"
+msgid "Valley"
msgstr ""
-msgid "Islet"
+msgid "A low area between hills."
msgstr ""
-msgid "Ridge"
+msgid "Cave Entrance"
msgstr ""
-msgid "A mountain or hill ridge."
+msgid "The entrance to a cave."
+msgstr ""
+
+msgid "Island"
+msgstr ""
+
+msgid "Islet"
msgstr ""
msgid "Nature"
@@ -21106,6 +21168,37 @@ msgstr ""
msgid "Forest"
msgstr ""
+msgid "Cutline"
+msgstr ""
+
+msgctxt "cutline"
+msgid "border"
+msgstr ""
+
+msgctxt "cutline"
+msgid "firebreak"
+msgstr ""
+
+msgctxt "cutline"
+msgid "hunting"
+msgstr ""
+
+msgctxt "cutline"
+msgid "loggingmachine"
+msgstr ""
+
+msgctxt "cutline"
+msgid "pipeline"
+msgstr ""
+
+msgctxt "cutline"
+msgid "piste"
+msgstr ""
+
+msgctxt "cutline"
+msgid "section"
+msgstr ""
+
msgid "Grassland"
msgstr ""
@@ -22039,6 +22132,9 @@ msgstr ""
msgid "Unspecific tag {0}"
msgstr ""
+msgid "Definition of {0} is unclear"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -27400,7 +27496,7 @@ msgstr ""
msgid "No object selected"
msgstr ""
-msgid "SeaMap Editor"
+msgid "SeaChart Editor"
msgstr ""
msgid "Seamark Inspector"
@@ -27472,6 +27568,9 @@ msgstr ""
msgid "Merge Nearby Nodes Threshold"
msgstr ""
+msgid "SeaMap Editor"
+msgstr ""
+
msgid "AutoSave LiveData"
msgstr ""
diff --git a/i18n/po/fr.po b/i18n/po/fr.po
index 9f13a60..11f0c86 100644
--- a/i18n/po/fr.po
+++ b/i18n/po/fr.po
@@ -5,16 +5,16 @@ msgid ""
msgstr ""
"Project-Id-Version: fr\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-04 03:32+0100\n"
-"PO-Revision-Date: 2015-02-22 14:06+0000\n"
-"Last-Translator: Dirk Stöcker <launchpad at dstoecker.de>\n"
+"POT-Creation-Date: 2015-04-01 03:33+0200\n"
+"PO-Revision-Date: 2015-03-31 15:10+0000\n"
+"Last-Translator: Frédéric Bonifas <fredericbonifas at gmail.com>\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: 2015-03-04 04:40+0000\n"
-"X-Generator: Launchpad (build 17361)\n"
+"X-Launchpad-Export-Date: 2015-04-01 04:40+0000\n"
+"X-Generator: Launchpad (build 17413)\n"
"Language: fr\n"
"X-Poedit-Bookmarks: 1767,-1,-1,2669,-1,-1,-1,-1,-1,-1\n"
@@ -1274,13 +1274,13 @@ msgid "Download notes from the note search API"
msgstr "Télécharger des notes depuis l’API de recherche de notes"
msgid "Search the OSM API for notes containing words:"
-msgstr ""
+msgstr "Rechercher les notes contenant les mots suivants dans l'API d'OSM"
msgid "Search for notes"
msgstr "Chercher des notes"
msgid "You must enter a search term"
-msgstr ""
+msgstr "Veuillez saisir un terme à rechercher"
msgid "Select All"
msgstr "Tout sélectionner"
@@ -1845,9 +1845,15 @@ msgstr "Données GPX téléchargées"
msgid "Markers from {0}"
msgstr "Marqueurs de {0}"
+msgid "Download OSM Notes"
+msgstr "Téléchargement des notes OSM"
+
msgid "Downloading Notes"
msgstr "En cours de téléchargement des notes"
+msgid "Notes"
+msgstr "Notes"
+
msgid "Download Compressed OSM Change"
msgstr "Téléchargement OSM Change compressé"
@@ -3911,7 +3917,7 @@ msgid "URL contains an invalid fragment: {0}"
msgstr "L''URL contient un fragment invalide: {0}"
msgid "Addresses"
-msgstr "Adresse"
+msgstr "Adresses"
msgid "Checks for errors in addresses and associatedStreet relations."
msgstr ""
@@ -3997,13 +4003,13 @@ msgid "Crossing ways"
msgstr "Chemins se croisant"
msgid "Crossing buildings"
-msgstr "Croisant des batiments"
+msgstr "Intersection de bâtiments"
msgid "Crossing waterways"
msgstr "Croisement de tracé de cours d’eau"
msgid "Crossing waterway/highway"
-msgstr "cours d’’eau/route se croisant"
+msgstr "Cours d’eau/route se croisant"
msgid "Crossing boundaries"
msgstr "Chevauchement de zones"
@@ -4196,7 +4202,11 @@ msgid ""
msgid_plural ""
"Multipolygon relation should be tagged with area tags and not the outer ways"
msgstr[0] ""
+"Les tags des multipolygones devraient être indiqués sur la relation et non "
+"sur le chemin extérieur"
msgstr[1] ""
+"Les tags des multipolygones devraient être indiqués sur la relation et non "
+"sur les chemins extérieurs"
msgid ""
"With the currently used mappaint style the style for inner way equals the "
@@ -5119,7 +5129,7 @@ msgid "Click to open the imagery tab in the preferences"
msgstr "Cliquez pour ouvrir l''onglet d''imagerie dans les préférences"
msgid "Search menu items"
-msgstr ""
+msgstr "Rechercher dans les éléments du menu"
msgid "Audio"
msgstr "Audio"
@@ -6670,6 +6680,9 @@ msgstr "Paramètres de style"
msgid "Customize the style"
msgstr "Personnaliser le style"
+msgid "List of notes"
+msgstr "Liste de notes"
+
msgid "Add comment"
msgstr "Ajouter un commentaire"
@@ -8103,9 +8116,6 @@ 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 "
@@ -9481,7 +9491,7 @@ msgid "Save Layer"
msgstr "Enregistrer le calque"
msgid "Note"
-msgstr "Paiement"
+msgstr "Note"
msgid "Notes layer"
msgstr "Calque des notes"
@@ -9965,7 +9975,7 @@ msgid "Delete File from disk"
msgstr "Supprimer un fichier du disque"
msgid "Copy image path"
-msgstr ""
+msgstr "Copier chemin de l’image"
msgid "Next"
msgstr "Suivant"
@@ -11605,6 +11615,8 @@ msgstr "Afficher les dates au format ISO"
msgid "Use native file choosers (nicer, but do not support file filters)"
msgstr ""
+"Utiliser le sélecteur de fichiers natif (plus joli, mais sans le support des "
+"filtres de fichier)"
msgid "Show localized name in selection lists, if available"
msgstr "Afficher les noms traduits dans la fenêtre de sélection"
@@ -13793,7 +13805,7 @@ msgstr ""
"{1}."
msgid "{0} bytes have been read"
-msgstr ""
+msgstr "{0} octets ont été lus"
msgid "Prepare OSM data..."
msgstr "Préparation des données…"
@@ -15590,13 +15602,13 @@ msgid "Landsat"
msgstr "Landsat"
msgid "Bing aerial imagery"
-msgstr ""
+msgstr "Imagerie aérienne Bing"
msgid "HDM (Humanitarian OpenStreetMap Team)"
msgstr "HDM (Humanitarian OpenStreetMap Team)"
msgid "Mapbox Satellite"
-msgstr ""
+msgstr "Satellite Mapbox"
msgid "MapQuest Open Aerial"
msgstr "MapQuest Open Aerial"
@@ -15614,7 +15626,7 @@ msgid "OpenStreetMap (Mapnik Black & White)"
msgstr "OpenStreetMap (Mapnik noir et blanc)"
msgid "OpenStreetMap (Mapnik, no labels)"
-msgstr ""
+msgstr "OpenStreetMap (Mapnik, sans étiquettes)"
msgid "skobbler heatmap"
msgstr "carte de chaleur skobbler"
@@ -17448,9 +17460,6 @@ msgstr "centre sportif"
msgid "stadium"
msgstr "stade"
-msgid "Select sport:"
-msgstr "Selection du sport :"
-
msgid "Sport"
msgstr "Sports"
@@ -17571,6 +17580,10 @@ msgid "rugby_union"
msgstr "rugby à XV"
msgctxt "sport"
+msgid "running"
+msgstr ""
+
+msgctxt "sport"
msgid "shooting"
msgstr "Stand de tir / Ball-trap"
@@ -17583,10 +17596,6 @@ msgid "skating"
msgstr "Ski de fond"
msgctxt "sport"
-msgid "skiing"
-msgstr "Ski"
-
-msgctxt "sport"
msgid "soccer"
msgstr "Football (Européen)"
@@ -17911,6 +17920,32 @@ msgstr "Poids maximal (tonnes)"
msgid "Toll"
msgstr "Péage"
+msgid "Is the water body intermittent (disappears seasonally)?"
+msgstr ""
+"Est-ce que la masse d''eau est intermittente (disparaît-elle "
+"saisonnièrement) ?"
+
+msgid "culvert"
+msgstr ""
+
+msgid "Water access rules:"
+msgstr ""
+
+msgid "Ship"
+msgstr ""
+
+msgid "designated"
+msgstr "signalé"
+
+msgid "Boat"
+msgstr ""
+
+msgid "Motorboat"
+msgstr ""
+
+msgid "Canoe"
+msgstr ""
+
msgid "Streets"
msgstr "Routes"
@@ -18126,9 +18161,6 @@ msgstr "Restrictions par mode de transport"
msgid "official"
msgstr "officiel"
-msgid "designated"
-msgstr "signalé"
-
msgid "Vehicles per type"
msgstr "Par type de véhicule"
@@ -18531,6 +18563,9 @@ msgstr "sens horaire"
msgid "Pedestrian Crossing"
msgstr "Passage piéton"
+msgid "In case of traffic signals:"
+msgstr ""
+
msgid "Traffic Calming"
msgstr "Ralentisseur"
@@ -18777,15 +18812,12 @@ msgstr "Fossé"
msgid "Stream"
msgstr "Ruisseau"
-msgid "Wadi"
-msgstr "Oued"
+msgid "River"
+msgstr "Fleuve, rivière"
msgid "Canal"
msgstr "Canal"
-msgid "River"
-msgstr "Fleuve, rivière"
-
msgid "Spring"
msgstr "Source"
@@ -18853,11 +18885,6 @@ msgstr "rivière"
msgid "Salt Water"
msgstr "Eau salée"
-msgid "Is the water body intermittent (disappears seasonally)?"
-msgstr ""
-"Est-ce que la masse d''eau est intermittente (disparaît-elle "
-"saisonnièrement) ?"
-
msgid "Coastline"
msgstr "Ligne côtière"
@@ -19703,6 +19730,9 @@ msgstr "Arrêt de bus"
msgid "Tactile Paving"
msgstr "Bande rugueuse"
+msgid "incorrect"
+msgstr ""
+
msgid "Bus Platform"
msgstr "Plateforme de bus"
@@ -19865,6 +19895,9 @@ msgstr "sushi"
msgid "Microbrewery"
msgstr "Microbrasserie"
+msgid "Outdoor seating"
+msgstr ""
+
msgid "Fast Food"
msgstr "Fast-Food"
@@ -20464,14 +20497,14 @@ msgstr "Boîte aux lettres"
msgid "Collection times"
msgstr "Heures de collecte"
-msgid "11:30"
-msgstr "11:30"
+msgid "Mo-Sa 09:00"
+msgstr ""
-msgid "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
-msgstr "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
+msgid "Mo-Fr 17:30; Sa 12:00"
+msgstr ""
-msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; Su,PH off"
-msgstr "Mo-Fr 09:00-12:00,17:15; Sa 14:00; Su,PH off"
+msgid "Mo-Fr 15:00,19:00; Sa 15:10; Su 10:30"
+msgstr ""
msgid "Drive through"
msgstr "Drive"
@@ -20709,7 +20742,7 @@ msgid "Count"
msgstr "Quantité"
msgid "Advertising Column"
-msgstr ""
+msgstr "Colonne Morris"
msgid "Billboard"
msgstr ""
@@ -20729,6 +20762,15 @@ msgstr "Centre sportif"
msgid "Pitch"
msgstr "Terrain de sport"
+msgid "artificial_turf"
+msgstr ""
+
+msgid "decoturf"
+msgstr ""
+
+msgid "tartan"
+msgstr ""
+
msgid "Racetrack"
msgstr "Circuit"
@@ -20836,6 +20878,12 @@ msgstr "nordique"
msgid "skitour"
msgstr "ski de randonnée"
+msgid "sled"
+msgstr ""
+
+msgid "sleigh"
+msgstr ""
+
msgid "snow_park"
msgstr "snowpark"
@@ -21088,6 +21136,10 @@ msgctxt "building"
msgid "construction"
msgstr "construction"
+msgctxt "building"
+msgid "Levels"
+msgstr ""
+
msgid "Residential Building"
msgstr "Bâtiment résidentiel"
@@ -21123,6 +21175,16 @@ msgctxt "building"
msgid "farm"
msgstr "Batiment agricole"
+msgid "Building part"
+msgstr ""
+
+msgctxt "building"
+msgid "Skipped Levels"
+msgstr ""
+
+msgid "Skipped height (meters)"
+msgstr ""
+
msgid "Entrance"
msgstr "Entrée"
@@ -22865,6 +22927,18 @@ msgstr "bouclier"
msgid "scoria"
msgstr "scorie"
+msgid "Ridge"
+msgstr "Ligne de crête"
+
+msgid "A mountain or hill ridge."
+msgstr "La crête d''un massif montagneux."
+
+msgid "Valley"
+msgstr ""
+
+msgid "A low area between hills."
+msgstr ""
+
msgid "Cave Entrance"
msgstr "Grotte"
@@ -22877,12 +22951,6 @@ msgstr "Île"
msgid "Islet"
msgstr "Îlot"
-msgid "Ridge"
-msgstr "Ligne de crête"
-
-msgid "A mountain or hill ridge."
-msgstr "La crête d''un massif montagneux."
-
msgid "Nature"
msgstr "Nature"
@@ -22910,6 +22978,37 @@ msgstr "Zone boisée où l’exploitation forestière n’est pas prédominante.
msgid "Forest"
msgstr "Forêt"
+msgid "Cutline"
+msgstr ""
+
+msgctxt "cutline"
+msgid "border"
+msgstr ""
+
+msgctxt "cutline"
+msgid "firebreak"
+msgstr ""
+
+msgctxt "cutline"
+msgid "hunting"
+msgstr ""
+
+msgctxt "cutline"
+msgid "loggingmachine"
+msgstr ""
+
+msgctxt "cutline"
+msgid "pipeline"
+msgstr ""
+
+msgctxt "cutline"
+msgid "piste"
+msgstr ""
+
+msgctxt "cutline"
+msgid "section"
+msgstr ""
+
msgid "Grassland"
msgstr "Prairie"
@@ -23416,7 +23515,7 @@ msgid "postal_code"
msgstr "code postal"
msgid "protected_area"
-msgstr ""
+msgstr "zone protégée"
msgid "Sub area"
msgstr "sous-zone"
@@ -23853,11 +23952,14 @@ msgstr ""
msgid "Unspecific tag {0}"
msgstr ""
+msgid "Definition of {0} is unclear"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr "{0} sur un nœud. Devrait être employé sur un chemin."
msgid "{0} on a node. Should be drawn as an area."
-msgstr ""
+msgstr "{0} sur un nœud. Devrait former une aire."
msgid "{0}=* on a node. Should be used in a relation"
msgstr "{0}=* sur un nœud. Devrait être employé dans une relation"
@@ -29597,8 +29699,8 @@ msgstr "Sauvegarde du fichier SDS"
msgid "No object selected"
msgstr ""
-msgid "SeaMap Editor"
-msgstr "Éditeur de carte maritime"
+msgid "SeaChart Editor"
+msgstr ""
msgid "Seamark Inspector"
msgstr ""
@@ -29669,6 +29771,9 @@ msgstr "Facteur de distance"
msgid "Merge Nearby Nodes Threshold"
msgstr "Seuil de fusion des nœuds voisins"
+msgid "SeaMap Editor"
+msgstr "Éditeur de carte maritime"
+
msgid "AutoSave LiveData"
msgstr "Sauvegarde automatique des données en direct"
diff --git a/i18n/po/gl.po b/i18n/po/gl.po
index 7e95679..08759ad 100644
--- a/i18n/po/gl.po
+++ b/i18n/po/gl.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-04 03:32+0100\n"
+"POT-Creation-Date: 2015-04-01 03:33+0200\n"
"PO-Revision-Date: 2015-02-02 23:45+0000\n"
"Last-Translator: Adrián Chaves Fernández <adriyetichaves at gmail.com>\n"
"Language-Team: Galician <proxecto at trasno.net>\n"
@@ -16,8 +16,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-03-04 04:42+0000\n"
-"X-Generator: Launchpad (build 17361)\n"
+"X-Launchpad-Export-Date: 2015-04-01 04:42+0000\n"
+"X-Generator: Launchpad (build 17413)\n"
"Language: gl\n"
"X-Poedit-Language: Galician\n"
@@ -1843,9 +1843,15 @@ msgstr "Datos GPX descargados"
msgid "Markers from {0}"
msgstr "Marcas de {0}"
+msgid "Download OSM Notes"
+msgstr ""
+
msgid "Downloading Notes"
msgstr ""
+msgid "Notes"
+msgstr "Anotacións"
+
msgid "Download Compressed OSM Change"
msgstr ""
@@ -6412,6 +6418,9 @@ msgstr ""
msgid "Customize the style"
msgstr ""
+msgid "List of notes"
+msgstr ""
+
msgid "Add comment"
msgstr ""
@@ -7786,9 +7795,6 @@ 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 ""
@@ -16265,9 +16271,6 @@ msgstr "Polideportivo"
msgid "stadium"
msgstr "Estadio"
-msgid "Select sport:"
-msgstr ""
-
msgid "Sport"
msgstr "Deportes"
@@ -16388,19 +16391,19 @@ msgid "rugby_union"
msgstr ""
msgctxt "sport"
-msgid "shooting"
+msgid "running"
msgstr ""
msgctxt "sport"
-msgid "skateboard"
+msgid "shooting"
msgstr ""
msgctxt "sport"
-msgid "skating"
+msgid "skateboard"
msgstr ""
msgctxt "sport"
-msgid "skiing"
+msgid "skating"
msgstr ""
msgctxt "sport"
@@ -16728,6 +16731,30 @@ msgstr "Peso máximo (t)"
msgid "Toll"
msgstr "Peaxe"
+msgid "Is the water body intermittent (disappears seasonally)?"
+msgstr ""
+
+msgid "culvert"
+msgstr ""
+
+msgid "Water access rules:"
+msgstr ""
+
+msgid "Ship"
+msgstr ""
+
+msgid "designated"
+msgstr "autorizado"
+
+msgid "Boat"
+msgstr ""
+
+msgid "Motorboat"
+msgstr ""
+
+msgid "Canoe"
+msgstr ""
+
msgid "Streets"
msgstr "Rúas"
@@ -16943,9 +16970,6 @@ msgstr ""
msgid "official"
msgstr "oficial"
-msgid "designated"
-msgstr "autorizado"
-
msgid "Vehicles per type"
msgstr ""
@@ -17335,6 +17359,9 @@ msgstr "no sentido das agullas do reloxo"
msgid "Pedestrian Crossing"
msgstr "Cruce peatonal"
+msgid "In case of traffic signals:"
+msgstr ""
+
msgid "Traffic Calming"
msgstr "Calmado de tráfico"
@@ -17582,15 +17609,12 @@ msgstr "Acequia"
msgid "Stream"
msgstr "Arroio ou riachuelo"
-msgid "Wadi"
-msgstr ""
+msgid "River"
+msgstr "Río"
msgid "Canal"
msgstr "Canal"
-msgid "River"
-msgstr "Río"
-
msgid "Spring"
msgstr "fonte"
@@ -17656,9 +17680,6 @@ msgstr ""
msgid "Salt Water"
msgstr ""
-msgid "Is the water body intermittent (disappears seasonally)?"
-msgstr ""
-
msgid "Coastline"
msgstr "Liña de costa"
@@ -18498,6 +18519,9 @@ msgstr "Parada de autobús"
msgid "Tactile Paving"
msgstr "Pavimento táctil"
+msgid "incorrect"
+msgstr ""
+
msgid "Bus Platform"
msgstr "Andén de autobús"
@@ -18660,6 +18684,9 @@ msgstr "sushi"
msgid "Microbrewery"
msgstr ""
+msgid "Outdoor seating"
+msgstr ""
+
msgid "Fast Food"
msgstr "Comida rápida"
@@ -19254,13 +19281,13 @@ msgstr "Buzón de Correos"
msgid "Collection times"
msgstr ""
-msgid "11:30"
+msgid "Mo-Sa 09:00"
msgstr ""
-msgid "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
+msgid "Mo-Fr 17:30; Sa 12:00"
msgstr ""
-msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; Su,PH off"
+msgid "Mo-Fr 15:00,19:00; Sa 15:10; Su 10:30"
msgstr ""
msgid "Drive through"
@@ -19519,6 +19546,15 @@ msgstr "Polideportivo"
msgid "Pitch"
msgstr "Cancha de xogo"
+msgid "artificial_turf"
+msgstr ""
+
+msgid "decoturf"
+msgstr ""
+
+msgid "tartan"
+msgstr ""
+
msgid "Racetrack"
msgstr "Pista de carreiras"
@@ -19626,6 +19662,12 @@ msgstr "nórdico"
msgid "skitour"
msgstr ""
+msgid "sled"
+msgstr ""
+
+msgid "sleigh"
+msgstr ""
+
msgid "snow_park"
msgstr "parque de snowboard"
@@ -19878,6 +19920,10 @@ msgctxt "building"
msgid "construction"
msgstr ""
+msgctxt "building"
+msgid "Levels"
+msgstr ""
+
msgid "Residential Building"
msgstr ""
@@ -19913,6 +19959,16 @@ msgctxt "building"
msgid "farm"
msgstr ""
+msgid "Building part"
+msgstr ""
+
+msgctxt "building"
+msgid "Skipped Levels"
+msgstr ""
+
+msgid "Skipped height (meters)"
+msgstr ""
+
msgid "Entrance"
msgstr "Entrada"
@@ -21646,6 +21702,18 @@ msgstr ""
msgid "scoria"
msgstr ""
+msgid "Ridge"
+msgstr ""
+
+msgid "A mountain or hill ridge."
+msgstr ""
+
+msgid "Valley"
+msgstr ""
+
+msgid "A low area between hills."
+msgstr ""
+
msgid "Cave Entrance"
msgstr "Entrada de cova"
@@ -21658,12 +21726,6 @@ msgstr "Illa"
msgid "Islet"
msgstr "Illote"
-msgid "Ridge"
-msgstr ""
-
-msgid "A mountain or hill ridge."
-msgstr ""
-
msgid "Nature"
msgstr "Natureza"
@@ -21691,6 +21753,37 @@ msgstr ""
msgid "Forest"
msgstr "Monte"
+msgid "Cutline"
+msgstr ""
+
+msgctxt "cutline"
+msgid "border"
+msgstr ""
+
+msgctxt "cutline"
+msgid "firebreak"
+msgstr ""
+
+msgctxt "cutline"
+msgid "hunting"
+msgstr ""
+
+msgctxt "cutline"
+msgid "loggingmachine"
+msgstr ""
+
+msgctxt "cutline"
+msgid "pipeline"
+msgstr ""
+
+msgctxt "cutline"
+msgid "piste"
+msgstr ""
+
+msgctxt "cutline"
+msgid "section"
+msgstr ""
+
msgid "Grassland"
msgstr ""
@@ -22624,6 +22717,9 @@ msgstr ""
msgid "Unspecific tag {0}"
msgstr ""
+msgid "Definition of {0} is unclear"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -28014,8 +28110,8 @@ msgstr ""
msgid "No object selected"
msgstr ""
-msgid "SeaMap Editor"
-msgstr "Editor Seamap"
+msgid "SeaChart Editor"
+msgstr ""
msgid "Seamark Inspector"
msgstr ""
@@ -28086,6 +28182,9 @@ msgstr ""
msgid "Merge Nearby Nodes Threshold"
msgstr ""
+msgid "SeaMap Editor"
+msgstr "Editor Seamap"
+
msgid "AutoSave LiveData"
msgstr ""
diff --git a/i18n/po/he.po b/i18n/po/he.po
index cabf1ba..4ce22d7 100644
--- a/i18n/po/he.po
+++ b/i18n/po/he.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-04 03:32+0100\n"
+"POT-Creation-Date: 2015-04-01 03:33+0200\n"
"PO-Revision-Date: 2013-03-30 13:38+0000\n"
"Last-Translator: Dirk Stöcker <launchpad at dstoecker.de>\n"
"Language-Team: Hebrew <he at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-03-04 04:43+0000\n"
-"X-Generator: Launchpad (build 17361)\n"
+"X-Launchpad-Export-Date: 2015-04-01 04:43+0000\n"
+"X-Generator: Launchpad (build 17413)\n"
"Language: he\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -1700,9 +1700,15 @@ msgstr "הורדו נתוני GPX"
msgid "Markers from {0}"
msgstr "סמנים מהמיקום {0}"
+msgid "Download OSM Notes"
+msgstr ""
+
msgid "Downloading Notes"
msgstr ""
+msgid "Notes"
+msgstr ""
+
msgid "Download Compressed OSM Change"
msgstr ""
@@ -6134,6 +6140,9 @@ msgstr ""
msgid "Customize the style"
msgstr ""
+msgid "List of notes"
+msgstr ""
+
msgid "Add comment"
msgstr ""
@@ -7455,9 +7464,6 @@ 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 ""
@@ -15723,9 +15729,6 @@ msgstr "מרכז ספורט"
msgid "stadium"
msgstr "איצטדיון"
-msgid "Select sport:"
-msgstr ""
-
msgid "Sport"
msgstr "ספורט"
@@ -15846,19 +15849,19 @@ msgid "rugby_union"
msgstr ""
msgctxt "sport"
-msgid "shooting"
+msgid "running"
msgstr ""
msgctxt "sport"
-msgid "skateboard"
+msgid "shooting"
msgstr ""
msgctxt "sport"
-msgid "skating"
+msgid "skateboard"
msgstr ""
msgctxt "sport"
-msgid "skiing"
+msgid "skating"
msgstr ""
msgctxt "sport"
@@ -16186,6 +16189,30 @@ msgstr "משקל מירבי (טונות)"
msgid "Toll"
msgstr "אגרה"
+msgid "Is the water body intermittent (disappears seasonally)?"
+msgstr ""
+
+msgid "culvert"
+msgstr ""
+
+msgid "Water access rules:"
+msgstr ""
+
+msgid "Ship"
+msgstr ""
+
+msgid "designated"
+msgstr ""
+
+msgid "Boat"
+msgstr ""
+
+msgid "Motorboat"
+msgstr ""
+
+msgid "Canoe"
+msgstr ""
+
msgid "Streets"
msgstr "רחובות"
@@ -16401,9 +16428,6 @@ msgstr ""
msgid "official"
msgstr ""
-msgid "designated"
-msgstr ""
-
msgid "Vehicles per type"
msgstr ""
@@ -16793,6 +16817,9 @@ msgstr ""
msgid "Pedestrian Crossing"
msgstr "מעבר חציה"
+msgid "In case of traffic signals:"
+msgstr ""
+
msgid "Traffic Calming"
msgstr ""
@@ -17039,15 +17066,12 @@ msgstr ""
msgid "Stream"
msgstr "נחל"
-msgid "Wadi"
-msgstr ""
+msgid "River"
+msgstr "נהר"
msgid "Canal"
msgstr "תעלה"
-msgid "River"
-msgstr "נהר"
-
msgid "Spring"
msgstr "מעיין"
@@ -17113,9 +17137,6 @@ msgstr ""
msgid "Salt Water"
msgstr ""
-msgid "Is the water body intermittent (disappears seasonally)?"
-msgstr ""
-
msgid "Coastline"
msgstr "קו חוף"
@@ -17955,6 +17976,9 @@ msgstr ""
msgid "Tactile Paving"
msgstr ""
+msgid "incorrect"
+msgstr ""
+
msgid "Bus Platform"
msgstr ""
@@ -18117,6 +18141,9 @@ msgstr ""
msgid "Microbrewery"
msgstr ""
+msgid "Outdoor seating"
+msgstr ""
+
msgid "Fast Food"
msgstr "מזון מהיר"
@@ -18711,13 +18738,13 @@ msgstr "תיבת דואר"
msgid "Collection times"
msgstr ""
-msgid "11:30"
+msgid "Mo-Sa 09:00"
msgstr ""
-msgid "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
+msgid "Mo-Fr 17:30; Sa 12:00"
msgstr ""
-msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; Su,PH off"
+msgid "Mo-Fr 15:00,19:00; Sa 15:10; Su 10:30"
msgstr ""
msgid "Drive through"
@@ -18976,6 +19003,15 @@ msgstr "מרכז ספורט"
msgid "Pitch"
msgstr ""
+msgid "artificial_turf"
+msgstr ""
+
+msgid "decoturf"
+msgstr ""
+
+msgid "tartan"
+msgstr ""
+
msgid "Racetrack"
msgstr "מסלול מירוצים"
@@ -19083,6 +19119,12 @@ msgstr ""
msgid "skitour"
msgstr ""
+msgid "sled"
+msgstr ""
+
+msgid "sleigh"
+msgstr ""
+
msgid "snow_park"
msgstr "פארק שלג"
@@ -19335,6 +19377,10 @@ msgctxt "building"
msgid "construction"
msgstr ""
+msgctxt "building"
+msgid "Levels"
+msgstr ""
+
msgid "Residential Building"
msgstr ""
@@ -19370,6 +19416,16 @@ msgctxt "building"
msgid "farm"
msgstr ""
+msgid "Building part"
+msgstr ""
+
+msgctxt "building"
+msgid "Skipped Levels"
+msgstr ""
+
+msgid "Skipped height (meters)"
+msgstr ""
+
msgid "Entrance"
msgstr "כניסה"
@@ -21103,6 +21159,18 @@ msgstr ""
msgid "scoria"
msgstr ""
+msgid "Ridge"
+msgstr ""
+
+msgid "A mountain or hill ridge."
+msgstr ""
+
+msgid "Valley"
+msgstr ""
+
+msgid "A low area between hills."
+msgstr ""
+
msgid "Cave Entrance"
msgstr "פתח מערה"
@@ -21115,12 +21183,6 @@ msgstr "אי"
msgid "Islet"
msgstr ""
-msgid "Ridge"
-msgstr ""
-
-msgid "A mountain or hill ridge."
-msgstr ""
-
msgid "Nature"
msgstr ""
@@ -21148,6 +21210,37 @@ msgstr ""
msgid "Forest"
msgstr "יער"
+msgid "Cutline"
+msgstr ""
+
+msgctxt "cutline"
+msgid "border"
+msgstr ""
+
+msgctxt "cutline"
+msgid "firebreak"
+msgstr ""
+
+msgctxt "cutline"
+msgid "hunting"
+msgstr ""
+
+msgctxt "cutline"
+msgid "loggingmachine"
+msgstr ""
+
+msgctxt "cutline"
+msgid "pipeline"
+msgstr ""
+
+msgctxt "cutline"
+msgid "piste"
+msgstr ""
+
+msgctxt "cutline"
+msgid "section"
+msgstr ""
+
msgid "Grassland"
msgstr ""
@@ -22081,6 +22174,9 @@ msgstr ""
msgid "Unspecific tag {0}"
msgstr ""
+msgid "Definition of {0} is unclear"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -27446,7 +27542,7 @@ msgstr ""
msgid "No object selected"
msgstr ""
-msgid "SeaMap Editor"
+msgid "SeaChart Editor"
msgstr ""
msgid "Seamark Inspector"
@@ -27518,6 +27614,9 @@ msgstr ""
msgid "Merge Nearby Nodes Threshold"
msgstr ""
+msgid "SeaMap Editor"
+msgstr ""
+
msgid "AutoSave LiveData"
msgstr ""
diff --git a/i18n/po/hi.po b/i18n/po/hi.po
index d2f9f27..c55e0e3 100644
--- a/i18n/po/hi.po
+++ b/i18n/po/hi.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-04 03:32+0100\n"
+"POT-Creation-Date: 2015-04-01 03:33+0200\n"
"PO-Revision-Date: 2009-11-14 16:28+0000\n"
"Last-Translator: nipunreddevil <nipunreddevil at gmail.com>\n"
"Language-Team: Hindi <hi at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-03-04 04:44+0000\n"
-"X-Generator: Launchpad (build 17361)\n"
+"X-Launchpad-Export-Date: 2015-04-01 04:44+0000\n"
+"X-Generator: Launchpad (build 17413)\n"
"Language: hi\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -1696,9 +1696,15 @@ msgstr ""
msgid "Markers from {0}"
msgstr ""
+msgid "Download OSM Notes"
+msgstr ""
+
msgid "Downloading Notes"
msgstr ""
+msgid "Notes"
+msgstr ""
+
msgid "Download Compressed OSM Change"
msgstr ""
@@ -6109,6 +6115,9 @@ msgstr ""
msgid "Customize the style"
msgstr ""
+msgid "List of notes"
+msgstr ""
+
msgid "Add comment"
msgstr ""
@@ -7428,9 +7437,6 @@ 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 ""
@@ -15682,9 +15688,6 @@ msgstr ""
msgid "stadium"
msgstr ""
-msgid "Select sport:"
-msgstr ""
-
msgid "Sport"
msgstr ""
@@ -15805,19 +15808,19 @@ msgid "rugby_union"
msgstr ""
msgctxt "sport"
-msgid "shooting"
+msgid "running"
msgstr ""
msgctxt "sport"
-msgid "skateboard"
+msgid "shooting"
msgstr ""
msgctxt "sport"
-msgid "skating"
+msgid "skateboard"
msgstr ""
msgctxt "sport"
-msgid "skiing"
+msgid "skating"
msgstr ""
msgctxt "sport"
@@ -16145,6 +16148,30 @@ msgstr ""
msgid "Toll"
msgstr ""
+msgid "Is the water body intermittent (disappears seasonally)?"
+msgstr ""
+
+msgid "culvert"
+msgstr ""
+
+msgid "Water access rules:"
+msgstr ""
+
+msgid "Ship"
+msgstr ""
+
+msgid "designated"
+msgstr ""
+
+msgid "Boat"
+msgstr ""
+
+msgid "Motorboat"
+msgstr ""
+
+msgid "Canoe"
+msgstr ""
+
msgid "Streets"
msgstr ""
@@ -16360,9 +16387,6 @@ msgstr ""
msgid "official"
msgstr ""
-msgid "designated"
-msgstr ""
-
msgid "Vehicles per type"
msgstr ""
@@ -16752,6 +16776,9 @@ msgstr ""
msgid "Pedestrian Crossing"
msgstr ""
+msgid "In case of traffic signals:"
+msgstr ""
+
msgid "Traffic Calming"
msgstr ""
@@ -16998,15 +17025,12 @@ msgstr ""
msgid "Stream"
msgstr ""
-msgid "Wadi"
+msgid "River"
msgstr ""
msgid "Canal"
msgstr ""
-msgid "River"
-msgstr ""
-
msgid "Spring"
msgstr ""
@@ -17072,9 +17096,6 @@ msgstr ""
msgid "Salt Water"
msgstr ""
-msgid "Is the water body intermittent (disappears seasonally)?"
-msgstr ""
-
msgid "Coastline"
msgstr ""
@@ -17914,6 +17935,9 @@ msgstr ""
msgid "Tactile Paving"
msgstr ""
+msgid "incorrect"
+msgstr ""
+
msgid "Bus Platform"
msgstr ""
@@ -18076,6 +18100,9 @@ msgstr ""
msgid "Microbrewery"
msgstr ""
+msgid "Outdoor seating"
+msgstr ""
+
msgid "Fast Food"
msgstr ""
@@ -18670,13 +18697,13 @@ msgstr ""
msgid "Collection times"
msgstr ""
-msgid "11:30"
+msgid "Mo-Sa 09:00"
msgstr ""
-msgid "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
+msgid "Mo-Fr 17:30; Sa 12:00"
msgstr ""
-msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; Su,PH off"
+msgid "Mo-Fr 15:00,19:00; Sa 15:10; Su 10:30"
msgstr ""
msgid "Drive through"
@@ -18935,6 +18962,15 @@ msgstr ""
msgid "Pitch"
msgstr ""
+msgid "artificial_turf"
+msgstr ""
+
+msgid "decoturf"
+msgstr ""
+
+msgid "tartan"
+msgstr ""
+
msgid "Racetrack"
msgstr ""
@@ -19042,6 +19078,12 @@ msgstr ""
msgid "skitour"
msgstr ""
+msgid "sled"
+msgstr ""
+
+msgid "sleigh"
+msgstr ""
+
msgid "snow_park"
msgstr ""
@@ -19294,6 +19336,10 @@ msgctxt "building"
msgid "construction"
msgstr ""
+msgctxt "building"
+msgid "Levels"
+msgstr ""
+
msgid "Residential Building"
msgstr ""
@@ -19329,6 +19375,16 @@ msgctxt "building"
msgid "farm"
msgstr ""
+msgid "Building part"
+msgstr ""
+
+msgctxt "building"
+msgid "Skipped Levels"
+msgstr ""
+
+msgid "Skipped height (meters)"
+msgstr ""
+
msgid "Entrance"
msgstr ""
@@ -21062,22 +21118,28 @@ msgstr ""
msgid "scoria"
msgstr ""
-msgid "Cave Entrance"
+msgid "Ridge"
msgstr ""
-msgid "The entrance to a cave."
+msgid "A mountain or hill ridge."
msgstr ""
-msgid "Island"
+msgid "Valley"
msgstr ""
-msgid "Islet"
+msgid "A low area between hills."
msgstr ""
-msgid "Ridge"
+msgid "Cave Entrance"
msgstr ""
-msgid "A mountain or hill ridge."
+msgid "The entrance to a cave."
+msgstr ""
+
+msgid "Island"
+msgstr ""
+
+msgid "Islet"
msgstr ""
msgid "Nature"
@@ -21107,6 +21169,37 @@ msgstr ""
msgid "Forest"
msgstr ""
+msgid "Cutline"
+msgstr ""
+
+msgctxt "cutline"
+msgid "border"
+msgstr ""
+
+msgctxt "cutline"
+msgid "firebreak"
+msgstr ""
+
+msgctxt "cutline"
+msgid "hunting"
+msgstr ""
+
+msgctxt "cutline"
+msgid "loggingmachine"
+msgstr ""
+
+msgctxt "cutline"
+msgid "pipeline"
+msgstr ""
+
+msgctxt "cutline"
+msgid "piste"
+msgstr ""
+
+msgctxt "cutline"
+msgid "section"
+msgstr ""
+
msgid "Grassland"
msgstr ""
@@ -22040,6 +22133,9 @@ msgstr ""
msgid "Unspecific tag {0}"
msgstr ""
+msgid "Definition of {0} is unclear"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -27401,7 +27497,7 @@ msgstr ""
msgid "No object selected"
msgstr ""
-msgid "SeaMap Editor"
+msgid "SeaChart Editor"
msgstr ""
msgid "Seamark Inspector"
@@ -27473,6 +27569,9 @@ msgstr ""
msgid "Merge Nearby Nodes Threshold"
msgstr ""
+msgid "SeaMap Editor"
+msgstr ""
+
msgid "AutoSave LiveData"
msgstr ""
diff --git a/i18n/po/hr.po b/i18n/po/hr.po
index 3584f9e..c3b03d8 100644
--- a/i18n/po/hr.po
+++ b/i18n/po/hr.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-04 03:32+0100\n"
+"POT-Creation-Date: 2015-04-01 03:33+0200\n"
"PO-Revision-Date: 2015-02-25 14:38+0000\n"
"Last-Translator: gogo <trebelnik2 at gmail.com>\n"
"Language-Team: Croatian <hr at li.org>\n"
@@ -16,8 +16,8 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2015-03-04 04:57+0000\n"
-"X-Generator: Launchpad (build 17361)\n"
+"X-Launchpad-Export-Date: 2015-04-01 04:56+0000\n"
+"X-Generator: Launchpad (build 17413)\n"
"Language: hr\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -1780,9 +1780,15 @@ msgstr "Preuzueti GPX podaci"
msgid "Markers from {0}"
msgstr ""
+msgid "Download OSM Notes"
+msgstr ""
+
msgid "Downloading Notes"
msgstr ""
+msgid "Notes"
+msgstr ""
+
msgid "Download Compressed OSM Change"
msgstr ""
@@ -6234,6 +6240,9 @@ msgstr ""
msgid "Customize the style"
msgstr ""
+msgid "List of notes"
+msgstr ""
+
msgid "Add comment"
msgstr ""
@@ -7557,9 +7566,6 @@ 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 ""
@@ -15839,9 +15845,6 @@ msgstr ""
msgid "stadium"
msgstr ""
-msgid "Select sport:"
-msgstr ""
-
msgid "Sport"
msgstr ""
@@ -15962,19 +15965,19 @@ msgid "rugby_union"
msgstr ""
msgctxt "sport"
-msgid "shooting"
+msgid "running"
msgstr ""
msgctxt "sport"
-msgid "skateboard"
+msgid "shooting"
msgstr ""
msgctxt "sport"
-msgid "skating"
+msgid "skateboard"
msgstr ""
msgctxt "sport"
-msgid "skiing"
+msgid "skating"
msgstr ""
msgctxt "sport"
@@ -16302,6 +16305,30 @@ msgstr "Max. težina (t)"
msgid "Toll"
msgstr "Cestarina (Toll)"
+msgid "Is the water body intermittent (disappears seasonally)?"
+msgstr ""
+
+msgid "culvert"
+msgstr ""
+
+msgid "Water access rules:"
+msgstr ""
+
+msgid "Ship"
+msgstr ""
+
+msgid "designated"
+msgstr "namijenjen"
+
+msgid "Boat"
+msgstr ""
+
+msgid "Motorboat"
+msgstr ""
+
+msgid "Canoe"
+msgstr ""
+
msgid "Streets"
msgstr ""
@@ -16517,9 +16544,6 @@ msgstr ""
msgid "official"
msgstr "službeno"
-msgid "designated"
-msgstr "namijenjen"
-
msgid "Vehicles per type"
msgstr "Vozila po vrsti"
@@ -16909,6 +16933,9 @@ msgstr "u smjeru kazaljke na satu"
msgid "Pedestrian Crossing"
msgstr "Pješački prijelaz"
+msgid "In case of traffic signals:"
+msgstr ""
+
msgid "Traffic Calming"
msgstr "Objekti za uporavanje prometa"
@@ -17155,15 +17182,12 @@ msgstr ""
msgid "Stream"
msgstr ""
-msgid "Wadi"
+msgid "River"
msgstr ""
msgid "Canal"
msgstr ""
-msgid "River"
-msgstr ""
-
msgid "Spring"
msgstr ""
@@ -17229,9 +17253,6 @@ msgstr ""
msgid "Salt Water"
msgstr ""
-msgid "Is the water body intermittent (disappears seasonally)?"
-msgstr ""
-
msgid "Coastline"
msgstr ""
@@ -18071,6 +18092,9 @@ msgstr ""
msgid "Tactile Paving"
msgstr ""
+msgid "incorrect"
+msgstr ""
+
msgid "Bus Platform"
msgstr ""
@@ -18233,6 +18257,9 @@ msgstr ""
msgid "Microbrewery"
msgstr ""
+msgid "Outdoor seating"
+msgstr ""
+
msgid "Fast Food"
msgstr ""
@@ -18827,13 +18854,13 @@ msgstr ""
msgid "Collection times"
msgstr ""
-msgid "11:30"
+msgid "Mo-Sa 09:00"
msgstr ""
-msgid "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
+msgid "Mo-Fr 17:30; Sa 12:00"
msgstr ""
-msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; Su,PH off"
+msgid "Mo-Fr 15:00,19:00; Sa 15:10; Su 10:30"
msgstr ""
msgid "Drive through"
@@ -19092,6 +19119,15 @@ msgstr ""
msgid "Pitch"
msgstr ""
+msgid "artificial_turf"
+msgstr ""
+
+msgid "decoturf"
+msgstr ""
+
+msgid "tartan"
+msgstr ""
+
msgid "Racetrack"
msgstr ""
@@ -19199,6 +19235,12 @@ msgstr ""
msgid "skitour"
msgstr ""
+msgid "sled"
+msgstr ""
+
+msgid "sleigh"
+msgstr ""
+
msgid "snow_park"
msgstr ""
@@ -19451,6 +19493,10 @@ msgctxt "building"
msgid "construction"
msgstr ""
+msgctxt "building"
+msgid "Levels"
+msgstr ""
+
msgid "Residential Building"
msgstr ""
@@ -19486,6 +19532,16 @@ msgctxt "building"
msgid "farm"
msgstr ""
+msgid "Building part"
+msgstr ""
+
+msgctxt "building"
+msgid "Skipped Levels"
+msgstr ""
+
+msgid "Skipped height (meters)"
+msgstr ""
+
msgid "Entrance"
msgstr ""
@@ -21219,22 +21275,28 @@ msgstr ""
msgid "scoria"
msgstr ""
-msgid "Cave Entrance"
+msgid "Ridge"
msgstr ""
-msgid "The entrance to a cave."
+msgid "A mountain or hill ridge."
msgstr ""
-msgid "Island"
+msgid "Valley"
msgstr ""
-msgid "Islet"
+msgid "A low area between hills."
msgstr ""
-msgid "Ridge"
+msgid "Cave Entrance"
msgstr ""
-msgid "A mountain or hill ridge."
+msgid "The entrance to a cave."
+msgstr ""
+
+msgid "Island"
+msgstr ""
+
+msgid "Islet"
msgstr ""
msgid "Nature"
@@ -21264,6 +21326,37 @@ msgstr ""
msgid "Forest"
msgstr ""
+msgid "Cutline"
+msgstr ""
+
+msgctxt "cutline"
+msgid "border"
+msgstr ""
+
+msgctxt "cutline"
+msgid "firebreak"
+msgstr ""
+
+msgctxt "cutline"
+msgid "hunting"
+msgstr ""
+
+msgctxt "cutline"
+msgid "loggingmachine"
+msgstr ""
+
+msgctxt "cutline"
+msgid "pipeline"
+msgstr ""
+
+msgctxt "cutline"
+msgid "piste"
+msgstr ""
+
+msgctxt "cutline"
+msgid "section"
+msgstr ""
+
msgid "Grassland"
msgstr ""
@@ -22197,6 +22290,9 @@ msgstr ""
msgid "Unspecific tag {0}"
msgstr ""
+msgid "Definition of {0} is unclear"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -27562,7 +27658,7 @@ msgstr ""
msgid "No object selected"
msgstr ""
-msgid "SeaMap Editor"
+msgid "SeaChart Editor"
msgstr ""
msgid "Seamark Inspector"
@@ -27634,6 +27730,9 @@ msgstr ""
msgid "Merge Nearby Nodes Threshold"
msgstr ""
+msgid "SeaMap Editor"
+msgstr ""
+
msgid "AutoSave LiveData"
msgstr ""
diff --git a/i18n/po/ht.po b/i18n/po/ht.po
index 2a6172d..1fbbbbd 100644
--- a/i18n/po/ht.po
+++ b/i18n/po/ht.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-04 03:32+0100\n"
+"POT-Creation-Date: 2015-04-01 03:33+0200\n"
"PO-Revision-Date: 2010-03-11 21:17+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: Haitian; Haitian Creole <ht at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-03-04 04:43+0000\n"
-"X-Generator: Launchpad (build 17361)\n"
+"X-Launchpad-Export-Date: 2015-04-01 04:43+0000\n"
+"X-Generator: Launchpad (build 17413)\n"
"Language: \n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -1696,9 +1696,15 @@ msgstr ""
msgid "Markers from {0}"
msgstr ""
+msgid "Download OSM Notes"
+msgstr ""
+
msgid "Downloading Notes"
msgstr ""
+msgid "Notes"
+msgstr ""
+
msgid "Download Compressed OSM Change"
msgstr ""
@@ -6109,6 +6115,9 @@ msgstr ""
msgid "Customize the style"
msgstr ""
+msgid "List of notes"
+msgstr ""
+
msgid "Add comment"
msgstr ""
@@ -7428,9 +7437,6 @@ 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 ""
@@ -15682,9 +15688,6 @@ msgstr ""
msgid "stadium"
msgstr ""
-msgid "Select sport:"
-msgstr ""
-
msgid "Sport"
msgstr ""
@@ -15805,19 +15808,19 @@ msgid "rugby_union"
msgstr ""
msgctxt "sport"
-msgid "shooting"
+msgid "running"
msgstr ""
msgctxt "sport"
-msgid "skateboard"
+msgid "shooting"
msgstr ""
msgctxt "sport"
-msgid "skating"
+msgid "skateboard"
msgstr ""
msgctxt "sport"
-msgid "skiing"
+msgid "skating"
msgstr ""
msgctxt "sport"
@@ -16145,6 +16148,30 @@ msgstr ""
msgid "Toll"
msgstr ""
+msgid "Is the water body intermittent (disappears seasonally)?"
+msgstr ""
+
+msgid "culvert"
+msgstr ""
+
+msgid "Water access rules:"
+msgstr ""
+
+msgid "Ship"
+msgstr ""
+
+msgid "designated"
+msgstr ""
+
+msgid "Boat"
+msgstr ""
+
+msgid "Motorboat"
+msgstr ""
+
+msgid "Canoe"
+msgstr ""
+
msgid "Streets"
msgstr ""
@@ -16360,9 +16387,6 @@ msgstr ""
msgid "official"
msgstr ""
-msgid "designated"
-msgstr ""
-
msgid "Vehicles per type"
msgstr ""
@@ -16752,6 +16776,9 @@ msgstr ""
msgid "Pedestrian Crossing"
msgstr ""
+msgid "In case of traffic signals:"
+msgstr ""
+
msgid "Traffic Calming"
msgstr ""
@@ -16998,15 +17025,12 @@ msgstr ""
msgid "Stream"
msgstr ""
-msgid "Wadi"
+msgid "River"
msgstr ""
msgid "Canal"
msgstr ""
-msgid "River"
-msgstr ""
-
msgid "Spring"
msgstr ""
@@ -17072,9 +17096,6 @@ msgstr ""
msgid "Salt Water"
msgstr ""
-msgid "Is the water body intermittent (disappears seasonally)?"
-msgstr ""
-
msgid "Coastline"
msgstr ""
@@ -17914,6 +17935,9 @@ msgstr ""
msgid "Tactile Paving"
msgstr ""
+msgid "incorrect"
+msgstr ""
+
msgid "Bus Platform"
msgstr ""
@@ -18076,6 +18100,9 @@ msgstr ""
msgid "Microbrewery"
msgstr ""
+msgid "Outdoor seating"
+msgstr ""
+
msgid "Fast Food"
msgstr ""
@@ -18670,13 +18697,13 @@ msgstr ""
msgid "Collection times"
msgstr ""
-msgid "11:30"
+msgid "Mo-Sa 09:00"
msgstr ""
-msgid "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
+msgid "Mo-Fr 17:30; Sa 12:00"
msgstr ""
-msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; Su,PH off"
+msgid "Mo-Fr 15:00,19:00; Sa 15:10; Su 10:30"
msgstr ""
msgid "Drive through"
@@ -18935,6 +18962,15 @@ msgstr ""
msgid "Pitch"
msgstr ""
+msgid "artificial_turf"
+msgstr ""
+
+msgid "decoturf"
+msgstr ""
+
+msgid "tartan"
+msgstr ""
+
msgid "Racetrack"
msgstr ""
@@ -19042,6 +19078,12 @@ msgstr ""
msgid "skitour"
msgstr ""
+msgid "sled"
+msgstr ""
+
+msgid "sleigh"
+msgstr ""
+
msgid "snow_park"
msgstr ""
@@ -19294,6 +19336,10 @@ msgctxt "building"
msgid "construction"
msgstr ""
+msgctxt "building"
+msgid "Levels"
+msgstr ""
+
msgid "Residential Building"
msgstr ""
@@ -19329,6 +19375,16 @@ msgctxt "building"
msgid "farm"
msgstr ""
+msgid "Building part"
+msgstr ""
+
+msgctxt "building"
+msgid "Skipped Levels"
+msgstr ""
+
+msgid "Skipped height (meters)"
+msgstr ""
+
msgid "Entrance"
msgstr ""
@@ -21062,22 +21118,28 @@ msgstr ""
msgid "scoria"
msgstr ""
-msgid "Cave Entrance"
+msgid "Ridge"
msgstr ""
-msgid "The entrance to a cave."
+msgid "A mountain or hill ridge."
msgstr ""
-msgid "Island"
+msgid "Valley"
msgstr ""
-msgid "Islet"
+msgid "A low area between hills."
msgstr ""
-msgid "Ridge"
+msgid "Cave Entrance"
msgstr ""
-msgid "A mountain or hill ridge."
+msgid "The entrance to a cave."
+msgstr ""
+
+msgid "Island"
+msgstr ""
+
+msgid "Islet"
msgstr ""
msgid "Nature"
@@ -21107,6 +21169,37 @@ msgstr ""
msgid "Forest"
msgstr ""
+msgid "Cutline"
+msgstr ""
+
+msgctxt "cutline"
+msgid "border"
+msgstr ""
+
+msgctxt "cutline"
+msgid "firebreak"
+msgstr ""
+
+msgctxt "cutline"
+msgid "hunting"
+msgstr ""
+
+msgctxt "cutline"
+msgid "loggingmachine"
+msgstr ""
+
+msgctxt "cutline"
+msgid "pipeline"
+msgstr ""
+
+msgctxt "cutline"
+msgid "piste"
+msgstr ""
+
+msgctxt "cutline"
+msgid "section"
+msgstr ""
+
msgid "Grassland"
msgstr ""
@@ -22040,6 +22133,9 @@ msgstr ""
msgid "Unspecific tag {0}"
msgstr ""
+msgid "Definition of {0} is unclear"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -27401,7 +27497,7 @@ msgstr ""
msgid "No object selected"
msgstr ""
-msgid "SeaMap Editor"
+msgid "SeaChart Editor"
msgstr ""
msgid "Seamark Inspector"
@@ -27473,6 +27569,9 @@ msgstr ""
msgid "Merge Nearby Nodes Threshold"
msgstr ""
+msgid "SeaMap Editor"
+msgstr ""
+
msgid "AutoSave LiveData"
msgstr ""
diff --git a/i18n/po/hu.po b/i18n/po/hu.po
index f3a764e..98391b6 100644
--- a/i18n/po/hu.po
+++ b/i18n/po/hu.po
@@ -8,16 +8,16 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-04 03:32+0100\n"
-"PO-Revision-Date: 2015-02-20 09:06+0000\n"
-"Last-Translator: Báthory Péter <bathory86p at gmail.com>\n"
+"POT-Creation-Date: 2015-04-01 03:33+0200\n"
+"PO-Revision-Date: 2015-03-19 20:09+0000\n"
+"Last-Translator: Úr Balázs <urbalazs at gmail.com>\n"
"Language-Team: Hungarian <kde-l10n-hu at kde.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-03-04 04:44+0000\n"
-"X-Generator: Launchpad (build 17361)\n"
+"X-Launchpad-Export-Date: 2015-04-01 04:44+0000\n"
+"X-Generator: Launchpad (build 17413)\n"
"Language: hu\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -490,7 +490,7 @@ msgid "Download data"
msgstr "Adatok letöltése"
msgid "Download object..."
-msgstr "Ojektumok letöltése ..."
+msgstr "Objektumok letöltése…"
msgid "Download OSM object by ID."
msgstr "OSM objektumok letöltése ID alapján"
@@ -531,7 +531,7 @@ msgid "Follow"
msgstr "Követés"
msgid "Fullscreen view"
-msgstr "Telejesképernyős nézet"
+msgstr "Teljes képernyős nézet"
msgid "Toggle fullscreen view"
msgstr "Teljes képernyős nézet be- illetve kikapcsolása"
@@ -1844,9 +1844,15 @@ msgstr "Letöltött GPX adatok"
msgid "Markers from {0}"
msgstr "Jelölők innen: {0}"
+msgid "Download OSM Notes"
+msgstr "OSM jegyzetek letöltése"
+
msgid "Downloading Notes"
msgstr "Jegyzetek letöltése"
+msgid "Notes"
+msgstr "Jegyzetek"
+
msgid "Download Compressed OSM Change"
msgstr "Tömörített OSM Change letöltése"
@@ -6618,6 +6624,9 @@ msgstr "Stílusbeállítások"
msgid "Customize the style"
msgstr "Stílus testreszabása"
+msgid "List of notes"
+msgstr ""
+
msgid "Add comment"
msgstr "Megjegyzés hozzáadása"
@@ -8060,9 +8069,6 @@ 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 "Jegyzetek"
-
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."
@@ -17328,9 +17334,6 @@ msgstr "sportközpont"
msgid "stadium"
msgstr "stadion"
-msgid "Select sport:"
-msgstr "Sport kiválasztás:"
-
msgid "Sport"
msgstr "Sport"
@@ -17451,6 +17454,10 @@ msgid "rugby_union"
msgstr "(unió) rögbi"
msgctxt "sport"
+msgid "running"
+msgstr ""
+
+msgctxt "sport"
msgid "shooting"
msgstr "lövészet"
@@ -17463,10 +17470,6 @@ msgid "skating"
msgstr "korcsolya"
msgctxt "sport"
-msgid "skiing"
-msgstr "síelés"
-
-msgctxt "sport"
msgid "soccer"
msgstr "futball"
@@ -17791,6 +17794,30 @@ msgstr "Max. össztömeg (tonna)"
msgid "Toll"
msgstr "Fizetős"
+msgid "Is the water body intermittent (disappears seasonally)?"
+msgstr "A víztömeg jelenléte időszakos (szezonálisan eltűnik)?"
+
+msgid "culvert"
+msgstr ""
+
+msgid "Water access rules:"
+msgstr ""
+
+msgid "Ship"
+msgstr ""
+
+msgid "designated"
+msgstr "kijelölt"
+
+msgid "Boat"
+msgstr ""
+
+msgid "Motorboat"
+msgstr ""
+
+msgid "Canoe"
+msgstr ""
+
msgid "Streets"
msgstr "Autóutak"
@@ -18006,9 +18033,6 @@ msgstr "Közlekedési mód korlátozások"
msgid "official"
msgstr "hivatalos"
-msgid "designated"
-msgstr "kijelölt"
-
msgid "Vehicles per type"
msgstr "Járművek típus szerint"
@@ -18411,6 +18435,9 @@ msgstr "óramutatóval megegyező"
msgid "Pedestrian Crossing"
msgstr "Gyalogátkelő"
+msgid "In case of traffic signals:"
+msgstr ""
+
msgid "Traffic Calming"
msgstr "Forgalomcsillapító"
@@ -18659,15 +18686,12 @@ msgstr "Árok"
msgid "Stream"
msgstr "Patak"
-msgid "Wadi"
-msgstr "Kiapadt folyómeder"
+msgid "River"
+msgstr "Folyó"
msgid "Canal"
msgstr "Csatorna"
-msgid "River"
-msgstr "Folyó"
-
msgid "Spring"
msgstr "Forrás"
@@ -18735,9 +18759,6 @@ msgstr "folyó"
msgid "Salt Water"
msgstr "Sós víz"
-msgid "Is the water body intermittent (disappears seasonally)?"
-msgstr "A víztömeg jelenléte időszakos (szezonálisan eltűnik)?"
-
msgid "Coastline"
msgstr "Partvonal"
@@ -19583,6 +19604,9 @@ msgstr "Buszmegálló"
msgid "Tactile Paving"
msgstr "Vakvezető burkolat"
+msgid "incorrect"
+msgstr ""
+
msgid "Bus Platform"
msgstr "Autóbuszperon"
@@ -19746,6 +19770,9 @@ msgstr "szusi"
msgid "Microbrewery"
msgstr "Házi sörfőzde"
+msgid "Outdoor seating"
+msgstr ""
+
msgid "Fast Food"
msgstr "Gyorsétterem"
@@ -20345,14 +20372,14 @@ msgstr "Postaláda"
msgid "Collection times"
msgstr "Begyűjtési időpontok"
-msgid "11:30"
-msgstr "11:30"
+msgid "Mo-Sa 09:00"
+msgstr ""
-msgid "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
-msgstr "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
+msgid "Mo-Fr 17:30; Sa 12:00"
+msgstr ""
-msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; Su,PH off"
-msgstr "Mo-Fr 09:00-12:00,17:15; Sa 14:00; Su,PH off"
+msgid "Mo-Fr 15:00,19:00; Sa 15:10; Su 10:30"
+msgstr ""
msgid "Drive through"
msgstr "Áthajtó (autós)"
@@ -20610,6 +20637,15 @@ msgstr "Sportközpont"
msgid "Pitch"
msgstr "Sportpálya"
+msgid "artificial_turf"
+msgstr ""
+
+msgid "decoturf"
+msgstr ""
+
+msgid "tartan"
+msgstr ""
+
msgid "Racetrack"
msgstr "Versenypálya"
@@ -20717,6 +20753,12 @@ msgstr "nordic"
msgid "skitour"
msgstr "sítúra"
+msgid "sled"
+msgstr ""
+
+msgid "sleigh"
+msgstr ""
+
msgid "snow_park"
msgstr "sípark"
@@ -20970,6 +21012,10 @@ msgctxt "building"
msgid "construction"
msgstr "építkezés"
+msgctxt "building"
+msgid "Levels"
+msgstr ""
+
msgid "Residential Building"
msgstr "Lakóépület"
@@ -21005,6 +21051,16 @@ msgctxt "building"
msgid "farm"
msgstr "farm"
+msgid "Building part"
+msgstr ""
+
+msgctxt "building"
+msgid "Skipped Levels"
+msgstr ""
+
+msgid "Skipped height (meters)"
+msgstr ""
+
msgid "Entrance"
msgstr "Bejárat"
@@ -22743,6 +22799,18 @@ msgstr "pajzs"
msgid "scoria"
msgstr "vulkáni salak"
+msgid "Ridge"
+msgstr "Gerinc"
+
+msgid "A mountain or hill ridge."
+msgstr "Egy domb- vagy hegygerinc."
+
+msgid "Valley"
+msgstr ""
+
+msgid "A low area between hills."
+msgstr ""
+
msgid "Cave Entrance"
msgstr "Barlangbejárat"
@@ -22755,12 +22823,6 @@ msgstr "Sziget"
msgid "Islet"
msgstr "Szigetecske"
-msgid "Ridge"
-msgstr "Gerinc"
-
-msgid "A mountain or hill ridge."
-msgstr "Egy domb- vagy hegygerinc."
-
msgid "Nature"
msgstr "Természet"
@@ -22788,6 +22850,37 @@ msgstr "Erdőség, ahol a fa előállítás nem uralja a használatot."
msgid "Forest"
msgstr "Ültetett erdő"
+msgid "Cutline"
+msgstr ""
+
+msgctxt "cutline"
+msgid "border"
+msgstr ""
+
+msgctxt "cutline"
+msgid "firebreak"
+msgstr ""
+
+msgctxt "cutline"
+msgid "hunting"
+msgstr ""
+
+msgctxt "cutline"
+msgid "loggingmachine"
+msgstr ""
+
+msgctxt "cutline"
+msgid "pipeline"
+msgstr ""
+
+msgctxt "cutline"
+msgid "piste"
+msgstr ""
+
+msgctxt "cutline"
+msgid "section"
+msgstr ""
+
msgid "Grassland"
msgstr "Füves terület"
@@ -23747,6 +23840,9 @@ msgstr ""
msgid "Unspecific tag {0}"
msgstr ""
+msgid "Definition of {0} is unclear"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr "{0} egy ponton. Vonalon kellene használni."
@@ -29181,7 +29277,7 @@ msgstr "SDS fájl mentése"
msgid "No object selected"
msgstr ""
-msgid "SeaMap Editor"
+msgid "SeaChart Editor"
msgstr ""
msgid "Seamark Inspector"
@@ -29253,6 +29349,9 @@ msgstr ""
msgid "Merge Nearby Nodes Threshold"
msgstr ""
+msgid "SeaMap Editor"
+msgstr ""
+
msgid "AutoSave LiveData"
msgstr ""
diff --git a/i18n/po/hy.po b/i18n/po/hy.po
index f0d0e63..0c0cf37 100644
--- a/i18n/po/hy.po
+++ b/i18n/po/hy.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-04 03:32+0100\n"
+"POT-Creation-Date: 2015-04-01 03:33+0200\n"
"PO-Revision-Date: 2011-04-13 21:51+0000\n"
"Last-Translator: Gev777 <Unknown>\n"
"Language-Team: Armenian <hy at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2015-03-04 04:32+0000\n"
-"X-Generator: Launchpad (build 17361)\n"
+"X-Launchpad-Export-Date: 2015-04-01 04:32+0000\n"
+"X-Generator: Launchpad (build 17413)\n"
"Language: hy\n"
msgid "Cancel"
@@ -1696,9 +1696,15 @@ msgstr ""
msgid "Markers from {0}"
msgstr ""
+msgid "Download OSM Notes"
+msgstr ""
+
msgid "Downloading Notes"
msgstr ""
+msgid "Notes"
+msgstr ""
+
msgid "Download Compressed OSM Change"
msgstr ""
@@ -6109,6 +6115,9 @@ msgstr ""
msgid "Customize the style"
msgstr ""
+msgid "List of notes"
+msgstr ""
+
msgid "Add comment"
msgstr ""
@@ -7428,9 +7437,6 @@ 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 ""
@@ -15682,9 +15688,6 @@ msgstr ""
msgid "stadium"
msgstr ""
-msgid "Select sport:"
-msgstr ""
-
msgid "Sport"
msgstr ""
@@ -15805,19 +15808,19 @@ msgid "rugby_union"
msgstr ""
msgctxt "sport"
-msgid "shooting"
+msgid "running"
msgstr ""
msgctxt "sport"
-msgid "skateboard"
+msgid "shooting"
msgstr ""
msgctxt "sport"
-msgid "skating"
+msgid "skateboard"
msgstr ""
msgctxt "sport"
-msgid "skiing"
+msgid "skating"
msgstr ""
msgctxt "sport"
@@ -16145,6 +16148,30 @@ msgstr ""
msgid "Toll"
msgstr ""
+msgid "Is the water body intermittent (disappears seasonally)?"
+msgstr ""
+
+msgid "culvert"
+msgstr ""
+
+msgid "Water access rules:"
+msgstr ""
+
+msgid "Ship"
+msgstr ""
+
+msgid "designated"
+msgstr ""
+
+msgid "Boat"
+msgstr ""
+
+msgid "Motorboat"
+msgstr ""
+
+msgid "Canoe"
+msgstr ""
+
msgid "Streets"
msgstr ""
@@ -16360,9 +16387,6 @@ msgstr ""
msgid "official"
msgstr ""
-msgid "designated"
-msgstr ""
-
msgid "Vehicles per type"
msgstr ""
@@ -16752,6 +16776,9 @@ msgstr ""
msgid "Pedestrian Crossing"
msgstr ""
+msgid "In case of traffic signals:"
+msgstr ""
+
msgid "Traffic Calming"
msgstr ""
@@ -16998,15 +17025,12 @@ msgstr ""
msgid "Stream"
msgstr ""
-msgid "Wadi"
+msgid "River"
msgstr ""
msgid "Canal"
msgstr ""
-msgid "River"
-msgstr ""
-
msgid "Spring"
msgstr ""
@@ -17072,9 +17096,6 @@ msgstr ""
msgid "Salt Water"
msgstr ""
-msgid "Is the water body intermittent (disappears seasonally)?"
-msgstr ""
-
msgid "Coastline"
msgstr ""
@@ -17914,6 +17935,9 @@ msgstr ""
msgid "Tactile Paving"
msgstr ""
+msgid "incorrect"
+msgstr ""
+
msgid "Bus Platform"
msgstr ""
@@ -18076,6 +18100,9 @@ msgstr ""
msgid "Microbrewery"
msgstr ""
+msgid "Outdoor seating"
+msgstr ""
+
msgid "Fast Food"
msgstr ""
@@ -18670,13 +18697,13 @@ msgstr ""
msgid "Collection times"
msgstr ""
-msgid "11:30"
+msgid "Mo-Sa 09:00"
msgstr ""
-msgid "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
+msgid "Mo-Fr 17:30; Sa 12:00"
msgstr ""
-msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; Su,PH off"
+msgid "Mo-Fr 15:00,19:00; Sa 15:10; Su 10:30"
msgstr ""
msgid "Drive through"
@@ -18935,6 +18962,15 @@ msgstr ""
msgid "Pitch"
msgstr ""
+msgid "artificial_turf"
+msgstr ""
+
+msgid "decoturf"
+msgstr ""
+
+msgid "tartan"
+msgstr ""
+
msgid "Racetrack"
msgstr ""
@@ -19042,6 +19078,12 @@ msgstr ""
msgid "skitour"
msgstr ""
+msgid "sled"
+msgstr ""
+
+msgid "sleigh"
+msgstr ""
+
msgid "snow_park"
msgstr ""
@@ -19294,6 +19336,10 @@ msgctxt "building"
msgid "construction"
msgstr ""
+msgctxt "building"
+msgid "Levels"
+msgstr ""
+
msgid "Residential Building"
msgstr ""
@@ -19329,6 +19375,16 @@ msgctxt "building"
msgid "farm"
msgstr ""
+msgid "Building part"
+msgstr ""
+
+msgctxt "building"
+msgid "Skipped Levels"
+msgstr ""
+
+msgid "Skipped height (meters)"
+msgstr ""
+
msgid "Entrance"
msgstr ""
@@ -21062,22 +21118,28 @@ msgstr ""
msgid "scoria"
msgstr ""
-msgid "Cave Entrance"
+msgid "Ridge"
msgstr ""
-msgid "The entrance to a cave."
+msgid "A mountain or hill ridge."
msgstr ""
-msgid "Island"
+msgid "Valley"
msgstr ""
-msgid "Islet"
+msgid "A low area between hills."
msgstr ""
-msgid "Ridge"
+msgid "Cave Entrance"
msgstr ""
-msgid "A mountain or hill ridge."
+msgid "The entrance to a cave."
+msgstr ""
+
+msgid "Island"
+msgstr ""
+
+msgid "Islet"
msgstr ""
msgid "Nature"
@@ -21107,6 +21169,37 @@ msgstr ""
msgid "Forest"
msgstr ""
+msgid "Cutline"
+msgstr ""
+
+msgctxt "cutline"
+msgid "border"
+msgstr ""
+
+msgctxt "cutline"
+msgid "firebreak"
+msgstr ""
+
+msgctxt "cutline"
+msgid "hunting"
+msgstr ""
+
+msgctxt "cutline"
+msgid "loggingmachine"
+msgstr ""
+
+msgctxt "cutline"
+msgid "pipeline"
+msgstr ""
+
+msgctxt "cutline"
+msgid "piste"
+msgstr ""
+
+msgctxt "cutline"
+msgid "section"
+msgstr ""
+
msgid "Grassland"
msgstr ""
@@ -22040,6 +22133,9 @@ msgstr ""
msgid "Unspecific tag {0}"
msgstr ""
+msgid "Definition of {0} is unclear"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -27401,7 +27497,7 @@ msgstr ""
msgid "No object selected"
msgstr ""
-msgid "SeaMap Editor"
+msgid "SeaChart Editor"
msgstr ""
msgid "Seamark Inspector"
@@ -27473,6 +27569,9 @@ msgstr ""
msgid "Merge Nearby Nodes Threshold"
msgstr ""
+msgid "SeaMap Editor"
+msgstr ""
+
msgid "AutoSave LiveData"
msgstr ""
diff --git a/i18n/po/ia.po b/i18n/po/ia.po
index 4448ea8..2e3bed8 100644
--- a/i18n/po/ia.po
+++ b/i18n/po/ia.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-04 03:32+0100\n"
+"POT-Creation-Date: 2015-04-01 03:33+0200\n"
"PO-Revision-Date: 2011-08-29 01:02+0000\n"
"Last-Translator: Emilio Sepulveda <Unknown>\n"
"Language-Team: Interlingua <ia at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-03-04 04:45+0000\n"
-"X-Generator: Launchpad (build 17361)\n"
+"X-Launchpad-Export-Date: 2015-04-01 04:45+0000\n"
+"X-Generator: Launchpad (build 17413)\n"
"Language: ia\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -1696,9 +1696,15 @@ msgstr ""
msgid "Markers from {0}"
msgstr ""
+msgid "Download OSM Notes"
+msgstr ""
+
msgid "Downloading Notes"
msgstr ""
+msgid "Notes"
+msgstr ""
+
msgid "Download Compressed OSM Change"
msgstr ""
@@ -6109,6 +6115,9 @@ msgstr ""
msgid "Customize the style"
msgstr ""
+msgid "List of notes"
+msgstr ""
+
msgid "Add comment"
msgstr ""
@@ -7428,9 +7437,6 @@ 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 ""
@@ -15682,9 +15688,6 @@ msgstr ""
msgid "stadium"
msgstr ""
-msgid "Select sport:"
-msgstr ""
-
msgid "Sport"
msgstr ""
@@ -15805,19 +15808,19 @@ msgid "rugby_union"
msgstr ""
msgctxt "sport"
-msgid "shooting"
+msgid "running"
msgstr ""
msgctxt "sport"
-msgid "skateboard"
+msgid "shooting"
msgstr ""
msgctxt "sport"
-msgid "skating"
+msgid "skateboard"
msgstr ""
msgctxt "sport"
-msgid "skiing"
+msgid "skating"
msgstr ""
msgctxt "sport"
@@ -16145,6 +16148,30 @@ msgstr ""
msgid "Toll"
msgstr ""
+msgid "Is the water body intermittent (disappears seasonally)?"
+msgstr ""
+
+msgid "culvert"
+msgstr ""
+
+msgid "Water access rules:"
+msgstr ""
+
+msgid "Ship"
+msgstr ""
+
+msgid "designated"
+msgstr ""
+
+msgid "Boat"
+msgstr ""
+
+msgid "Motorboat"
+msgstr ""
+
+msgid "Canoe"
+msgstr ""
+
msgid "Streets"
msgstr ""
@@ -16360,9 +16387,6 @@ msgstr ""
msgid "official"
msgstr ""
-msgid "designated"
-msgstr ""
-
msgid "Vehicles per type"
msgstr ""
@@ -16752,6 +16776,9 @@ msgstr ""
msgid "Pedestrian Crossing"
msgstr ""
+msgid "In case of traffic signals:"
+msgstr ""
+
msgid "Traffic Calming"
msgstr ""
@@ -16998,15 +17025,12 @@ msgstr ""
msgid "Stream"
msgstr ""
-msgid "Wadi"
+msgid "River"
msgstr ""
msgid "Canal"
msgstr ""
-msgid "River"
-msgstr ""
-
msgid "Spring"
msgstr ""
@@ -17072,9 +17096,6 @@ msgstr ""
msgid "Salt Water"
msgstr ""
-msgid "Is the water body intermittent (disappears seasonally)?"
-msgstr ""
-
msgid "Coastline"
msgstr ""
@@ -17914,6 +17935,9 @@ msgstr ""
msgid "Tactile Paving"
msgstr ""
+msgid "incorrect"
+msgstr ""
+
msgid "Bus Platform"
msgstr ""
@@ -18076,6 +18100,9 @@ msgstr ""
msgid "Microbrewery"
msgstr ""
+msgid "Outdoor seating"
+msgstr ""
+
msgid "Fast Food"
msgstr ""
@@ -18670,13 +18697,13 @@ msgstr ""
msgid "Collection times"
msgstr ""
-msgid "11:30"
+msgid "Mo-Sa 09:00"
msgstr ""
-msgid "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
+msgid "Mo-Fr 17:30; Sa 12:00"
msgstr ""
-msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; Su,PH off"
+msgid "Mo-Fr 15:00,19:00; Sa 15:10; Su 10:30"
msgstr ""
msgid "Drive through"
@@ -18935,6 +18962,15 @@ msgstr ""
msgid "Pitch"
msgstr ""
+msgid "artificial_turf"
+msgstr ""
+
+msgid "decoturf"
+msgstr ""
+
+msgid "tartan"
+msgstr ""
+
msgid "Racetrack"
msgstr ""
@@ -19042,6 +19078,12 @@ msgstr ""
msgid "skitour"
msgstr ""
+msgid "sled"
+msgstr ""
+
+msgid "sleigh"
+msgstr ""
+
msgid "snow_park"
msgstr ""
@@ -19294,6 +19336,10 @@ msgctxt "building"
msgid "construction"
msgstr ""
+msgctxt "building"
+msgid "Levels"
+msgstr ""
+
msgid "Residential Building"
msgstr ""
@@ -19329,6 +19375,16 @@ msgctxt "building"
msgid "farm"
msgstr ""
+msgid "Building part"
+msgstr ""
+
+msgctxt "building"
+msgid "Skipped Levels"
+msgstr ""
+
+msgid "Skipped height (meters)"
+msgstr ""
+
msgid "Entrance"
msgstr ""
@@ -21062,22 +21118,28 @@ msgstr ""
msgid "scoria"
msgstr ""
-msgid "Cave Entrance"
+msgid "Ridge"
msgstr ""
-msgid "The entrance to a cave."
+msgid "A mountain or hill ridge."
msgstr ""
-msgid "Island"
+msgid "Valley"
msgstr ""
-msgid "Islet"
+msgid "A low area between hills."
msgstr ""
-msgid "Ridge"
+msgid "Cave Entrance"
msgstr ""
-msgid "A mountain or hill ridge."
+msgid "The entrance to a cave."
+msgstr ""
+
+msgid "Island"
+msgstr ""
+
+msgid "Islet"
msgstr ""
msgid "Nature"
@@ -21107,6 +21169,37 @@ msgstr ""
msgid "Forest"
msgstr ""
+msgid "Cutline"
+msgstr ""
+
+msgctxt "cutline"
+msgid "border"
+msgstr ""
+
+msgctxt "cutline"
+msgid "firebreak"
+msgstr ""
+
+msgctxt "cutline"
+msgid "hunting"
+msgstr ""
+
+msgctxt "cutline"
+msgid "loggingmachine"
+msgstr ""
+
+msgctxt "cutline"
+msgid "pipeline"
+msgstr ""
+
+msgctxt "cutline"
+msgid "piste"
+msgstr ""
+
+msgctxt "cutline"
+msgid "section"
+msgstr ""
+
msgid "Grassland"
msgstr ""
@@ -22040,6 +22133,9 @@ msgstr ""
msgid "Unspecific tag {0}"
msgstr ""
+msgid "Definition of {0} is unclear"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -27401,7 +27497,7 @@ msgstr ""
msgid "No object selected"
msgstr ""
-msgid "SeaMap Editor"
+msgid "SeaChart Editor"
msgstr ""
msgid "Seamark Inspector"
@@ -27473,6 +27569,9 @@ msgstr ""
msgid "Merge Nearby Nodes Threshold"
msgstr ""
+msgid "SeaMap Editor"
+msgstr ""
+
msgid "AutoSave LiveData"
msgstr ""
diff --git a/i18n/po/id.po b/i18n/po/id.po
index 44675bb..e8452c2 100644
--- a/i18n/po/id.po
+++ b/i18n/po/id.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-04 03:32+0100\n"
+"POT-Creation-Date: 2015-04-01 03:33+0200\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"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2015-03-04 04:46+0000\n"
-"X-Generator: Launchpad (build 17361)\n"
+"X-Launchpad-Export-Date: 2015-04-01 04:45+0000\n"
+"X-Generator: Launchpad (build 17413)\n"
"Language: id\n"
"X-Language: id_ID\n"
@@ -1816,9 +1816,15 @@ msgstr "Mendownload Data GPX"
msgid "Markers from {0}"
msgstr "Penanda dari {0}"
+msgid "Download OSM Notes"
+msgstr ""
+
msgid "Downloading Notes"
msgstr ""
+msgid "Notes"
+msgstr "Catatan"
+
msgid "Download Compressed OSM Change"
msgstr "Download Perubahan OSM yang dikompresi"
@@ -6470,6 +6476,9 @@ msgstr ""
msgid "Customize the style"
msgstr ""
+msgid "List of notes"
+msgstr ""
+
msgid "Add comment"
msgstr ""
@@ -7876,9 +7885,6 @@ 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 ""
@@ -16849,9 +16855,6 @@ msgstr "pusat_olahraga"
msgid "stadium"
msgstr "stadion"
-msgid "Select sport:"
-msgstr ""
-
msgid "Sport"
msgstr "Olahraga"
@@ -16972,19 +16975,19 @@ msgid "rugby_union"
msgstr ""
msgctxt "sport"
-msgid "shooting"
+msgid "running"
msgstr ""
msgctxt "sport"
-msgid "skateboard"
+msgid "shooting"
msgstr ""
msgctxt "sport"
-msgid "skating"
+msgid "skateboard"
msgstr ""
msgctxt "sport"
-msgid "skiing"
+msgid "skating"
msgstr ""
msgctxt "sport"
@@ -17312,6 +17315,30 @@ msgstr "Berat Maksimum (ton)"
msgid "Toll"
msgstr "Tol"
+msgid "Is the water body intermittent (disappears seasonally)?"
+msgstr ""
+
+msgid "culvert"
+msgstr ""
+
+msgid "Water access rules:"
+msgstr ""
+
+msgid "Ship"
+msgstr ""
+
+msgid "designated"
+msgstr "ditunjuk"
+
+msgid "Boat"
+msgstr ""
+
+msgid "Motorboat"
+msgstr ""
+
+msgid "Canoe"
+msgstr ""
+
msgid "Streets"
msgstr "Jalan"
@@ -17527,9 +17554,6 @@ msgstr "Pelarangan moda transportasi"
msgid "official"
msgstr "resmi"
-msgid "designated"
-msgstr "ditunjuk"
-
msgid "Vehicles per type"
msgstr "kendaraan pertipe"
@@ -17928,6 +17952,9 @@ msgstr "Serarah jarum jam"
msgid "Pedestrian Crossing"
msgstr "Penyebrangan Pedestrian"
+msgid "In case of traffic signals:"
+msgstr ""
+
msgid "Traffic Calming"
msgstr "Traffic Calming"
@@ -18174,15 +18201,12 @@ msgstr "Parit"
msgid "Stream"
msgstr "Anak Sungai"
-msgid "Wadi"
-msgstr ""
+msgid "River"
+msgstr "Sungai"
msgid "Canal"
msgstr "Kanal"
-msgid "River"
-msgstr "Sungai"
-
msgid "Spring"
msgstr "Mata Air"
@@ -18248,9 +18272,6 @@ msgstr "sungai"
msgid "Salt Water"
msgstr ""
-msgid "Is the water body intermittent (disappears seasonally)?"
-msgstr ""
-
msgid "Coastline"
msgstr "Garis pantai"
@@ -19090,6 +19111,9 @@ msgstr "Bus Stop"
msgid "Tactile Paving"
msgstr "Tactile Paving"
+msgid "incorrect"
+msgstr ""
+
msgid "Bus Platform"
msgstr "Peron Bus"
@@ -19252,6 +19276,9 @@ msgstr "sushi"
msgid "Microbrewery"
msgstr "Microbrewery"
+msgid "Outdoor seating"
+msgstr ""
+
msgid "Fast Food"
msgstr "Makanan Cepat Saji"
@@ -19846,13 +19873,13 @@ msgstr "Kotak Pos"
msgid "Collection times"
msgstr ""
-msgid "11:30"
+msgid "Mo-Sa 09:00"
msgstr ""
-msgid "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
+msgid "Mo-Fr 17:30; Sa 12:00"
msgstr ""
-msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; Su,PH off"
+msgid "Mo-Fr 15:00,19:00; Sa 15:10; Su 10:30"
msgstr ""
msgid "Drive through"
@@ -20111,6 +20138,15 @@ msgstr "Pusat Olahraga"
msgid "Pitch"
msgstr "lapangan"
+msgid "artificial_turf"
+msgstr ""
+
+msgid "decoturf"
+msgstr ""
+
+msgid "tartan"
+msgstr ""
+
msgid "Racetrack"
msgstr "Trek Balap Mobil"
@@ -20218,6 +20254,12 @@ msgstr "nordic"
msgid "skitour"
msgstr "skitour"
+msgid "sled"
+msgstr ""
+
+msgid "sleigh"
+msgstr ""
+
msgid "snow_park"
msgstr "taman_pertunjukkan"
@@ -20470,6 +20512,10 @@ msgctxt "building"
msgid "construction"
msgstr ""
+msgctxt "building"
+msgid "Levels"
+msgstr ""
+
msgid "Residential Building"
msgstr "Bangunan Permukiman"
@@ -20505,6 +20551,16 @@ msgctxt "building"
msgid "farm"
msgstr ""
+msgid "Building part"
+msgstr ""
+
+msgctxt "building"
+msgid "Skipped Levels"
+msgstr ""
+
+msgid "Skipped height (meters)"
+msgstr ""
+
msgid "Entrance"
msgstr "Pintu Masuk"
@@ -22238,6 +22294,18 @@ msgstr ""
msgid "scoria"
msgstr ""
+msgid "Ridge"
+msgstr ""
+
+msgid "A mountain or hill ridge."
+msgstr ""
+
+msgid "Valley"
+msgstr ""
+
+msgid "A low area between hills."
+msgstr ""
+
msgid "Cave Entrance"
msgstr "Pintu Masuk Goa"
@@ -22250,12 +22318,6 @@ msgstr "Pulau"
msgid "Islet"
msgstr "Pulau kecil"
-msgid "Ridge"
-msgstr ""
-
-msgid "A mountain or hill ridge."
-msgstr ""
-
msgid "Nature"
msgstr "Alami"
@@ -22283,6 +22345,37 @@ msgstr ""
msgid "Forest"
msgstr "Hutan"
+msgid "Cutline"
+msgstr ""
+
+msgctxt "cutline"
+msgid "border"
+msgstr ""
+
+msgctxt "cutline"
+msgid "firebreak"
+msgstr ""
+
+msgctxt "cutline"
+msgid "hunting"
+msgstr ""
+
+msgctxt "cutline"
+msgid "loggingmachine"
+msgstr ""
+
+msgctxt "cutline"
+msgid "pipeline"
+msgstr ""
+
+msgctxt "cutline"
+msgid "piste"
+msgstr ""
+
+msgctxt "cutline"
+msgid "section"
+msgstr ""
+
msgid "Grassland"
msgstr "Padang Rumput"
@@ -23218,6 +23311,9 @@ msgstr ""
msgid "Unspecific tag {0}"
msgstr ""
+msgid "Definition of {0} is unclear"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -28924,8 +29020,8 @@ msgstr "Simpan file SDS"
msgid "No object selected"
msgstr ""
-msgid "SeaMap Editor"
-msgstr "Editor SeaMap"
+msgid "SeaChart Editor"
+msgstr ""
msgid "Seamark Inspector"
msgstr ""
@@ -29009,6 +29105,9 @@ msgstr "Faktor jarak"
msgid "Merge Nearby Nodes Threshold"
msgstr "Menggabungkan ambang batas Node/titik terdekat"
+msgid "SeaMap Editor"
+msgstr "Editor SeaMap"
+
msgid "AutoSave LiveData"
msgstr "AutoSave LiveData"
diff --git a/i18n/po/is.po b/i18n/po/is.po
index 09eb5f7..c76a336 100644
--- a/i18n/po/is.po
+++ b/i18n/po/is.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-04 03:32+0100\n"
+"POT-Creation-Date: 2015-04-01 03:33+0200\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"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-03-04 04:45+0000\n"
-"X-Generator: Launchpad (build 17361)\n"
+"X-Launchpad-Export-Date: 2015-04-01 04:44+0000\n"
+"X-Generator: Launchpad (build 17413)\n"
"Language: is\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -1710,9 +1710,15 @@ msgstr "Sótt GPX gögn"
msgid "Markers from {0}"
msgstr "Punktar frá {0}"
+msgid "Download OSM Notes"
+msgstr ""
+
msgid "Downloading Notes"
msgstr ""
+msgid "Notes"
+msgstr "Athugasemd"
+
msgid "Download Compressed OSM Change"
msgstr ""
@@ -6130,6 +6136,9 @@ msgstr ""
msgid "Customize the style"
msgstr ""
+msgid "List of notes"
+msgstr ""
+
msgid "Add comment"
msgstr ""
@@ -7456,9 +7465,6 @@ 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 ""
@@ -15734,9 +15740,6 @@ msgstr "íþróttamiðstöð"
msgid "stadium"
msgstr "íþróttaleikvangur"
-msgid "Select sport:"
-msgstr ""
-
msgid "Sport"
msgstr "Íþróttir"
@@ -15857,19 +15860,19 @@ msgid "rugby_union"
msgstr ""
msgctxt "sport"
-msgid "shooting"
+msgid "running"
msgstr ""
msgctxt "sport"
-msgid "skateboard"
+msgid "shooting"
msgstr ""
msgctxt "sport"
-msgid "skating"
+msgid "skateboard"
msgstr ""
msgctxt "sport"
-msgid "skiing"
+msgid "skating"
msgstr ""
msgctxt "sport"
@@ -16197,6 +16200,30 @@ msgstr "Hámarksþyngt (í tonnum)"
msgid "Toll"
msgstr "Tollur"
+msgid "Is the water body intermittent (disappears seasonally)?"
+msgstr ""
+
+msgid "culvert"
+msgstr ""
+
+msgid "Water access rules:"
+msgstr ""
+
+msgid "Ship"
+msgstr ""
+
+msgid "designated"
+msgstr ""
+
+msgid "Boat"
+msgstr ""
+
+msgid "Motorboat"
+msgstr ""
+
+msgid "Canoe"
+msgstr ""
+
msgid "Streets"
msgstr "Stræti"
@@ -16412,9 +16439,6 @@ msgstr ""
msgid "official"
msgstr ""
-msgid "designated"
-msgstr ""
-
msgid "Vehicles per type"
msgstr ""
@@ -16804,6 +16828,9 @@ msgstr "réttsælis"
msgid "Pedestrian Crossing"
msgstr "Gangbraut"
+msgid "In case of traffic signals:"
+msgstr ""
+
msgid "Traffic Calming"
msgstr ""
@@ -17050,15 +17077,12 @@ msgstr ""
msgid "Stream"
msgstr "Lækur"
-msgid "Wadi"
-msgstr ""
+msgid "River"
+msgstr "Á"
msgid "Canal"
msgstr "Skipaskurður"
-msgid "River"
-msgstr "Á"
-
msgid "Spring"
msgstr "Goshver"
@@ -17124,9 +17148,6 @@ msgstr ""
msgid "Salt Water"
msgstr ""
-msgid "Is the water body intermittent (disappears seasonally)?"
-msgstr ""
-
msgid "Coastline"
msgstr "Strandlengja"
@@ -17966,6 +17987,9 @@ msgstr "Strætóstopp"
msgid "Tactile Paving"
msgstr ""
+msgid "incorrect"
+msgstr ""
+
msgid "Bus Platform"
msgstr ""
@@ -18128,6 +18152,9 @@ msgstr ""
msgid "Microbrewery"
msgstr ""
+msgid "Outdoor seating"
+msgstr ""
+
msgid "Fast Food"
msgstr "Skyndibiti"
@@ -18722,13 +18749,13 @@ msgstr "Póstkassi"
msgid "Collection times"
msgstr ""
-msgid "11:30"
+msgid "Mo-Sa 09:00"
msgstr ""
-msgid "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
+msgid "Mo-Fr 17:30; Sa 12:00"
msgstr ""
-msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; Su,PH off"
+msgid "Mo-Fr 15:00,19:00; Sa 15:10; Su 10:30"
msgstr ""
msgid "Drive through"
@@ -18987,6 +19014,15 @@ msgstr "Íþróttamiðstöð"
msgid "Pitch"
msgstr "Völlur"
+msgid "artificial_turf"
+msgstr ""
+
+msgid "decoturf"
+msgstr ""
+
+msgid "tartan"
+msgstr ""
+
msgid "Racetrack"
msgstr ""
@@ -19094,6 +19130,12 @@ msgstr ""
msgid "skitour"
msgstr ""
+msgid "sled"
+msgstr ""
+
+msgid "sleigh"
+msgstr ""
+
msgid "snow_park"
msgstr ""
@@ -19346,6 +19388,10 @@ msgctxt "building"
msgid "construction"
msgstr ""
+msgctxt "building"
+msgid "Levels"
+msgstr ""
+
msgid "Residential Building"
msgstr ""
@@ -19381,6 +19427,16 @@ msgctxt "building"
msgid "farm"
msgstr ""
+msgid "Building part"
+msgstr ""
+
+msgctxt "building"
+msgid "Skipped Levels"
+msgstr ""
+
+msgid "Skipped height (meters)"
+msgstr ""
+
msgid "Entrance"
msgstr "Inngangur"
@@ -21114,6 +21170,18 @@ msgstr ""
msgid "scoria"
msgstr ""
+msgid "Ridge"
+msgstr ""
+
+msgid "A mountain or hill ridge."
+msgstr ""
+
+msgid "Valley"
+msgstr ""
+
+msgid "A low area between hills."
+msgstr ""
+
msgid "Cave Entrance"
msgstr "Hellismunni"
@@ -21126,12 +21194,6 @@ msgstr "Eyja"
msgid "Islet"
msgstr ""
-msgid "Ridge"
-msgstr ""
-
-msgid "A mountain or hill ridge."
-msgstr ""
-
msgid "Nature"
msgstr ""
@@ -21159,6 +21221,37 @@ msgstr ""
msgid "Forest"
msgstr "Skógur (ræktaður)"
+msgid "Cutline"
+msgstr ""
+
+msgctxt "cutline"
+msgid "border"
+msgstr ""
+
+msgctxt "cutline"
+msgid "firebreak"
+msgstr ""
+
+msgctxt "cutline"
+msgid "hunting"
+msgstr ""
+
+msgctxt "cutline"
+msgid "loggingmachine"
+msgstr ""
+
+msgctxt "cutline"
+msgid "pipeline"
+msgstr ""
+
+msgctxt "cutline"
+msgid "piste"
+msgstr ""
+
+msgctxt "cutline"
+msgid "section"
+msgstr ""
+
msgid "Grassland"
msgstr ""
@@ -22092,6 +22185,9 @@ msgstr ""
msgid "Unspecific tag {0}"
msgstr ""
+msgid "Definition of {0} is unclear"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -27453,7 +27549,7 @@ msgstr ""
msgid "No object selected"
msgstr ""
-msgid "SeaMap Editor"
+msgid "SeaChart Editor"
msgstr ""
msgid "Seamark Inspector"
@@ -27525,6 +27621,9 @@ msgstr ""
msgid "Merge Nearby Nodes Threshold"
msgstr ""
+msgid "SeaMap Editor"
+msgstr ""
+
msgid "AutoSave LiveData"
msgstr ""
diff --git a/i18n/po/it.po b/i18n/po/it.po
index 8774f40..3d91809 100644
--- a/i18n/po/it.po
+++ b/i18n/po/it.po
@@ -4,16 +4,16 @@ msgid ""
msgstr ""
"Project-Id-Version: josm 20081003\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-04 03:32+0100\n"
-"PO-Revision-Date: 2015-02-27 20:04+0000\n"
-"Last-Translator: Dirk Stöcker <launchpad at dstoecker.de>\n"
+"POT-Creation-Date: 2015-04-01 03:33+0200\n"
+"PO-Revision-Date: 2015-03-30 13:27+0000\n"
+"Last-Translator: Sbiribizio <ftambussa at gmail.com>\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: 2015-03-04 04:46+0000\n"
-"X-Generator: Launchpad (build 17361)\n"
+"X-Launchpad-Export-Date: 2015-04-01 04:46+0000\n"
+"X-Generator: Launchpad (build 17413)\n"
"Language: it\n"
"X-Language: it_IT\n"
"X-Source-Language: en\n"
@@ -1282,16 +1282,16 @@ msgid "Search Notes..."
msgstr "Cerca Note"
msgid "Download notes from the note search API"
-msgstr ""
+msgstr "Scarica le note dalle API di ricerca delle note"
msgid "Search the OSM API for notes containing words:"
-msgstr ""
+msgstr "Cerca nelle API OSM le note contenenti le parole:"
msgid "Search for notes"
-msgstr "Cerca note"
+msgstr "Cerca le note"
msgid "You must enter a search term"
-msgstr "Devi immettere un ternine di ricerca"
+msgstr "Occorre immettere un termine di ricerca"
msgid "Select All"
msgstr "Seleziona tutto"
@@ -1300,8 +1300,8 @@ msgid ""
"Select all undeleted objects in the data layer. This selects incomplete "
"objects too."
msgstr ""
-"Seleziona tutti gli oggetti ripristinati nel livello dati. Seleziona anche "
-"gli oggetti incompleti."
+"Seleziona tutti gli oggetti non cancellati nel livello dati. Verranno anche "
+"selezionati gli oggetti incompleti."
msgid "Non-branching way sequences"
msgstr "Sequenze di percorsi non ramificati"
@@ -1876,9 +1876,15 @@ msgstr "Dati GPX scaricati"
msgid "Markers from {0}"
msgstr "Contrassegni da {0}"
+msgid "Download OSM Notes"
+msgstr "Scarica le note OSM"
+
msgid "Downloading Notes"
msgstr "Scaricamento note"
+msgid "Notes"
+msgstr "Annotazioni"
+
msgid "Download Compressed OSM Change"
msgstr "Scarica modifica OSM compressa"
@@ -6793,6 +6799,9 @@ msgstr "Impostazioni stile"
msgid "Customize the style"
msgstr "Personalizza lo stile"
+msgid "List of notes"
+msgstr "Lista di note"
+
msgid "Add comment"
msgstr "Aggiungi un commento"
@@ -8280,9 +8289,6 @@ 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."
@@ -17780,9 +17786,6 @@ msgstr "centro sportivo"
msgid "stadium"
msgstr "stadio"
-msgid "Select sport:"
-msgstr "Seleziona sport:"
-
msgid "Sport"
msgstr "Discipline sportive"
@@ -17903,6 +17906,10 @@ msgid "rugby_union"
msgstr "rugby a 15 (rugby union)"
msgctxt "sport"
+msgid "running"
+msgstr ""
+
+msgctxt "sport"
msgid "shooting"
msgstr "poligono di tiro"
@@ -17915,10 +17922,6 @@ msgid "skating"
msgstr "pattinaggio"
msgctxt "sport"
-msgid "skiing"
-msgstr "sci"
-
-msgctxt "sport"
msgid "soccer"
msgstr "calcio"
@@ -18243,6 +18246,30 @@ msgstr "Peso massimo (tonnellate)"
msgid "Toll"
msgstr "Pedaggio"
+msgid "Is the water body intermittent (disappears seasonally)?"
+msgstr "E'' il corpo d''acqua intermittente (scompare stagionalmente)?"
+
+msgid "culvert"
+msgstr ""
+
+msgid "Water access rules:"
+msgstr ""
+
+msgid "Ship"
+msgstr ""
+
+msgid "designated"
+msgstr "specifico"
+
+msgid "Boat"
+msgstr ""
+
+msgid "Motorboat"
+msgstr ""
+
+msgid "Canoe"
+msgstr ""
+
msgid "Streets"
msgstr "Strade"
@@ -18460,9 +18487,6 @@ msgstr "Divieti alla modalità di trasporto"
msgid "official"
msgstr "ufficiale"
-msgid "designated"
-msgstr "specifico"
-
msgid "Vehicles per type"
msgstr "Veicoli per tipo"
@@ -18868,6 +18892,9 @@ msgstr "senso orario"
msgid "Pedestrian Crossing"
msgstr "Attraversamento pedonale"
+msgid "In case of traffic signals:"
+msgstr ""
+
msgid "Traffic Calming"
msgstr "Dissuasore di velocità"
@@ -19116,15 +19143,12 @@ msgstr "Fosso"
msgid "Stream"
msgstr "Torrente"
-msgid "Wadi"
-msgstr "Uadi"
+msgid "River"
+msgstr "Fiume"
msgid "Canal"
msgstr "Canale"
-msgid "River"
-msgstr "Fiume"
-
msgid "Spring"
msgstr "Sorgente"
@@ -19192,9 +19216,6 @@ msgstr "fiume"
msgid "Salt Water"
msgstr "Acqua salata"
-msgid "Is the water body intermittent (disappears seasonally)?"
-msgstr "E'' il corpo d''acqua intermittente (scompare stagionalmente)?"
-
msgid "Coastline"
msgstr "Linea di costa"
@@ -20043,6 +20064,9 @@ msgstr "Fermata dell''autobus"
msgid "Tactile Paving"
msgstr "Pavimentazione tattile"
+msgid "incorrect"
+msgstr ""
+
msgid "Bus Platform"
msgstr "Banchina autobus"
@@ -20205,6 +20229,9 @@ msgstr "sushi"
msgid "Microbrewery"
msgstr "Microbirrificio"
+msgid "Outdoor seating"
+msgstr ""
+
msgid "Fast Food"
msgstr "Fast food"
@@ -20800,14 +20827,14 @@ msgstr "Cassetta Postale"
msgid "Collection times"
msgstr "Orari di raccolta"
-msgid "11:30"
-msgstr "11:30"
+msgid "Mo-Sa 09:00"
+msgstr ""
-msgid "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
-msgstr "Lu-Ve 15:00,17:45,19:00,23:00; Sa 15:10; Do 10:30,23:00"
+msgid "Mo-Fr 17:30; Sa 12:00"
+msgstr ""
-msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; Su,PH off"
-msgstr "Lu-Ve 09:00-12:00,17:15; Sa 14:00; Do,Festività chiuso"
+msgid "Mo-Fr 15:00,19:00; Sa 15:10; Su 10:30"
+msgstr ""
msgid "Drive through"
msgstr "Attraversamento in auto (drive-through)"
@@ -21065,6 +21092,15 @@ msgstr "Centro sportivo"
msgid "Pitch"
msgstr "Campo sportivo"
+msgid "artificial_turf"
+msgstr ""
+
+msgid "decoturf"
+msgstr ""
+
+msgid "tartan"
+msgstr ""
+
msgid "Racetrack"
msgstr "Circuito (pista)"
@@ -21172,6 +21208,12 @@ msgstr "Sci nordico"
msgid "skitour"
msgstr "sci alpinismo"
+msgid "sled"
+msgstr ""
+
+msgid "sleigh"
+msgstr ""
+
msgid "snow_park"
msgstr "snow_park"
@@ -21424,6 +21466,10 @@ msgctxt "building"
msgid "construction"
msgstr "in costruzione"
+msgctxt "building"
+msgid "Levels"
+msgstr ""
+
msgid "Residential Building"
msgstr "Edificio residenziale"
@@ -21459,6 +21505,16 @@ msgctxt "building"
msgid "farm"
msgstr "agricolo"
+msgid "Building part"
+msgstr ""
+
+msgctxt "building"
+msgid "Skipped Levels"
+msgstr ""
+
+msgid "Skipped height (meters)"
+msgstr ""
+
msgid "Entrance"
msgstr "Ingresso"
@@ -22220,10 +22276,10 @@ msgstr ""
"elettrici!)"
msgid "Power Busbar"
-msgstr "Blindosbarra elettrica"
+msgstr "Sbarra elettrica"
msgid "Power Bay"
-msgstr "Scomparto elettrico"
+msgstr "Stallo elettrico"
msgid "Power Switch"
msgstr "Interruttore elettrico"
@@ -22312,7 +22368,7 @@ msgid "Cable Distribution Cabinet"
msgstr "Armadio di derivazione"
msgid "Power Tower"
-msgstr "Torre elettrica"
+msgstr "Traliccio"
msgid "Type of construction"
msgstr "Tipo di costruzione"
@@ -23197,6 +23253,18 @@ msgstr "a scudo"
msgid "scoria"
msgstr "di scorie"
+msgid "Ridge"
+msgstr "Cresta / crinale"
+
+msgid "A mountain or hill ridge."
+msgstr "Il crinale di un monte o collina."
+
+msgid "Valley"
+msgstr ""
+
+msgid "A low area between hills."
+msgstr ""
+
msgid "Cave Entrance"
msgstr "Ingresso di una grotta"
@@ -23209,12 +23277,6 @@ msgstr "Isola"
msgid "Islet"
msgstr "Isoletta"
-msgid "Ridge"
-msgstr "Cresta / crinale"
-
-msgid "A mountain or hill ridge."
-msgstr "Il crinale di un monte o collina."
-
msgid "Nature"
msgstr "Natura"
@@ -23242,6 +23304,37 @@ msgstr "Bosco la cui funzione prevalente non è la produzione di legname."
msgid "Forest"
msgstr "Foresta"
+msgid "Cutline"
+msgstr ""
+
+msgctxt "cutline"
+msgid "border"
+msgstr ""
+
+msgctxt "cutline"
+msgid "firebreak"
+msgstr ""
+
+msgctxt "cutline"
+msgid "hunting"
+msgstr ""
+
+msgctxt "cutline"
+msgid "loggingmachine"
+msgstr ""
+
+msgctxt "cutline"
+msgid "pipeline"
+msgstr ""
+
+msgctxt "cutline"
+msgid "piste"
+msgstr ""
+
+msgctxt "cutline"
+msgid "section"
+msgstr ""
+
msgid "Grassland"
msgstr "Prateria naurale"
@@ -24204,6 +24297,9 @@ msgstr ""
msgid "Unspecific tag {0}"
msgstr ""
+msgid "Definition of {0} is unclear"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr "{0} in un nodo. Dovrebbe essere usato in un tracciato."
@@ -30078,8 +30174,8 @@ msgstr "Salva file SDS"
msgid "No object selected"
msgstr "Nessun oggetto selezionato"
-msgid "SeaMap Editor"
-msgstr "Editor SeaMap"
+msgid "SeaChart Editor"
+msgstr ""
msgid "Seamark Inspector"
msgstr "Seamark Inspector"
@@ -30165,6 +30261,9 @@ msgstr "Fattore di distanza"
msgid "Merge Nearby Nodes Threshold"
msgstr "Limite di unione di nodi limitrofi"
+msgid "SeaMap Editor"
+msgstr "Editor SeaMap"
+
msgid "AutoSave LiveData"
msgstr "Salvataggio automatico LiveData"
diff --git a/i18n/po/ja.po b/i18n/po/ja.po
index 909a5d2..2a4802b 100644
--- a/i18n/po/ja.po
+++ b/i18n/po/ja.po
@@ -7,21 +7,24 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-04 03:32+0100\n"
-"PO-Revision-Date: 2015-02-22 09:17+0000\n"
+"POT-Creation-Date: 2015-04-01 03:33+0200\n"
+"PO-Revision-Date: 2015-03-27 16:35+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: 2015-03-04 04:47+0000\n"
-"X-Generator: Launchpad (build 17361)\n"
+"X-Launchpad-Export-Date: 2015-04-01 04:46+0000\n"
+"X-Generator: Launchpad (build 17413)\n"
"X-Poedit-Country: JAPAN\n"
"Language: ja\n"
"X-Poedit-Language: Japanese\n"
"X-Poedit-SourceCharset: utf-8\n"
+msgid "Note"
+msgstr "メモ"
+
msgid "{0}: option ''{1}'' is ambiguous"
msgstr "{0}: オプション ''{1}'' はあいまいです"
@@ -1201,7 +1204,7 @@ msgstr "すべて選択"
msgid ""
"Select all undeleted objects in the data layer. This selects incomplete "
"objects too."
-msgstr "データレイヤーの復元されるオブジェクトをすべて選択してください。不完全なオブジェクトも選択します。"
+msgstr "データレイヤーから、削除されていないオブジェクトをすべて選択します。不完全なオブジェクトも選択します。"
msgid "Non-branching way sequences"
msgstr "分岐していない一連のウェイ"
@@ -1713,9 +1716,15 @@ msgstr "ダウンロードしたGPXデータ"
msgid "Markers from {0}"
msgstr "{0} のマーカー"
+msgid "Download OSM Notes"
+msgstr "OSMのメモをダウンロード"
+
msgid "Downloading Notes"
msgstr "メモをダウンロード中"
+msgid "Notes"
+msgstr "メモ"
+
msgid "Download Compressed OSM Change"
msgstr "OSMの変更を圧縮形式でダウンロード"
@@ -1839,7 +1848,7 @@ msgid "Create note"
msgstr "メモを作成"
msgid "Enter a detailed comment to create a note"
-msgstr "ノートを作成するために詳細コメントを入力してください"
+msgstr "メモを作成するために詳細コメントを入力してください"
msgid "You must enter a comment to create a new note"
msgstr "新しいメモを作成するには、コメントを入力する必要があります"
@@ -3766,7 +3775,7 @@ msgid "Performs semantic checks on highways."
msgstr "道路の意味上のチェックを行います。"
msgid "Incorrect roundabout (highway: {0} instead of {1})"
-msgstr "ロータリー交差点が無効です(highway: {1} の代わりに {0})"
+msgstr "環状交差点が無効です(highway: {1} の代わりに {0})"
msgid "Highway link is not linked to adequate highway/link"
msgstr "道路の連絡路が適切な道路/連絡路と接続していない"
@@ -3872,7 +3881,7 @@ msgstr "アウターウェイのスタイルがアンマッチです"
msgid ""
"With the currently used mappaint style(s) the style for outer way mismatches "
"polygon"
-msgstr ""
+msgstr "現在使用されている地図描画スタイルでは、外部のウェイがポリゴンに合いません"
msgid "Area style on outer way"
msgstr "outerウェイにエリアスタイルがあります"
@@ -4011,10 +4020,10 @@ msgid "<empty>"
msgstr "<empty>"
msgid "Role {0} unknown in templates {1}"
-msgstr ""
+msgstr "ロール{0}はテンプレート{1}で認識できません"
msgid "Empty role type found when expecting one of {0}"
-msgstr ""
+msgstr "空のロールが見つかりました。{0}のどれかを指定する必要があります"
msgid "Role {0} missing"
msgstr "ロール{0} がありません"
@@ -4552,19 +4561,19 @@ msgid "/PATH/TO/JOSM/PREF "
msgstr "/PATH/TO/JOSM/PREF "
msgid "Set the preferences directory"
-msgstr ""
+msgstr "設定ディレクトリを設定"
msgid "/PATH/TO/JOSM/USERDATA"
msgstr "/PATH/TO/JOSM/USERDATA"
msgid "Set the user data directory"
-msgstr ""
+msgstr "ユーザーデータのディレクトリを設定"
msgid "/PATH/TO/JOSM/CACHE "
msgstr "/PATH/TO/JOSM/CACHE "
msgid "Set the cache directory"
-msgstr ""
+msgstr "キャッシュディレクトリを設定"
msgid "/PATH/TO/JOSM/HOMEDIR "
msgstr "/PATH/TO/JOSM/HOMEDIR "
@@ -4572,12 +4581,12 @@ msgstr "/PATH/TO/JOSM/HOMEDIR "
msgid ""
"Relocate all 3 directories to homedir. Cache directory will be in "
"homedir/cache"
-msgstr ""
+msgstr "全3件のディレクトリをhomedirに移動しました。キャッシュディレクトリはhomedir/cacheになります"
msgid ""
"-Djosm.home has lower precedence, i.e. the specific setting overrides the "
"general one"
-msgstr ""
+msgstr "-Djosm.homeは優先度が低く、例えばより具体的な設定があれば上書きされます"
msgid ""
"note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4738,7 +4747,7 @@ msgid "Click to open the imagery tab in the preferences"
msgstr "クリックすると設定の画像タブを開きます"
msgid "Search menu items"
-msgstr ""
+msgstr "メニュー項目を検索"
msgid "Audio"
msgstr "音声"
@@ -4818,7 +4827,7 @@ msgstr "マウスポインターの位置にあるオブジェクトの名前で
msgid ""
"Middle click again to cycle through.<br>Hold CTRL to select directly from "
"this list with the mouse.<hr>"
-msgstr "繰り返すには再び真中をクリックしてください。<br> CTRL キーを押しつづけるとマウスでこの表から直接選べます。"
+msgstr "さらに中クリックするとこの一覧の項目を順に選択できます。<br> CTRL キーを押しつづけるとマウスでこの一覧から直接選べます。"
msgid "(no object)"
msgstr "(オブジェクトなし)"
@@ -4839,7 +4848,7 @@ msgid "Layer ''{0}'' must be in list of layers"
msgstr "レイヤー ''{0}'' はレイヤーのリスト中になければなりません"
msgid "Default (open, closed, new)"
-msgstr ""
+msgstr "既定 (開いている、閉じている、新規)"
msgid "Username"
msgstr "ユーザー名"
@@ -4851,7 +4860,7 @@ msgid "Last change date"
msgstr "最終更新日"
msgid "Select note sorting method"
-msgstr ""
+msgstr "メモの並び替え方法を選択してください"
msgid "Click to cancel the current operation"
msgstr "クリックして現在の操作をキャンセル"
@@ -6185,6 +6194,9 @@ msgstr "スタイル設定"
msgid "Customize the style"
msgstr "スタイルをカスタマイズ"
+msgid "List of notes"
+msgstr "メモの一覧"
+
msgid "Add comment"
msgstr "コメントの追加"
@@ -6219,7 +6231,7 @@ msgid "Reopen note with message:"
msgstr "メッセージを付けてメモを再開:"
msgid "Sort notes"
-msgstr ""
+msgstr "メモを並べ替え"
msgid "Sort"
msgstr "並べ替え"
@@ -7520,11 +7532,8 @@ 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 "選択したダウンロード領域内でダウンロードするメモを選択してください。"
+msgstr "選択すると指定されたダウンロード領域内のメモをダウンロードします。"
msgid "Download as new layer"
msgstr "新しいレイヤーとしてダウンロード"
@@ -7574,6 +7583,9 @@ msgid ""
"<strong>{2}</strong> is enabled.<br>Please choose to either download OSM "
"data, or GPX data, or Notes, or all.</html>"
msgstr ""
+"<html><strong>{0}</strong>、 "
+"<strong>{1}</strong>、<strong>{2}</strong>の、いずれも選択されていません。<br>ダウンロード対象を、OSM "
+"データ、GPX データ、メモのいずれかから選択、あるいはすべてを選択してください。</html>"
msgid "Download referrers (parent relations)"
msgstr "参照元(親リレーション)をダウンロード"
@@ -8734,9 +8746,6 @@ msgstr ""
msgid "Save Layer"
msgstr "レイヤーを保存"
-msgid "Note"
-msgstr "備考"
-
msgid "Notes layer"
msgstr "メモレイヤー"
@@ -9155,8 +9164,7 @@ msgstr[0] "GPSタグが必要なものが{0}件見つかりました。"
msgid "{0} has updated GPS data."
msgid_plural "{0} have updated GPS data."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "{0}さんがGPSデータを更新しました。"
msgid "Delete image file from disk"
msgstr "ディスクから画像ファイルを削除"
@@ -9197,7 +9205,7 @@ msgid "Delete File from disk"
msgstr "ディスクからファイルを削除"
msgid "Copy image path"
-msgstr ""
+msgstr "画像のパスをコピー"
msgid "Next"
msgstr "次へ"
@@ -9834,10 +9842,10 @@ msgid "Select to grant JOSM the right to write your server preferences"
msgstr "選択してJOSMにあなたのサーバープリファレンスに書き込む権限を付与"
msgid "Allow modifications of notes"
-msgstr "備考の編集を許可"
+msgstr "メモの編集を許可"
msgid "Select to grant JOSM the right to modify notes on your behalf"
-msgstr "選択するとJOSMにあなたに代わって備考を変更する権限を与えます"
+msgstr "選択するとJOSMにあなたに代わってメモを変更する権限を与えます"
msgid "Retrieving OAuth Access Token..."
msgstr "OAuthアクセストークンを取得中..."
@@ -10108,7 +10116,7 @@ msgid "Toolbar"
msgstr "ツールバー"
msgid "Available"
-msgstr "有効"
+msgstr "利用可能"
msgid "Action parameters"
msgstr "アクションパラメータ"
@@ -12878,10 +12886,10 @@ msgid "Cannot start remotecontrol server on port {0}: {1}"
msgstr "リモート制御サーバーがポート{0}で開始できません。{1}"
msgid "RemoteControl::Accepting connections on {0}:{1}"
-msgstr ""
+msgstr "リモート制御::接続を{0}:{1}で受け付けています"
msgid "RemoteControl::Server stopped."
-msgstr "リモートコントロール::サーバーが停止しました。"
+msgstr "リモート制御::サーバーが停止しました。"
msgid "Cannot start remotecontrol https server on port {0}: {1}"
msgstr "リモート制御のhttpsサーバーをポート{0}で開始できません。{1}"
@@ -12890,7 +12898,7 @@ msgid "Unable to initialize Remote Control HTTPS Server"
msgstr "リモート制御用HTTPSサーバーを初期化できませんでした"
msgid "RemoteControl::Accepting secure connections on {0}:{1}"
-msgstr ""
+msgstr "リモート制御::セキュアな接続を{0}:{1}で受け付けています"
msgid "RemoteControl::Server (https) stopped."
msgstr "リモート制御::サーバー(https)が停止しました。"
@@ -14526,7 +14534,7 @@ msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
msgstr "Loire-Atlantique - Orthophotos 2012 - 20 cm"
msgid "SIG L-R - Languedoc-Roussillon 2012 - 20 cm"
-msgstr ""
+msgstr "SIG L-R - Languedoc-Roussillon 2012 - 20 cm"
msgid "Toulouse - Orthophotoplan 2013"
msgstr "Toulouse - Orthophotoplan 2013"
@@ -14636,10 +14644,10 @@ msgid "Ireland Bartholomew Quarter-Inch 1940"
msgstr "Ireland Bartholomew Quarter-Inch 1940"
msgid "OSMIE Townlands"
-msgstr ""
+msgstr "OSMIE Townlands"
msgid "OSMIE EDs"
-msgstr ""
+msgstr "OSMIE EDs"
msgid "OSMIE Civil Parishes"
msgstr ""
@@ -15452,7 +15460,7 @@ msgstr ""
"り、再オープンしたり、コメントしたりすることができます。"
msgid "Enables user to work with pictures hosted at mapillary.com"
-msgstr ""
+msgstr "ユーザーがmapillary.comからの画像で作業できるようにする"
msgid ""
"Provide a measurement dialog and a layer to measure length and angle of "
@@ -15557,6 +15565,8 @@ msgid ""
"properties window. Available country presets: Belgium, Germany, Poland, "
"Slovakia, Spain."
msgstr ""
+"道路標識を選択してオブジェクトをタグ付けできるプラグインです。プロパティウィンドウの右上隅に現れる小さいアイコンをクリックするとダイアログが開きます。プリ"
+"セットが有効な国は、ベルギー、ドイツ、ポーランド、スロバキア、スペインです。"
msgid ""
"Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -15572,10 +15582,10 @@ msgid "Loads data from SDS"
msgstr "SDSからのデータのロード"
msgid "Imagery Layer for Sea Charts"
-msgstr ""
+msgstr "海図の画像レイヤーです"
msgid "Edit features for Sea Charts"
-msgstr ""
+msgstr "海図の地物を編集"
msgid ""
"Simplify area by removing nodes on very obtuse angles. This can be "
@@ -15628,7 +15638,7 @@ msgstr "OSMデータに電子署名をするプラグイン"
msgid ""
"Provides a straightforward GUI for adding, editing and deleting turn lanes."
-msgstr "右左折レーンの追加、編集、削除用に直感的なGUIを提供します。"
+msgstr "右左折車線の追加、編集、削除に直観的なGUIを提供します。"
msgid ""
"The turnrestrictions plugin allows to enter maintain information about turn "
@@ -15727,7 +15737,7 @@ msgid "sett"
msgstr "石畳(不定形)"
msgid "Smoothness"
-msgstr ""
+msgstr "滑らかさ"
msgid "excellent"
msgstr ""
@@ -15891,7 +15901,7 @@ msgid "yes"
msgstr "はい"
msgid "rail"
-msgstr "線路"
+msgstr "第三軌条"
msgid "Voltage in Volts (V)"
msgstr "電圧(V)"
@@ -16042,9 +16052,6 @@ msgstr "スポーツセンター"
msgid "stadium"
msgstr "スタジアム"
-msgid "Select sport:"
-msgstr "スポーツを選択:"
-
msgid "Sport"
msgstr "スポーツ"
@@ -16165,6 +16172,10 @@ msgid "rugby_union"
msgstr "ラグビー"
msgctxt "sport"
+msgid "running"
+msgstr ""
+
+msgctxt "sport"
msgid "shooting"
msgstr "射撃"
@@ -16177,10 +16188,6 @@ msgid "skating"
msgstr "スケート"
msgctxt "sport"
-msgid "skiing"
-msgstr "スキー"
-
-msgctxt "sport"
msgid "soccer"
msgstr "サッカー"
@@ -16505,6 +16512,30 @@ msgstr "最大重量(t)"
msgid "Toll"
msgstr "料金"
+msgid "Is the water body intermittent (disappears seasonally)?"
+msgstr "永続的な水域ではない（季節によってなくなる）？"
+
+msgid "culvert"
+msgstr ""
+
+msgid "Water access rules:"
+msgstr ""
+
+msgid "Ship"
+msgstr ""
+
+msgid "designated"
+msgstr "標示あり"
+
+msgid "Boat"
+msgstr ""
+
+msgid "Motorboat"
+msgstr ""
+
+msgid "Canoe"
+msgstr ""
+
msgid "Streets"
msgstr "ストリート"
@@ -16698,7 +16729,7 @@ msgid "Junction"
msgstr "接続道路"
msgid "roundabout"
-msgstr "ロータリー交差点"
+msgstr "環状交差点"
msgid "jughandle"
msgstr "右折連絡路"
@@ -16720,9 +16751,6 @@ msgstr "通行制限"
msgid "official"
msgstr "公務"
-msgid "designated"
-msgstr "標示あり"
-
msgid "Vehicles per type"
msgstr "車両種類別"
@@ -16792,7 +16820,7 @@ msgid "no"
msgstr "禁止"
msgid "Roundabout"
-msgstr "ロータリー交差点"
+msgstr "環状交差点"
msgctxt "Highway"
msgid "construction"
@@ -16924,13 +16952,13 @@ msgid "Cycleway"
msgstr "自転車用道路"
msgid "lane"
-msgstr "レーン"
+msgstr "車線"
msgid "track"
msgstr "トラック"
msgid "opposite_lane"
-msgstr "反対側のレーン"
+msgstr "反対車線"
msgid "opposite_track"
msgstr "反対側のトラック"
@@ -16939,16 +16967,16 @@ msgid "opposite"
msgstr "反対側"
msgid "share_busway"
-msgstr "バスと共用のレーン"
+msgstr "バスと共用の車線"
msgid "shared_lane"
-msgstr "共用レーン"
+msgstr "共用車線"
msgid "Cycleway left"
-msgstr "左側の自転車レーン"
+msgstr "左側の自転車通行帯"
msgid "Cycleway right"
-msgstr "右側の自転車レーン"
+msgstr "右側の自転車通行帯"
msgid "Oneway (bicycle)"
msgstr "一方通行(自転車)"
@@ -17104,7 +17132,7 @@ msgid "Give Way"
msgstr "前方優先道路"
msgid "Mini-Roundabout"
-msgstr "小さいロータリー"
+msgstr "小さい環状交差点"
msgid "clockwise"
msgstr "時計回り"
@@ -17112,6 +17140,9 @@ msgstr "時計回り"
msgid "Pedestrian Crossing"
msgstr "横断歩道"
+msgid "In case of traffic signals:"
+msgstr ""
+
msgid "Traffic Calming"
msgstr "交通静穏化"
@@ -17164,7 +17195,7 @@ msgstr "名前付き交差点"
msgid ""
"Used in some countries for a named road junction who’s name serves for local "
"orientation."
-msgstr ""
+msgstr "移動の目印になる、名前のついた交差点です。（一部の国で使用）"
msgid "Elevator"
msgstr "エレベーター"
@@ -17360,15 +17391,12 @@ msgstr "排水路"
msgid "Stream"
msgstr "小川"
-msgid "Wadi"
-msgstr "涸れ川"
+msgid "River"
+msgstr "川"
msgid "Canal"
msgstr "運河"
-msgid "River"
-msgstr "川"
-
msgid "Spring"
msgstr "泉"
@@ -17434,9 +17462,6 @@ msgstr "河川"
msgid "Salt Water"
msgstr "塩水"
-msgid "Is the water body intermittent (disappears seasonally)?"
-msgstr "永続的な水域ではない（季節によってなくなる）？"
-
msgid "Coastline"
msgstr "海岸線"
@@ -17833,7 +17858,7 @@ msgid "Shell"
msgstr "シェル石油"
msgid "Socar"
-msgstr ""
+msgstr "Socar"
msgid "Statoil"
msgstr "Statoil"
@@ -17914,16 +17939,16 @@ msgid "1/50 mix (mofa/moped)"
msgstr "50:1混合油(モペッド等)"
msgid "Fuel cards:"
-msgstr ""
+msgstr "給油カード:"
msgid "DKV"
-msgstr ""
+msgstr "DKV"
msgid "Routex"
-msgstr ""
+msgstr "Routex"
msgid "UTA"
-msgstr ""
+msgstr "UTA"
msgid "Charging Station"
msgstr "充電ステーション"
@@ -18052,7 +18077,7 @@ msgid "Public Bicycle Repair Station"
msgstr "公共自転車修理場所"
msgid "Chain tool"
-msgstr ""
+msgstr "チェーン修理"
msgid "Public Transport"
msgstr "公共交通"
@@ -18276,6 +18301,9 @@ msgstr "バス停"
msgid "Tactile Paving"
msgstr "点字ブロック"
+msgid "incorrect"
+msgstr ""
+
msgid "Bus Platform"
msgstr "バス乗り場"
@@ -18307,7 +18335,7 @@ msgid "Apron"
msgstr "エプロン"
msgid "Plane Parking Position"
-msgstr ""
+msgstr "駐機場"
msgid "Hangar"
msgstr "格納庫"
@@ -18438,6 +18466,9 @@ msgstr "寿司"
msgid "Microbrewery"
msgstr "地酒醸造所"
+msgid "Outdoor seating"
+msgstr ""
+
msgid "Fast Food"
msgstr "ファストフード"
@@ -18611,13 +18642,13 @@ msgid "Movie Theater/Cinema"
msgstr "映画館"
msgid "Drive-in theater"
-msgstr ""
+msgstr "ドライブインシアター"
msgid "3D"
-msgstr ""
+msgstr "3D"
msgid "Number of screens"
-msgstr ""
+msgstr "スクリーン数"
msgid "Minimum age"
msgstr ""
@@ -19032,14 +19063,14 @@ msgstr "郵便ポスト"
msgid "Collection times"
msgstr "収集時刻"
-msgid "11:30"
-msgstr "11:30"
+msgid "Mo-Sa 09:00"
+msgstr ""
-msgid "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
-msgstr "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
+msgid "Mo-Fr 17:30; Sa 12:00"
+msgstr ""
-msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; Su,PH off"
-msgstr "Mo-Fr 09:00-12:00,17:15; Sa 14:00; Su,PH off"
+msgid "Mo-Fr 15:00,19:00; Sa 15:10; Su 10:30"
+msgstr ""
msgid "Drive through"
msgstr "ドライブスルー"
@@ -19253,7 +19284,7 @@ msgstr "消火栓の位置"
msgctxt "hydrant position"
msgid "lane"
-msgstr "レーン"
+msgstr "車線"
msgctxt "hydrant position"
msgid "parking_lot"
@@ -19297,6 +19328,15 @@ msgstr "スポーツセンター"
msgid "Pitch"
msgstr "競技場"
+msgid "artificial_turf"
+msgstr ""
+
+msgid "decoturf"
+msgstr ""
+
+msgid "tartan"
+msgstr ""
+
msgid "Racetrack"
msgstr "競技トラック"
@@ -19404,6 +19444,12 @@ msgstr "ノルディックスキー"
msgid "skitour"
msgstr "スキーツアー"
+msgid "sled"
+msgstr ""
+
+msgid "sleigh"
+msgstr ""
+
msgid "snow_park"
msgstr "スノーパーク"
@@ -19656,6 +19702,10 @@ msgctxt "building"
msgid "construction"
msgstr "建設中"
+msgctxt "building"
+msgid "Levels"
+msgstr ""
+
msgid "Residential Building"
msgstr "住宅"
@@ -19691,6 +19741,16 @@ msgctxt "building"
msgid "farm"
msgstr "農業用"
+msgid "Building part"
+msgstr ""
+
+msgctxt "building"
+msgid "Skipped Levels"
+msgstr ""
+
+msgid "Skipped height (meters)"
+msgstr ""
+
msgid "Entrance"
msgstr "出入口"
@@ -19903,7 +19963,7 @@ msgid "Tide Level"
msgstr "潮位"
msgid "Groundwater"
-msgstr ""
+msgstr "地下水"
msgid "Traffic"
msgstr "交通"
@@ -20553,7 +20613,7 @@ msgid "tubular"
msgstr "筒状"
msgid "solid"
-msgstr ""
+msgstr "電柱"
msgid "steel"
msgstr "鉄"
@@ -20564,7 +20624,7 @@ msgstr "赤/白"
msgctxt "power"
msgid "Tower type"
-msgstr ""
+msgstr "塔の種類"
msgctxt "power"
msgid "suspension"
@@ -20848,7 +20908,7 @@ msgid "Wayside Shrine"
msgstr "道祖神"
msgid "Place of worship"
-msgstr ""
+msgstr "宗教施設"
msgctxt "building"
msgid "wayside_shrine"
@@ -21424,6 +21484,18 @@ msgstr "楯状火山"
msgid "scoria"
msgstr "鐘状火山"
+msgid "Ridge"
+msgstr "尾根"
+
+msgid "A mountain or hill ridge."
+msgstr "山や丘の尾根です。"
+
+msgid "Valley"
+msgstr ""
+
+msgid "A low area between hills."
+msgstr ""
+
msgid "Cave Entrance"
msgstr "洞窟の出入口"
@@ -21436,12 +21508,6 @@ msgstr "島"
msgid "Islet"
msgstr "小島"
-msgid "Ridge"
-msgstr "尾根"
-
-msgid "A mountain or hill ridge."
-msgstr "山や丘の尾根です。"
-
msgid "Nature"
msgstr "自然"
@@ -21469,6 +21535,37 @@ msgstr "木材生産が積極的に行われていない森林です。"
msgid "Forest"
msgstr "人工林"
+msgid "Cutline"
+msgstr ""
+
+msgctxt "cutline"
+msgid "border"
+msgstr ""
+
+msgctxt "cutline"
+msgid "firebreak"
+msgstr ""
+
+msgctxt "cutline"
+msgid "hunting"
+msgstr ""
+
+msgctxt "cutline"
+msgid "loggingmachine"
+msgstr ""
+
+msgctxt "cutline"
+msgid "pipeline"
+msgstr ""
+
+msgctxt "cutline"
+msgid "piste"
+msgstr ""
+
+msgctxt "cutline"
+msgid "section"
+msgstr ""
+
msgid "Grassland"
msgstr "草原"
@@ -22403,6 +22500,9 @@ msgstr "{0}={1}は未定義です。''{1}''を''left''、''right''、''both''の
msgid "Unspecific tag {0}"
msgstr ""
+msgid "Definition of {0} is unclear"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr "{0}がノードに設定されています。ウェイに設定するべきです。"
@@ -26144,7 +26244,7 @@ msgid "Split by municipality"
msgstr "municipalityで分割"
msgid "Split this data by municipality (admin_level=8)."
-msgstr "このデータをmunicipalita(管理レベル=8)で分割します。"
+msgstr "このデータをmunicipality(管理レベル=8)で分割します。"
msgid "Split by sector"
msgstr "sectorで分割"
@@ -27954,8 +28054,8 @@ msgstr "SDSファイルを保存"
msgid "No object selected"
msgstr ""
-msgid "SeaMap Editor"
-msgstr "SeaMapエディタ"
+msgid "SeaChart Editor"
+msgstr ""
msgid "Seamark Inspector"
msgstr ""
@@ -28032,6 +28132,9 @@ msgstr "距離の係数"
msgid "Merge Nearby Nodes Threshold"
msgstr "近接するノードを結合する閾値"
+msgid "SeaMap Editor"
+msgstr "SeaMapエディタ"
+
msgid "AutoSave LiveData"
msgstr "LiveDataの自動保存"
@@ -28252,7 +28355,7 @@ msgstr ""
msgid ""
"New version of Tracer2Server is available. For best results please upgrade "
"to version {0}."
-msgstr "Trace2Serverの新しいバージョンが利用可能です。良い結果を出すためにもバージョン{0}にアップグレードしてください。"
+msgstr "Tracer2Serverの新しいバージョンが利用可能です。良い結果を出すためにもバージョン{0}にアップグレードしてください。"
msgid "No set of parameter is active!"
msgstr "有効なパラメーターのセットがありません。"
@@ -28411,7 +28514,7 @@ msgid "Show all available signatures for selected attribute."
msgstr "選択された属性のすべての有効な署名を表示します。"
msgid "Show deleted tags and notes if they were signed before"
-msgstr "以前に署名されていた削除されたタグや備考を表示"
+msgstr "以前に署名されていた削除されたタグやメモを表示"
msgid ""
"Use default (and maybe existing) GnuPG directory ({0}) to store new keys and "
@@ -28639,7 +28742,7 @@ msgid "Delete turn."
msgstr "進行方向を削除します。"
msgid "{0} lanes are not referenced in any turn-relation."
-msgstr "{0} 本の車線がどの進行方向リレーションからもさん方されていません。"
+msgstr "{0} 本の車線がどの進行方向リレーションからも参照されていません。"
msgid "Put the ways in order."
msgstr "順番にウェイを配置します。"
@@ -28905,7 +29008,7 @@ msgstr "クリップボードから''経由地''オブジェクトを挿入"
msgid ""
"Failed to retrieve OSM object with id {0} from dataset {1}. Cannot add it as "
"''via''."
-msgstr "データセット {1} から ID {0} のOSMオブジェクトを受信できませんでした。 ''via'' としてを追加できません。"
+msgstr "データセット {1} から ID {0} のOSMオブジェクトを受信できませんでした。 ''via'' として追加できません。"
msgctxt "turnrestrictions"
msgid "From:"
@@ -29319,7 +29422,7 @@ msgstr "リレーションを外す"
msgid ""
"Duplicate nodes, ways and relations that are used by multiple relations."
-msgstr "複数のリレーションから使用されているノード、ウェイ、リレーションが重複しています。"
+msgstr "複数のリレーションから使用されているノード、ウェイ、リレーションを複製します。"
msgid "UnGlue Relations"
msgstr "リレーションを外す"
diff --git a/i18n/po/ka.po b/i18n/po/ka.po
index 71d28ab..2d80f60 100644
--- a/i18n/po/ka.po
+++ b/i18n/po/ka.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-04 03:32+0100\n"
+"POT-Creation-Date: 2015-04-01 03:33+0200\n"
"PO-Revision-Date: 2011-12-16 00:14+0000\n"
"Last-Translator: datogogishvili <Unknown>\n"
"Language-Team: Georgian <ka at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2015-03-04 04:41+0000\n"
-"X-Generator: Launchpad (build 17361)\n"
+"X-Launchpad-Export-Date: 2015-04-01 04:41+0000\n"
+"X-Generator: Launchpad (build 17413)\n"
"Language: ka\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -1701,9 +1701,15 @@ msgstr ""
msgid "Markers from {0}"
msgstr ""
+msgid "Download OSM Notes"
+msgstr ""
+
msgid "Downloading Notes"
msgstr ""
+msgid "Notes"
+msgstr ""
+
msgid "Download Compressed OSM Change"
msgstr ""
@@ -6114,6 +6120,9 @@ msgstr ""
msgid "Customize the style"
msgstr ""
+msgid "List of notes"
+msgstr ""
+
msgid "Add comment"
msgstr ""
@@ -7433,9 +7442,6 @@ 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 ""
@@ -15687,9 +15693,6 @@ msgstr ""
msgid "stadium"
msgstr ""
-msgid "Select sport:"
-msgstr ""
-
msgid "Sport"
msgstr ""
@@ -15810,19 +15813,19 @@ msgid "rugby_union"
msgstr ""
msgctxt "sport"
-msgid "shooting"
+msgid "running"
msgstr ""
msgctxt "sport"
-msgid "skateboard"
+msgid "shooting"
msgstr ""
msgctxt "sport"
-msgid "skating"
+msgid "skateboard"
msgstr ""
msgctxt "sport"
-msgid "skiing"
+msgid "skating"
msgstr ""
msgctxt "sport"
@@ -16150,6 +16153,30 @@ msgstr ""
msgid "Toll"
msgstr ""
+msgid "Is the water body intermittent (disappears seasonally)?"
+msgstr ""
+
+msgid "culvert"
+msgstr ""
+
+msgid "Water access rules:"
+msgstr ""
+
+msgid "Ship"
+msgstr ""
+
+msgid "designated"
+msgstr ""
+
+msgid "Boat"
+msgstr ""
+
+msgid "Motorboat"
+msgstr ""
+
+msgid "Canoe"
+msgstr ""
+
msgid "Streets"
msgstr ""
@@ -16365,9 +16392,6 @@ msgstr ""
msgid "official"
msgstr ""
-msgid "designated"
-msgstr ""
-
msgid "Vehicles per type"
msgstr ""
@@ -16757,6 +16781,9 @@ msgstr ""
msgid "Pedestrian Crossing"
msgstr ""
+msgid "In case of traffic signals:"
+msgstr ""
+
msgid "Traffic Calming"
msgstr ""
@@ -17003,15 +17030,12 @@ msgstr ""
msgid "Stream"
msgstr ""
-msgid "Wadi"
+msgid "River"
msgstr ""
msgid "Canal"
msgstr ""
-msgid "River"
-msgstr ""
-
msgid "Spring"
msgstr ""
@@ -17077,9 +17101,6 @@ msgstr ""
msgid "Salt Water"
msgstr ""
-msgid "Is the water body intermittent (disappears seasonally)?"
-msgstr ""
-
msgid "Coastline"
msgstr ""
@@ -17919,6 +17940,9 @@ msgstr ""
msgid "Tactile Paving"
msgstr ""
+msgid "incorrect"
+msgstr ""
+
msgid "Bus Platform"
msgstr ""
@@ -18081,6 +18105,9 @@ msgstr ""
msgid "Microbrewery"
msgstr ""
+msgid "Outdoor seating"
+msgstr ""
+
msgid "Fast Food"
msgstr ""
@@ -18675,13 +18702,13 @@ msgstr ""
msgid "Collection times"
msgstr ""
-msgid "11:30"
+msgid "Mo-Sa 09:00"
msgstr ""
-msgid "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
+msgid "Mo-Fr 17:30; Sa 12:00"
msgstr ""
-msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; Su,PH off"
+msgid "Mo-Fr 15:00,19:00; Sa 15:10; Su 10:30"
msgstr ""
msgid "Drive through"
@@ -18940,6 +18967,15 @@ msgstr ""
msgid "Pitch"
msgstr ""
+msgid "artificial_turf"
+msgstr ""
+
+msgid "decoturf"
+msgstr ""
+
+msgid "tartan"
+msgstr ""
+
msgid "Racetrack"
msgstr ""
@@ -19047,6 +19083,12 @@ msgstr ""
msgid "skitour"
msgstr ""
+msgid "sled"
+msgstr ""
+
+msgid "sleigh"
+msgstr ""
+
msgid "snow_park"
msgstr ""
@@ -19299,6 +19341,10 @@ msgctxt "building"
msgid "construction"
msgstr ""
+msgctxt "building"
+msgid "Levels"
+msgstr ""
+
msgid "Residential Building"
msgstr ""
@@ -19334,6 +19380,16 @@ msgctxt "building"
msgid "farm"
msgstr ""
+msgid "Building part"
+msgstr ""
+
+msgctxt "building"
+msgid "Skipped Levels"
+msgstr ""
+
+msgid "Skipped height (meters)"
+msgstr ""
+
msgid "Entrance"
msgstr ""
@@ -21067,22 +21123,28 @@ msgstr ""
msgid "scoria"
msgstr ""
-msgid "Cave Entrance"
+msgid "Ridge"
msgstr ""
-msgid "The entrance to a cave."
+msgid "A mountain or hill ridge."
msgstr ""
-msgid "Island"
+msgid "Valley"
msgstr ""
-msgid "Islet"
+msgid "A low area between hills."
msgstr ""
-msgid "Ridge"
+msgid "Cave Entrance"
msgstr ""
-msgid "A mountain or hill ridge."
+msgid "The entrance to a cave."
+msgstr ""
+
+msgid "Island"
+msgstr ""
+
+msgid "Islet"
msgstr ""
msgid "Nature"
@@ -21112,6 +21174,37 @@ msgstr ""
msgid "Forest"
msgstr ""
+msgid "Cutline"
+msgstr ""
+
+msgctxt "cutline"
+msgid "border"
+msgstr ""
+
+msgctxt "cutline"
+msgid "firebreak"
+msgstr ""
+
+msgctxt "cutline"
+msgid "hunting"
+msgstr ""
+
+msgctxt "cutline"
+msgid "loggingmachine"
+msgstr ""
+
+msgctxt "cutline"
+msgid "pipeline"
+msgstr ""
+
+msgctxt "cutline"
+msgid "piste"
+msgstr ""
+
+msgctxt "cutline"
+msgid "section"
+msgstr ""
+
msgid "Grassland"
msgstr ""
@@ -22045,6 +22138,9 @@ msgstr ""
msgid "Unspecific tag {0}"
msgstr ""
+msgid "Definition of {0} is unclear"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -27406,7 +27502,7 @@ msgstr ""
msgid "No object selected"
msgstr ""
-msgid "SeaMap Editor"
+msgid "SeaChart Editor"
msgstr ""
msgid "Seamark Inspector"
@@ -27478,6 +27574,9 @@ msgstr ""
msgid "Merge Nearby Nodes Threshold"
msgstr ""
+msgid "SeaMap Editor"
+msgstr ""
+
msgid "AutoSave LiveData"
msgstr ""
diff --git a/i18n/po/km.po b/i18n/po/km.po
index 4e167f9..c130899 100644
--- a/i18n/po/km.po
+++ b/i18n/po/km.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-04 03:32+0100\n"
+"POT-Creation-Date: 2015-04-01 03:33+0200\n"
"PO-Revision-Date: 2015-01-27 10:25+0000\n"
"Last-Translator: Sophea Sok <sksophea at gmail.com>\n"
"Language-Team: Khmer <km at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2015-03-04 04:47+0000\n"
-"X-Generator: Launchpad (build 17361)\n"
+"X-Launchpad-Export-Date: 2015-04-01 04:47+0000\n"
+"X-Generator: Launchpad (build 17413)\n"
"Language: \n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -1814,9 +1814,15 @@ msgstr "បានទាញយកទិន្នន័យជីភី
msgid "Markers from {0}"
msgstr "ចំណាំមកពី {0}"
+msgid "Download OSM Notes"
+msgstr ""
+
msgid "Downloading Notes"
msgstr "កំពុងទាញយកតំណ"
+msgid "Notes"
+msgstr "ចំណាំ"
+
msgid "Download Compressed OSM Change"
msgstr "ទាញយកការផ្លាស់ប្ដូរ OSM ដែលបានបង្ហាប់"
@@ -6558,6 +6564,9 @@ msgstr "ការកំណត់រចនាប័ទ្ម"
msgid "Customize the style"
msgstr "ប្ដូររចនាប័ទ្មតាមបំណង"
+msgid "List of notes"
+msgstr ""
+
msgid "Add comment"
msgstr "បន្ថែមមតិយោបល់"
@@ -8001,9 +8010,6 @@ 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 "ជ្រើសដើម្បីទាញយកចំណាំនៅក្នុងតំបន់ទាញយកដែលបានជ្រើស។"
@@ -17218,9 +17224,6 @@ msgstr ""
msgid "stadium"
msgstr ""
-msgid "Select sport:"
-msgstr ""
-
msgid "Sport"
msgstr ""
@@ -17341,19 +17344,19 @@ msgid "rugby_union"
msgstr ""
msgctxt "sport"
-msgid "shooting"
+msgid "running"
msgstr ""
msgctxt "sport"
-msgid "skateboard"
+msgid "shooting"
msgstr ""
msgctxt "sport"
-msgid "skating"
+msgid "skateboard"
msgstr ""
msgctxt "sport"
-msgid "skiing"
+msgid "skating"
msgstr ""
msgctxt "sport"
@@ -17681,6 +17684,30 @@ msgstr ""
msgid "Toll"
msgstr ""
+msgid "Is the water body intermittent (disappears seasonally)?"
+msgstr ""
+
+msgid "culvert"
+msgstr ""
+
+msgid "Water access rules:"
+msgstr ""
+
+msgid "Ship"
+msgstr ""
+
+msgid "designated"
+msgstr ""
+
+msgid "Boat"
+msgstr ""
+
+msgid "Motorboat"
+msgstr ""
+
+msgid "Canoe"
+msgstr ""
+
msgid "Streets"
msgstr ""
@@ -17896,9 +17923,6 @@ msgstr ""
msgid "official"
msgstr ""
-msgid "designated"
-msgstr ""
-
msgid "Vehicles per type"
msgstr ""
@@ -18288,6 +18312,9 @@ msgstr ""
msgid "Pedestrian Crossing"
msgstr ""
+msgid "In case of traffic signals:"
+msgstr ""
+
msgid "Traffic Calming"
msgstr ""
@@ -18534,15 +18561,12 @@ msgstr ""
msgid "Stream"
msgstr ""
-msgid "Wadi"
+msgid "River"
msgstr ""
msgid "Canal"
msgstr ""
-msgid "River"
-msgstr ""
-
msgid "Spring"
msgstr ""
@@ -18608,9 +18632,6 @@ msgstr ""
msgid "Salt Water"
msgstr ""
-msgid "Is the water body intermittent (disappears seasonally)?"
-msgstr ""
-
msgid "Coastline"
msgstr ""
@@ -19450,6 +19471,9 @@ msgstr ""
msgid "Tactile Paving"
msgstr ""
+msgid "incorrect"
+msgstr ""
+
msgid "Bus Platform"
msgstr ""
@@ -19612,6 +19636,9 @@ msgstr ""
msgid "Microbrewery"
msgstr ""
+msgid "Outdoor seating"
+msgstr ""
+
msgid "Fast Food"
msgstr ""
@@ -20206,13 +20233,13 @@ msgstr ""
msgid "Collection times"
msgstr ""
-msgid "11:30"
+msgid "Mo-Sa 09:00"
msgstr ""
-msgid "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
+msgid "Mo-Fr 17:30; Sa 12:00"
msgstr ""
-msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; Su,PH off"
+msgid "Mo-Fr 15:00,19:00; Sa 15:10; Su 10:30"
msgstr ""
msgid "Drive through"
@@ -20471,6 +20498,15 @@ msgstr ""
msgid "Pitch"
msgstr ""
+msgid "artificial_turf"
+msgstr ""
+
+msgid "decoturf"
+msgstr ""
+
+msgid "tartan"
+msgstr ""
+
msgid "Racetrack"
msgstr ""
@@ -20578,6 +20614,12 @@ msgstr ""
msgid "skitour"
msgstr ""
+msgid "sled"
+msgstr ""
+
+msgid "sleigh"
+msgstr ""
+
msgid "snow_park"
msgstr ""
@@ -20830,6 +20872,10 @@ msgctxt "building"
msgid "construction"
msgstr ""
+msgctxt "building"
+msgid "Levels"
+msgstr ""
+
msgid "Residential Building"
msgstr ""
@@ -20865,6 +20911,16 @@ msgctxt "building"
msgid "farm"
msgstr ""
+msgid "Building part"
+msgstr ""
+
+msgctxt "building"
+msgid "Skipped Levels"
+msgstr ""
+
+msgid "Skipped height (meters)"
+msgstr ""
+
msgid "Entrance"
msgstr ""
@@ -22598,22 +22654,28 @@ msgstr ""
msgid "scoria"
msgstr ""
-msgid "Cave Entrance"
+msgid "Ridge"
msgstr ""
-msgid "The entrance to a cave."
+msgid "A mountain or hill ridge."
msgstr ""
-msgid "Island"
+msgid "Valley"
msgstr ""
-msgid "Islet"
+msgid "A low area between hills."
msgstr ""
-msgid "Ridge"
+msgid "Cave Entrance"
msgstr ""
-msgid "A mountain or hill ridge."
+msgid "The entrance to a cave."
+msgstr ""
+
+msgid "Island"
+msgstr ""
+
+msgid "Islet"
msgstr ""
msgid "Nature"
@@ -22643,6 +22705,37 @@ msgstr ""
msgid "Forest"
msgstr ""
+msgid "Cutline"
+msgstr ""
+
+msgctxt "cutline"
+msgid "border"
+msgstr ""
+
+msgctxt "cutline"
+msgid "firebreak"
+msgstr ""
+
+msgctxt "cutline"
+msgid "hunting"
+msgstr ""
+
+msgctxt "cutline"
+msgid "loggingmachine"
+msgstr ""
+
+msgctxt "cutline"
+msgid "pipeline"
+msgstr ""
+
+msgctxt "cutline"
+msgid "piste"
+msgstr ""
+
+msgctxt "cutline"
+msgid "section"
+msgstr ""
+
msgid "Grassland"
msgstr ""
@@ -23576,6 +23669,9 @@ msgstr ""
msgid "Unspecific tag {0}"
msgstr ""
+msgid "Definition of {0} is unclear"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -28937,7 +29033,7 @@ msgstr ""
msgid "No object selected"
msgstr ""
-msgid "SeaMap Editor"
+msgid "SeaChart Editor"
msgstr ""
msgid "Seamark Inspector"
@@ -29009,6 +29105,9 @@ msgstr ""
msgid "Merge Nearby Nodes Threshold"
msgstr ""
+msgid "SeaMap Editor"
+msgstr ""
+
msgid "AutoSave LiveData"
msgstr ""
diff --git a/i18n/po/ko.po b/i18n/po/ko.po
index 37e167b..196c619 100644
--- a/i18n/po/ko.po
+++ b/i18n/po/ko.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-04 03:32+0100\n"
+"POT-Creation-Date: 2015-04-01 03:33+0200\n"
"PO-Revision-Date: 2015-02-27 14:53+0000\n"
"Last-Translator: Yongmin Hong <revi at fastlizard4.org>\n"
"Language-Team: Korean <ko at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2015-03-04 04:48+0000\n"
-"X-Generator: Launchpad (build 17361)\n"
+"X-Launchpad-Export-Date: 2015-04-01 04:48+0000\n"
+"X-Generator: Launchpad (build 17413)\n"
"Language: ko\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -1689,9 +1689,15 @@ msgstr "다운로드된 GPX"
msgid "Markers from {0}"
msgstr ""
+msgid "Download OSM Notes"
+msgstr ""
+
msgid "Downloading Notes"
msgstr ""
+msgid "Notes"
+msgstr ""
+
msgid "Download Compressed OSM Change"
msgstr ""
@@ -6093,6 +6099,9 @@ msgstr ""
msgid "Customize the style"
msgstr ""
+msgid "List of notes"
+msgstr ""
+
msgid "Add comment"
msgstr ""
@@ -7412,9 +7421,6 @@ 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 ""
@@ -15671,9 +15677,6 @@ msgstr ""
msgid "stadium"
msgstr ""
-msgid "Select sport:"
-msgstr ""
-
msgid "Sport"
msgstr ""
@@ -15794,19 +15797,19 @@ msgid "rugby_union"
msgstr ""
msgctxt "sport"
-msgid "shooting"
+msgid "running"
msgstr ""
msgctxt "sport"
-msgid "skateboard"
+msgid "shooting"
msgstr ""
msgctxt "sport"
-msgid "skating"
+msgid "skateboard"
msgstr ""
msgctxt "sport"
-msgid "skiing"
+msgid "skating"
msgstr ""
msgctxt "sport"
@@ -16134,6 +16137,30 @@ msgstr ""
msgid "Toll"
msgstr ""
+msgid "Is the water body intermittent (disappears seasonally)?"
+msgstr ""
+
+msgid "culvert"
+msgstr ""
+
+msgid "Water access rules:"
+msgstr ""
+
+msgid "Ship"
+msgstr ""
+
+msgid "designated"
+msgstr ""
+
+msgid "Boat"
+msgstr ""
+
+msgid "Motorboat"
+msgstr ""
+
+msgid "Canoe"
+msgstr ""
+
msgid "Streets"
msgstr ""
@@ -16349,9 +16376,6 @@ msgstr ""
msgid "official"
msgstr ""
-msgid "designated"
-msgstr ""
-
msgid "Vehicles per type"
msgstr ""
@@ -16741,6 +16765,9 @@ msgstr ""
msgid "Pedestrian Crossing"
msgstr ""
+msgid "In case of traffic signals:"
+msgstr ""
+
msgid "Traffic Calming"
msgstr ""
@@ -16987,15 +17014,12 @@ msgstr ""
msgid "Stream"
msgstr ""
-msgid "Wadi"
+msgid "River"
msgstr ""
msgid "Canal"
msgstr ""
-msgid "River"
-msgstr ""
-
msgid "Spring"
msgstr ""
@@ -17061,9 +17085,6 @@ msgstr ""
msgid "Salt Water"
msgstr ""
-msgid "Is the water body intermittent (disappears seasonally)?"
-msgstr ""
-
msgid "Coastline"
msgstr ""
@@ -17903,6 +17924,9 @@ msgstr ""
msgid "Tactile Paving"
msgstr ""
+msgid "incorrect"
+msgstr ""
+
msgid "Bus Platform"
msgstr ""
@@ -18065,6 +18089,9 @@ msgstr ""
msgid "Microbrewery"
msgstr ""
+msgid "Outdoor seating"
+msgstr ""
+
msgid "Fast Food"
msgstr ""
@@ -18659,13 +18686,13 @@ msgstr ""
msgid "Collection times"
msgstr ""
-msgid "11:30"
+msgid "Mo-Sa 09:00"
msgstr ""
-msgid "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
+msgid "Mo-Fr 17:30; Sa 12:00"
msgstr ""
-msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; Su,PH off"
+msgid "Mo-Fr 15:00,19:00; Sa 15:10; Su 10:30"
msgstr ""
msgid "Drive through"
@@ -18924,6 +18951,15 @@ msgstr ""
msgid "Pitch"
msgstr ""
+msgid "artificial_turf"
+msgstr ""
+
+msgid "decoturf"
+msgstr ""
+
+msgid "tartan"
+msgstr ""
+
msgid "Racetrack"
msgstr ""
@@ -19031,6 +19067,12 @@ msgstr ""
msgid "skitour"
msgstr ""
+msgid "sled"
+msgstr ""
+
+msgid "sleigh"
+msgstr ""
+
msgid "snow_park"
msgstr ""
@@ -19283,6 +19325,10 @@ msgctxt "building"
msgid "construction"
msgstr ""
+msgctxt "building"
+msgid "Levels"
+msgstr ""
+
msgid "Residential Building"
msgstr ""
@@ -19318,6 +19364,16 @@ msgctxt "building"
msgid "farm"
msgstr ""
+msgid "Building part"
+msgstr ""
+
+msgctxt "building"
+msgid "Skipped Levels"
+msgstr ""
+
+msgid "Skipped height (meters)"
+msgstr ""
+
msgid "Entrance"
msgstr ""
@@ -21051,22 +21107,28 @@ msgstr ""
msgid "scoria"
msgstr ""
-msgid "Cave Entrance"
+msgid "Ridge"
msgstr ""
-msgid "The entrance to a cave."
+msgid "A mountain or hill ridge."
msgstr ""
-msgid "Island"
+msgid "Valley"
msgstr ""
-msgid "Islet"
+msgid "A low area between hills."
msgstr ""
-msgid "Ridge"
+msgid "Cave Entrance"
msgstr ""
-msgid "A mountain or hill ridge."
+msgid "The entrance to a cave."
+msgstr ""
+
+msgid "Island"
+msgstr ""
+
+msgid "Islet"
msgstr ""
msgid "Nature"
@@ -21096,6 +21158,37 @@ msgstr ""
msgid "Forest"
msgstr ""
+msgid "Cutline"
+msgstr ""
+
+msgctxt "cutline"
+msgid "border"
+msgstr ""
+
+msgctxt "cutline"
+msgid "firebreak"
+msgstr ""
+
+msgctxt "cutline"
+msgid "hunting"
+msgstr ""
+
+msgctxt "cutline"
+msgid "loggingmachine"
+msgstr ""
+
+msgctxt "cutline"
+msgid "pipeline"
+msgstr ""
+
+msgctxt "cutline"
+msgid "piste"
+msgstr ""
+
+msgctxt "cutline"
+msgid "section"
+msgstr ""
+
msgid "Grassland"
msgstr ""
@@ -22029,6 +22122,9 @@ msgstr ""
msgid "Unspecific tag {0}"
msgstr ""
+msgid "Definition of {0} is unclear"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -27390,7 +27486,7 @@ msgstr ""
msgid "No object selected"
msgstr ""
-msgid "SeaMap Editor"
+msgid "SeaChart Editor"
msgstr ""
msgid "Seamark Inspector"
@@ -27462,6 +27558,9 @@ msgstr ""
msgid "Merge Nearby Nodes Threshold"
msgstr ""
+msgid "SeaMap Editor"
+msgstr ""
+
msgid "AutoSave LiveData"
msgstr ""
diff --git a/i18n/po/ky.po b/i18n/po/ky.po
index a5f7518..d607421 100644
--- a/i18n/po/ky.po
+++ b/i18n/po/ky.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL at ADDRESS>\n"
-"POT-Creation-Date: 2015-03-04 03:32+0100\n"
+"POT-Creation-Date: 2015-04-01 03:33+0200\n"
"PO-Revision-Date: 2012-12-18 02:36+0000\n"
"Last-Translator: chyngyz <Unknown>\n"
"Language-Team: Kirghiz <ky at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2015-03-04 04:48+0000\n"
-"X-Generator: Launchpad (build 17361)\n"
+"X-Launchpad-Export-Date: 2015-04-01 04:47+0000\n"
+"X-Generator: Launchpad (build 17413)\n"
msgid "{0}: option ''{1}'' is ambiguous"
msgstr ""
@@ -1695,9 +1695,15 @@ msgstr ""
msgid "Markers from {0}"
msgstr ""
+msgid "Download OSM Notes"
+msgstr ""
+
msgid "Downloading Notes"
msgstr ""
+msgid "Notes"
+msgstr ""
+
msgid "Download Compressed OSM Change"
msgstr ""
@@ -6108,6 +6114,9 @@ msgstr ""
msgid "Customize the style"
msgstr ""
+msgid "List of notes"
+msgstr ""
+
msgid "Add comment"
msgstr ""
@@ -7427,9 +7436,6 @@ 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 ""
@@ -15681,9 +15687,6 @@ msgstr ""
msgid "stadium"
msgstr ""
-msgid "Select sport:"
-msgstr ""
-
msgid "Sport"
msgstr ""
@@ -15804,19 +15807,19 @@ msgid "rugby_union"
msgstr ""
msgctxt "sport"
-msgid "shooting"
+msgid "running"
msgstr ""
msgctxt "sport"
-msgid "skateboard"
+msgid "shooting"
msgstr ""
msgctxt "sport"
-msgid "skating"
+msgid "skateboard"
msgstr ""
msgctxt "sport"
-msgid "skiing"
+msgid "skating"
msgstr ""
msgctxt "sport"
@@ -16144,6 +16147,30 @@ msgstr ""
msgid "Toll"
msgstr ""
+msgid "Is the water body intermittent (disappears seasonally)?"
+msgstr ""
+
+msgid "culvert"
+msgstr ""
+
+msgid "Water access rules:"
+msgstr ""
+
+msgid "Ship"
+msgstr ""
+
+msgid "designated"
+msgstr ""
+
+msgid "Boat"
+msgstr ""
+
+msgid "Motorboat"
+msgstr ""
+
+msgid "Canoe"
+msgstr ""
+
msgid "Streets"
msgstr ""
@@ -16359,9 +16386,6 @@ msgstr ""
msgid "official"
msgstr ""
-msgid "designated"
-msgstr ""
-
msgid "Vehicles per type"
msgstr ""
@@ -16751,6 +16775,9 @@ msgstr ""
msgid "Pedestrian Crossing"
msgstr ""
+msgid "In case of traffic signals:"
+msgstr ""
+
msgid "Traffic Calming"
msgstr ""
@@ -16997,15 +17024,12 @@ msgstr ""
msgid "Stream"
msgstr ""
-msgid "Wadi"
+msgid "River"
msgstr ""
msgid "Canal"
msgstr ""
-msgid "River"
-msgstr ""
-
msgid "Spring"
msgstr ""
@@ -17071,9 +17095,6 @@ msgstr ""
msgid "Salt Water"
msgstr ""
-msgid "Is the water body intermittent (disappears seasonally)?"
-msgstr ""
-
msgid "Coastline"
msgstr ""
@@ -17913,6 +17934,9 @@ msgstr ""
msgid "Tactile Paving"
msgstr ""
+msgid "incorrect"
+msgstr ""
+
msgid "Bus Platform"
msgstr ""
@@ -18075,6 +18099,9 @@ msgstr ""
msgid "Microbrewery"
msgstr ""
+msgid "Outdoor seating"
+msgstr ""
+
msgid "Fast Food"
msgstr ""
@@ -18669,13 +18696,13 @@ msgstr ""
msgid "Collection times"
msgstr ""
-msgid "11:30"
+msgid "Mo-Sa 09:00"
msgstr ""
-msgid "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
+msgid "Mo-Fr 17:30; Sa 12:00"
msgstr ""
-msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; Su,PH off"
+msgid "Mo-Fr 15:00,19:00; Sa 15:10; Su 10:30"
msgstr ""
msgid "Drive through"
@@ -18934,6 +18961,15 @@ msgstr ""
msgid "Pitch"
msgstr ""
+msgid "artificial_turf"
+msgstr ""
+
+msgid "decoturf"
+msgstr ""
+
+msgid "tartan"
+msgstr ""
+
msgid "Racetrack"
msgstr ""
@@ -19041,6 +19077,12 @@ msgstr ""
msgid "skitour"
msgstr ""
+msgid "sled"
+msgstr ""
+
+msgid "sleigh"
+msgstr ""
+
msgid "snow_park"
msgstr ""
@@ -19293,6 +19335,10 @@ msgctxt "building"
msgid "construction"
msgstr ""
+msgctxt "building"
+msgid "Levels"
+msgstr ""
+
msgid "Residential Building"
msgstr ""
@@ -19328,6 +19374,16 @@ msgctxt "building"
msgid "farm"
msgstr ""
+msgid "Building part"
+msgstr ""
+
+msgctxt "building"
+msgid "Skipped Levels"
+msgstr ""
+
+msgid "Skipped height (meters)"
+msgstr ""
+
msgid "Entrance"
msgstr ""
@@ -21061,22 +21117,28 @@ msgstr ""
msgid "scoria"
msgstr ""
-msgid "Cave Entrance"
+msgid "Ridge"
msgstr ""
-msgid "The entrance to a cave."
+msgid "A mountain or hill ridge."
msgstr ""
-msgid "Island"
+msgid "Valley"
msgstr ""
-msgid "Islet"
+msgid "A low area between hills."
msgstr ""
-msgid "Ridge"
+msgid "Cave Entrance"
msgstr ""
-msgid "A mountain or hill ridge."
+msgid "The entrance to a cave."
+msgstr ""
+
+msgid "Island"
+msgstr ""
+
+msgid "Islet"
msgstr ""
msgid "Nature"
@@ -21106,6 +21168,37 @@ msgstr ""
msgid "Forest"
msgstr ""
+msgid "Cutline"
+msgstr ""
+
+msgctxt "cutline"
+msgid "border"
+msgstr ""
+
+msgctxt "cutline"
+msgid "firebreak"
+msgstr ""
+
+msgctxt "cutline"
+msgid "hunting"
+msgstr ""
+
+msgctxt "cutline"
+msgid "loggingmachine"
+msgstr ""
+
+msgctxt "cutline"
+msgid "pipeline"
+msgstr ""
+
+msgctxt "cutline"
+msgid "piste"
+msgstr ""
+
+msgctxt "cutline"
+msgid "section"
+msgstr ""
+
msgid "Grassland"
msgstr ""
@@ -22039,6 +22132,9 @@ msgstr ""
msgid "Unspecific tag {0}"
msgstr ""
+msgid "Definition of {0} is unclear"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -27400,7 +27496,7 @@ msgstr ""
msgid "No object selected"
msgstr ""
-msgid "SeaMap Editor"
+msgid "SeaChart Editor"
msgstr ""
msgid "Seamark Inspector"
@@ -27472,6 +27568,9 @@ msgstr ""
msgid "Merge Nearby Nodes Threshold"
msgstr ""
+msgid "SeaMap Editor"
+msgstr ""
+
msgid "AutoSave LiveData"
msgstr ""
diff --git a/i18n/po/lo.po b/i18n/po/lo.po
index b670568..5bc34d2 100644
--- a/i18n/po/lo.po
+++ b/i18n/po/lo.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-04 03:32+0100\n"
+"POT-Creation-Date: 2015-04-01 03:33+0200\n"
"PO-Revision-Date: 2009-09-15 10:06+0000\n"
"Last-Translator: Anousone <Unknown>\n"
"Language-Team: Lao <lo at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2015-03-04 04:49+0000\n"
-"X-Generator: Launchpad (build 17361)\n"
+"X-Launchpad-Export-Date: 2015-04-01 04:48+0000\n"
+"X-Generator: Launchpad (build 17413)\n"
"Language: \n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -1696,9 +1696,15 @@ msgstr ""
msgid "Markers from {0}"
msgstr ""
+msgid "Download OSM Notes"
+msgstr ""
+
msgid "Downloading Notes"
msgstr ""
+msgid "Notes"
+msgstr ""
+
msgid "Download Compressed OSM Change"
msgstr ""
@@ -6109,6 +6115,9 @@ msgstr ""
msgid "Customize the style"
msgstr ""
+msgid "List of notes"
+msgstr ""
+
msgid "Add comment"
msgstr ""
@@ -7428,9 +7437,6 @@ 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 ""
@@ -15682,9 +15688,6 @@ msgstr ""
msgid "stadium"
msgstr ""
-msgid "Select sport:"
-msgstr ""
-
msgid "Sport"
msgstr ""
@@ -15805,19 +15808,19 @@ msgid "rugby_union"
msgstr ""
msgctxt "sport"
-msgid "shooting"
+msgid "running"
msgstr ""
msgctxt "sport"
-msgid "skateboard"
+msgid "shooting"
msgstr ""
msgctxt "sport"
-msgid "skating"
+msgid "skateboard"
msgstr ""
msgctxt "sport"
-msgid "skiing"
+msgid "skating"
msgstr ""
msgctxt "sport"
@@ -16145,6 +16148,30 @@ msgstr ""
msgid "Toll"
msgstr ""
+msgid "Is the water body intermittent (disappears seasonally)?"
+msgstr ""
+
+msgid "culvert"
+msgstr ""
+
+msgid "Water access rules:"
+msgstr ""
+
+msgid "Ship"
+msgstr ""
+
+msgid "designated"
+msgstr ""
+
+msgid "Boat"
+msgstr ""
+
+msgid "Motorboat"
+msgstr ""
+
+msgid "Canoe"
+msgstr ""
+
msgid "Streets"
msgstr ""
@@ -16360,9 +16387,6 @@ msgstr ""
msgid "official"
msgstr ""
-msgid "designated"
-msgstr ""
-
msgid "Vehicles per type"
msgstr ""
@@ -16752,6 +16776,9 @@ msgstr ""
msgid "Pedestrian Crossing"
msgstr ""
+msgid "In case of traffic signals:"
+msgstr ""
+
msgid "Traffic Calming"
msgstr ""
@@ -16998,15 +17025,12 @@ msgstr ""
msgid "Stream"
msgstr ""
-msgid "Wadi"
+msgid "River"
msgstr ""
msgid "Canal"
msgstr ""
-msgid "River"
-msgstr ""
-
msgid "Spring"
msgstr ""
@@ -17072,9 +17096,6 @@ msgstr ""
msgid "Salt Water"
msgstr ""
-msgid "Is the water body intermittent (disappears seasonally)?"
-msgstr ""
-
msgid "Coastline"
msgstr ""
@@ -17914,6 +17935,9 @@ msgstr ""
msgid "Tactile Paving"
msgstr ""
+msgid "incorrect"
+msgstr ""
+
msgid "Bus Platform"
msgstr ""
@@ -18076,6 +18100,9 @@ msgstr ""
msgid "Microbrewery"
msgstr ""
+msgid "Outdoor seating"
+msgstr ""
+
msgid "Fast Food"
msgstr ""
@@ -18670,13 +18697,13 @@ msgstr ""
msgid "Collection times"
msgstr ""
-msgid "11:30"
+msgid "Mo-Sa 09:00"
msgstr ""
-msgid "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
+msgid "Mo-Fr 17:30; Sa 12:00"
msgstr ""
-msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; Su,PH off"
+msgid "Mo-Fr 15:00,19:00; Sa 15:10; Su 10:30"
msgstr ""
msgid "Drive through"
@@ -18935,6 +18962,15 @@ msgstr ""
msgid "Pitch"
msgstr ""
+msgid "artificial_turf"
+msgstr ""
+
+msgid "decoturf"
+msgstr ""
+
+msgid "tartan"
+msgstr ""
+
msgid "Racetrack"
msgstr ""
@@ -19042,6 +19078,12 @@ msgstr ""
msgid "skitour"
msgstr ""
+msgid "sled"
+msgstr ""
+
+msgid "sleigh"
+msgstr ""
+
msgid "snow_park"
msgstr ""
@@ -19294,6 +19336,10 @@ msgctxt "building"
msgid "construction"
msgstr ""
+msgctxt "building"
+msgid "Levels"
+msgstr ""
+
msgid "Residential Building"
msgstr ""
@@ -19329,6 +19375,16 @@ msgctxt "building"
msgid "farm"
msgstr ""
+msgid "Building part"
+msgstr ""
+
+msgctxt "building"
+msgid "Skipped Levels"
+msgstr ""
+
+msgid "Skipped height (meters)"
+msgstr ""
+
msgid "Entrance"
msgstr ""
@@ -21062,22 +21118,28 @@ msgstr ""
msgid "scoria"
msgstr ""
-msgid "Cave Entrance"
+msgid "Ridge"
msgstr ""
-msgid "The entrance to a cave."
+msgid "A mountain or hill ridge."
msgstr ""
-msgid "Island"
+msgid "Valley"
msgstr ""
-msgid "Islet"
+msgid "A low area between hills."
msgstr ""
-msgid "Ridge"
+msgid "Cave Entrance"
msgstr ""
-msgid "A mountain or hill ridge."
+msgid "The entrance to a cave."
+msgstr ""
+
+msgid "Island"
+msgstr ""
+
+msgid "Islet"
msgstr ""
msgid "Nature"
@@ -21107,6 +21169,37 @@ msgstr ""
msgid "Forest"
msgstr ""
+msgid "Cutline"
+msgstr ""
+
+msgctxt "cutline"
+msgid "border"
+msgstr ""
+
+msgctxt "cutline"
+msgid "firebreak"
+msgstr ""
+
+msgctxt "cutline"
+msgid "hunting"
+msgstr ""
+
+msgctxt "cutline"
+msgid "loggingmachine"
+msgstr ""
+
+msgctxt "cutline"
+msgid "pipeline"
+msgstr ""
+
+msgctxt "cutline"
+msgid "piste"
+msgstr ""
+
+msgctxt "cutline"
+msgid "section"
+msgstr ""
+
msgid "Grassland"
msgstr ""
@@ -22040,6 +22133,9 @@ msgstr ""
msgid "Unspecific tag {0}"
msgstr ""
+msgid "Definition of {0} is unclear"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -27401,7 +27497,7 @@ msgstr ""
msgid "No object selected"
msgstr ""
-msgid "SeaMap Editor"
+msgid "SeaChart Editor"
msgstr ""
msgid "Seamark Inspector"
@@ -27473,6 +27569,9 @@ msgstr ""
msgid "Merge Nearby Nodes Threshold"
msgstr ""
+msgid "SeaMap Editor"
+msgstr ""
+
msgid "AutoSave LiveData"
msgstr ""
diff --git a/i18n/po/lt.po b/i18n/po/lt.po
index cf4ed3b..e41d461 100644
--- a/i18n/po/lt.po
+++ b/i18n/po/lt.po
@@ -7,17 +7,17 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-04 03:32+0100\n"
-"PO-Revision-Date: 2015-02-27 19:08+0000\n"
-"Last-Translator: jurkis <atvejis at gmail.com>\n"
+"POT-Creation-Date: 2015-04-01 03:33+0200\n"
+"PO-Revision-Date: 2015-03-31 11:26+0000\n"
+"Last-Translator: Tomas Straupis <tomasstraupis at gmail.com>\n"
"Language-Team: Lithuanian <lt at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
"(n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2015-03-04 04:49+0000\n"
-"X-Generator: Launchpad (build 17361)\n"
+"X-Launchpad-Export-Date: 2015-04-01 04:49+0000\n"
+"X-Generator: Launchpad (build 17413)\n"
"Language: lt\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -186,7 +186,7 @@ msgstr[0] ""
"Jūs tuoj atidarysite {0} naršyklės langą.<br>Tai ir užterš jūsų monitorių "
"naršyklių langais<br>ir užtruks kažkiek laiko."
msgstr[1] ""
-"Jūs tuoj atidarysite {0} naršyklės langų.<br>Tai ir užterš jūsų monitorių "
+"Jūs tuoj atidarysite {0} naršyklės langus.<br>Tai ir užterš jūsų monitorių "
"naršyklių langais<br>ir užtruks kažkiek laiko."
msgstr[2] ""
"Jūs tuoj atidarysite {0} naršyklės langų.<br>Tai ir užterš jūsų monitorių "
@@ -199,7 +199,7 @@ msgid "Click to continue and to open {0} browser"
msgid_plural "Click to continue and to open {0} browsers"
msgstr[0] "Spauskite, kad tęstumėte atidarinėti {0} naršyklę"
msgstr[1] "Spauskite, kad tęstumėte atidarinėti {0} naršykles"
-msgstr[2] "Spauskite, kad tęstumėte atidarinėti {0} naršykles"
+msgstr[2] "Spauskite, kad tęstumėte atidarinėti {0} naršyklių"
msgid "Cancel"
msgstr "Atšaukti"
@@ -1837,9 +1837,15 @@ msgstr "Atsiuntė GPX duomenis"
msgid "Markers from {0}"
msgstr "Žymekliai iš {0}"
+msgid "Download OSM Notes"
+msgstr "Atsisiųsti OSM pastabas"
+
msgid "Downloading Notes"
msgstr "Atsiunčiamos pastabos"
+msgid "Notes"
+msgstr "Banknotai"
+
msgid "Download Compressed OSM Change"
msgstr "Atsiųsti suspaustą OSM pokytį"
@@ -2191,47 +2197,54 @@ msgstr "Negalima padėti tašką už pasaulio ribų."
msgid "Add a new node to way"
msgid_plural "Add a new node to {0} ways"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Pridėti tašką į kelią"
+msgstr[1] "Pridėti tašką į {0} kelius"
+msgstr[2] "Pridėti tašką į {0} kelius"
msgid "Cannot delete node that is referenced by multiple objects"
-msgstr ""
+msgstr "Negalima ištrinti taško, kurį naudoja keli objektai"
msgid "Cannot delete node that has tags"
-msgstr ""
+msgstr "Negalima ištrinti taško, turinčio žymų"
msgid "Parallel"
-msgstr ""
+msgstr "Lygiagretus"
msgid "Make parallel copies of ways"
-msgstr ""
+msgstr "Kurti lygiagrečias kelių kopijas"
msgid "make parallel helper line"
-msgstr ""
+msgstr "lygiagrečių kūrimo pagalbinė linija"
msgid ""
"Select ways as in Select mode. Drag selected ways or a single way to create "
"a parallel copy (Alt toggles tag preservation)"
msgstr ""
+"Parinkite kelius kaip žymėjimo režime. Tempkite pažymėtus kelius ar vieną "
+"kelią, kad sukurtumėte lygiagrečią kopiją (Alt perjungia žymų išlaikymą)"
msgid "Hold Ctrl to toggle snapping"
-msgstr ""
+msgstr "Laikykite Ctrl pritraukimo perjungimui"
msgid ""
"ParallelWayAction\n"
"The ways selected must form a simple branchless path"
msgstr ""
+"LygiagrečiųKeliųVeiksmas\n"
+"Parinkti keliai turi formuoti paprastą kelią be atsišakojimų"
msgid "Make parallel way error"
-msgstr ""
+msgstr "Lygiagretaus kelio kūrimo klaida"
msgid "Drag play head"
-msgstr ""
+msgstr "Tempto grojimo galvutę"
msgid ""
"Drag play head and release near track to play audio from there; "
"SHIFT+release to synchronize audio at that point."
msgstr ""
+"Tempkite grojimo galvutę ir paleskite šalia pėdsako, kad grotumėte garsą nuo "
+"ten; SHIFT+paleiskite, kad sinchronizuotumėte garsą tame taške."
msgid "Select, move, scale and rotate objects"
msgstr "Parinkti, perkelti, keiti dydį ir pasukti objektus"
@@ -2254,28 +2267,41 @@ msgid_plural ""
"an error.\n"
"Really move them?"
msgstr[0] ""
+"Jūs perkėlėte daugiau nei {0} elementą. Didelio kiekio elementų perkėlimas "
+"dažniausiai yra klaida.\n"
+"Tikrai juos perkelti?"
msgstr[1] ""
+"Jūs perkėlėte daugiau nei {0} elementus. Didelio kiekio elementų perkėlimas "
+"dažniausiai yra klaida.\n"
+"Tikrai juos perkelti?"
+msgstr[2] ""
+"Jūs perkėlėte daugiau nei {0} elementus. Didelio kiekio elementų perkėlimas "
+"dažniausiai yra klaida.\n"
+"Tikrai juos perkelti?"
msgid "Release the mouse button to select the objects in the rectangle."
msgstr ""
"Atleiskite pelės mygtuką, kad parinktumėte objektus, esančius stačiakampyje."
msgid "Ctrl to merge with nearest node."
-msgstr ""
+msgstr "Ctrl suliejimui su artimiausiu tašku."
msgid "Release the mouse button to stop moving."
-msgstr ""
+msgstr "Atleiskite pelės mygtuką, kad baigtumėte perkėlimą."
msgid "Release the mouse button to stop rotating."
msgstr "Atleiskite pelės mygtuką, kad baigtumėte sukimą."
msgid "Release the mouse button to stop scaling."
-msgstr ""
+msgstr "Atleiskite pelės mygtuką, kad baigtumėte mastelio keitimą."
msgid ""
"Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
"Ctrl to rotate selected; Alt-Ctrl to scale selected; or change selection"
msgstr ""
+"Perkelkite objektus tempimu; Shift - kad pridėtumėte į pažymėjimą (Ctrl - "
+"perjungimui); Shift-Ctrl - pažymėto pavertimui; Alt-Ctrl - keisti pažymėto "
+"dydį; arba pakeiskite pažymėjimą"
msgid "Add and move a virtual new node to way"
msgid_plural "Add and move a virtual new node to {0} ways"
@@ -2299,29 +2325,31 @@ msgstr ""
msgid "Add all objects selected in the current dataset after the last member"
msgstr ""
+"Pridėti visus dabartinėje aibėje pažymėtus elementus po paskutinio nario"
msgid "Add selection to relation"
-msgstr ""
+msgstr "Pridėti pažymėjimą į ryšį"
msgid "Add selection to {0} relation"
msgid_plural "Add selection to {0} relations"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Pridėti pažymėjimą į {0} ryšį"
+msgstr[1] "Pridėti pažymėjimą į {0} ryšius"
+msgstr[2] "Pridėti pažymėjimą į {0} ryšius"
msgid "Delete the selected relation"
msgstr "Ištrinti parinktus ryšį"
msgid "Download all members of the selected relations"
-msgstr ""
+msgstr "Atsiųsti visus pažymėtų ryšių narius"
msgid "Download members"
-msgstr ""
+msgstr "Atsiųsti narius"
msgid "Download incomplete members of selected relations"
-msgstr ""
+msgstr "Atsiųsti nepilnus pažymėtų ryšių narius"
msgid "Download incomplete members"
-msgstr ""
+msgstr "Atsiųsti nepilnus narius"
msgid "Create a copy of this relation and open it in another editor window"
msgstr "Sukurti šio ryšio kopiją ir atverti kitą redaktoriaus langą"
@@ -2330,7 +2358,7 @@ msgid "Edit"
msgstr "Taisa"
msgid "Call relation editor for selected relation"
-msgstr ""
+msgstr "Iškviesti ryšių redaktorių pažymėtam ryšiui"
msgid ""
"You are about to open <b>{0}</b> different relation editor "
@@ -2339,40 +2367,47 @@ msgid_plural ""
"You are about to open <b>{0}</b> different relation editors "
"simultaneously.<br/>Do you want to continue?"
msgstr[0] ""
+"Jūs tuoj vienu metu atversite <b>{0}</b> skirtingų ryšių redaktorių.<br/>Ar "
+"norite tęsti?"
msgstr[1] ""
+"Jūs tuoj vienu metu atversite <b>{0}</b> skirtingų ryšių redaktorių.<br/>Ar "
+"norite tęsti?"
+msgstr[2] ""
+"Jūs tuoj vienu metu atversite <b>{0}</b> skirtingų ryšių redaktorių.<br/>Ar "
+"norite tęsti?"
msgid "Confirmation"
msgstr "Patvirtinimas"
msgid "Select in relation list"
-msgstr ""
+msgstr "Pažymėti ryšių sąraše"
msgid "Select relation in relation list."
-msgstr ""
+msgstr "Parinkite ryšį ryšių sąraše."
msgid "Add the members of all selected relations to current selection"
-msgstr ""
+msgstr "Pridėti visų pažymėtų ryšių narius į dabartinį pažymėjimą"
msgid "Select the members of all selected relations"
-msgstr ""
+msgstr "Pažymėti visus pažymėtų ryšių narius"
msgid "Select members (add)"
-msgstr ""
+msgstr "Pažymėti narius (pridėti)"
msgid "Select members"
-msgstr ""
+msgstr "Pažymėti narius"
msgid "Add the selected relations to the current selection"
-msgstr ""
+msgstr "Pridėti pažymėtus ryšius prie dabartinio pažymėjimo"
msgid "Set the current selection to the list of selected relations"
-msgstr ""
+msgstr "Dabartinį pažymėjimą pakeisti pažymėtų ryšių sąrašu"
msgid "Select relation (add)"
-msgstr ""
+msgstr "Pažymėti ryšį (pridėti)"
msgid "Select relation"
-msgstr ""
+msgstr "Pažymėti ryšį"
msgid "<not>"
msgstr "<ne>"
@@ -2381,28 +2416,28 @@ msgid "<or>"
msgstr "<arba>"
msgid "<xor>"
-msgstr ""
+msgstr "<xor>"
msgid "<left parent>"
-msgstr ""
+msgstr "<kairys tėvas>"
msgid "<right parent>"
-msgstr ""
+msgstr "<dešinys tėvas>"
msgid "<colon>"
-msgstr ""
+msgstr "<kabliataškis>"
msgid "<equals>"
-msgstr ""
+msgstr "<lygu>"
msgid "<key>"
-msgstr ""
+msgstr "<raktas>"
msgid "<question mark>"
-msgstr ""
+msgstr "<klaustukas>"
msgid "<end-of-file>"
-msgstr ""
+msgstr "<failo-pabaiga>"
msgid "Search..."
msgstr "Iškoti..."
@@ -2420,7 +2455,7 @@ msgid "Search string:"
msgstr "Paieškos eilutė:"
msgid "Enter the search expression"
-msgstr ""
+msgstr "Įveskite paieškos išraišką"
msgid "replace selection"
msgstr "keisti parinkimą"
@@ -2432,22 +2467,22 @@ msgid "remove from selection"
msgstr "pašalinti iš parinktų"
msgid "find in selection"
-msgstr ""
+msgstr "Rasti pažymėjime"
msgid "case sensitive"
msgstr "skirti raidžių dydį"
msgid "all objects"
-msgstr ""
+msgstr "visi objektai"
msgid "Also include incomplete and deleted objects in search."
-msgstr ""
+msgstr "Taipogi įtraukti į paiešką nepilnus ir ištrintus objektus."
msgid "regular expression"
msgstr "reguliarusis reiškinys"
msgid "add toolbar button"
-msgstr ""
+msgstr "pridėti įrankinės mygtuką"
msgid "Filter"
msgstr "Filtras"
@@ -2456,7 +2491,7 @@ msgid "Search"
msgstr "Paieška"
msgid "Submit filter"
-msgstr ""
+msgstr "Įkelti filtrą"
msgid "Start Search"
msgstr "Pradėti paiešką"
@@ -2466,197 +2501,230 @@ msgid ""
"\n"
" {0}"
msgstr ""
+"Netinkama paieškos išraiška: \n"
+"\n"
+" {0}"
msgid "Invalid search expression"
-msgstr ""
+msgstr "Netinkama paieškos išraiška"
msgid "<b>Baker Street</b> - ''Baker'' and ''Street'' in any key"
-msgstr ""
+msgstr "<b>Kepinių gatvė</b> - „Kepinių“ ir „gatvė“ bet kuriam rakte"
msgid "<b>\"Baker Street\"</b> - ''Baker Street'' in any key"
-msgstr ""
+msgstr "<b>„Kepinių gatvė“</b> - „Kepinių gatvė“ bet kuriam rakte"
msgid "<b>key:Bak</b> - ''Bak'' anywhere in the key ''key''"
-msgstr ""
+msgstr "<b>raktas:Bak</b> - „Bak“ bet kur rakte „raktas“"
msgid "<b>-key:Bak</b> - ''Bak'' nowhere in the key ''key''"
-msgstr ""
+msgstr "<br>-key:Bak</b> - „Bak“ niekur rakte „raktas“"
msgid "<b>key=value</b> - key ''key'' with value exactly ''value''"
msgstr ""
+"<b>raktas=reikšmė</b> - raktas „raktas“ su konkrečia reikšme „reikšmė“"
msgid ""
"<b>key=*</b> - key ''key'' with any value. Try also <b>*=value</b>, "
"<b>key=</b>, <b>*=*</b>, <b>*=</b>"
msgstr ""
+"<b>raktas=*</b> - raktas „raktas“ su bet kokia reikšme. Taipogi pabandykite "
+"<b>*=reikšmė</b>, <b>raktas=</b>, <b>*=*</b>, <b>*=</b>"
msgid "<b>key:</b> - key ''key'' set to any value"
-msgstr ""
+msgstr "<b>raktas:</b> - raktas „raktas“ turi bet kokią reikšmę"
msgid ""
"<b>key?</b> - key ''key'' with the value ''yes'', ''true'', ''1'' or ''on''"
msgstr ""
+"<b>raktas?</b> - raktas „key“ su reikšme „yes“, „true“, „1“ arba „on“"
msgid "Special targets"
-msgstr ""
+msgstr "Ypatingi tikslai"
msgid ""
"<b>type:</b>... - objects with corresponding type (<b>node</b>, <b>way</b>, "
"<b>relation</b>)"
msgstr ""
+"<b>tipas:</b>... - atitinkamo tipo objektai (<b>node</b>, <b>way</b>, "
+"<b>relation</b>)"
msgid "<b>user:</b>... - objects changed by user"
-msgstr ""
+msgstr "<b>user:</b>... - naudotojo pakeisti objektai"
msgid "<b>user:anonymous</b> - objects changed by anonymous users"
-msgstr ""
+msgstr "<b>user:anonymous</b> - anoniminių naudotojų pakeisti objektai"
msgid "<b>id:</b>... - objects with given ID (0 for new objects)"
-msgstr ""
+msgstr "<b>id:</b> ... objektai su nurodytu ID (0 - naujiems objektams)"
msgid ""
"<b>version:</b>... - objects with given version (0 objects without an "
"assigned version)"
msgstr ""
+"<b>version:</b>... - nurodytos versijos objektai (0 objektai be priskirtos "
+"versijos)"
msgid ""
"<b>changeset:</b>... - objects with given changeset ID (0 objects without an "
"assigned changeset)"
msgstr ""
+"<b>changeset:</b>... - objektai su nurodytu pakeitimo ID (0 objektai be "
+"priskirto pakeitimo)"
msgid ""
"<b>nodes:</b>... - objects with given number of nodes (<b>nodes:</b>count, "
"<b>nodes:</b>min-max, <b>nodes:</b>min- or <b>nodes:</b>-max)"
msgstr ""
+"<b>nodes:</b>... - objektai su nurodytu taškų skaičiumi "
+"(<b>nodes:</b>skaičius, <b>nodes:</b>min-maks, <b>nodes:</b>min- arba "
+"<b>nodes:</b>-maks"
msgid ""
"<b>tags:</b>... - objects with given number of tags (<b>tags:</b>count, "
"<b>tags:</b>min-max, <b>tags:</b>min- or <b>tags:</b>-max)"
msgstr ""
+"<b>tags:</b>... - objektai su nurodytu žymų skaičiumi (<b>tags:</b>skaičius, "
+"<b>tags:</b>min-maks, <b>tags:</b>min- arba <b>tags:</b>-maks"
msgid "<b>role:</b>... - objects with given role in a relation"
-msgstr ""
+msgstr "<b>role:</b>... - objektai su nurodyta role ryšyje"
msgid ""
"<b>timestamp:</b>timestamp - objects with this last modification timestamp "
"(2009-11-12T14:51:09Z, 2009-11-12 or T14:51 ...)"
msgstr ""
+"<b>timestamp:</b>timestamp - objektai su nurodytu paskutinio keitimo laiku "
+"(2009-11-12T14:51:09Z, 2009-11-12 or T14:51 ...)"
msgid ""
"<b>timestamp:</b>min/max - objects with last modification within range"
-msgstr ""
+msgstr "<b>timestamp:</b>min/maks - objektai su paskutiniu keitimu intervale"
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>... - uždari keliai su plotu m² (<b>areasize:</b>min-maks "
+"arba <b>areasize:</b>maks)"
msgid "<b>modified</b> - all changed objects"
-msgstr ""
+msgstr "<b>modified</b> - visi pakeisti objektai"
msgid "<b>selected</b> - all selected objects"
-msgstr ""
+msgstr "<b>selected</b> - visi pažymėti objektai"
msgid "<b>incomplete</b> - all incomplete objects"
-msgstr ""
+msgstr "<b>incomplete</b> - visi nepilni objektai"
msgid "<b>untagged</b> - all untagged objects"
-msgstr ""
+msgstr "<b>untagged</b> - visi nepažymėti objektai"
msgid "<b>closed</b> - all closed ways (a node is not considered closed)"
-msgstr ""
+msgstr "<b>closed</b> - visi uždari keliai (taškas nėra uždaras)"
msgid ""
"<b>child <i>expr</i></b> - all children of objects matching the expression"
-msgstr ""
+msgstr "<b>child <i>expr</i></b> - visi išraišką atitinkančių objektų vaikai"
msgid ""
"<b>parent <i>expr</i></b> - all parents of objects matching the expression"
-msgstr ""
+msgstr "<b>parent <i>expr</i></b> - visi išraišką atitinkančių objektų tėvai"
msgid ""
"<b>(all)indownloadedarea</b> - objects (and all its way nodes / relation "
"members) in downloaded area"
msgstr ""
+"<b>(all)indownloadedarea</b> - objektai (ir visi jų taškai / ryšių nariai), "
+"esantys atsiųstame plote"
msgid ""
"<b>(all)inview</b> - objects (and all its way nodes / relation members) in "
"current view"
msgstr ""
+"<b>(all)inview</b> objektai „ir visi jų taškai / ryšių nariai) dabartiniame "
+"rodinyje"
msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
-msgstr ""
+msgstr "Naudokite <b>|</b> arba <b>OR</b> sujungti loginiu „arba“"
msgid "Use <b>\"</b> to quote operators (e.g. if key contains <b>:</b>)"
msgstr ""
+"Naudokite <b>\"</b> operatorių išskyrimui (pvz. jei rakte yra simbolis "
+"<b>:</b>)"
msgid ""
"Within quoted strings the <b>\"</b> and <b>\\</b> characters need to be "
"escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and <b>\\\\</b>)."
msgstr ""
+"Kabutėse išskirtose eilutėse prieš <b>\"</b> ir <b>\\</b> simbolius turi "
+"eiti <b>\\</b> (pvz. <b>\\\"</b> ir <b>\\\\</b>)."
msgid "Use <b>(</b> and <b>)</b> to group expressions"
-msgstr ""
+msgstr "Naudokite <b>(</b> ir <b>)</b> išraiškų grupavimui"
msgid "basic examples"
-msgstr ""
+msgstr "paprasti pavyzdžiai"
msgid "Baker Street"
-msgstr ""
+msgstr "Kepyklos gatvė"
msgid "''Baker'' and ''Street'' in any key"
-msgstr ""
+msgstr "„Kepyklos“ ir „Gatvė“ bet kurioje žymoje"
msgid "\"Baker Street\""
-msgstr ""
+msgstr "„Kepyklos gatvė“"
msgid "''Baker Street'' in any key"
-msgstr ""
+msgstr "„Kepyklos gatvė“ bet kurioje žymoje"
msgid "basics"
-msgstr ""
+msgstr "pagrindai"
msgid "''valuefragment'' anywhere in ''key''"
-msgstr ""
+msgstr "„reikšmėsdalis“ bet kur „rakte“"
msgid "''valuefragment'' nowhere in ''key''"
-msgstr ""
+msgstr "„reikšmėsdalis“ niekur „rakte“"
msgid "''key'' with exactly ''value''"
-msgstr ""
+msgstr "„raktas“ su tikslia „reikšme“"
msgid "''key'' with any value"
-msgstr ""
+msgstr "„raktas“ su bet kokia reikšme"
msgid "''value'' in any key"
-msgstr ""
+msgstr "„reikšmė“ bet kurioje žymoje"
msgid "matches if ''key'' exists"
-msgstr ""
+msgstr "atitinka, jei „žyma“ egzistuoja"
msgid "matches if ''key'' is greater than ''value'' (analogously, less than)"
-msgstr ""
+msgstr "atitinka, jei „žyma“ didesnė už „reikšmę“ (analogiškai su mažiau už)"
msgid "combinators"
-msgstr ""
+msgstr "kombinatoriai"
msgid "logical and (both expressions have to be satisfied)"
-msgstr ""
+msgstr "loginis ir (abi išraiškos turi būti teisingos)"
msgid "logical or (at least one expression has to be satisfied)"
-msgstr ""
+msgstr "loginis arba (bent viena išraiška turi būti teisinga)"
msgid "logical not"
-msgstr ""
+msgstr "loginis ne"
msgid "use parenthesis to group expressions"
-msgstr ""
+msgstr "išraiškų grupavimui naudokite skliaustus"
msgid ""
"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
"<b>\\\\</b>)."
msgstr ""
+"veiksmų išskyrimas kabutėmis.<br>Kabutėmis išskirtame tekste prieš <b>\"</b> "
+"ir <b>\\<\\b> simbolius reikia rašyti <b>\\</b> (pvz. <b>\\\"</b> ir <b>\\\\"
+"</b>)."
msgid "objects"
msgstr "objektai"
@@ -2671,7 +2739,7 @@ msgid "all closed ways"
msgstr "visi uždari keliai"
msgid "object without useful tags"
-msgstr ""
+msgstr "objektas be naudingų žymų"
msgid "metadata"
msgstr "meta duomenys"
@@ -2686,85 +2754,87 @@ msgid "objects with given version"
msgstr "objektai su duota versija"
msgid "objects with given changeset ID"
-msgstr ""
+msgstr "objektai su nurodytu pakeitimo ID"
msgid "objects with last modification timestamp within range"
-msgstr ""
+msgstr "objektai su paskutine keitimo data intervale"
msgid "properties"
msgstr "ypatybęs"
msgid "objects with at least 20 nodes"
-msgstr ""
+msgstr "objektai su ne mažiau nei 20 taškų"
msgid "objects having 5 to 10 tags"
-msgstr ""
+msgstr "objektai, turintys nuo 5 iki 10 žymų"
msgid "objects with given role in a relation"
-msgstr ""
+msgstr "objektai su nurodyta role ryšyje"
msgid "closed ways with an area of 100 m²"
-msgstr ""
+msgstr "uždari keliai, kurių plotas 100 m²"
msgid "state"
-msgstr ""
+msgstr "būsena"
msgid "all modified objects"
-msgstr ""
+msgstr "visi pakeisti objektai"
msgid "all new objects"
-msgstr ""
+msgstr "visi nauji objektai"
msgid "all selected objects"
-msgstr ""
+msgstr "visi pažymėti objektai"
msgid "all incomplete objects"
-msgstr ""
+msgstr "visi nebaigti objektai"
msgid "related objects"
-msgstr ""
+msgstr "susiję objektai"
msgid "all children of objects matching the expression"
-msgstr ""
+msgstr "išraišką atitinkančių objektų vaikai"
msgid "all parents of objects matching the expression"
-msgstr ""
+msgstr "išraišką atitinkančių objektų tėvai"
msgid "n-th member of relation and/or n-th node of way"
-msgstr ""
+msgstr "n-tasis ryšio narys ir/arba n-tasis kelio taškas"
msgid "every n-th member of relation and/or every n-th node of way"
msgstr ""
+"kiekvienas n-tasis ryšio narys ir/arba kiekvienas n-tasis kelio taškas"
msgid "view"
-msgstr ""
+msgstr "rodinys"
msgid "objects in current view"
-msgstr ""
+msgstr "objektai dabartiniame rodinyje"
msgid "objects (and all its way nodes / relation members) in current view"
msgstr ""
+"objektai (ir visi jo kelio taškai / ryšio nariai) dabartiniame rodinyje"
msgid "objects in downloaded area"
-msgstr ""
+msgstr "objektai atsiųstame plote"
msgid "objects (and all its way nodes / relation members) in downloaded area"
-msgstr ""
+msgstr "objektai (ir visi jo kelių taškai / ryšių nariai) atsisiųstame plote"
msgid "No match found for ''{0}''"
-msgstr ""
+msgstr "„{0}“ nerasta"
msgid "Nothing added to selection by searching for ''{0}''"
-msgstr ""
+msgstr "Ieškant „{0}“ į pažymėjimą nieko nepridėta"
msgid "Nothing removed from selection by searching for ''{0}''"
-msgstr ""
+msgstr "Ieškant „{0}“ iš pažymėjimo nieko neišimta"
msgid "Nothing found in selection by searching for ''{0}''"
-msgstr ""
+msgstr "Ieškant „{0}“ pažymėjime nieko nerasta"
msgid "Found {0} matches"
-msgstr ""
+msgstr "Rasta {0} atitikmenų"
msgctxt "search"
msgid "CS"
@@ -2787,59 +2857,71 @@ msgid ""
"\n"
"{2}"
msgstr ""
+"įvyko regex „{0}“ nagrinėjimo klaida ties pozicija {1}, pilna klaida:\n"
+"\n"
+"{2}"
msgid ""
"The regex \"{0}\" had a parse error, full error:\n"
"\n"
"{1}"
msgstr ""
+"įvyko regex „{0}“ nagrinėjimo klaida, pilna klaida:\n"
+"\n"
+"{1}"
msgid "Expecting <i>min</i>/<i>max</i> after ''timestamp''"
-msgstr ""
+msgstr "po „timestamp“ tikimasi <i>min</i>/<i>maks</i>"
msgid "Range of primitive ids expected"
-msgstr ""
+msgstr "Tikimasi primityvių id intervalo"
msgid "Range of changeset ids expected"
-msgstr ""
+msgstr "Tikimasi pakeitimų id intervalo"
msgid "Range of versions expected"
-msgstr ""
+msgstr "Tikimasi versijų intervalo"
msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
msgstr ""
+"Raktas negali būti tuščias, kai naudojamas žymos operatorius. Pavyzdys: "
+"raktas=reikšmė"
msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
msgstr ""
+"Nežinomas primityvo tipas: {0}. Leistinos reikšmės yra node, way arba "
+"relation"
msgid "Positive integer expected"
-msgstr ""
+msgstr "Tikimasi teigiamo sveiko skaičiaus"
msgid "Range of numbers expected"
-msgstr ""
+msgstr "Tikimasi skaičių intervalo"
msgid "Unexpected token. Expected {0}, found {1}"
-msgstr ""
+msgstr "Netikėta frazė. Tikėtasi {0}, rasta {1}"
msgid "Unexpected token: {0}"
-msgstr ""
+msgstr "Netikėta frazė: {0}"
msgid "Missing parameter for OR"
-msgstr ""
+msgstr "Trūksta OR parametro"
msgid "Missing parameter for XOR"
-msgstr ""
+msgstr "Trūksta XOR parametro"
msgid "Missing operator for NOT"
-msgstr ""
+msgstr "Trūksta NOT operatoriaus"
msgid "Automatically truncating value of tag ''{0}'' on deleted object {1}"
-msgstr ""
+msgstr "Automatiškai apkarpoma žymos „{0}“ reikšmė ištrintame objekte {1}"
msgid ""
"Length of value for tag ''{0}'' on object {1} exceeds the max. allowed "
"length {2}. Values length is {3}."
msgstr ""
+"Žymos „{0}“ objekte {1} reikšmės ilgis didesnis už maksimalų. Leidžiamas "
+"ilgis {2}. Reikšmės ilgis {3}."
msgid "Precondition Violation"
msgstr "Sąlygos pažeidimas"
@@ -2851,37 +2933,40 @@ msgid "API Capabilities Violation"
msgstr "API galimybių pažeidimas"
msgid "Cyclic dependency between relations:"
-msgstr ""
+msgstr "Ciklinis ryšys tarp ryšių:"
msgid "Removed obsolete tags"
-msgstr ""
+msgstr "Pašalintos nebenaudojamos žymos"
msgid "Fix deprecated tags"
-msgstr ""
+msgstr "Taisyti pasenusias žymas"
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} ryšių sukuria ciklą, nes jie turi nuorodų vienas į kitą.<br>JOSM "
+"negali jų įkelti. Prašome pakeisti ryšius ir panaikinti ciklines "
+"priklausomybes.</html>"
msgid "Relation ..."
-msgstr ""
+msgstr "Ryšys..."
msgid "... refers to relation"
-msgstr ""
+msgstr "...rodo į ryšį"
msgid "Cycling dependencies"
-msgstr ""
+msgstr "Ciklinė priklausomybė"
msgid "Uploading modified notes"
-msgstr ""
+msgstr "Įrašomos pakeistos pastabos"
msgid "Note {0} failed: {1}"
-msgstr ""
+msgstr "Pastaba {0} nepavyko: {1}"
msgid "Notes failed to upload"
-msgstr ""
+msgstr "Nepavyko įrašyti pastabų"
msgid ""
"The following are results of automatic validation. Try fixing these, but be "
@@ -2889,12 +2974,16 @@ msgid ""
"cancel this dialog, you can find the entries in the validator side panel to "
"inspect them."
msgstr ""
+"Čia yra automatinio tikrinimo rezultatai. Pabandykite juos pataisyti, bet "
+"būkite atsargūs (nenaikinkite teisingų duomenų). Jei abejojate - "
+"ignoruokite.<br>Nutraukę šį dialogą, įrašus peržiūrai rasite tikrintojo "
+"šoniniame skydelyje."
msgid "Errors"
msgstr "Klaidos"
msgid "Usually this should be fixed."
-msgstr ""
+msgstr "Paprastai tai reikia pataisyti"
msgid "Warnings"
msgstr "Perspėjimai"
@@ -2906,10 +2995,10 @@ msgid "Other"
msgstr "KIta"
msgid "Informational warnings, expect many false entries."
-msgstr ""
+msgstr "Informaciniai įspėjimai, tikėkitės daug neteisingų įrašų."
msgid "Suspicious data found. Upload anyway?"
-msgstr ""
+msgstr "Rasti įtartini duomenys. Vis tiek įrašyti?"
msgid "Continue upload"
msgstr "Tęsti išsiuntimą"
@@ -2930,60 +3019,64 @@ msgstr[1] "Pridėti {0} objektai"
msgstr[2] "Pridėta {0} objektų"
msgid "New way {0} has 0 nodes"
-msgstr ""
+msgstr "Naujas kelias {0} turi 0 taškų"
msgid "Change node {0}"
-msgstr ""
+msgstr "Keisti tašką {0}"
msgid "Change way {0}"
-msgstr ""
+msgstr "Keisti kelią {0}"
msgid "Change relation {0}"
-msgstr ""
+msgstr "Keisti ryšį {0}"
msgid "Changed nodes of {0}"
-msgstr ""
+msgstr "Pakeisti {0} taškai"
msgid "Remove \"{0}\" for node ''{1}''"
-msgstr ""
+msgstr "Išimti „{0}“ taškui „{1}“"
msgid "Remove \"{0}\" for way ''{1}''"
-msgstr ""
+msgstr "Išimti „{0}“ keliui „{1}“"
msgid "Remove \"{0}\" for relation ''{1}''"
-msgstr ""
+msgstr "Išimti „{0}“ ryšiui „{1}“"
msgid "Set {0}={1} for node ''{2}''"
-msgstr ""
+msgstr "Nustatyti {0}={1} taškui „{2}“"
msgid "Set {0}={1} for way ''{2}''"
-msgstr ""
+msgstr "Nustatyti {0}={1} keliui „{2}“"
msgid "Set {0}={1} for relation ''{2}''"
-msgstr ""
+msgstr "Nustatyti {0}={1} ryšiui „{2}“"
msgid "Remove \"{0}\" for {1} object"
msgid_plural "Remove \"{0}\" for {1} objects"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Išimti „{0}“ {1} objektui"
+msgstr[1] "Išimti „{0}“ {1} objektams"
+msgstr[2] "Išimti „{0}“ {1} objektams"
msgid "Set {0}={1} for {2} object"
msgid_plural "Set {0}={1} for {2} objects"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Nustatyti {0}={1} {2} objektui"
+msgstr[1] "Nustatyti {0}={1} {2} objektams"
+msgstr[2] "Nustatyti {0}={1} {2} objektams"
msgid "Deleted {0} tags for {1} object"
msgid_plural "Deleted {0} tags for {1} objects"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Ištrinta {0} žymų {1} objektui"
+msgstr[1] "Ištrinta {0} žymų {1} objektui"
+msgstr[2] "Ištrinta {0} žymų {1} objektui"
msgid "Set {0} tags for {1} object"
msgid_plural "Set {0} tags for {1} objects"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Nustatyta {0} žymų {1} objektui"
+msgstr[1] "Nustatyta {0} žymų {1} objektui"
+msgstr[2] "Nustatyta {0} žymų {1} objektui"
msgid "Replace \"{0}\" by \"{1}\" for"
-msgstr ""
+msgstr "Keisti „{0} į „{1}“"
msgid "object"
msgid_plural "objects"
@@ -2992,19 +3085,19 @@ msgstr[1] "objektai"
msgstr[2] "objektų"
msgid "Change relation member role for {0} {1}"
-msgstr ""
+msgstr "Keisti ryšio nario rolę {0} {1}"
msgid "At least one object to delete required, got empty collection"
-msgstr ""
+msgstr "Reikia bent vieno objekto ištrynimui, gautas tuščias rinkinys"
msgid "Delete node {0}"
-msgstr ""
+msgstr "Trinti tašką {0}"
msgid "Delete way {0}"
-msgstr ""
+msgstr "Trinti kelią {0}"
msgid "Delete relation {0}"
-msgstr ""
+msgstr "Trinti ryšį {0}"
msgid "Delete {0} object"
msgid_plural "Delete {0} objects"
@@ -3014,21 +3107,24 @@ msgstr[2] "Šalinti {0} objektų"
msgid "Delete {0} node"
msgid_plural "Delete {0} nodes"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Trinti {0} tašką"
+msgstr[1] "Trinti {0} taškus"
+msgstr[2] "Trinti {0} taškus"
msgid "Delete {0} way"
msgid_plural "Delete {0} ways"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Trinti {0} kelią"
+msgstr[1] "Trinti {0} kelius"
+msgstr[2] "Trinti {0} kelius"
msgid "Delete {0} relation"
msgid_plural "Delete {0} relations"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Ištrinti {0} ryšį"
+msgstr[1] "Ištrinti {0} ryšius"
+msgstr[2] "Ištrinti {0} ryšius"
msgid "Deleted ''{0}''"
-msgstr ""
+msgstr "Ištrintas „{0}“"
msgid "Delete confirmation"
msgstr "Šalinimo patvirtinimas"
@@ -3038,11 +3134,16 @@ msgid ""
"downloaded.<br>This can cause problems because other objects (that you do "
"not see) might use them.<br>Do you really want to delete?"
msgstr ""
+"Jūs tuoj ištrinsite taškus už jūsų atsiųsto ploto ribų.<br>Dėl to gali kilti "
+"problemų su kitais objektais (kurių jūs nematote), kurie gali naudoti tuos "
+"taškus.<br>Ar tikrai norite ištrinti?"
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 ""
+"Jūs tuoj ištrinsite nepilnus objektus.<br>Tai sukels problemų, nes jūs "
+"nematote tikro objekto.<br>Ar tikrai norite ištrinti?"
msgid ""
"You are about to delete {0} relation: {1}<br/>This step is rarely necessary "
@@ -3053,117 +3154,140 @@ msgid_plural ""
"and cannot be undone easily after being uploaded to the server.<br/>Do you "
"really want to delete?"
msgstr[0] ""
+"Jūs tuoj ištrinsite {0} ryšį: {1}<br/>Toks žingsnis retai reikalingas ir "
+"nėra lengvai atstatomas po to, kai pakeitimai nusiunčiami į serverį.<br/>Ar "
+"tikrai norite ištrinti?"
msgstr[1] ""
+"Jūs tuoj ištrinsite {0} ryšius: {1}<br/>Toks žingsnis retai reikalingas ir "
+"nėra lengvai atstatomas po to, kai pakeitimai nusiunčiami į serverį.<br/>Ar "
+"tikrai norite ištrinti?"
+msgstr[2] ""
+"Jūs tuoj ištrinsite {0} ryšius: {1}<br/>Toks žingsnis retai reikalingas ir "
+"nėra lengvai atstatomas po to, kai pakeitimai nusiunčiami į serverį.<br/>Ar "
+"tikrai norite ištrinti?"
msgid "Delete relation?"
-msgstr ""
+msgstr "Ištrinti ryšį?"
msgid "Move {0} node"
msgid_plural "Move {0} nodes"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Perkelti {0} tašką"
+msgstr[1] "Perkelti {0} taškus"
+msgstr[2] "Perkelti {0} taškus"
msgid "Purged {0} object"
msgid_plural "Purged {0} objects"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Išvalytas {0} objektas"
+msgstr[1] "Išvalyti {0} objektai"
+msgstr[2] "Išvalyti {0} objektai"
msgid "Removed nodes from {0}"
-msgstr ""
+msgstr "Išimti taškai iš {0}"
msgid "Rotate {0} node"
msgid_plural "Rotate {0} nodes"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Pasukti {0} tašką"
+msgstr[1] "Pasukti {0} taškus"
+msgstr[2] "Pasukti {0} taškus"
msgid "Scale {0} node"
msgid_plural "Scale {0} nodes"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Keisti {0} taško dydį"
+msgstr[1] "Keisti {0} taškų dydį"
+msgstr[2] "Keisti {0} taškų dydį"
msgid "Selected {0} object"
msgid_plural "Selected {0} objects"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Pažymėtas {0} objektas"
+msgstr[1] "Pažymėti {0} objektai"
+msgstr[2] "Pažymėti {0} objektai"
msgid "Sequence: {0}"
-msgstr ""
+msgstr "Seka: {0}"
msgid "Transform {0} node"
msgid_plural "Transform {0} nodes"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Transformuoti {0} tašką"
+msgstr[1] "Transformuoti {0} taškus"
+msgstr[2] "Transformuoti {0} taškus"
msgid ""
"<html>Layer ''{0}'' already has a conflict for object<br>''{1}''.<br>This "
"conflict cannot be added.</html>"
msgstr ""
+"<html>Sluoksnis „{0}“ jau turi konfliktą objekte<br>„{1}“.<br>Šio konflikto "
+"negalima pridėti.</html>"
msgid "Double conflict"
-msgstr ""
+msgstr "Dvigubas konfliktas"
msgid ""
"Layer ''{0}'' does not exist any more. Cannot remove conflict for object "
"''{1}''."
msgstr ""
+"Sluoksnio „{0}“ daugiau nebėra. Negalima pašalinti konflikto objekte „{1}“."
msgid "Add conflict for ''{0}''"
-msgstr ""
+msgstr "Pridėti konfliktą objektui „{0}“"
msgid ""
"Cannot undo command ''{0}'' because layer ''{1}'' is not present any more"
msgstr ""
+"Negalima atstatyti komandos „{0}“, nes sluoksnio „{1}“ daugiau nebėra"
msgid "Resolve conflicts in coordinates in {0}"
-msgstr ""
+msgstr "Išspręsti konfliktus koordinatėse {0}"
msgid "Cannot resolve undecided conflict."
-msgstr ""
+msgstr "Negalima išspręsti nenuspręsto konflikto."
msgid "Resolve conflicts in deleted state in {0}"
-msgstr ""
+msgstr "Išspręsti ištrintos būsenos konfliktus {0}"
msgid "Set the ''modified'' flag for node {0}"
-msgstr ""
+msgstr "Taškui {0} nustatyti gairę „pakeistas“"
msgid "Set the ''modified'' flag for way {0}"
-msgstr ""
+msgstr "Keliui {0} nustatyti gairę „pakeistas“"
msgid "Set the ''modified'' flag for relation {0}"
-msgstr ""
+msgstr "Ryšiui {0} nustatyti gairę „pakeistas“"
msgid "Resolve conflicts in member list of relation {0}"
-msgstr ""
+msgstr "Išspręsti konfliktus ryšio {0} narių sąraše"
msgid "Resolve {0} tag conflict in node {1}"
msgid_plural "Resolve {0} tag conflicts in node {1}"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Išspręsti {0} žymų konfliktą taške {1}"
+msgstr[1] "Išspręsti {0} žymų konfliktus taške {1}"
+msgstr[2] "Išspręsti {0} žymų konfliktus taške {1}"
msgid "Resolve {0} tag conflict in way {1}"
msgid_plural "Resolve {0} tag conflicts in way {1}"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Išspręsti {0} žymų konfliktą kelyje {1}"
+msgstr[1] "Išspręsti {0} žymų konfliktus kelyje {1}"
+msgstr[2] "Išspręsti {0} žymų konfliktus kelyje {1}"
msgid "Resolve {0} tag conflict in relation {1}"
msgid_plural "Resolve {0} tag conflicts in relation {1}"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Išspręsti {0} žymų konfliktą ryšyje {1}"
+msgstr[1] "Išspręsti {0} žymų konfliktus ryšyje {1}"
+msgstr[2] "Išspręsti {0} žymų konfliktus ryšyje {1}"
msgid "Resolve version conflict for node {0}"
-msgstr ""
+msgstr "Išspręsti taško {0} versijos konfliktą"
msgid "Resolve version conflict for way {0}"
-msgstr ""
+msgstr "Išspręsti kelio {0} versijos konfliktą"
msgid "Resolve version conflict for relation {0}"
-msgstr ""
+msgstr "Išspręsti ryšio {0} versijos konfliktą"
msgid "Resolve conflicts in node list of way {0}"
-msgstr ""
+msgstr "Išspręsti kelio {0} taškų sąrašo konfliktą"
msgid "Main dataset does not include node {0}"
-msgstr ""
+msgstr "Pagrindiniame duomenų rinkinyje nėra taško {0}"
msgid "Apply?"
msgstr "Pritaikyti?"
@@ -3177,15 +3301,27 @@ 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] ""
+"<html>Jūs ruošiatės pakeisti kryptį kelio „{0}“,<br/>kurio semantinė žymos "
+"„{1}“ reikšmė yra nustatoma kryptimi.<br/>Ar tikrai norite pakeisti kelio "
+"kryptį, tokiu būdu pakeisdami jo semantinę reikšmę?</html>"
msgstr[1] ""
+"<html>Jūs ruošiatės pakeisti kryptį kelio „{0}“,<br/>kurio semantinė šių "
+"žymų reikšmė yra nustatoma kryptimi:<br/>{1}Ar tikrai norite pakeisti kelio "
+"kryptį, tokiu būdu pakeisdami jo semantinę reikšmę?</html>"
+msgstr[2] ""
+"<html>Jūs ruošiatės pakeisti kryptį kelio „{0}“,<br/>kurio semantinė šių "
+"žymų reikšmė yra nustatoma kryptimi:<br/>{1}Ar tikrai norite pakeisti kelio "
+"kryptį, tokiu būdu pakeisdami jo semantinę reikšmę?</html>"
msgid "Reverse directional way."
-msgstr ""
+msgstr "Pakeisti kelio kryptį"
msgid ""
"When reversing this way, the following changes are suggested in order to "
"maintain data consistency."
msgstr ""
+"Keičiant kelio kryptį, siūlomi šie pakeitimai, kad būtų išlaikytas duomenų "
+"nuoseklumas"
msgid "Relation"
msgstr "Ryšys"
@@ -3209,46 +3345,47 @@ msgid "New value"
msgstr "Nauja vertė"
msgid "Apply selected changes"
-msgstr ""
+msgstr "Pritaikyti pažymėtus pakeitimus"
msgid "Do not apply changes"
-msgstr ""
+msgstr "Netaikyti pakeitimų"
msgid "Please select which changes you want to apply."
-msgstr ""
+msgstr "Prašome parinkti, kuriuos pakeitimus taikyti"
msgid "Tags of "
-msgstr ""
+msgstr "Žymos "
msgid "Roles in relations referring to"
-msgstr ""
+msgstr "Rolės ryšiuose, susijusiuose su"
msgid "Automatic tag correction"
-msgstr ""
+msgstr "Automatinis žymų taisymas"
msgid "Unable to create directory {0}, autosave will be disabled"
-msgstr ""
+msgstr "Nepavyksta sukurti aplanko {0}, automatinis įrašymas išjungtas"
msgid "Unable to create file {0}, other filename will be used"
-msgstr ""
+msgstr "Nepavyko sukurti failo {0}, bus naudojamas kitas failo pavadinimas"
msgid "IOError while creating file, autosave will be skipped: {0}"
msgstr ""
+"Įvesties klaida kuriant failą, automatinis įrašymas bus praleistas: {0}"
msgid "Unable to delete old backup file {0}"
-msgstr ""
+msgstr "Nepavyksta ištrinti seną atsarginį failą {0}"
msgid "Your work has been saved automatically."
-msgstr ""
+msgstr "Jūsų darbas buvo automatiškai įrašytas."
msgid "Restoring files"
msgstr "Atkuriami failai"
msgid "Illegal latitude value ''{0}''"
-msgstr ""
+msgstr "Netinkama platumos reikšmė „{0}“"
msgid "Illegal longitude value ''{0}''"
-msgstr ""
+msgstr "Netinkama ilgumos reikšmė „{0}“"
msgid "Question"
msgstr "Klausimas"
@@ -3267,108 +3404,126 @@ msgid ""
"default value is unknown at this moment.<br/> Please activate corresponding "
"function manually and retry importing."
msgstr ""
+"<html>Nustatymų failas prašo pridėti nustatymus prie <b>{0}</b>,<br/>bet jo "
+"numatytoji reikšmė šiuo metu nežinoma.<br/>Prašome aktyvuoti atitinkamą "
+"funkciją rankiniu būdu ir pakartoti importą."
msgid "Failed to create missing cache directory: {0}"
-msgstr ""
+msgstr "Nepavyko sukurti trūkstamą podėlio aplanką: {0}"
msgid "<html>Failed to create missing cache directory: {0}</html>"
-msgstr ""
+msgstr "<html>Nepavyko sukurti trūkstamą podėlio aplanką: {0}</html>"
msgid ""
"Failed to initialize preferences. Preference directory ''{0}'' is not a "
"directory."
msgstr ""
+"Nepavyko inicializuoti nustatymus. Nustatymų aplankas „{0}“ nėra aplankas."
msgid ""
"<html>Failed to initialize preferences.<br>Preference directory ''{0}'' is "
"not a directory.</html>"
msgstr ""
+"<html>Nepavyko inicializuoti nustatymus.<br>Nustatymų aplankas „{0}“ nėra "
+"aplankas.</html>"
msgid ""
"Failed to initialize preferences. Failed to create missing preference "
"directory: {0}"
msgstr ""
+"Nepavyko inicializuoti nustatymus. Nepavyko sukurti trūkstamą nustatymų "
+"aplanką: {0}"
msgid ""
"<html>Failed to initialize preferences.<br>Failed to create missing "
"preference directory: {0}</html>"
msgstr ""
+"<html>Nepavyko inicializuoti nustatymus.<br>Nepavyko sukurti trūkstamą "
+"nustatymų aplanką: {0}</html>"
msgid "Missing preference file ''{0}''. Creating a default preference file."
msgstr ""
+"Trūksta nustatymų failo „{0}“. Kuriamas numatytasis nustatymų failas."
msgid ""
"Replacing existing preference file ''{0}'' with default preference file."
msgstr ""
+"Egzistuojantis nustatymų failas „{0}“ keičiamas numatytuoju nustatymų failu."
msgid ""
"<html>Failed to initialize preferences.<br>Failed to reset preference file "
"to default: {0}</html>"
msgstr ""
+"<html>Nepavyko inicializuoti nustatymus.<br>Nepavyko nustatymo failo "
+"pakeisti numatytuoju: {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>Nustatymų faile buvo klaidų.<br>Daroma atsarginė kopija<br>{0}<br>ir "
+"kuriamas naujas numatytasis nustatymų failas.</html>"
msgid ""
"Failed to initialize preferences. Failed to reset preference file to "
"default: {0}"
msgstr ""
+"Nepavyko inicializuoti nustatymus. Nepavyko nustatymų failo pakeisti "
+"numatytuoju: {0}"
msgid "Paint style {0}: {1}"
-msgstr ""
+msgstr "Paišymo stilus {0}: {1}"
msgid "Layer: {0}"
msgstr "Sluoksnis: {0}"
msgid "Failed to persist preferences to ''{0}''"
-msgstr ""
+msgstr "Nepavyko išlaikyti nustatymo „{0}“"
msgid " (at line {0}, column {1})"
-msgstr ""
+msgstr " (eilutėje {0}, stulpelyje {1})"
msgid "Preference setting {0} has been removed since it is no longer used."
-msgstr ""
+msgstr "Nustatymas {0} buvo pašalintas, nes jis daugiau nenaudojamas."
msgid "Metric"
-msgstr ""
+msgstr "Metrinė"
msgid "Chinese"
-msgstr ""
+msgstr "Kinų"
msgid "Imperial"
-msgstr ""
+msgstr "Britiška"
msgid "Nautical Mile"
-msgstr ""
+msgstr "Jūrmylės"
msgid "Failed to load resource ''{0}'', error is {1}."
-msgstr ""
+msgstr "Nepavyko įkelti resurso „{0}, klaida yra {1}."
msgid "UNKNOWN"
msgstr "NEŽINOMAS"
msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
-msgstr ""
+msgstr "Netikėta JOSM versija peržiūros faile, reikšmė yra „{0}“"
msgid "The revision file ''/REVISION'' is missing."
-msgstr ""
+msgstr "Nėra peržiūros failo „/REVISION“."
msgid "Already registered a conflict for primitive ''{0}''."
-msgstr ""
+msgstr "Jau užregistruotas primityvo „{0}“ konfliktas."
msgid "Decimal Degrees"
-msgstr ""
+msgstr "Dešimtainiai laipsniai"
msgid "deg° min'' sec\""
-msgstr ""
+msgstr "laip° min'' sek\""
msgid "deg° min'' (Nautical)"
-msgstr ""
+msgstr "laip° min'' (Jūrų)"
msgid "Projected Coordinates"
-msgstr ""
+msgstr "Projektuotos koordinatės"
msgctxt "compass"
msgid "S"
@@ -3387,54 +3542,62 @@ msgid "E"
msgstr "R"
msgid "Not in cache"
-msgstr ""
+msgstr "Ne podėlyje"
msgid "Projection ''{0}'' is not found, bookmark ''{1}'' is not usable"
-msgstr ""
+msgstr "Projekcija „{0}“ nerasta, žymelė „{1}“ nepanaudojama"
msgid "ID > 0 expected. Got {0}."
-msgstr ""
+msgstr "Tikėtasi ID > 0. Gauta {0}."
msgid "Version > 0 expected. Got {0}."
-msgstr ""
+msgstr "Tikėtasi Version > 0. Gauta {0}"
msgid ""
"Cannot assign a changesetId > 0 to a new primitive. Value of changesetId is "
"{0}"
msgstr ""
+"Nepavyksta priskirti changesetId > 0 naujam primityvui. PakeitimoId reikšmė "
+"yra {0}"
msgid "A primitive with ID = 0 cannot be invisible."
-msgstr ""
+msgstr "Primityvas su ID = 0 negali būti nematomas."
msgid ""
"Unable to add primitive {0} to the dataset because it is already included"
msgstr ""
+"Nepavyksta į duomenų rinkinį pridėti primityvo {0}, nes jis jau pridėtas"
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 tikėjosi duomenų rinkinyje rasti primityvą [{0} {1}], bet jo ten nėra. "
+"Prašome pranešti apie tai čia {2}. Tai nėra kritinė klaida, turėtumėte "
+"galėti saugiai tęsti darbą."
msgid "Missing merge target for way with id {0}"
-msgstr ""
+msgstr "Nėra suliejimo paskirties keliui su id {0}"
msgid ""
"Object of type {0} with id {1} was marked to be deleted, but it''s missing "
"in the source dataset"
msgstr ""
+"Tipo {0} objektas su id {1} buvo pažymėtas ištrynimui, bet jo nėra "
+"pradiniame duomenų rinkinyje"
msgid "Missing merge target for node with id {0}"
-msgstr ""
+msgstr "Nėra suliejimo paskirties taškui su id {0}"
msgid "Missing merge target for relation with id {0}"
-msgstr ""
+msgstr "Nėra suliejimo paskirties ryšiui su id {0}"
msgid "Missing merge target of type {0} with id {1}"
-msgstr ""
+msgstr "Nėra suliejimo paskirties tipo {0} su id {1}"
msgid "Conflict in ''visible'' attribute for object of type {0} with id {1}"
-msgstr ""
+msgstr "Konfliktas „matomame“ atribute objektui tipo {0} su id {1}"
msgid "Merging data..."
msgstr "Suliejami duomenys..."
@@ -3443,22 +3606,25 @@ msgid "Test ''{0}'' completed in {1}"
msgstr "Testas „{0}“ baigtas per {1}"
msgid "Cannot add a way with only {0} nodes."
-msgstr ""
+msgstr "Negalima pridėti kelio, kuris turi tik {0} taškus."
msgid "Each node must connect exactly 2 ways"
-msgstr ""
+msgstr "Kiekvienas taškas turi sujungti tiksliai 2 kelius"
msgid "There is an intersection between ways."
-msgstr ""
+msgstr "Keliai susikerta."
msgid ""
"Cannot merge because either of the participating primitives is new and the "
"other is not"
msgstr ""
+"Negalima sulieti, nes vienas iš dalyvaujančių primityvų yra naujas, o kitas -"
+" ne"
msgid ""
"Cannot merge primitives with different ids. This id is {0}, the other is {1}"
msgstr ""
+"Negalima sulieti primityvų su skirtingais id. Šis id yra {0}, o kitas - {1}"
msgid "node"
msgid_plural "nodes"
@@ -3488,60 +3654,66 @@ msgid ""
"Tag collection cannot be applied to a primitive because there are keys with "
"multiple values."
msgstr ""
+"Žymų rinkinio negalima pritaikyti primityvui, nes yra raktų su keliomis "
+"reikšmėmis."
msgid "<anonymous>"
msgstr "<anoniminis>"
msgid "Cannot add node {0} to incomplete way {1}."
-msgstr ""
+msgstr "Negalima pridėti taško {0} į nepilną kelią {1}."
msgid "Nodes in way must be in the same dataset"
-msgstr ""
+msgstr "Kelio taškai turi būti tame pačiame duomenų rinkinyje"
msgid "Deleted node referenced by {0}"
-msgstr ""
+msgstr "Ištrintas taškas, priklausantis {0}"
msgid "Complete node {0} with null coordinates in way {1}"
-msgstr ""
+msgstr "Baikite tašką {0} su tuščiomis koordinatėmis kelyje {1}"
msgid ""
"Cannot compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
-msgstr ""
+msgstr "Negalima sulyginti primityvo su ID „{0}“ su primityvu su ID „{1}“."
msgid "Parameter {0} not in range 0..{1}. Got ''{2}''."
-msgstr ""
+msgstr "Parametras {0} ne intervale 0..{1}. Gauta „{2}“."
msgid "Failed to load map renderer class ''{0}''. The class wasn''t found."
-msgstr ""
+msgstr "Nepavyko įkelti žemėlapio braižymo klasės „{0}“. Klasė nerasta."
msgid ""
"Can''t activate map renderer class ''{0}'', because the class wasn''t found."
msgstr ""
+"Negalima aktyvuoti žemėlapio braižymo klasės „{0}“, nes klasė nerasta."
msgid "Activating the standard map renderer instead."
-msgstr ""
+msgstr "Vietoje to aktyvuojamas standartinis žemėlapio braižymas."
msgid ""
"Can''t activate map renderer class ''{0}'', because it isn''t a subclass of "
"''{1}''."
msgstr ""
+"Negalima aktyvuoti žemėlapio braižymo klasės „{0}“, nes ji yra „{1}“ poklasė."
msgid ""
"Can''t activate map renderer class ''{0}'', because it isn''t registered as "
"map renderer."
msgstr ""
+"Negalima aktyvuoti žemėlapio braižymo klasės „{0}“, nes ji nėra registruota "
+"kaip žemėlapio braižytoja."
msgid "Wireframe Map Renderer"
-msgstr ""
+msgstr "Vielinis žemėlapio braižymas"
msgid "Renders the map as simple wire frame."
-msgstr ""
+msgstr "Braižo žemėlapį kaip paprastą vielų rėmą."
msgid "Styled Map Renderer"
-msgstr ""
+msgstr "Stilizuotas žemėlapio braižymas"
msgid "Renders the map using style rules in a set of style sheets."
-msgstr ""
+msgstr "Braižo žemėlapį pagal stiliaus taisykles keliose stilių lentelėse."
msgid "inactive"
msgstr "neaktyvus"
@@ -3550,7 +3722,7 @@ msgid "selected"
msgstr "parinkti"
msgid "Relation: selected"
-msgstr ""
+msgstr "Ryšys: pažymėtas"
msgid "Node: standard"
msgstr "Taškas: standartinis"
@@ -3568,90 +3740,93 @@ msgid "background"
msgstr "fonas"
msgid "highlight"
-msgstr ""
+msgstr "paryškinimas"
msgid "highlight wireframe"
-msgstr ""
+msgstr "paryškintas rėmas"
msgid "untagged"
-msgstr ""
+msgstr "be žymų"
msgid "text"
msgstr "tekstas"
msgid "areatext"
-msgstr ""
+msgstr "ploto tekstas"
msgid "Parameter must begin with a ''+'' character (found ''{0}'')"
-msgstr ""
+msgstr "Parametras turi prasidėti „+“ simboliu (rasta „{0}“)"
msgid "Unknown parameter: ''{0}''."
-msgstr ""
+msgstr "Nežinomas parametras: „{0}“."
msgid "Value expected for parameter ''{0}''."
-msgstr ""
+msgstr "Parametrui „{0}“ tikėtasi reikšmės."
msgid "No value expected for parameter ''{0}''."
-msgstr ""
+msgstr "Parametrui „{0}“ reikšmės nesitikėta."
msgid "Unexpected parameter format (''{0}'')"
-msgstr ""
+msgstr "Netikėtas parametro formatas („{0}“)"
msgid "Value ''{0}'' for option +init not supported."
-msgstr ""
+msgstr "Reikšmė „{0}“ parinkčiai +init nepalaikoma."
msgid ": "
msgstr ": "
msgid "Ellipsoid ''{0}'' not supported."
-msgstr ""
+msgstr "Elipsoidas „{0}“ nepalaikomas."
msgid "Combination of ellipsoid parameters is not supported."
-msgstr ""
+msgstr "Elipsoido parametrų rinkinys nepalaikomas."
msgid "Ellipsoid required (+ellps=* or +a=*, +b=*)"
-msgstr ""
+msgstr "Reikia elipsoido (+ellps=* arba +a=*, +b=*)"
msgid "Grid shift file ''{0}'' for option +nadgrids not supported."
-msgstr ""
+msgstr "Tinklelio poslinkio failas „{0}“ parinkčiai +nadgrids nepalaikomas."
msgid "Unknown datum identifier: ''{0}''"
-msgstr ""
+msgstr "Nežinomas datum identifikatorius: „{0}“"
msgid "Datum required (+datum=*, +towgs84=* or +nadgrids=*)"
-msgstr ""
+msgstr "Reikalingas datum (+datum=*, +towgs84=* or +nadgrids=*)"
msgid ""
"Unexpected number of arguments for parameter ''towgs84'' (must be 3 or 7)"
msgstr ""
+"Netikėtas parametro „towgs84“ argumentų skaičius (turi būti 3 arba 7)"
msgid "Unable to parse value of parameter ''towgs84'' (''{0}'')"
-msgstr ""
+msgstr "Nepavyko išnagrinėti parametro „towgs84“ reikšmės („{0}“)"
msgid "Projection required (+proj=*)"
-msgstr ""
+msgstr "Reikia projekcijos (+proj=*)"
msgid "Unknown projection identifier: ''{0}''"
-msgstr ""
+msgstr "Nežinomas projekcijos identifikatorius: „{0}“"
msgid "Unexpected number of arguments for parameter ''+bounds'' (must be 4)"
-msgstr ""
+msgstr "Netikėtas parametro „+bounds“ argumentų skaičius (turi būti 4)"
msgid "Unknown parameter ''{0}''"
msgstr "Nežinomas parametras „{0}“"
msgid "Expected number argument for parameter ''{0}''"
-msgstr ""
+msgstr "Tikėtasi skaitinio argumento parametrui „{0}“"
msgid "Unable to parse value ''{1}'' of parameter ''{0}'' as number."
msgstr ""
+"Nepavyksta išnagrinėti parametro „{0}“ reikšmės „{1}“ kaip skaičiaus."
msgid ""
"Unable to parse value ''{1}'' of parameter ''{0}'' as coordinate value."
msgstr ""
+"Nepavyksta išnagrinėti parametro „{0}“ reikšmės „{1}“ kaip koordinatės."
msgid "Custom Projection"
-msgstr ""
+msgstr "Sava projekcija"
msgid "GRS80"
msgstr "GRS80"
@@ -3660,51 +3835,53 @@ msgid "WGS84"
msgstr "WGS84"
msgid "Parameter ''{0}'' required."
-msgstr ""
+msgstr "Parametras „{0}“ privalomas."
msgid "Lambert Conformal Conic"
-msgstr ""
+msgstr "Lambert Conformal Conic"
msgid "Lat/lon (Geodetic)"
-msgstr ""
+msgstr "Plat/ilg (Geodetic)"
msgid "Mercator"
msgstr "Merkaratorius"
msgid "Swiss Oblique Mercator"
-msgstr ""
+msgstr "Swiss Oblique Mercator"
msgid "Transverse Mercator"
-msgstr ""
+msgstr "Transverse Mercator"
msgid ""
"Error initializing test {0}:\n"
" {1}"
msgstr ""
+"Klaida inicializuojant testą {0}:\n"
+" {1}"
msgid "validation error"
-msgstr ""
+msgstr "tikrinimo klaida"
msgid "validation warning"
-msgstr ""
+msgstr "tikrinimo įspėjimas"
msgid "validation other"
-msgstr ""
+msgstr "tikrinimo kita"
msgid "Running test {0}"
-msgstr ""
+msgstr "Vykdomas testas {0}"
msgid "E-mail address contains non-ascii characters"
-msgstr ""
+msgstr "E-pašto adrese yra ne ascii simbolių"
msgid "E-mail address is invalid"
-msgstr ""
+msgstr "E-pašto adresas netinkamas"
msgid "E-mail address contains an invalid username: {0}"
-msgstr ""
+msgstr "E-pašto adrese yra netinkamas naudotojo vardas: {0}"
msgid "E-mail address contains an invalid domain: {0}"
-msgstr ""
+msgstr "E-pašto adrese yra netinkamas domenas: {0}"
msgid "URL contains non-ascii characters"
msgstr ""
@@ -6297,6 +6474,9 @@ msgstr ""
msgid "Customize the style"
msgstr ""
+msgid "List of notes"
+msgstr ""
+
msgid "Add comment"
msgstr ""
@@ -7618,9 +7798,6 @@ 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 ""
@@ -15895,9 +16072,6 @@ msgstr "sporto_centras"
msgid "stadium"
msgstr "stadionas"
-msgid "Select sport:"
-msgstr ""
-
msgid "Sport"
msgstr "Sportas"
@@ -16018,19 +16192,19 @@ msgid "rugby_union"
msgstr ""
msgctxt "sport"
-msgid "shooting"
+msgid "running"
msgstr ""
msgctxt "sport"
-msgid "skateboard"
+msgid "shooting"
msgstr ""
msgctxt "sport"
-msgid "skating"
+msgid "skateboard"
msgstr ""
msgctxt "sport"
-msgid "skiing"
+msgid "skating"
msgstr ""
msgctxt "sport"
@@ -16358,6 +16532,30 @@ msgstr "Ribota masė (tonos)"
msgid "Toll"
msgstr "Mokestis"
+msgid "Is the water body intermittent (disappears seasonally)?"
+msgstr ""
+
+msgid "culvert"
+msgstr ""
+
+msgid "Water access rules:"
+msgstr ""
+
+msgid "Ship"
+msgstr ""
+
+msgid "designated"
+msgstr ""
+
+msgid "Boat"
+msgstr ""
+
+msgid "Motorboat"
+msgstr ""
+
+msgid "Canoe"
+msgstr ""
+
msgid "Streets"
msgstr "Gatvės"
@@ -16573,9 +16771,6 @@ msgstr ""
msgid "official"
msgstr ""
-msgid "designated"
-msgstr ""
-
msgid "Vehicles per type"
msgstr ""
@@ -16965,6 +17160,9 @@ msgstr "pagal laikrodžio rodyklę"
msgid "Pedestrian Crossing"
msgstr "Pėsčiųjų perėja"
+msgid "In case of traffic signals:"
+msgstr ""
+
msgid "Traffic Calming"
msgstr ""
@@ -17211,15 +17409,12 @@ msgstr "Griovys"
msgid "Stream"
msgstr "Upelis"
-msgid "Wadi"
-msgstr "Sezoniškai išdžiūstančios upės vaga"
+msgid "River"
+msgstr "Upė"
msgid "Canal"
msgstr "Kanalas"
-msgid "River"
-msgstr "Upė"
-
msgid "Spring"
msgstr "Šaltinis"
@@ -17285,9 +17480,6 @@ msgstr "upė"
msgid "Salt Water"
msgstr ""
-msgid "Is the water body intermittent (disappears seasonally)?"
-msgstr ""
-
msgid "Coastline"
msgstr "Pakrantė"
@@ -18127,6 +18319,9 @@ msgstr "Autobusų stotelė"
msgid "Tactile Paving"
msgstr ""
+msgid "incorrect"
+msgstr ""
+
msgid "Bus Platform"
msgstr "Autobusų platforma"
@@ -18289,6 +18484,9 @@ msgstr "suši"
msgid "Microbrewery"
msgstr ""
+msgid "Outdoor seating"
+msgstr ""
+
msgid "Fast Food"
msgstr "Greitas Maistas"
@@ -18883,13 +19081,13 @@ msgstr ""
msgid "Collection times"
msgstr ""
-msgid "11:30"
+msgid "Mo-Sa 09:00"
msgstr ""
-msgid "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
+msgid "Mo-Fr 17:30; Sa 12:00"
msgstr ""
-msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; Su,PH off"
+msgid "Mo-Fr 15:00,19:00; Sa 15:10; Su 10:30"
msgstr ""
msgid "Drive through"
@@ -19148,6 +19346,15 @@ msgstr "Sporto Centras"
msgid "Pitch"
msgstr "Aikštelė"
+msgid "artificial_turf"
+msgstr ""
+
+msgid "decoturf"
+msgstr ""
+
+msgid "tartan"
+msgstr ""
+
msgid "Racetrack"
msgstr "Lenktynių Trasa"
@@ -19255,6 +19462,12 @@ msgstr ""
msgid "skitour"
msgstr ""
+msgid "sled"
+msgstr ""
+
+msgid "sleigh"
+msgstr ""
+
msgid "snow_park"
msgstr ""
@@ -19507,6 +19720,10 @@ msgctxt "building"
msgid "construction"
msgstr ""
+msgctxt "building"
+msgid "Levels"
+msgstr ""
+
msgid "Residential Building"
msgstr "Gyvenamasisi Pastatas"
@@ -19542,6 +19759,16 @@ msgctxt "building"
msgid "farm"
msgstr ""
+msgid "Building part"
+msgstr ""
+
+msgctxt "building"
+msgid "Skipped Levels"
+msgstr ""
+
+msgid "Skipped height (meters)"
+msgstr ""
+
msgid "Entrance"
msgstr "Įėjimas"
@@ -21275,22 +21502,28 @@ msgstr ""
msgid "scoria"
msgstr ""
-msgid "Cave Entrance"
+msgid "Ridge"
msgstr ""
-msgid "The entrance to a cave."
+msgid "A mountain or hill ridge."
msgstr ""
-msgid "Island"
+msgid "Valley"
msgstr ""
-msgid "Islet"
+msgid "A low area between hills."
msgstr ""
-msgid "Ridge"
+msgid "Cave Entrance"
msgstr ""
-msgid "A mountain or hill ridge."
+msgid "The entrance to a cave."
+msgstr ""
+
+msgid "Island"
+msgstr ""
+
+msgid "Islet"
msgstr ""
msgid "Nature"
@@ -21320,6 +21553,37 @@ msgstr ""
msgid "Forest"
msgstr ""
+msgid "Cutline"
+msgstr ""
+
+msgctxt "cutline"
+msgid "border"
+msgstr ""
+
+msgctxt "cutline"
+msgid "firebreak"
+msgstr ""
+
+msgctxt "cutline"
+msgid "hunting"
+msgstr ""
+
+msgctxt "cutline"
+msgid "loggingmachine"
+msgstr ""
+
+msgctxt "cutline"
+msgid "pipeline"
+msgstr ""
+
+msgctxt "cutline"
+msgid "piste"
+msgstr ""
+
+msgctxt "cutline"
+msgid "section"
+msgstr ""
+
msgid "Grassland"
msgstr ""
@@ -22253,6 +22517,9 @@ msgstr ""
msgid "Unspecific tag {0}"
msgstr ""
+msgid "Definition of {0} is unclear"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -27616,7 +27883,7 @@ msgstr "Išsaugoti SDS failą"
msgid "No object selected"
msgstr ""
-msgid "SeaMap Editor"
+msgid "SeaChart Editor"
msgstr ""
msgid "Seamark Inspector"
@@ -27688,6 +27955,9 @@ msgstr ""
msgid "Merge Nearby Nodes Threshold"
msgstr ""
+msgid "SeaMap Editor"
+msgstr ""
+
msgid "AutoSave LiveData"
msgstr ""
diff --git a/i18n/po/lv.po b/i18n/po/lv.po
index 64295aa..b11a24c 100644
--- a/i18n/po/lv.po
+++ b/i18n/po/lv.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-04 03:32+0100\n"
+"POT-Creation-Date: 2015-04-01 03:33+0200\n"
"PO-Revision-Date: 2012-10-03 22:16+0000\n"
"Last-Translator: Dirk Stöcker <launchpad at dstoecker.de>\n"
"Language-Team: Latvian <lv at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2015-03-04 04:49+0000\n"
-"X-Generator: Launchpad (build 17361)\n"
+"X-Launchpad-Export-Date: 2015-04-01 04:49+0000\n"
+"X-Generator: Launchpad (build 17413)\n"
"Language: lv\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -1707,9 +1707,15 @@ msgstr ""
msgid "Markers from {0}"
msgstr ""
+msgid "Download OSM Notes"
+msgstr ""
+
msgid "Downloading Notes"
msgstr ""
+msgid "Notes"
+msgstr ""
+
msgid "Download Compressed OSM Change"
msgstr ""
@@ -6119,6 +6125,9 @@ msgstr ""
msgid "Customize the style"
msgstr ""
+msgid "List of notes"
+msgstr ""
+
msgid "Add comment"
msgstr ""
@@ -7438,9 +7447,6 @@ 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 ""
@@ -15696,9 +15702,6 @@ msgstr ""
msgid "stadium"
msgstr ""
-msgid "Select sport:"
-msgstr ""
-
msgid "Sport"
msgstr ""
@@ -15819,19 +15822,19 @@ msgid "rugby_union"
msgstr ""
msgctxt "sport"
-msgid "shooting"
+msgid "running"
msgstr ""
msgctxt "sport"
-msgid "skateboard"
+msgid "shooting"
msgstr ""
msgctxt "sport"
-msgid "skating"
+msgid "skateboard"
msgstr ""
msgctxt "sport"
-msgid "skiing"
+msgid "skating"
msgstr ""
msgctxt "sport"
@@ -16159,6 +16162,30 @@ msgstr ""
msgid "Toll"
msgstr ""
+msgid "Is the water body intermittent (disappears seasonally)?"
+msgstr ""
+
+msgid "culvert"
+msgstr ""
+
+msgid "Water access rules:"
+msgstr ""
+
+msgid "Ship"
+msgstr ""
+
+msgid "designated"
+msgstr ""
+
+msgid "Boat"
+msgstr ""
+
+msgid "Motorboat"
+msgstr ""
+
+msgid "Canoe"
+msgstr ""
+
msgid "Streets"
msgstr ""
@@ -16374,9 +16401,6 @@ msgstr ""
msgid "official"
msgstr ""
-msgid "designated"
-msgstr ""
-
msgid "Vehicles per type"
msgstr ""
@@ -16766,6 +16790,9 @@ msgstr ""
msgid "Pedestrian Crossing"
msgstr ""
+msgid "In case of traffic signals:"
+msgstr ""
+
msgid "Traffic Calming"
msgstr ""
@@ -17012,15 +17039,12 @@ msgstr ""
msgid "Stream"
msgstr ""
-msgid "Wadi"
+msgid "River"
msgstr ""
msgid "Canal"
msgstr ""
-msgid "River"
-msgstr ""
-
msgid "Spring"
msgstr ""
@@ -17086,9 +17110,6 @@ msgstr ""
msgid "Salt Water"
msgstr ""
-msgid "Is the water body intermittent (disappears seasonally)?"
-msgstr ""
-
msgid "Coastline"
msgstr ""
@@ -17928,6 +17949,9 @@ msgstr ""
msgid "Tactile Paving"
msgstr ""
+msgid "incorrect"
+msgstr ""
+
msgid "Bus Platform"
msgstr ""
@@ -18090,6 +18114,9 @@ msgstr ""
msgid "Microbrewery"
msgstr ""
+msgid "Outdoor seating"
+msgstr ""
+
msgid "Fast Food"
msgstr ""
@@ -18684,13 +18711,13 @@ msgstr ""
msgid "Collection times"
msgstr ""
-msgid "11:30"
+msgid "Mo-Sa 09:00"
msgstr ""
-msgid "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
+msgid "Mo-Fr 17:30; Sa 12:00"
msgstr ""
-msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; Su,PH off"
+msgid "Mo-Fr 15:00,19:00; Sa 15:10; Su 10:30"
msgstr ""
msgid "Drive through"
@@ -18949,6 +18976,15 @@ msgstr ""
msgid "Pitch"
msgstr ""
+msgid "artificial_turf"
+msgstr ""
+
+msgid "decoturf"
+msgstr ""
+
+msgid "tartan"
+msgstr ""
+
msgid "Racetrack"
msgstr ""
@@ -19056,6 +19092,12 @@ msgstr ""
msgid "skitour"
msgstr ""
+msgid "sled"
+msgstr ""
+
+msgid "sleigh"
+msgstr ""
+
msgid "snow_park"
msgstr ""
@@ -19308,6 +19350,10 @@ msgctxt "building"
msgid "construction"
msgstr ""
+msgctxt "building"
+msgid "Levels"
+msgstr ""
+
msgid "Residential Building"
msgstr ""
@@ -19343,6 +19389,16 @@ msgctxt "building"
msgid "farm"
msgstr ""
+msgid "Building part"
+msgstr ""
+
+msgctxt "building"
+msgid "Skipped Levels"
+msgstr ""
+
+msgid "Skipped height (meters)"
+msgstr ""
+
msgid "Entrance"
msgstr ""
@@ -21076,22 +21132,28 @@ msgstr ""
msgid "scoria"
msgstr ""
-msgid "Cave Entrance"
+msgid "Ridge"
msgstr ""
-msgid "The entrance to a cave."
+msgid "A mountain or hill ridge."
msgstr ""
-msgid "Island"
+msgid "Valley"
msgstr ""
-msgid "Islet"
+msgid "A low area between hills."
msgstr ""
-msgid "Ridge"
+msgid "Cave Entrance"
msgstr ""
-msgid "A mountain or hill ridge."
+msgid "The entrance to a cave."
+msgstr ""
+
+msgid "Island"
+msgstr ""
+
+msgid "Islet"
msgstr ""
msgid "Nature"
@@ -21121,6 +21183,37 @@ msgstr ""
msgid "Forest"
msgstr ""
+msgid "Cutline"
+msgstr ""
+
+msgctxt "cutline"
+msgid "border"
+msgstr ""
+
+msgctxt "cutline"
+msgid "firebreak"
+msgstr ""
+
+msgctxt "cutline"
+msgid "hunting"
+msgstr ""
+
+msgctxt "cutline"
+msgid "loggingmachine"
+msgstr ""
+
+msgctxt "cutline"
+msgid "pipeline"
+msgstr ""
+
+msgctxt "cutline"
+msgid "piste"
+msgstr ""
+
+msgctxt "cutline"
+msgid "section"
+msgstr ""
+
msgid "Grassland"
msgstr ""
@@ -22054,6 +22147,9 @@ msgstr ""
msgid "Unspecific tag {0}"
msgstr ""
+msgid "Definition of {0} is unclear"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -27415,7 +27511,7 @@ msgstr ""
msgid "No object selected"
msgstr ""
-msgid "SeaMap Editor"
+msgid "SeaChart Editor"
msgstr ""
msgid "Seamark Inspector"
@@ -27487,6 +27583,9 @@ msgstr ""
msgid "Merge Nearby Nodes Threshold"
msgstr ""
+msgid "SeaMap Editor"
+msgstr ""
+
msgid "AutoSave LiveData"
msgstr ""
diff --git a/i18n/po/mk.po b/i18n/po/mk.po
index de742c4..9463cf2 100644
--- a/i18n/po/mk.po
+++ b/i18n/po/mk.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-04 03:32+0100\n"
+"POT-Creation-Date: 2015-04-01 03:33+0200\n"
"PO-Revision-Date: 2013-05-11 04:37+0000\n"
"Last-Translator: Bojan Jankuloski <bojan.jankuloski at gmail.com>\n"
"Language-Team: Macedonian <mk at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n"
-"X-Launchpad-Export-Date: 2015-03-04 04:50+0000\n"
-"X-Generator: Launchpad (build 17361)\n"
+"X-Launchpad-Export-Date: 2015-04-01 04:49+0000\n"
+"X-Generator: Launchpad (build 17413)\n"
"Language: mk\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -1699,9 +1699,15 @@ msgstr ""
msgid "Markers from {0}"
msgstr ""
+msgid "Download OSM Notes"
+msgstr ""
+
msgid "Downloading Notes"
msgstr ""
+msgid "Notes"
+msgstr ""
+
msgid "Download Compressed OSM Change"
msgstr ""
@@ -6112,6 +6118,9 @@ msgstr ""
msgid "Customize the style"
msgstr ""
+msgid "List of notes"
+msgstr ""
+
msgid "Add comment"
msgstr ""
@@ -7431,9 +7440,6 @@ 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 ""
@@ -15686,9 +15692,6 @@ msgstr ""
msgid "stadium"
msgstr ""
-msgid "Select sport:"
-msgstr ""
-
msgid "Sport"
msgstr ""
@@ -15809,19 +15812,19 @@ msgid "rugby_union"
msgstr ""
msgctxt "sport"
-msgid "shooting"
+msgid "running"
msgstr ""
msgctxt "sport"
-msgid "skateboard"
+msgid "shooting"
msgstr ""
msgctxt "sport"
-msgid "skating"
+msgid "skateboard"
msgstr ""
msgctxt "sport"
-msgid "skiing"
+msgid "skating"
msgstr ""
msgctxt "sport"
@@ -16149,6 +16152,30 @@ msgstr ""
msgid "Toll"
msgstr ""
+msgid "Is the water body intermittent (disappears seasonally)?"
+msgstr ""
+
+msgid "culvert"
+msgstr ""
+
+msgid "Water access rules:"
+msgstr ""
+
+msgid "Ship"
+msgstr ""
+
+msgid "designated"
+msgstr ""
+
+msgid "Boat"
+msgstr ""
+
+msgid "Motorboat"
+msgstr ""
+
+msgid "Canoe"
+msgstr ""
+
msgid "Streets"
msgstr ""
@@ -16364,9 +16391,6 @@ msgstr ""
msgid "official"
msgstr ""
-msgid "designated"
-msgstr ""
-
msgid "Vehicles per type"
msgstr ""
@@ -16756,6 +16780,9 @@ msgstr ""
msgid "Pedestrian Crossing"
msgstr ""
+msgid "In case of traffic signals:"
+msgstr ""
+
msgid "Traffic Calming"
msgstr ""
@@ -17002,15 +17029,12 @@ msgstr ""
msgid "Stream"
msgstr ""
-msgid "Wadi"
+msgid "River"
msgstr ""
msgid "Canal"
msgstr ""
-msgid "River"
-msgstr ""
-
msgid "Spring"
msgstr ""
@@ -17076,9 +17100,6 @@ msgstr ""
msgid "Salt Water"
msgstr ""
-msgid "Is the water body intermittent (disappears seasonally)?"
-msgstr ""
-
msgid "Coastline"
msgstr ""
@@ -17918,6 +17939,9 @@ msgstr ""
msgid "Tactile Paving"
msgstr ""
+msgid "incorrect"
+msgstr ""
+
msgid "Bus Platform"
msgstr ""
@@ -18080,6 +18104,9 @@ msgstr ""
msgid "Microbrewery"
msgstr ""
+msgid "Outdoor seating"
+msgstr ""
+
msgid "Fast Food"
msgstr ""
@@ -18674,13 +18701,13 @@ msgstr ""
msgid "Collection times"
msgstr ""
-msgid "11:30"
+msgid "Mo-Sa 09:00"
msgstr ""
-msgid "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
+msgid "Mo-Fr 17:30; Sa 12:00"
msgstr ""
-msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; Su,PH off"
+msgid "Mo-Fr 15:00,19:00; Sa 15:10; Su 10:30"
msgstr ""
msgid "Drive through"
@@ -18939,6 +18966,15 @@ msgstr ""
msgid "Pitch"
msgstr ""
+msgid "artificial_turf"
+msgstr ""
+
+msgid "decoturf"
+msgstr ""
+
+msgid "tartan"
+msgstr ""
+
msgid "Racetrack"
msgstr ""
@@ -19046,6 +19082,12 @@ msgstr ""
msgid "skitour"
msgstr ""
+msgid "sled"
+msgstr ""
+
+msgid "sleigh"
+msgstr ""
+
msgid "snow_park"
msgstr ""
@@ -19298,6 +19340,10 @@ msgctxt "building"
msgid "construction"
msgstr ""
+msgctxt "building"
+msgid "Levels"
+msgstr ""
+
msgid "Residential Building"
msgstr ""
@@ -19333,6 +19379,16 @@ msgctxt "building"
msgid "farm"
msgstr ""
+msgid "Building part"
+msgstr ""
+
+msgctxt "building"
+msgid "Skipped Levels"
+msgstr ""
+
+msgid "Skipped height (meters)"
+msgstr ""
+
msgid "Entrance"
msgstr ""
@@ -21066,22 +21122,28 @@ msgstr ""
msgid "scoria"
msgstr ""
-msgid "Cave Entrance"
+msgid "Ridge"
msgstr ""
-msgid "The entrance to a cave."
+msgid "A mountain or hill ridge."
msgstr ""
-msgid "Island"
+msgid "Valley"
msgstr ""
-msgid "Islet"
+msgid "A low area between hills."
msgstr ""
-msgid "Ridge"
+msgid "Cave Entrance"
msgstr ""
-msgid "A mountain or hill ridge."
+msgid "The entrance to a cave."
+msgstr ""
+
+msgid "Island"
+msgstr ""
+
+msgid "Islet"
msgstr ""
msgid "Nature"
@@ -21111,6 +21173,37 @@ msgstr ""
msgid "Forest"
msgstr ""
+msgid "Cutline"
+msgstr ""
+
+msgctxt "cutline"
+msgid "border"
+msgstr ""
+
+msgctxt "cutline"
+msgid "firebreak"
+msgstr ""
+
+msgctxt "cutline"
+msgid "hunting"
+msgstr ""
+
+msgctxt "cutline"
+msgid "loggingmachine"
+msgstr ""
+
+msgctxt "cutline"
+msgid "pipeline"
+msgstr ""
+
+msgctxt "cutline"
+msgid "piste"
+msgstr ""
+
+msgctxt "cutline"
+msgid "section"
+msgstr ""
+
msgid "Grassland"
msgstr ""
@@ -22044,6 +22137,9 @@ msgstr ""
msgid "Unspecific tag {0}"
msgstr ""
+msgid "Definition of {0} is unclear"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -27405,7 +27501,7 @@ msgstr ""
msgid "No object selected"
msgstr ""
-msgid "SeaMap Editor"
+msgid "SeaChart Editor"
msgstr ""
msgid "Seamark Inspector"
@@ -27477,6 +27573,9 @@ msgstr ""
msgid "Merge Nearby Nodes Threshold"
msgstr ""
+msgid "SeaMap Editor"
+msgstr ""
+
msgid "AutoSave LiveData"
msgstr ""
diff --git a/i18n/po/ms.po b/i18n/po/ms.po
index 09c5344..8508bf9 100644
--- a/i18n/po/ms.po
+++ b/i18n/po/ms.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-04 03:32+0100\n"
+"POT-Creation-Date: 2015-04-01 03:33+0200\n"
"PO-Revision-Date: 2011-12-11 22:14+0000\n"
"Last-Translator: abuyop <Unknown>\n"
"Language-Team: Malay <ms at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-03-04 04:50+0000\n"
-"X-Generator: Launchpad (build 17361)\n"
+"X-Launchpad-Export-Date: 2015-04-01 04:50+0000\n"
+"X-Generator: Launchpad (build 17413)\n"
"Language: ms\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -1696,9 +1696,15 @@ msgstr ""
msgid "Markers from {0}"
msgstr ""
+msgid "Download OSM Notes"
+msgstr ""
+
msgid "Downloading Notes"
msgstr ""
+msgid "Notes"
+msgstr ""
+
msgid "Download Compressed OSM Change"
msgstr ""
@@ -6109,6 +6115,9 @@ msgstr ""
msgid "Customize the style"
msgstr ""
+msgid "List of notes"
+msgstr ""
+
msgid "Add comment"
msgstr ""
@@ -7428,9 +7437,6 @@ 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 ""
@@ -15682,9 +15688,6 @@ msgstr ""
msgid "stadium"
msgstr ""
-msgid "Select sport:"
-msgstr ""
-
msgid "Sport"
msgstr ""
@@ -15805,19 +15808,19 @@ msgid "rugby_union"
msgstr ""
msgctxt "sport"
-msgid "shooting"
+msgid "running"
msgstr ""
msgctxt "sport"
-msgid "skateboard"
+msgid "shooting"
msgstr ""
msgctxt "sport"
-msgid "skating"
+msgid "skateboard"
msgstr ""
msgctxt "sport"
-msgid "skiing"
+msgid "skating"
msgstr ""
msgctxt "sport"
@@ -16145,6 +16148,30 @@ msgstr ""
msgid "Toll"
msgstr ""
+msgid "Is the water body intermittent (disappears seasonally)?"
+msgstr ""
+
+msgid "culvert"
+msgstr ""
+
+msgid "Water access rules:"
+msgstr ""
+
+msgid "Ship"
+msgstr ""
+
+msgid "designated"
+msgstr ""
+
+msgid "Boat"
+msgstr ""
+
+msgid "Motorboat"
+msgstr ""
+
+msgid "Canoe"
+msgstr ""
+
msgid "Streets"
msgstr ""
@@ -16360,9 +16387,6 @@ msgstr ""
msgid "official"
msgstr ""
-msgid "designated"
-msgstr ""
-
msgid "Vehicles per type"
msgstr ""
@@ -16752,6 +16776,9 @@ msgstr ""
msgid "Pedestrian Crossing"
msgstr ""
+msgid "In case of traffic signals:"
+msgstr ""
+
msgid "Traffic Calming"
msgstr ""
@@ -16998,15 +17025,12 @@ msgstr ""
msgid "Stream"
msgstr ""
-msgid "Wadi"
+msgid "River"
msgstr ""
msgid "Canal"
msgstr ""
-msgid "River"
-msgstr ""
-
msgid "Spring"
msgstr ""
@@ -17072,9 +17096,6 @@ msgstr ""
msgid "Salt Water"
msgstr ""
-msgid "Is the water body intermittent (disappears seasonally)?"
-msgstr ""
-
msgid "Coastline"
msgstr ""
@@ -17914,6 +17935,9 @@ msgstr ""
msgid "Tactile Paving"
msgstr ""
+msgid "incorrect"
+msgstr ""
+
msgid "Bus Platform"
msgstr ""
@@ -18076,6 +18100,9 @@ msgstr ""
msgid "Microbrewery"
msgstr ""
+msgid "Outdoor seating"
+msgstr ""
+
msgid "Fast Food"
msgstr ""
@@ -18670,13 +18697,13 @@ msgstr ""
msgid "Collection times"
msgstr ""
-msgid "11:30"
+msgid "Mo-Sa 09:00"
msgstr ""
-msgid "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
+msgid "Mo-Fr 17:30; Sa 12:00"
msgstr ""
-msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; Su,PH off"
+msgid "Mo-Fr 15:00,19:00; Sa 15:10; Su 10:30"
msgstr ""
msgid "Drive through"
@@ -18935,6 +18962,15 @@ msgstr ""
msgid "Pitch"
msgstr ""
+msgid "artificial_turf"
+msgstr ""
+
+msgid "decoturf"
+msgstr ""
+
+msgid "tartan"
+msgstr ""
+
msgid "Racetrack"
msgstr ""
@@ -19042,6 +19078,12 @@ msgstr ""
msgid "skitour"
msgstr ""
+msgid "sled"
+msgstr ""
+
+msgid "sleigh"
+msgstr ""
+
msgid "snow_park"
msgstr ""
@@ -19294,6 +19336,10 @@ msgctxt "building"
msgid "construction"
msgstr ""
+msgctxt "building"
+msgid "Levels"
+msgstr ""
+
msgid "Residential Building"
msgstr ""
@@ -19329,6 +19375,16 @@ msgctxt "building"
msgid "farm"
msgstr ""
+msgid "Building part"
+msgstr ""
+
+msgctxt "building"
+msgid "Skipped Levels"
+msgstr ""
+
+msgid "Skipped height (meters)"
+msgstr ""
+
msgid "Entrance"
msgstr ""
@@ -21062,22 +21118,28 @@ msgstr ""
msgid "scoria"
msgstr ""
-msgid "Cave Entrance"
+msgid "Ridge"
msgstr ""
-msgid "The entrance to a cave."
+msgid "A mountain or hill ridge."
msgstr ""
-msgid "Island"
+msgid "Valley"
msgstr ""
-msgid "Islet"
+msgid "A low area between hills."
msgstr ""
-msgid "Ridge"
+msgid "Cave Entrance"
msgstr ""
-msgid "A mountain or hill ridge."
+msgid "The entrance to a cave."
+msgstr ""
+
+msgid "Island"
+msgstr ""
+
+msgid "Islet"
msgstr ""
msgid "Nature"
@@ -21107,6 +21169,37 @@ msgstr ""
msgid "Forest"
msgstr ""
+msgid "Cutline"
+msgstr ""
+
+msgctxt "cutline"
+msgid "border"
+msgstr ""
+
+msgctxt "cutline"
+msgid "firebreak"
+msgstr ""
+
+msgctxt "cutline"
+msgid "hunting"
+msgstr ""
+
+msgctxt "cutline"
+msgid "loggingmachine"
+msgstr ""
+
+msgctxt "cutline"
+msgid "pipeline"
+msgstr ""
+
+msgctxt "cutline"
+msgid "piste"
+msgstr ""
+
+msgctxt "cutline"
+msgid "section"
+msgstr ""
+
msgid "Grassland"
msgstr ""
@@ -22040,6 +22133,9 @@ msgstr ""
msgid "Unspecific tag {0}"
msgstr ""
+msgid "Definition of {0} is unclear"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -27401,7 +27497,7 @@ msgstr ""
msgid "No object selected"
msgstr ""
-msgid "SeaMap Editor"
+msgid "SeaChart Editor"
msgstr ""
msgid "Seamark Inspector"
@@ -27473,6 +27569,9 @@ msgstr ""
msgid "Merge Nearby Nodes Threshold"
msgstr ""
+msgid "SeaMap Editor"
+msgstr ""
+
msgid "AutoSave LiveData"
msgstr ""
diff --git a/i18n/po/nb.po b/i18n/po/nb.po
index ea32648..29333e9 100644
--- a/i18n/po/nb.po
+++ b/i18n/po/nb.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-04 03:32+0100\n"
+"POT-Creation-Date: 2015-04-01 03:33+0200\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"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-03-04 04:52+0000\n"
-"X-Generator: Launchpad (build 17361)\n"
+"X-Launchpad-Export-Date: 2015-04-01 04:51+0000\n"
+"X-Generator: Launchpad (build 17413)\n"
"Language: nb\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -1713,9 +1713,15 @@ msgstr "Laster ned GPX-data"
msgid "Markers from {0}"
msgstr "Markører fra {0}"
+msgid "Download OSM Notes"
+msgstr ""
+
msgid "Downloading Notes"
msgstr ""
+msgid "Notes"
+msgstr "Sedler"
+
msgid "Download Compressed OSM Change"
msgstr ""
@@ -6181,6 +6187,9 @@ msgstr ""
msgid "Customize the style"
msgstr ""
+msgid "List of notes"
+msgstr ""
+
msgid "Add comment"
msgstr ""
@@ -7502,9 +7511,6 @@ 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 ""
@@ -15865,9 +15871,6 @@ msgstr "sportssenter"
msgid "stadium"
msgstr "stadion"
-msgid "Select sport:"
-msgstr ""
-
msgid "Sport"
msgstr "Sport"
@@ -15988,19 +15991,19 @@ msgid "rugby_union"
msgstr ""
msgctxt "sport"
-msgid "shooting"
+msgid "running"
msgstr ""
msgctxt "sport"
-msgid "skateboard"
+msgid "shooting"
msgstr ""
msgctxt "sport"
-msgid "skating"
+msgid "skateboard"
msgstr ""
msgctxt "sport"
-msgid "skiing"
+msgid "skating"
msgstr ""
msgctxt "sport"
@@ -16328,6 +16331,30 @@ msgstr "Maksvekt (tonn)"
msgid "Toll"
msgstr "Avgift"
+msgid "Is the water body intermittent (disappears seasonally)?"
+msgstr ""
+
+msgid "culvert"
+msgstr ""
+
+msgid "Water access rules:"
+msgstr ""
+
+msgid "Ship"
+msgstr ""
+
+msgid "designated"
+msgstr "brukertype"
+
+msgid "Boat"
+msgstr ""
+
+msgid "Motorboat"
+msgstr ""
+
+msgid "Canoe"
+msgstr ""
+
msgid "Streets"
msgstr "Veier"
@@ -16543,9 +16570,6 @@ msgstr ""
msgid "official"
msgstr ""
-msgid "designated"
-msgstr "brukertype"
-
msgid "Vehicles per type"
msgstr ""
@@ -16935,6 +16959,9 @@ msgstr "med_klokka"
msgid "Pedestrian Crossing"
msgstr "Fotgjengerfelt"
+msgid "In case of traffic signals:"
+msgstr ""
+
msgid "Traffic Calming"
msgstr "Fartsdemping"
@@ -17181,15 +17208,12 @@ msgstr "Dike"
msgid "Stream"
msgstr "Bekk"
-msgid "Wadi"
-msgstr ""
+msgid "River"
+msgstr "Elv"
msgid "Canal"
msgstr "Kanal"
-msgid "River"
-msgstr "Elv"
-
msgid "Spring"
msgstr "Vannkilde"
@@ -17255,9 +17279,6 @@ msgstr ""
msgid "Salt Water"
msgstr ""
-msgid "Is the water body intermittent (disappears seasonally)?"
-msgstr ""
-
msgid "Coastline"
msgstr "Kystlinje"
@@ -18097,6 +18118,9 @@ msgstr "Bussholdeplass"
msgid "Tactile Paving"
msgstr ""
+msgid "incorrect"
+msgstr ""
+
msgid "Bus Platform"
msgstr "Bussplatform"
@@ -18259,6 +18283,9 @@ msgstr ""
msgid "Microbrewery"
msgstr ""
+msgid "Outdoor seating"
+msgstr ""
+
msgid "Fast Food"
msgstr "Gatekjøkken"
@@ -18853,13 +18880,13 @@ msgstr "Postkasse"
msgid "Collection times"
msgstr ""
-msgid "11:30"
+msgid "Mo-Sa 09:00"
msgstr ""
-msgid "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
+msgid "Mo-Fr 17:30; Sa 12:00"
msgstr ""
-msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; Su,PH off"
+msgid "Mo-Fr 15:00,19:00; Sa 15:10; Su 10:30"
msgstr ""
msgid "Drive through"
@@ -19118,6 +19145,15 @@ msgstr "Sportssenter"
msgid "Pitch"
msgstr "Bane"
+msgid "artificial_turf"
+msgstr ""
+
+msgid "decoturf"
+msgstr ""
+
+msgid "tartan"
+msgstr ""
+
msgid "Racetrack"
msgstr "Racerbane"
@@ -19225,6 +19261,12 @@ msgstr "langrenn"
msgid "skitour"
msgstr ""
+msgid "sled"
+msgstr ""
+
+msgid "sleigh"
+msgstr ""
+
msgid "snow_park"
msgstr "snøpark"
@@ -19477,6 +19519,10 @@ msgctxt "building"
msgid "construction"
msgstr ""
+msgctxt "building"
+msgid "Levels"
+msgstr ""
+
msgid "Residential Building"
msgstr ""
@@ -19512,6 +19558,16 @@ msgctxt "building"
msgid "farm"
msgstr ""
+msgid "Building part"
+msgstr ""
+
+msgctxt "building"
+msgid "Skipped Levels"
+msgstr ""
+
+msgid "Skipped height (meters)"
+msgstr ""
+
msgid "Entrance"
msgstr "Inngang"
@@ -21245,6 +21301,18 @@ msgstr ""
msgid "scoria"
msgstr ""
+msgid "Ridge"
+msgstr ""
+
+msgid "A mountain or hill ridge."
+msgstr ""
+
+msgid "Valley"
+msgstr ""
+
+msgid "A low area between hills."
+msgstr ""
+
msgid "Cave Entrance"
msgstr "Huleinngang"
@@ -21257,12 +21325,6 @@ msgstr "Øy"
msgid "Islet"
msgstr "Holme"
-msgid "Ridge"
-msgstr ""
-
-msgid "A mountain or hill ridge."
-msgstr ""
-
msgid "Nature"
msgstr ""
@@ -21290,6 +21352,37 @@ msgstr ""
msgid "Forest"
msgstr "Skog"
+msgid "Cutline"
+msgstr ""
+
+msgctxt "cutline"
+msgid "border"
+msgstr ""
+
+msgctxt "cutline"
+msgid "firebreak"
+msgstr ""
+
+msgctxt "cutline"
+msgid "hunting"
+msgstr ""
+
+msgctxt "cutline"
+msgid "loggingmachine"
+msgstr ""
+
+msgctxt "cutline"
+msgid "pipeline"
+msgstr ""
+
+msgctxt "cutline"
+msgid "piste"
+msgstr ""
+
+msgctxt "cutline"
+msgid "section"
+msgstr ""
+
msgid "Grassland"
msgstr ""
@@ -22223,6 +22316,9 @@ msgstr ""
msgid "Unspecific tag {0}"
msgstr ""
+msgid "Definition of {0} is unclear"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -27621,7 +27717,7 @@ msgstr ""
msgid "No object selected"
msgstr ""
-msgid "SeaMap Editor"
+msgid "SeaChart Editor"
msgstr ""
msgid "Seamark Inspector"
@@ -27693,6 +27789,9 @@ msgstr ""
msgid "Merge Nearby Nodes Threshold"
msgstr ""
+msgid "SeaMap Editor"
+msgstr ""
+
msgid "AutoSave LiveData"
msgstr "Lagre LiveData automatisk"
diff --git a/i18n/po/nds.po b/i18n/po/nds.po
index 5d3b5e5..6022326 100644
--- a/i18n/po/nds.po
+++ b/i18n/po/nds.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-04 03:32+0100\n"
+"POT-Creation-Date: 2015-04-01 03:33+0200\n"
"PO-Revision-Date: 2009-11-29 09:01+0000\n"
"Last-Translator: Dirk Stöcker <launchpad at dstoecker.de>\n"
"Language-Team: German, Low <nds at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-03-04 04:51+0000\n"
-"X-Generator: Launchpad (build 17361)\n"
+"X-Launchpad-Export-Date: 2015-04-01 04:50+0000\n"
+"X-Generator: Launchpad (build 17413)\n"
"Language: \n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -1696,9 +1696,15 @@ msgstr ""
msgid "Markers from {0}"
msgstr ""
+msgid "Download OSM Notes"
+msgstr ""
+
msgid "Downloading Notes"
msgstr ""
+msgid "Notes"
+msgstr ""
+
msgid "Download Compressed OSM Change"
msgstr ""
@@ -6108,6 +6114,9 @@ msgstr ""
msgid "Customize the style"
msgstr ""
+msgid "List of notes"
+msgstr ""
+
msgid "Add comment"
msgstr ""
@@ -7427,9 +7436,6 @@ 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 ""
@@ -15681,9 +15687,6 @@ msgstr ""
msgid "stadium"
msgstr ""
-msgid "Select sport:"
-msgstr ""
-
msgid "Sport"
msgstr ""
@@ -15804,19 +15807,19 @@ msgid "rugby_union"
msgstr ""
msgctxt "sport"
-msgid "shooting"
+msgid "running"
msgstr ""
msgctxt "sport"
-msgid "skateboard"
+msgid "shooting"
msgstr ""
msgctxt "sport"
-msgid "skating"
+msgid "skateboard"
msgstr ""
msgctxt "sport"
-msgid "skiing"
+msgid "skating"
msgstr ""
msgctxt "sport"
@@ -16144,6 +16147,30 @@ msgstr ""
msgid "Toll"
msgstr ""
+msgid "Is the water body intermittent (disappears seasonally)?"
+msgstr ""
+
+msgid "culvert"
+msgstr ""
+
+msgid "Water access rules:"
+msgstr ""
+
+msgid "Ship"
+msgstr ""
+
+msgid "designated"
+msgstr ""
+
+msgid "Boat"
+msgstr ""
+
+msgid "Motorboat"
+msgstr ""
+
+msgid "Canoe"
+msgstr ""
+
msgid "Streets"
msgstr ""
@@ -16359,9 +16386,6 @@ msgstr ""
msgid "official"
msgstr ""
-msgid "designated"
-msgstr ""
-
msgid "Vehicles per type"
msgstr ""
@@ -16751,6 +16775,9 @@ msgstr ""
msgid "Pedestrian Crossing"
msgstr ""
+msgid "In case of traffic signals:"
+msgstr ""
+
msgid "Traffic Calming"
msgstr ""
@@ -16997,15 +17024,12 @@ msgstr ""
msgid "Stream"
msgstr ""
-msgid "Wadi"
+msgid "River"
msgstr ""
msgid "Canal"
msgstr ""
-msgid "River"
-msgstr ""
-
msgid "Spring"
msgstr ""
@@ -17071,9 +17095,6 @@ msgstr ""
msgid "Salt Water"
msgstr ""
-msgid "Is the water body intermittent (disappears seasonally)?"
-msgstr ""
-
msgid "Coastline"
msgstr "Hüste"
@@ -17913,6 +17934,9 @@ msgstr ""
msgid "Tactile Paving"
msgstr ""
+msgid "incorrect"
+msgstr ""
+
msgid "Bus Platform"
msgstr ""
@@ -18075,6 +18099,9 @@ msgstr ""
msgid "Microbrewery"
msgstr ""
+msgid "Outdoor seating"
+msgstr ""
+
msgid "Fast Food"
msgstr ""
@@ -18669,13 +18696,13 @@ msgstr ""
msgid "Collection times"
msgstr ""
-msgid "11:30"
+msgid "Mo-Sa 09:00"
msgstr ""
-msgid "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
+msgid "Mo-Fr 17:30; Sa 12:00"
msgstr ""
-msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; Su,PH off"
+msgid "Mo-Fr 15:00,19:00; Sa 15:10; Su 10:30"
msgstr ""
msgid "Drive through"
@@ -18934,6 +18961,15 @@ msgstr ""
msgid "Pitch"
msgstr ""
+msgid "artificial_turf"
+msgstr ""
+
+msgid "decoturf"
+msgstr ""
+
+msgid "tartan"
+msgstr ""
+
msgid "Racetrack"
msgstr ""
@@ -19041,6 +19077,12 @@ msgstr ""
msgid "skitour"
msgstr ""
+msgid "sled"
+msgstr ""
+
+msgid "sleigh"
+msgstr ""
+
msgid "snow_park"
msgstr ""
@@ -19293,6 +19335,10 @@ msgctxt "building"
msgid "construction"
msgstr ""
+msgctxt "building"
+msgid "Levels"
+msgstr ""
+
msgid "Residential Building"
msgstr ""
@@ -19328,6 +19374,16 @@ msgctxt "building"
msgid "farm"
msgstr ""
+msgid "Building part"
+msgstr ""
+
+msgctxt "building"
+msgid "Skipped Levels"
+msgstr ""
+
+msgid "Skipped height (meters)"
+msgstr ""
+
msgid "Entrance"
msgstr ""
@@ -21061,22 +21117,28 @@ msgstr ""
msgid "scoria"
msgstr ""
-msgid "Cave Entrance"
+msgid "Ridge"
msgstr ""
-msgid "The entrance to a cave."
+msgid "A mountain or hill ridge."
msgstr ""
-msgid "Island"
+msgid "Valley"
msgstr ""
-msgid "Islet"
+msgid "A low area between hills."
msgstr ""
-msgid "Ridge"
+msgid "Cave Entrance"
msgstr ""
-msgid "A mountain or hill ridge."
+msgid "The entrance to a cave."
+msgstr ""
+
+msgid "Island"
+msgstr ""
+
+msgid "Islet"
msgstr ""
msgid "Nature"
@@ -21106,6 +21168,37 @@ msgstr ""
msgid "Forest"
msgstr "Woold"
+msgid "Cutline"
+msgstr ""
+
+msgctxt "cutline"
+msgid "border"
+msgstr ""
+
+msgctxt "cutline"
+msgid "firebreak"
+msgstr ""
+
+msgctxt "cutline"
+msgid "hunting"
+msgstr ""
+
+msgctxt "cutline"
+msgid "loggingmachine"
+msgstr ""
+
+msgctxt "cutline"
+msgid "pipeline"
+msgstr ""
+
+msgctxt "cutline"
+msgid "piste"
+msgstr ""
+
+msgctxt "cutline"
+msgid "section"
+msgstr ""
+
msgid "Grassland"
msgstr ""
@@ -22039,6 +22132,9 @@ msgstr ""
msgid "Unspecific tag {0}"
msgstr ""
+msgid "Definition of {0} is unclear"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -27400,7 +27496,7 @@ msgstr ""
msgid "No object selected"
msgstr ""
-msgid "SeaMap Editor"
+msgid "SeaChart Editor"
msgstr ""
msgid "Seamark Inspector"
@@ -27472,6 +27568,9 @@ msgstr ""
msgid "Merge Nearby Nodes Threshold"
msgstr ""
+msgid "SeaMap Editor"
+msgstr ""
+
msgid "AutoSave LiveData"
msgstr ""
diff --git a/i18n/po/nl.po b/i18n/po/nl.po
index 2fe3dc9..c101792 100644
--- a/i18n/po/nl.po
+++ b/i18n/po/nl.po
@@ -7,16 +7,16 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-04 03:32+0100\n"
-"PO-Revision-Date: 2014-06-10 11:21+0000\n"
-"Last-Translator: Jan Cnops <jan.cnops at scarlet.be>\n"
+"POT-Creation-Date: 2015-04-01 03:33+0200\n"
+"PO-Revision-Date: 2015-03-14 09:21+0000\n"
+"Last-Translator: Erik Bent <Unknown>\n"
"Language-Team: Dutch\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-03-04 04:38+0000\n"
-"X-Generator: Launchpad (build 17361)\n"
+"X-Launchpad-Export-Date: 2015-04-01 04:38+0000\n"
+"X-Generator: Launchpad (build 17413)\n"
"Language: nl\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -1240,7 +1240,7 @@ msgid "Report bug"
msgstr "Probleem rapporteren"
msgid "Report a ticket to JOSM bugtracker"
-msgstr ""
+msgstr "Fout melden via JSOM bugtracker"
msgid "Restart"
msgstr "Opnieuw starten"
@@ -1288,19 +1288,19 @@ msgid "Save the current data to a new file."
msgstr "Sla de huidige gegevens in een nieuw bestand op."
msgid "Search Notes..."
-msgstr ""
+msgstr "Doorzoek notities..."
msgid "Download notes from the note search API"
-msgstr ""
+msgstr "Ophalen notities via de zoek API"
msgid "Search the OSM API for notes containing words:"
-msgstr ""
+msgstr "Zoek via de OSM API naar notities met de volgende woorden:"
msgid "Search for notes"
-msgstr ""
+msgstr "Zoeken naar notities"
msgid "You must enter a search term"
-msgstr ""
+msgstr "Voer een zoekterm in"
msgid "Select All"
msgstr "Alles selecteren"
@@ -1712,13 +1712,13 @@ msgid "Nothing to upload. Get some data first."
msgstr "Niets te uploaden. Verzamel eerst enkele gegevens."
msgid "Upload note changes to server"
-msgstr ""
+msgstr "Upload notitiewijziging naar server"
msgid "Upload notes"
-msgstr ""
+msgstr "Upload notities"
msgid "Uploading notes to server"
-msgstr ""
+msgstr "Notities worden naar server gestuurd"
msgid "Upload selection"
msgstr "Selectie uploaden"
@@ -1877,8 +1877,14 @@ msgstr "Gedownloade GPX-gegevens"
msgid "Markers from {0}"
msgstr "Markeringen van {0}"
+msgid "Download OSM Notes"
+msgstr "Download OSM notities"
+
msgid "Downloading Notes"
-msgstr ""
+msgstr "Notities worden opgehaald"
+
+msgid "Notes"
+msgstr "Notities"
msgid "Download Compressed OSM Change"
msgstr "Gecomprimeerde wijziging van OSM downloaden"
@@ -2004,25 +2010,25 @@ msgid "Error during download"
msgstr "Fout tijdens het downloaden"
msgid "Add a new Note"
-msgstr ""
+msgstr "Voeg nieuwe notitie toe"
msgid "Add note mode"
-msgstr ""
+msgstr "Toevoegen notitie mode"
msgid "Click the location where you wish to create a new note"
-msgstr ""
+msgstr "Geef locatie aan waar een notitie gemaakt moet worden"
msgid "Create new note"
-msgstr ""
+msgstr "Maan nieuwe notitie"
msgid "Create note"
-msgstr ""
+msgstr "Maak notitie"
msgid "Enter a detailed comment to create a note"
-msgstr ""
+msgstr "Geef uitgebreide omschrijving om notitie te maken"
msgid "You must enter a comment to create a new note"
-msgstr ""
+msgstr "Je moet een opmerking opgeven om een nieuwe notitie te maken"
msgid "Delete Mode"
msgstr "modus Verwijderen"
@@ -2997,13 +3003,13 @@ msgid "Cycling dependencies"
msgstr "Cirkelverwijzingen"
msgid "Uploading modified notes"
-msgstr ""
+msgstr "Gewijzigde notities versturen"
msgid "Note {0} failed: {1}"
-msgstr ""
+msgstr "Notitie {0} fout {1}"
msgid "Notes failed to upload"
-msgstr ""
+msgstr "Notities niet verstuurd"
msgid ""
"The following are results of automatic validation. Try fixing these, but be "
@@ -3217,8 +3223,8 @@ msgstr[1] "Schaal {0} knopen"
msgid "Selected {0} object"
msgid_plural "Selected {0} objects"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "{0} object geselecteerd"
+msgstr[1] "{0} objecten geselecteerd"
msgid "Sequence: {0}"
msgstr "Volgorde: {0}"
@@ -3907,37 +3913,37 @@ msgid "Running test {0}"
msgstr "Uitvoeren test {0}"
msgid "E-mail address contains non-ascii characters"
-msgstr ""
+msgstr "E-mail adres bevat verkeerde karakters"
msgid "E-mail address is invalid"
-msgstr ""
+msgstr "E-mail adres niet goed"
msgid "E-mail address contains an invalid username: {0}"
-msgstr ""
+msgstr "E-mail adres bevat ongeldige gebruikersnaam: {0}"
msgid "E-mail address contains an invalid domain: {0}"
-msgstr ""
+msgstr "E-Mail adres bevat ongeldig domein: {0}"
msgid "URL contains non-ascii characters"
-msgstr ""
+msgstr "URL bevat verkeerde karakters"
msgid "URL is invalid"
-msgstr ""
+msgstr "URL is ongeldig"
msgid "URL contains an invalid protocol: {0}"
-msgstr ""
+msgstr "URL bevan ongeldig protocol: {0}"
msgid "URL contains an invalid authority: {0}"
msgstr ""
msgid "URL contains an invalid path: {0}"
-msgstr ""
+msgstr "URL heeft ongeldig pad: {0}"
msgid "URL contains an invalid query: {0}"
-msgstr ""
+msgstr "URL heeft een ongeldige zoekopdracht: {0}"
msgid "URL contains an invalid fragment: {0}"
-msgstr ""
+msgstr "URL heeft een ongeldig deel: {0}"
msgid "Addresses"
msgstr "Adressen"
@@ -3964,17 +3970,19 @@ msgid "House number too far from street"
msgstr "Huisnummer ligt te ver van de straat"
msgid "API Capabilities"
-msgstr ""
+msgstr "API mogelijkheden"
msgid "Checks for errors against API capabilities"
-msgstr ""
+msgstr "Kontroleer op fouten met de API mogelijkheden"
msgid ""
"Way contains more than {0} nodes. It should be replaced by a multipolygon"
msgstr ""
+"Weg heeft meer dan {0} punten en moet vervangen worden door een multipolygoon"
msgid "Way contains more than {0} nodes. It should be split or simplified"
msgstr ""
+"Weg heeft meer dan {0} punten en moet gesplitst of vereenvoudigd worden"
msgid "Barriers and entrances"
msgstr "Barrières en ingangen"
@@ -4022,7 +4030,7 @@ msgid "Crossing ways"
msgstr "Kruisende wegen"
msgid "Crossing buildings"
-msgstr ""
+msgstr "Kruist gebouwen"
msgid "Crossing waterways"
msgstr "Kruisende waterwegen"
@@ -4144,22 +4152,22 @@ msgid "Unknown source:maxspeed context: {0}"
msgstr "Onbekende context source:maxspeed: {0}"
msgid "Internet tags"
-msgstr ""
+msgstr "Internet tags"
msgid "Checks for errors in internet-related tags."
-msgstr ""
+msgstr "Kontroleer fouten in internet-gerelateerde tags"
msgid " URL cannot be converted to ASCII: {0}"
-msgstr ""
+msgstr " URL kan niet omgezet worden naar ASCII: {0}"
msgid "''{0}'': {1}"
-msgstr ""
+msgstr "''{0}'': {1}"
msgid "Lane tags"
msgstr "Tags Lane"
msgid "Test that validates ''lane:'' tags."
-msgstr ""
+msgstr "Test die de \"lane:\" tags kontroleert."
msgid "Number of {0} greater than {1}"
msgstr "Aantal {0} groter dan {1}"
@@ -4218,7 +4226,7 @@ msgid "Role for ''{0}'' should be ''{1}''"
msgstr "Rol voor ''{0}'' zou moeten zijn ''{1}''"
msgid "No area style for multipolygon"
-msgstr ""
+msgstr "Geen gebeidsstijl voor multipolygoon"
msgid ""
"Multipolygon relation should be tagged with area tags and not the outer way"
@@ -6701,6 +6709,9 @@ msgstr ""
msgid "Customize the style"
msgstr ""
+msgid "List of notes"
+msgstr ""
+
msgid "Add comment"
msgstr ""
@@ -8171,9 +8182,6 @@ 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 ""
@@ -17470,9 +17478,6 @@ msgstr "Sportcentrum"
msgid "stadium"
msgstr "Stadion"
-msgid "Select sport:"
-msgstr "Selecteer sport:"
-
msgid "Sport"
msgstr "Sport"
@@ -17593,6 +17598,10 @@ msgid "rugby_union"
msgstr "rugby (union)"
msgctxt "sport"
+msgid "running"
+msgstr ""
+
+msgctxt "sport"
msgid "shooting"
msgstr "schietsport"
@@ -17605,10 +17614,6 @@ msgid "skating"
msgstr "schaatsen"
msgctxt "sport"
-msgid "skiing"
-msgstr "skiën"
-
-msgctxt "sport"
msgid "soccer"
msgstr "voetbal"
@@ -17933,6 +17938,30 @@ msgstr "Max. gewicht (ton)"
msgid "Toll"
msgstr "Tol"
+msgid "Is the water body intermittent (disappears seasonally)?"
+msgstr ""
+
+msgid "culvert"
+msgstr ""
+
+msgid "Water access rules:"
+msgstr ""
+
+msgid "Ship"
+msgstr ""
+
+msgid "designated"
+msgstr "bestemmingsverkeer"
+
+msgid "Boat"
+msgstr ""
+
+msgid "Motorboat"
+msgstr ""
+
+msgid "Canoe"
+msgstr ""
+
msgid "Streets"
msgstr "Straten"
@@ -18148,9 +18177,6 @@ msgstr "Toegangsbeperkingen"
msgid "official"
msgstr "officieel"
-msgid "designated"
-msgstr "bestemmingsverkeer"
-
msgid "Vehicles per type"
msgstr "Voertuigen per type"
@@ -18553,6 +18579,9 @@ msgstr "met de klok mee"
msgid "Pedestrian Crossing"
msgstr "Voetgangersoversteekplaats"
+msgid "In case of traffic signals:"
+msgstr ""
+
msgid "Traffic Calming"
msgstr "Verkeersremmers"
@@ -18799,15 +18828,12 @@ msgstr "Gracht"
msgid "Stream"
msgstr "Beek"
-msgid "Wadi"
-msgstr "Wadi"
+msgid "River"
+msgstr "Rivier"
msgid "Canal"
msgstr "Kanaal"
-msgid "River"
-msgstr "Rivier"
-
msgid "Spring"
msgstr "Bron"
@@ -18873,9 +18899,6 @@ msgstr "rivier"
msgid "Salt Water"
msgstr ""
-msgid "Is the water body intermittent (disappears seasonally)?"
-msgstr ""
-
msgid "Coastline"
msgstr "Kustlijn"
@@ -19716,6 +19739,9 @@ msgstr "Bushalte"
msgid "Tactile Paving"
msgstr "Tactiele tegels"
+msgid "incorrect"
+msgstr ""
+
msgid "Bus Platform"
msgstr "Busperron"
@@ -19878,6 +19904,9 @@ msgstr "sushi"
msgid "Microbrewery"
msgstr "Microbrouwerij"
+msgid "Outdoor seating"
+msgstr ""
+
msgid "Fast Food"
msgstr "Fastfood"
@@ -20472,14 +20501,14 @@ msgstr "Brievenbus"
msgid "Collection times"
msgstr "Tijden legen"
-msgid "11:30"
-msgstr "11:30"
+msgid "Mo-Sa 09:00"
+msgstr ""
-msgid "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
-msgstr "ma-vr 15:00,17:45,19:00,23:00; za 15:10; zo 10:30,23:00"
+msgid "Mo-Fr 17:30; Sa 12:00"
+msgstr ""
-msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; Su,PH off"
-msgstr "Ma-Vr 09:00-12:00,17:15; Za 14:00; Zo,Feestdagen gesloten"
+msgid "Mo-Fr 15:00,19:00; Sa 15:10; Su 10:30"
+msgstr ""
msgid "Drive through"
msgstr "Overdekt"
@@ -20737,6 +20766,15 @@ msgstr "Sportcentrum"
msgid "Pitch"
msgstr "Sportveld"
+msgid "artificial_turf"
+msgstr ""
+
+msgid "decoturf"
+msgstr ""
+
+msgid "tartan"
+msgstr ""
+
msgid "Racetrack"
msgstr "Wedstrijdbaan"
@@ -20844,6 +20882,12 @@ msgstr "Scandinavisch"
msgid "skitour"
msgstr "skitour"
+msgid "sled"
+msgstr ""
+
+msgid "sleigh"
+msgstr ""
+
msgid "snow_park"
msgstr "sneeuw_park"
@@ -21096,6 +21140,10 @@ msgctxt "building"
msgid "construction"
msgstr "constructie"
+msgctxt "building"
+msgid "Levels"
+msgstr ""
+
msgid "Residential Building"
msgstr "Woongebouw"
@@ -21131,6 +21179,16 @@ msgctxt "building"
msgid "farm"
msgstr "land-/tuinbouw"
+msgid "Building part"
+msgstr ""
+
+msgctxt "building"
+msgid "Skipped Levels"
+msgstr ""
+
+msgid "Skipped height (meters)"
+msgstr ""
+
msgid "Entrance"
msgstr "Doorgang"
@@ -22866,6 +22924,18 @@ msgstr ""
msgid "scoria"
msgstr ""
+msgid "Ridge"
+msgstr ""
+
+msgid "A mountain or hill ridge."
+msgstr ""
+
+msgid "Valley"
+msgstr ""
+
+msgid "A low area between hills."
+msgstr ""
+
msgid "Cave Entrance"
msgstr "Grotingang"
@@ -22878,12 +22948,6 @@ msgstr "Eiland"
msgid "Islet"
msgstr "Klein eiland"
-msgid "Ridge"
-msgstr ""
-
-msgid "A mountain or hill ridge."
-msgstr ""
-
msgid "Nature"
msgstr "Natuur"
@@ -22911,6 +22975,37 @@ msgstr ""
msgid "Forest"
msgstr "Bosbouw"
+msgid "Cutline"
+msgstr ""
+
+msgctxt "cutline"
+msgid "border"
+msgstr ""
+
+msgctxt "cutline"
+msgid "firebreak"
+msgstr ""
+
+msgctxt "cutline"
+msgid "hunting"
+msgstr ""
+
+msgctxt "cutline"
+msgid "loggingmachine"
+msgstr ""
+
+msgctxt "cutline"
+msgid "pipeline"
+msgstr ""
+
+msgctxt "cutline"
+msgid "piste"
+msgstr ""
+
+msgctxt "cutline"
+msgid "section"
+msgstr ""
+
msgid "Grassland"
msgstr "Grasland"
@@ -23844,6 +23939,9 @@ msgstr ""
msgid "Unspecific tag {0}"
msgstr ""
+msgid "Definition of {0} is unclear"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -29650,8 +29748,8 @@ msgstr "Sla het SDS-bestand op"
msgid "No object selected"
msgstr ""
-msgid "SeaMap Editor"
-msgstr "Bewerken SeaMap"
+msgid "SeaChart Editor"
+msgstr ""
msgid "Seamark Inspector"
msgstr ""
@@ -29737,6 +29835,9 @@ msgstr "Factor afstand"
msgid "Merge Nearby Nodes Threshold"
msgstr "Drempel voor samenvoegen dicht bij elkaar gelegen knopen"
+msgid "SeaMap Editor"
+msgstr "Bewerken SeaMap"
+
msgid "AutoSave LiveData"
msgstr "LiveData automatisch opslaan"
diff --git a/i18n/po/nn.po b/i18n/po/nn.po
index e054d6a..8786ed6 100644
--- a/i18n/po/nn.po
+++ b/i18n/po/nn.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-04 03:32+0100\n"
+"POT-Creation-Date: 2015-04-01 03:33+0200\n"
"PO-Revision-Date: 2009-07-15 12:49+0000\n"
"Last-Translator: Skippern <Unknown>\n"
"Language-Team: Norwegian Nynorsk <nn at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-03-04 04:51+0000\n"
-"X-Generator: Launchpad (build 17361)\n"
+"X-Launchpad-Export-Date: 2015-04-01 04:51+0000\n"
+"X-Generator: Launchpad (build 17413)\n"
"Language: nn\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -1696,9 +1696,15 @@ msgstr ""
msgid "Markers from {0}"
msgstr ""
+msgid "Download OSM Notes"
+msgstr ""
+
msgid "Downloading Notes"
msgstr ""
+msgid "Notes"
+msgstr ""
+
msgid "Download Compressed OSM Change"
msgstr ""
@@ -6109,6 +6115,9 @@ msgstr ""
msgid "Customize the style"
msgstr ""
+msgid "List of notes"
+msgstr ""
+
msgid "Add comment"
msgstr ""
@@ -7428,9 +7437,6 @@ 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 ""
@@ -15682,9 +15688,6 @@ msgstr ""
msgid "stadium"
msgstr ""
-msgid "Select sport:"
-msgstr ""
-
msgid "Sport"
msgstr ""
@@ -15805,19 +15808,19 @@ msgid "rugby_union"
msgstr ""
msgctxt "sport"
-msgid "shooting"
+msgid "running"
msgstr ""
msgctxt "sport"
-msgid "skateboard"
+msgid "shooting"
msgstr ""
msgctxt "sport"
-msgid "skating"
+msgid "skateboard"
msgstr ""
msgctxt "sport"
-msgid "skiing"
+msgid "skating"
msgstr ""
msgctxt "sport"
@@ -16145,6 +16148,30 @@ msgstr ""
msgid "Toll"
msgstr ""
+msgid "Is the water body intermittent (disappears seasonally)?"
+msgstr ""
+
+msgid "culvert"
+msgstr ""
+
+msgid "Water access rules:"
+msgstr ""
+
+msgid "Ship"
+msgstr ""
+
+msgid "designated"
+msgstr ""
+
+msgid "Boat"
+msgstr ""
+
+msgid "Motorboat"
+msgstr ""
+
+msgid "Canoe"
+msgstr ""
+
msgid "Streets"
msgstr ""
@@ -16360,9 +16387,6 @@ msgstr ""
msgid "official"
msgstr ""
-msgid "designated"
-msgstr ""
-
msgid "Vehicles per type"
msgstr ""
@@ -16752,6 +16776,9 @@ msgstr ""
msgid "Pedestrian Crossing"
msgstr ""
+msgid "In case of traffic signals:"
+msgstr ""
+
msgid "Traffic Calming"
msgstr ""
@@ -16998,15 +17025,12 @@ msgstr ""
msgid "Stream"
msgstr ""
-msgid "Wadi"
+msgid "River"
msgstr ""
msgid "Canal"
msgstr ""
-msgid "River"
-msgstr ""
-
msgid "Spring"
msgstr ""
@@ -17072,9 +17096,6 @@ msgstr ""
msgid "Salt Water"
msgstr ""
-msgid "Is the water body intermittent (disappears seasonally)?"
-msgstr ""
-
msgid "Coastline"
msgstr ""
@@ -17914,6 +17935,9 @@ msgstr ""
msgid "Tactile Paving"
msgstr ""
+msgid "incorrect"
+msgstr ""
+
msgid "Bus Platform"
msgstr ""
@@ -18076,6 +18100,9 @@ msgstr ""
msgid "Microbrewery"
msgstr ""
+msgid "Outdoor seating"
+msgstr ""
+
msgid "Fast Food"
msgstr ""
@@ -18670,13 +18697,13 @@ msgstr ""
msgid "Collection times"
msgstr ""
-msgid "11:30"
+msgid "Mo-Sa 09:00"
msgstr ""
-msgid "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
+msgid "Mo-Fr 17:30; Sa 12:00"
msgstr ""
-msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; Su,PH off"
+msgid "Mo-Fr 15:00,19:00; Sa 15:10; Su 10:30"
msgstr ""
msgid "Drive through"
@@ -18935,6 +18962,15 @@ msgstr ""
msgid "Pitch"
msgstr ""
+msgid "artificial_turf"
+msgstr ""
+
+msgid "decoturf"
+msgstr ""
+
+msgid "tartan"
+msgstr ""
+
msgid "Racetrack"
msgstr ""
@@ -19042,6 +19078,12 @@ msgstr ""
msgid "skitour"
msgstr ""
+msgid "sled"
+msgstr ""
+
+msgid "sleigh"
+msgstr ""
+
msgid "snow_park"
msgstr ""
@@ -19294,6 +19336,10 @@ msgctxt "building"
msgid "construction"
msgstr ""
+msgctxt "building"
+msgid "Levels"
+msgstr ""
+
msgid "Residential Building"
msgstr ""
@@ -19329,6 +19375,16 @@ msgctxt "building"
msgid "farm"
msgstr ""
+msgid "Building part"
+msgstr ""
+
+msgctxt "building"
+msgid "Skipped Levels"
+msgstr ""
+
+msgid "Skipped height (meters)"
+msgstr ""
+
msgid "Entrance"
msgstr ""
@@ -21062,22 +21118,28 @@ msgstr ""
msgid "scoria"
msgstr ""
-msgid "Cave Entrance"
+msgid "Ridge"
msgstr ""
-msgid "The entrance to a cave."
+msgid "A mountain or hill ridge."
msgstr ""
-msgid "Island"
+msgid "Valley"
msgstr ""
-msgid "Islet"
+msgid "A low area between hills."
msgstr ""
-msgid "Ridge"
+msgid "Cave Entrance"
msgstr ""
-msgid "A mountain or hill ridge."
+msgid "The entrance to a cave."
+msgstr ""
+
+msgid "Island"
+msgstr ""
+
+msgid "Islet"
msgstr ""
msgid "Nature"
@@ -21107,6 +21169,37 @@ msgstr ""
msgid "Forest"
msgstr ""
+msgid "Cutline"
+msgstr ""
+
+msgctxt "cutline"
+msgid "border"
+msgstr ""
+
+msgctxt "cutline"
+msgid "firebreak"
+msgstr ""
+
+msgctxt "cutline"
+msgid "hunting"
+msgstr ""
+
+msgctxt "cutline"
+msgid "loggingmachine"
+msgstr ""
+
+msgctxt "cutline"
+msgid "pipeline"
+msgstr ""
+
+msgctxt "cutline"
+msgid "piste"
+msgstr ""
+
+msgctxt "cutline"
+msgid "section"
+msgstr ""
+
msgid "Grassland"
msgstr ""
@@ -22040,6 +22133,9 @@ msgstr ""
msgid "Unspecific tag {0}"
msgstr ""
+msgid "Definition of {0} is unclear"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -27401,7 +27497,7 @@ msgstr ""
msgid "No object selected"
msgstr ""
-msgid "SeaMap Editor"
+msgid "SeaChart Editor"
msgstr ""
msgid "Seamark Inspector"
@@ -27473,6 +27569,9 @@ msgstr ""
msgid "Merge Nearby Nodes Threshold"
msgstr ""
+msgid "SeaMap Editor"
+msgstr ""
+
msgid "AutoSave LiveData"
msgstr ""
diff --git a/i18n/po/oc.po b/i18n/po/oc.po
index 4215e22..f348934 100644
--- a/i18n/po/oc.po
+++ b/i18n/po/oc.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-04 03:32+0100\n"
+"POT-Creation-Date: 2015-04-01 03:33+0200\n"
"PO-Revision-Date: 2012-10-03 22:14+0000\n"
"Last-Translator: Cédric VALMARY (Tot en òc) <cvalmary at yahoo.fr>\n"
"Language-Team: Occitan (post 1500) <oc at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2015-03-04 04:52+0000\n"
-"X-Generator: Launchpad (build 17361)\n"
+"X-Launchpad-Export-Date: 2015-04-01 04:52+0000\n"
+"X-Generator: Launchpad (build 17413)\n"
"Language: \n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -1703,9 +1703,15 @@ msgstr "Donadas GPX telecargadas"
msgid "Markers from {0}"
msgstr ""
+msgid "Download OSM Notes"
+msgstr ""
+
msgid "Downloading Notes"
msgstr ""
+msgid "Notes"
+msgstr ""
+
msgid "Download Compressed OSM Change"
msgstr ""
@@ -6116,6 +6122,9 @@ msgstr ""
msgid "Customize the style"
msgstr ""
+msgid "List of notes"
+msgstr ""
+
msgid "Add comment"
msgstr ""
@@ -7435,9 +7444,6 @@ 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 ""
@@ -15691,9 +15697,6 @@ msgstr ""
msgid "stadium"
msgstr ""
-msgid "Select sport:"
-msgstr ""
-
msgid "Sport"
msgstr ""
@@ -15814,19 +15817,19 @@ msgid "rugby_union"
msgstr ""
msgctxt "sport"
-msgid "shooting"
+msgid "running"
msgstr ""
msgctxt "sport"
-msgid "skateboard"
+msgid "shooting"
msgstr ""
msgctxt "sport"
-msgid "skating"
+msgid "skateboard"
msgstr ""
msgctxt "sport"
-msgid "skiing"
+msgid "skating"
msgstr ""
msgctxt "sport"
@@ -16154,6 +16157,30 @@ msgstr ""
msgid "Toll"
msgstr ""
+msgid "Is the water body intermittent (disappears seasonally)?"
+msgstr ""
+
+msgid "culvert"
+msgstr ""
+
+msgid "Water access rules:"
+msgstr ""
+
+msgid "Ship"
+msgstr ""
+
+msgid "designated"
+msgstr ""
+
+msgid "Boat"
+msgstr ""
+
+msgid "Motorboat"
+msgstr ""
+
+msgid "Canoe"
+msgstr ""
+
msgid "Streets"
msgstr ""
@@ -16369,9 +16396,6 @@ msgstr ""
msgid "official"
msgstr ""
-msgid "designated"
-msgstr ""
-
msgid "Vehicles per type"
msgstr ""
@@ -16761,6 +16785,9 @@ msgstr ""
msgid "Pedestrian Crossing"
msgstr ""
+msgid "In case of traffic signals:"
+msgstr ""
+
msgid "Traffic Calming"
msgstr ""
@@ -17007,15 +17034,12 @@ msgstr ""
msgid "Stream"
msgstr ""
-msgid "Wadi"
+msgid "River"
msgstr ""
msgid "Canal"
msgstr ""
-msgid "River"
-msgstr ""
-
msgid "Spring"
msgstr ""
@@ -17081,9 +17105,6 @@ msgstr ""
msgid "Salt Water"
msgstr ""
-msgid "Is the water body intermittent (disappears seasonally)?"
-msgstr ""
-
msgid "Coastline"
msgstr ""
@@ -17923,6 +17944,9 @@ msgstr ""
msgid "Tactile Paving"
msgstr ""
+msgid "incorrect"
+msgstr ""
+
msgid "Bus Platform"
msgstr ""
@@ -18085,6 +18109,9 @@ msgstr ""
msgid "Microbrewery"
msgstr ""
+msgid "Outdoor seating"
+msgstr ""
+
msgid "Fast Food"
msgstr ""
@@ -18679,13 +18706,13 @@ msgstr ""
msgid "Collection times"
msgstr ""
-msgid "11:30"
+msgid "Mo-Sa 09:00"
msgstr ""
-msgid "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
+msgid "Mo-Fr 17:30; Sa 12:00"
msgstr ""
-msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; Su,PH off"
+msgid "Mo-Fr 15:00,19:00; Sa 15:10; Su 10:30"
msgstr ""
msgid "Drive through"
@@ -18944,6 +18971,15 @@ msgstr ""
msgid "Pitch"
msgstr ""
+msgid "artificial_turf"
+msgstr ""
+
+msgid "decoturf"
+msgstr ""
+
+msgid "tartan"
+msgstr ""
+
msgid "Racetrack"
msgstr ""
@@ -19051,6 +19087,12 @@ msgstr ""
msgid "skitour"
msgstr ""
+msgid "sled"
+msgstr ""
+
+msgid "sleigh"
+msgstr ""
+
msgid "snow_park"
msgstr ""
@@ -19303,6 +19345,10 @@ msgctxt "building"
msgid "construction"
msgstr ""
+msgctxt "building"
+msgid "Levels"
+msgstr ""
+
msgid "Residential Building"
msgstr ""
@@ -19338,6 +19384,16 @@ msgctxt "building"
msgid "farm"
msgstr ""
+msgid "Building part"
+msgstr ""
+
+msgctxt "building"
+msgid "Skipped Levels"
+msgstr ""
+
+msgid "Skipped height (meters)"
+msgstr ""
+
msgid "Entrance"
msgstr ""
@@ -21071,22 +21127,28 @@ msgstr ""
msgid "scoria"
msgstr ""
-msgid "Cave Entrance"
+msgid "Ridge"
msgstr ""
-msgid "The entrance to a cave."
+msgid "A mountain or hill ridge."
msgstr ""
-msgid "Island"
+msgid "Valley"
msgstr ""
-msgid "Islet"
+msgid "A low area between hills."
msgstr ""
-msgid "Ridge"
+msgid "Cave Entrance"
msgstr ""
-msgid "A mountain or hill ridge."
+msgid "The entrance to a cave."
+msgstr ""
+
+msgid "Island"
+msgstr ""
+
+msgid "Islet"
msgstr ""
msgid "Nature"
@@ -21116,6 +21178,37 @@ msgstr ""
msgid "Forest"
msgstr ""
+msgid "Cutline"
+msgstr ""
+
+msgctxt "cutline"
+msgid "border"
+msgstr ""
+
+msgctxt "cutline"
+msgid "firebreak"
+msgstr ""
+
+msgctxt "cutline"
+msgid "hunting"
+msgstr ""
+
+msgctxt "cutline"
+msgid "loggingmachine"
+msgstr ""
+
+msgctxt "cutline"
+msgid "pipeline"
+msgstr ""
+
+msgctxt "cutline"
+msgid "piste"
+msgstr ""
+
+msgctxt "cutline"
+msgid "section"
+msgstr ""
+
msgid "Grassland"
msgstr ""
@@ -22049,6 +22142,9 @@ msgstr ""
msgid "Unspecific tag {0}"
msgstr ""
+msgid "Definition of {0} is unclear"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -27410,7 +27506,7 @@ msgstr ""
msgid "No object selected"
msgstr ""
-msgid "SeaMap Editor"
+msgid "SeaChart Editor"
msgstr ""
msgid "Seamark Inspector"
@@ -27482,6 +27578,9 @@ msgstr ""
msgid "Merge Nearby Nodes Threshold"
msgstr ""
+msgid "SeaMap Editor"
+msgstr ""
+
msgid "AutoSave LiveData"
msgstr ""
diff --git a/i18n/po/pa.po b/i18n/po/pa.po
index ee0121e..db1bf65 100644
--- a/i18n/po/pa.po
+++ b/i18n/po/pa.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-04 03:32+0100\n"
+"POT-Creation-Date: 2015-04-01 03:33+0200\n"
"PO-Revision-Date: 2011-05-06 15:52+0000\n"
"Last-Translator: A S Alam <aalam at users.sf.net>\n"
"Language-Team: Punjabi <pa at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-03-04 04:53+0000\n"
-"X-Generator: Launchpad (build 17361)\n"
+"X-Launchpad-Export-Date: 2015-04-01 04:52+0000\n"
+"X-Generator: Launchpad (build 17413)\n"
"Language: pa\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -1696,9 +1696,15 @@ msgstr ""
msgid "Markers from {0}"
msgstr ""
+msgid "Download OSM Notes"
+msgstr ""
+
msgid "Downloading Notes"
msgstr ""
+msgid "Notes"
+msgstr ""
+
msgid "Download Compressed OSM Change"
msgstr ""
@@ -6109,6 +6115,9 @@ msgstr ""
msgid "Customize the style"
msgstr ""
+msgid "List of notes"
+msgstr ""
+
msgid "Add comment"
msgstr ""
@@ -7428,9 +7437,6 @@ 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 ""
@@ -15682,9 +15688,6 @@ msgstr ""
msgid "stadium"
msgstr ""
-msgid "Select sport:"
-msgstr ""
-
msgid "Sport"
msgstr ""
@@ -15805,19 +15808,19 @@ msgid "rugby_union"
msgstr ""
msgctxt "sport"
-msgid "shooting"
+msgid "running"
msgstr ""
msgctxt "sport"
-msgid "skateboard"
+msgid "shooting"
msgstr ""
msgctxt "sport"
-msgid "skating"
+msgid "skateboard"
msgstr ""
msgctxt "sport"
-msgid "skiing"
+msgid "skating"
msgstr ""
msgctxt "sport"
@@ -16145,6 +16148,30 @@ msgstr ""
msgid "Toll"
msgstr ""
+msgid "Is the water body intermittent (disappears seasonally)?"
+msgstr ""
+
+msgid "culvert"
+msgstr ""
+
+msgid "Water access rules:"
+msgstr ""
+
+msgid "Ship"
+msgstr ""
+
+msgid "designated"
+msgstr ""
+
+msgid "Boat"
+msgstr ""
+
+msgid "Motorboat"
+msgstr ""
+
+msgid "Canoe"
+msgstr ""
+
msgid "Streets"
msgstr ""
@@ -16360,9 +16387,6 @@ msgstr ""
msgid "official"
msgstr ""
-msgid "designated"
-msgstr ""
-
msgid "Vehicles per type"
msgstr ""
@@ -16752,6 +16776,9 @@ msgstr ""
msgid "Pedestrian Crossing"
msgstr ""
+msgid "In case of traffic signals:"
+msgstr ""
+
msgid "Traffic Calming"
msgstr ""
@@ -16998,15 +17025,12 @@ msgstr ""
msgid "Stream"
msgstr ""
-msgid "Wadi"
+msgid "River"
msgstr ""
msgid "Canal"
msgstr ""
-msgid "River"
-msgstr ""
-
msgid "Spring"
msgstr ""
@@ -17072,9 +17096,6 @@ msgstr ""
msgid "Salt Water"
msgstr ""
-msgid "Is the water body intermittent (disappears seasonally)?"
-msgstr ""
-
msgid "Coastline"
msgstr ""
@@ -17914,6 +17935,9 @@ msgstr ""
msgid "Tactile Paving"
msgstr ""
+msgid "incorrect"
+msgstr ""
+
msgid "Bus Platform"
msgstr ""
@@ -18076,6 +18100,9 @@ msgstr ""
msgid "Microbrewery"
msgstr ""
+msgid "Outdoor seating"
+msgstr ""
+
msgid "Fast Food"
msgstr ""
@@ -18670,13 +18697,13 @@ msgstr ""
msgid "Collection times"
msgstr ""
-msgid "11:30"
+msgid "Mo-Sa 09:00"
msgstr ""
-msgid "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
+msgid "Mo-Fr 17:30; Sa 12:00"
msgstr ""
-msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; Su,PH off"
+msgid "Mo-Fr 15:00,19:00; Sa 15:10; Su 10:30"
msgstr ""
msgid "Drive through"
@@ -18935,6 +18962,15 @@ msgstr ""
msgid "Pitch"
msgstr ""
+msgid "artificial_turf"
+msgstr ""
+
+msgid "decoturf"
+msgstr ""
+
+msgid "tartan"
+msgstr ""
+
msgid "Racetrack"
msgstr ""
@@ -19042,6 +19078,12 @@ msgstr ""
msgid "skitour"
msgstr ""
+msgid "sled"
+msgstr ""
+
+msgid "sleigh"
+msgstr ""
+
msgid "snow_park"
msgstr ""
@@ -19294,6 +19336,10 @@ msgctxt "building"
msgid "construction"
msgstr ""
+msgctxt "building"
+msgid "Levels"
+msgstr ""
+
msgid "Residential Building"
msgstr ""
@@ -19329,6 +19375,16 @@ msgctxt "building"
msgid "farm"
msgstr ""
+msgid "Building part"
+msgstr ""
+
+msgctxt "building"
+msgid "Skipped Levels"
+msgstr ""
+
+msgid "Skipped height (meters)"
+msgstr ""
+
msgid "Entrance"
msgstr ""
@@ -21062,22 +21118,28 @@ msgstr ""
msgid "scoria"
msgstr ""
-msgid "Cave Entrance"
+msgid "Ridge"
msgstr ""
-msgid "The entrance to a cave."
+msgid "A mountain or hill ridge."
msgstr ""
-msgid "Island"
+msgid "Valley"
msgstr ""
-msgid "Islet"
+msgid "A low area between hills."
msgstr ""
-msgid "Ridge"
+msgid "Cave Entrance"
msgstr ""
-msgid "A mountain or hill ridge."
+msgid "The entrance to a cave."
+msgstr ""
+
+msgid "Island"
+msgstr ""
+
+msgid "Islet"
msgstr ""
msgid "Nature"
@@ -21107,6 +21169,37 @@ msgstr ""
msgid "Forest"
msgstr ""
+msgid "Cutline"
+msgstr ""
+
+msgctxt "cutline"
+msgid "border"
+msgstr ""
+
+msgctxt "cutline"
+msgid "firebreak"
+msgstr ""
+
+msgctxt "cutline"
+msgid "hunting"
+msgstr ""
+
+msgctxt "cutline"
+msgid "loggingmachine"
+msgstr ""
+
+msgctxt "cutline"
+msgid "pipeline"
+msgstr ""
+
+msgctxt "cutline"
+msgid "piste"
+msgstr ""
+
+msgctxt "cutline"
+msgid "section"
+msgstr ""
+
msgid "Grassland"
msgstr ""
@@ -22040,6 +22133,9 @@ msgstr ""
msgid "Unspecific tag {0}"
msgstr ""
+msgid "Definition of {0} is unclear"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -27401,7 +27497,7 @@ msgstr ""
msgid "No object selected"
msgstr ""
-msgid "SeaMap Editor"
+msgid "SeaChart Editor"
msgstr ""
msgid "Seamark Inspector"
@@ -27473,6 +27569,9 @@ msgstr ""
msgid "Merge Nearby Nodes Threshold"
msgstr ""
+msgid "SeaMap Editor"
+msgstr ""
+
msgid "AutoSave LiveData"
msgstr ""
diff --git a/i18n/po/pl.po b/i18n/po/pl.po
index 8612ae7..414e032 100644
--- a/i18n/po/pl.po
+++ b/i18n/po/pl.po
@@ -7,17 +7,17 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-04 03:32+0100\n"
-"PO-Revision-Date: 2015-03-04 00:46+0000\n"
-"Last-Translator: Marcin Floryan <marcin.floryan at gmail.com>\n"
+"POT-Creation-Date: 2015-04-01 03:33+0200\n"
+"PO-Revision-Date: 2015-04-01 00:29+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: 2015-03-04 04:54+0000\n"
-"X-Generator: Launchpad (build 17361)\n"
+"X-Launchpad-Export-Date: 2015-04-01 04:53+0000\n"
+"X-Generator: Launchpad (build 17413)\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"
@@ -32,13 +32,13 @@ msgid "{0}: option ''{1}'' is ambiguous"
msgstr "{0}: opcja \"{1}\" jest niejednoznaczna"
msgid "{0}: option ''--{1}'' does not allow an argument"
-msgstr "{0}: opcja \"--{1}\" nie zezwala na argument"
+msgstr "{0}: opcja \"--{1}\" nie zezwala na parametr"
msgid "{0}: option ''{1}{2}'' does not allow an argument"
-msgstr "{0}: opcja ''{1}{2}'' nie dopuszcza argumentu"
+msgstr "{0}: opcja ''{1}{2}'' nie zezwala na parametr"
msgid "{0}: option ''{1}'' requires an argument"
-msgstr "{0}: opcja ''{1}'' wymaga argumentu"
+msgstr "{0}: opcja ''{1}'' wymaga użycia parametru"
msgid "{0}: unrecognized option ''--{1}''"
msgstr "{0}: nierozpoznana opcja ''--{1}''"
@@ -53,7 +53,7 @@ msgid "{0}: invalid option -- {1}"
msgstr "{0}: nieprawidłowa opcja -- {1}"
msgid "{0}: option requires an argument -- {1}"
-msgstr "{0}: opcja wymaga użycia argumentu -- {1}"
+msgstr "{0}: opcja wymaga użycia parametru -- {1}"
msgid "Invalid value {0} for parameter ''has_arg''"
msgstr "Niepoprawna wartość {0} dla parametru ''has_arg''"
@@ -63,7 +63,8 @@ msgstr "Warunki korzystania z tła"
msgid "Opening link not supported on current platform (''{0}'')"
msgstr ""
-"Połączenie do otworzenia nie jest obsługiwane na tej platformie (\"{0}\")"
+"Połączenie do otworzenia nie jest obsługiwane na bieżącej platformie "
+"(\"{0}\")"
msgid "ERROR: {0}"
msgstr "BŁĄD: {0}"
@@ -90,28 +91,28 @@ msgid "Help"
msgstr "Pomoc"
msgid "Initializing OSM API"
-msgstr "Inicjalizacja OSM API"
+msgstr "Inicjowanie API OSM"
msgid "Initializing validator"
-msgstr "Inicjalizacja walidatora"
+msgstr "Inicjowanie walidatora"
msgid "Initializing presets"
-msgstr "Inicjalizacja ustawień"
+msgstr "Inicjowanie ustawień"
msgid "Initializing map styles"
-msgstr "Inicjalizacja stylów map"
+msgstr "Inicjowanie stylów map"
msgid "Loading imagery preferences"
msgstr "Wczytywanie ustawień podkładów mapy"
msgid "Updating user interface"
-msgstr "Odświeżanie interfejsu użytkownika"
+msgstr "Uaktualnianie interfejsu użytkownika"
msgid "{0} completed in {1}"
msgstr "zakończono {0} z {1}"
msgid "Ignoring malformed file URL: \"{0}\""
-msgstr "Pominięto niepoprawny URL do pliku: \"{0}\""
+msgstr "Pominięto nieprawidłowy adres URL pliku: \"{0}\""
msgid "Warning"
msgstr "Ostrzeżenie"
@@ -120,15 +121,15 @@ msgid "Parameter \"downloadgps\" does not accept file names or file URLs"
msgstr "Parametr \"downloadgps\" nie przyjmuje nazw plików lub adresów URL"
msgid "Ignoring malformed URL: \"{0}\""
-msgstr "Pominięto niepoprawny URL: \"{0}\""
+msgstr "Pominięto nieprawidłowy adres URL: \"{0}\""
msgid ""
"<h2>JOSM requires Java version {0}.</h2>Detected Java version: {1}.<br>You "
"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 do poprawnej pracy wymaga Java wersję {0}.</h2>Wykryto Java wersję: "
-"{1}.<br>Możesz <ul><li>zaktualizować swoją wersję Java (JRE) "
+"<h2>JOSM do poprawnego działania wymaga Java w wersji {0}.</h2>Wykryto Java "
+"w wersji: {1}.<br>Możesz <ul><li>zaktualizować swoją wersję Java (JRE) "
"albo</li><li>używać wcześniejszej (kompatybilnej z Java {2}) wersji "
"JOSM.</li></ul>Więcej informacji:"
@@ -145,7 +146,7 @@ msgid "About"
msgstr "O programie"
msgid "Display the about screen."
-msgstr "Wyświetla informacje o programie JOSM."
+msgstr "Wyświetla informacje o programie"
msgid "Java OpenStreetMap Editor"
msgstr "Edytor OpenStreetMap w Javie"
@@ -160,7 +161,7 @@ msgid "Java Version {0}"
msgstr "Wersja Javy {0}"
msgid "Homepage"
-msgstr "Strona domowa"
+msgstr "Strona główna"
msgid "Bug Reports"
msgstr "Raporty o błędach"
@@ -1268,16 +1269,16 @@ msgid "Save the current data to a new file."
msgstr "Zapisuje bieżące dane do nowego pliku."
msgid "Search Notes..."
-msgstr "Szukaj uwag..."
+msgstr "Wyszukaj uwagi..."
msgid "Download notes from the note search API"
-msgstr "Pobierz uwagi z API wyszukiwania uwag"
+msgstr "Pobiera uwagi z API wyszukiwania uwag"
msgid "Search the OSM API for notes containing words:"
msgstr "Poszukaj w OSM API uwag zawierających słowa:"
msgid "Search for notes"
-msgstr "Szukaj uwag"
+msgstr "Wyszukaj uwagi"
msgid "You must enter a search term"
msgstr ""
@@ -1854,9 +1855,15 @@ msgstr "Pobrane dane GPX"
msgid "Markers from {0}"
msgstr "Znaczniki z {0}"
+msgid "Download OSM Notes"
+msgstr ""
+
msgid "Downloading Notes"
msgstr "Pobieranie uwag"
+msgid "Notes"
+msgstr "Uwagi"
+
msgid "Download Compressed OSM Change"
msgstr "Pobiera skompresowane zmiany OSM"
@@ -3430,27 +3437,29 @@ msgstr "<html>Nie udało się utworzyć brakującego folderu cache: {0}</html>"
msgid ""
"Failed to initialize preferences. Preference directory ''{0}'' is not a "
"directory."
-msgstr "Błąd inicjalizowania ustawień. Katalog \"{0}\" nie jest katalogiem."
+msgstr ""
+"Nie udało się zainicjować preferencji. Katalog \"{0}\" nie jest katalogiem."
msgid ""
"<html>Failed to initialize preferences.<br>Preference directory ''{0}'' is "
"not a directory.</html>"
msgstr ""
-"<html>Nie można zainicjować ustawień.<br>Folder ustawień ''{0}'' nie jest "
-"folderem.</html>"
+"<html>Nie udało się zainicjować preferencji.<br>Katalog preferencji ''{0}'' "
+"nie jest katalogiem.</html>"
msgid ""
"Failed to initialize preferences. Failed to create missing preference "
"directory: {0}"
msgstr ""
-"Błąd inicjalizowania ustawień. Błąd tworzenia brakującego katalogu: {0}"
+"Nie udało się zainicjować preferencji. Błąd tworzenia brakującego katalogu: "
+"{0}"
msgid ""
"<html>Failed to initialize preferences.<br>Failed to create missing "
"preference directory: {0}</html>"
msgstr ""
-"<html>Nie można zainicjować ustawień. <br>Nie udało się utworzyć brakującego "
-"katalogu ustawień: {0}</html>"
+"<html>Nie udało się zainicjować preferencji. <br>Nie udało się utworzyć "
+"brakującego katalogu ustawień: {0}</html>"
msgid "Missing preference file ''{0}''. Creating a default preference file."
msgstr ""
@@ -3466,8 +3475,8 @@ msgid ""
"<html>Failed to initialize preferences.<br>Failed to reset preference file "
"to default: {0}</html>"
msgstr ""
-"<html> Nie można zainicjować ustawień . <br> udało się przywrócić pliku "
-"ustawień domyślnych: {0} </ html>"
+"<html>Nie udało się zainicjować preferencji.<br>Nie udało się przywrócić "
+"pliku ustawień domyślnych: {0} </ html>"
msgid ""
"<html>Preferences file had errors.<br> Making backup of old one to "
@@ -3480,8 +3489,8 @@ msgid ""
"Failed to initialize preferences. Failed to reset preference file to "
"default: {0}"
msgstr ""
-"Błąd inicjalizowania ustawień. Błąd przywacania domyślnych ustawień pliku: "
-"{0}"
+"Nie udało się zainicjować preferencji. Nie udało się przywrócić pliku "
+"ustawień domyślnych: {0}"
msgid "Paint style {0}: {1}"
msgstr "Styl rysowania {0}: {1}"
@@ -4852,7 +4861,7 @@ msgid "Imagery offset"
msgstr "Przesunięcie warstwy obrazu"
msgid "Imagery"
-msgstr "Podkłady mapy"
+msgstr "Podkłady"
msgctxt "layer"
msgid "Offset"
@@ -4874,7 +4883,7 @@ msgid "Standard unix geometry argument"
msgstr "Standardowy argument X-Windows określający wymiary okna"
msgid "Download the bounding box"
-msgstr "Pobierze dane wskazane prostokątem."
+msgstr "Pobierz dane z obszaru edycji"
msgid "Download the location at the URL (with lat=x&lon=y&zoom=z)"
msgstr "Pobierz lokalizację jako adres URL (lat=x&lon=y&zoom=z)"
@@ -4883,7 +4892,7 @@ msgid "Open a file (any file type that can be opened with File/Open)"
msgstr "Otwórz plik (każdy typ jaki może być otwarty poprzez Plik/Otwórz)"
msgid "Download the bounding box as raw GPS"
-msgstr "Pobierz obszar jako surowy GPS"
+msgstr "Pobierz obszar edycji jako surowe dane GPS"
msgid "Download the location at the URL (with lat=x&lon=y&zoom=z) as raw GPS"
msgstr "Pobierz lokalizację adresu (z lat=x&lon=y&zoom=z) jako raw GPS"
@@ -4979,7 +4988,7 @@ msgid "Enabled detailed debug level (trace)"
msgstr "Włączony poziom dokładnego debugowania (trace)"
msgid "Initializing"
-msgstr "Inicjalizacja"
+msgstr "Inicjowanie"
msgid "Updating plugins"
msgstr "Aktualizowanie wtyczek"
@@ -5101,7 +5110,7 @@ msgid "Menu: {0}"
msgstr "Menu: {0}"
msgid "Save and load the current session (list of layers, etc.)"
-msgstr "Zapisz i załaduj aktualną sesję (lista warstw, itd.)"
+msgstr "Zapisuje i wczytuje bieżącą sesję (listę warstw, itd.)"
msgid "Edit toolbar"
msgstr "Pasek narzędzi"
@@ -5122,7 +5131,7 @@ msgid "Click to open the imagery tab in the preferences"
msgstr "Kliknij aby otworzyć konfigurację podkładu w Ustawieniach"
msgid "Search menu items"
-msgstr "Szukaj elementów menu"
+msgstr "Wyszukaj w menu"
msgid "Audio"
msgstr "Dźwięk"
@@ -6372,13 +6381,13 @@ msgid "{0} Nodes: "
msgstr "{0} węzłów: "
msgid "Bounding box: "
-msgstr ""
+msgstr "Obszar edycji: "
msgid "Bounding box (projected): "
-msgstr ""
+msgstr "Obszar edycji (w projekcji): "
msgid "Center of bounding box: "
-msgstr ""
+msgstr "Centrum obszaru edycji: "
msgid "Coordinates: "
msgstr "Współrzędne: "
@@ -6648,6 +6657,9 @@ msgstr "Ustawienia stylu"
msgid "Customize the style"
msgstr "Dostosuj styl"
+msgid "List of notes"
+msgstr ""
+
msgid "Add comment"
msgstr "Dodaj komentarz"
@@ -7145,7 +7157,7 @@ msgstr ""
"zamknięte"
msgid "Select only changesets related to a specific bounding box"
-msgstr "Wybierz tylko zestawy zmian związane z konkretnym obszarem"
+msgstr "Wybierz tylko zestawy zmian związane z konkretnym obszarem edycji"
msgid "Query open changesets only"
msgstr "Zapytanie tylko o otwarte zestawy zmian"
@@ -7245,14 +7257,18 @@ msgid ""
"Cannot restrict the changeset query to a specific bounding box. The input is "
"invalid."
msgstr ""
+"Podano nieprawidłowe dane. Ograniczenie zestawów zmian do konkretnego "
+"obszaru edycji nie powiodło się."
msgid ""
"<html>Please enter valid longitude/latitude values to restrict<br>the "
"changeset query to a specific bounding box.</html>"
msgstr ""
+"<html>Podaj prawidłową długość i szerokość geograficzną aby ograniczyć<br> "
+"zestawy zmian do danego obszaru edycji.</html>"
msgid "Invalid bounding box"
-msgstr ""
+msgstr "Nieprawidłowy obszar edycji"
msgid ""
"The current value is not a valid user ID. Please enter an integer value > 0"
@@ -7938,7 +7954,7 @@ msgid "Load parent relations"
msgstr "Wczytuje relacje nadrzędne"
msgid "Reload"
-msgstr "Odśwież"
+msgstr "Wczytaj ponownie"
msgid "Loading parent relations"
msgstr "Wczytywanie relacji nadrzędnych"
@@ -7959,7 +7975,7 @@ msgid "Edit relation #{0} in layer ''{1}''"
msgstr "Edycja relacji #{0} w warstwie \"{1}\""
msgid "Load relation"
-msgstr "Załaduj relacje"
+msgstr "Wczytaj relacje"
msgid "way is connected"
msgstr "linia jest połączona"
@@ -8041,7 +8057,7 @@ msgstr ""
"Adres URL z www.openstreetmap.org (można wkleić adres aby pobrać obszar)"
msgid "Bounding Box"
-msgstr "Wybrany obszar"
+msgstr "Obszar edycji"
msgid "The string ''{0}'' is not a valid double value."
msgstr "Napis ''{0}'' nie reprezentuje poprawnej liczby zmiennoprzecinkowej."
@@ -8067,9 +8083,6 @@ 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."
@@ -8128,7 +8141,7 @@ msgid ""
msgstr ""
msgid "Download referrers (parent relations)"
-msgstr "Załaduj obiekty nadrzędne (relacje)"
+msgstr "Pobierz obiekty nadrzędne (relacje)"
msgid "Download object"
msgstr "Pobierz obiekt"
@@ -8147,7 +8160,7 @@ msgid "Select if the members of a relation should be downloaded as well"
msgstr "Wybierz czy pobrać również obiekty należące do relacji"
msgid "Download referrers (parent relations and ways)"
-msgstr "Załaduj obiekty nadrzędne (np. relacje i linie)"
+msgstr "Pobierz obiekty nadrzędne (np. relacje i linie)"
msgid "Class Type"
msgstr "Typ Klasy"
@@ -8701,7 +8714,7 @@ msgid "Download objects"
msgstr "Pobrane obiekty"
msgid "Initializing nodes to download ..."
-msgstr "Inicjalizuję węzły do pobrania..."
+msgstr "Inicjowanie węzłów do pobrania..."
msgid "Object could not be downloaded"
msgid_plural "Some objects could not be downloaded"
@@ -8920,13 +8933,13 @@ msgid "Update objects"
msgstr "Aktualizacja obiektów"
msgid "Initializing nodes to update ..."
-msgstr "Inicjuję węzły do uaktualnienia..."
+msgstr "Inicjowanie węzłów do uaktualnienia..."
msgid "Initializing ways to update ..."
-msgstr "Inicjuję linie do uaktualnienia..."
+msgstr "Inicjowanie linii do uaktualnienia..."
msgid "Initializing relations to update ..."
-msgstr "Inicjuję relację do uaktualnienia..."
+msgstr "Inicjowanie relacji do uaktualnienia..."
msgid "Settings"
msgstr "Ustawienia"
@@ -10034,7 +10047,7 @@ msgid "Calculating Download Area"
msgstr "Przeliczam pobierany obszar"
msgid "Precache imagery tiles along this track"
-msgstr "Załaduj do pamięci podręcznej podkład mapy wzdłuż tej trasy"
+msgstr "Wczytaj do pamięci podręcznej podkład mapy wzdłuż tej trasy"
msgid "Precaching WMS"
msgstr "Wstępne buforowanie WMS"
@@ -10510,7 +10523,7 @@ msgid "Authorizing OAuth Request token ''{0}'' at the OSM website ..."
msgstr "Uwierzytelniam Żeton Żądania OAuth ''{0}'' na witrynie OSM..."
msgid "Initializing a session at the OSM website..."
-msgstr "Inicjuję sesję na witrynie OSM..."
+msgstr "Inicjowanie sesji na witrynie OSM..."
msgid "Authenticating the session for user ''{0}''..."
msgstr "Uwierzytelniam sesję użytkownika ''{0}''"
@@ -11490,7 +11503,7 @@ msgstr ""
"poziom powiększenia: {3}"
msgid "{0} is replaced by X-coordinate of the tile"
-msgstr "{0} jest zamienianiy na koordynat X dla kafelka"
+msgstr "{0} jest zamieniany na koordynat X dla kafelka"
msgid "{0} is replaced by Y-coordinate of the tile"
msgstr "{0} jest zamieniany na koordynat Y dla kafelka"
@@ -11551,7 +11564,7 @@ msgid "Show Bounds"
msgstr "Pokaż obszar"
msgid "No bounding box was found for this layer."
-msgstr ""
+msgstr "Brak obszaru edycji dla tej warstwy"
msgid "imagery fade"
msgstr "przyciemnienia podkładu mapy"
@@ -11871,7 +11884,7 @@ msgid "Add the selected available presets to the list of active presets"
msgstr "Dodaje zaznaczone dostępne szablony do listy aktywnych szablonów"
msgid "Reloads the list of available presets from ''{0}''"
-msgstr "Ponownie załaduj listę dostępnych szablonów z ''{0}''"
+msgstr "Ponownie wczytaj listę dostępnych szablonów z ''{0}''"
msgid "Loading preset sources from ''{0}''"
msgstr "Ładuję źródła szablonu z ''{0}''"
@@ -12835,8 +12848,8 @@ msgid ""
"URL from www.openstreetmap.org (you can paste a download URL here to specify "
"a bounding box)"
msgstr ""
-"URL ze strony www.openstreetmap.org (możesz wkleić tu adres URL do pobrania "
-"aby wskazać granice obszaru)"
+"URL ze strony www.openstreetmap.org (możesz wkleić tu adres URL aby "
+"wyznaczyć obszar edycji)"
msgid ""
"The current value is not a valid changeset ID. Please enter an integer value "
@@ -14940,7 +14953,7 @@ msgstr "miasto"
msgctxt "Place type"
msgid "locality"
-msgstr "okolica"
+msgstr "miejsce niezaludnione"
msgctxt "Place type"
msgid "village"
@@ -14964,7 +14977,7 @@ msgstr "wyspa"
msgctxt "Place type"
msgid "county"
-msgstr "powiat"
+msgstr "powiat/hrabstwo"
msgctxt "Place type"
msgid "hamlet"
@@ -14972,7 +14985,7 @@ msgstr "przysiółek"
msgctxt "Place type"
msgid "suburb"
-msgstr "dzielnica"
+msgstr "dzielnica/przedmieście"
msgid "All Files"
msgstr "Wszystkie pliki"
@@ -16332,6 +16345,8 @@ msgid ""
"Bring in errors from Osm Inspector and display it on the current JOSM "
"bounding box"
msgstr ""
+"Pobierz listę błędów z serwisu Osm Inspector i wyświetl je w bieżącym "
+"obszarze edycji JOSM"
msgid "Import/export OSM data in PBF format"
msgstr "Import/eksport danych OSM w formacie PBF"
@@ -16859,9 +16874,6 @@ msgstr "centrum sportowe"
msgid "stadium"
msgstr "stadion"
-msgid "Select sport:"
-msgstr "Wybierz sport:"
-
msgid "Sport"
msgstr "Sport"
@@ -16982,6 +16994,10 @@ msgid "rugby_union"
msgstr ""
msgctxt "sport"
+msgid "running"
+msgstr ""
+
+msgctxt "sport"
msgid "shooting"
msgstr "strzelectwo"
@@ -16994,10 +17010,6 @@ msgid "skating"
msgstr "łyżwiarstwo"
msgctxt "sport"
-msgid "skiing"
-msgstr "narciarstwo"
-
-msgctxt "sport"
msgid "soccer"
msgstr "piłka nożna (soccer)"
@@ -17027,7 +17039,7 @@ msgstr ""
msgctxt "parking"
msgid "multi-storey"
-msgstr ""
+msgstr "wielopoziomowy"
msgctxt "parking"
msgid "surface"
@@ -17183,7 +17195,7 @@ msgid "evangelical"
msgstr "ewangelickie"
msgid "greek_catholic"
-msgstr ""
+msgstr "greckokatolickie"
msgid "jehovahs_witness"
msgstr "jehowityzm"
@@ -17198,7 +17210,7 @@ msgid "mormon"
msgstr "mormoni"
msgid "old_catholic"
-msgstr ""
+msgstr "starokatolickie"
msgid "orthodox"
msgstr "prawosławne"
@@ -17322,6 +17334,30 @@ msgstr "Maks. ciężar (w tonach)"
msgid "Toll"
msgstr "Bramka (opłaty)"
+msgid "Is the water body intermittent (disappears seasonally)?"
+msgstr "Czy to woda okresowa (sezonowo zanikająca)?"
+
+msgid "culvert"
+msgstr "przepust"
+
+msgid "Water access rules:"
+msgstr ""
+
+msgid "Ship"
+msgstr "Statek"
+
+msgid "designated"
+msgstr "dla wyznaczonych pojazdów"
+
+msgid "Boat"
+msgstr "Łódź"
+
+msgid "Motorboat"
+msgstr "Motorówka"
+
+msgid "Canoe"
+msgstr "Kanadyjka"
+
msgid "Streets"
msgstr "Sieć drogowa"
@@ -17391,7 +17427,7 @@ msgstr "ścieżka"
msgctxt "Highway"
msgid "cycleway"
-msgstr ""
+msgstr "droga dla rowerów"
msgid "Vehicle access"
msgstr ""
@@ -17424,7 +17460,7 @@ msgid "parking_aisle"
msgstr "uliczka parkingowa"
msgid "drive-through"
-msgstr ""
+msgstr "przejazd (drive-through)"
msgid "Parking Aisle"
msgstr "Uliczka parkingowa"
@@ -17537,9 +17573,6 @@ msgstr "Ograniczenia w ruchu"
msgid "official"
msgstr "oficjalnie"
-msgid "designated"
-msgstr "dla wyznaczonych pojazdów"
-
msgid "Vehicles per type"
msgstr "Pojazdy według typu"
@@ -17590,7 +17623,7 @@ msgstr "Wyprzedzanie"
msgctxt "overtaking"
msgid "yes"
-msgstr ""
+msgstr "tak"
msgctxt "overtaking"
msgid "both"
@@ -17606,14 +17639,14 @@ msgstr ""
msgctxt "overtaking"
msgid "no"
-msgstr ""
+msgstr "nie"
msgid "Roundabout"
msgstr "Rondo"
msgctxt "Highway"
msgid "construction"
-msgstr ""
+msgstr "w budowie"
msgid "Ford"
msgstr "Bród"
@@ -17798,37 +17831,37 @@ msgid "Amount of Steps"
msgstr "Ilość stopni"
msgid "Ramp"
-msgstr ""
+msgstr "Rampa"
msgid "Stroller ramp"
-msgstr ""
+msgstr "Rampa dla wózków dziecięcych"
msgid "Bicycle ramp"
-msgstr ""
+msgstr "Rampa dla rowerów"
msgid "Wheelchair ramp"
-msgstr ""
+msgstr "Rampa dla wózków inwalidzkich"
msgid "Luggage ramp"
-msgstr ""
+msgstr "Rampa na bagaż"
msgid "automatic"
-msgstr ""
+msgstr "atomatyczna"
msgid "manual"
-msgstr ""
+msgstr "ręczna"
msgid "Handrail"
-msgstr ""
+msgstr "Poręcz"
msgid "Left handrail"
-msgstr ""
+msgstr "Poręcz z lewej"
msgid "Center handrail"
-msgstr ""
+msgstr "Poręcz pośrodku"
msgid "Right handrail"
-msgstr ""
+msgstr "Poręcz z prawej"
msgid "Waypoints"
msgstr "Punkty drogowe"
@@ -17929,6 +17962,9 @@ msgstr "zgodnie z ruchem wskazówek zegara"
msgid "Pedestrian Crossing"
msgstr "Przejście dla pieszych"
+msgid "In case of traffic signals:"
+msgstr ""
+
msgid "Traffic Calming"
msgstr "Środek uspokojenia ruchu"
@@ -18074,7 +18110,7 @@ msgid "wire"
msgstr "drut"
msgid "Guard Rail"
-msgstr "Bariera drogowa/przeciwwypadkowa/energochłonna (Guard Rail)"
+msgstr "Barierka drogowa"
msgid "Wall"
msgstr "Mur"
@@ -18175,15 +18211,12 @@ msgstr "Rów"
msgid "Stream"
msgstr "Strumień"
-msgid "Wadi"
-msgstr "Ued (suche koryto rzeki)"
+msgid "River"
+msgstr "Rzeka"
msgid "Canal"
msgstr "Kanał"
-msgid "River"
-msgstr "Rzeka"
-
msgid "Spring"
msgstr "Źródło"
@@ -18249,9 +18282,6 @@ msgstr "rzeka"
msgid "Salt Water"
msgstr "Słona woda"
-msgid "Is the water body intermittent (disappears seasonally)?"
-msgstr "Czy to woda okresowa (sezonowo zanikająca)?"
-
msgid "Coastline"
msgstr "Wybrzeże"
@@ -18543,7 +18573,7 @@ msgid "Station"
msgstr "Stacja"
msgid "Pylon"
-msgstr ""
+msgstr "Pylon"
msgid "Parking"
msgstr "Parking"
@@ -18759,7 +18789,7 @@ msgid "Repair"
msgstr "Warsztat samochodowy"
msgid "Parts"
-msgstr "Części"
+msgstr "Części samochodowe"
msgid "Tires"
msgstr "Opony"
@@ -19091,6 +19121,9 @@ msgstr "Przystanek autobusowy"
msgid "Tactile Paving"
msgstr "Nawierzchnia dla niewidomych"
+msgid "incorrect"
+msgstr ""
+
msgid "Bus Platform"
msgstr "Peron autobusowy"
@@ -19173,7 +19206,7 @@ msgid "Hostel"
msgstr "Hostel"
msgid "Alpine Hut"
-msgstr "Chata alpejska"
+msgstr "Schronisko górskie"
msgid "Caravan Site/RV Park"
msgstr "Kemping samochodowy"
@@ -19253,6 +19286,9 @@ msgstr "sushi"
msgid "Microbrewery"
msgstr "Mikrobrowar"
+msgid "Outdoor seating"
+msgstr ""
+
msgid "Fast Food"
msgstr "Fast food"
@@ -19426,16 +19462,16 @@ msgid "Movie Theater/Cinema"
msgstr "Kino"
msgid "Drive-in theater"
-msgstr ""
+msgstr "Teatr samochodowy"
msgid "3D"
-msgstr ""
+msgstr "3D"
msgid "Number of screens"
-msgstr ""
+msgstr "Liczba ekranów"
msgid "Minimum age"
-msgstr ""
+msgstr "Wiek minimalny"
msgid "Zoo"
msgstr "Zoo"
@@ -19580,7 +19616,7 @@ msgstr "greckokatolickie"
msgctxt "christian"
msgid "greek_orthodox"
-msgstr "greckokatolickie"
+msgstr "greckoprawosławne"
msgctxt "christian"
msgid "jehovahs_witness"
@@ -19628,7 +19664,7 @@ msgstr "rzymskokatolickie"
msgctxt "christian"
msgid "russian_orthodox"
-msgstr "prawosławne"
+msgstr "rosyjskoprawosławne"
msgctxt "christian"
msgid "seventh_day_adventist"
@@ -19809,7 +19845,7 @@ msgid "public"
msgstr "publiczny"
msgid "seasonal"
-msgstr ""
+msgstr "sezonowo"
msgid "flush"
msgstr ""
@@ -19818,13 +19854,13 @@ msgid "pitlatrine"
msgstr ""
msgid "chemical"
-msgstr ""
+msgstr "chemiczna"
msgid "bucket"
-msgstr ""
+msgstr "wiadro"
msgid "Usage Position"
-msgstr ""
+msgstr "Pozycja korzystania"
msgid "seated"
msgstr ""
@@ -19847,13 +19883,13 @@ msgstr "Skrzynka pocztowa"
msgid "Collection times"
msgstr "Czas odbioru"
-msgid "11:30"
+msgid "Mo-Sa 09:00"
msgstr ""
-msgid "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
+msgid "Mo-Fr 17:30; Sa 12:00"
msgstr ""
-msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; Su,PH off"
+msgid "Mo-Fr 15:00,19:00; Sa 15:10; Su 10:30"
msgstr ""
msgid "Drive through"
@@ -20112,6 +20148,15 @@ msgstr "Centrum sportowe"
msgid "Pitch"
msgstr "Boisko"
+msgid "artificial_turf"
+msgstr ""
+
+msgid "decoturf"
+msgstr ""
+
+msgid "tartan"
+msgstr ""
+
msgid "Racetrack"
msgstr "Tor wyścigowy"
@@ -20141,10 +20186,10 @@ msgid "track"
msgstr "tor"
msgid "Nine-pin Bowling"
-msgstr ""
+msgstr "Kręgle klasyczne"
msgid "Ten-pin Bowling"
-msgstr ""
+msgstr "Bowling"
msgid "Archery"
msgstr "Łucznictwo"
@@ -20219,6 +20264,12 @@ msgstr ""
msgid "skitour"
msgstr ""
+msgid "sled"
+msgstr ""
+
+msgid "sleigh"
+msgstr ""
+
msgid "snow_park"
msgstr ""
@@ -20337,7 +20388,7 @@ msgid "Boule"
msgstr "Bule"
msgid "Lawn Bowling"
-msgstr ""
+msgstr "Bowls"
msgid "Cricket"
msgstr "Krykiet"
@@ -20425,7 +20476,7 @@ msgstr "biura i usługi"
msgctxt "building"
msgid "barn"
-msgstr ""
+msgstr "stodoła"
msgctxt "building"
msgid "farm_auxiliary"
@@ -20465,12 +20516,16 @@ msgstr "szopa"
msgctxt "building"
msgid "cowshed"
-msgstr ""
+msgstr "obora"
msgctxt "building"
msgid "construction"
msgstr "w budowie"
+msgctxt "building"
+msgid "Levels"
+msgstr "Poziomy"
+
msgid "Residential Building"
msgstr "Budynek mieszkalny"
@@ -20506,6 +20561,16 @@ msgctxt "building"
msgid "farm"
msgstr "budynek na farmie"
+msgid "Building part"
+msgstr "Część budynku"
+
+msgctxt "building"
+msgid "Skipped Levels"
+msgstr "Pominięte poziomy"
+
+msgid "Skipped height (meters)"
+msgstr "Wysokość podstawy (metry)"
+
msgid "Entrance"
msgstr "Wejście"
@@ -20533,7 +20598,7 @@ msgid "Entrance number"
msgstr "Numer wejścia"
msgid "Flat numbers"
-msgstr "Ilość mieszkań"
+msgstr "Zakres numerów"
msgid "Tower"
msgstr "Wieża"
@@ -20748,25 +20813,25 @@ msgid "Seismic Activity"
msgstr "Aktywność sejsmiczna"
msgid "Recording:"
-msgstr ""
+msgstr "Rejestracja:"
msgid "Automated"
-msgstr ""
+msgstr "Automatyczna"
msgid "Manually"
-msgstr ""
+msgstr "Ręczna"
msgid "Remote"
msgstr "Zdalny"
msgid "Display:"
-msgstr ""
+msgstr "Ekran:"
msgid "Analog"
-msgstr ""
+msgstr "Analogowy"
msgid "Digital"
-msgstr ""
+msgstr "Cyfrowy"
msgid "Survey Point"
msgstr "Punkt geodezyjny"
@@ -20931,7 +20996,7 @@ msgid "Power Generator"
msgstr "Generator elektryczny"
msgid "Biofuel Power Generator"
-msgstr ""
+msgstr "Generator na biopaliwo"
msgid "Generator Type"
msgstr "Typ generatora"
@@ -20946,10 +21011,10 @@ msgid "steam_generator"
msgstr ""
msgid "Biogas Power Generator"
-msgstr ""
+msgstr "Generator na biogaz"
msgid "Biomass Power Generator"
-msgstr ""
+msgstr "Generator na biomasę"
msgid "Method"
msgstr "Metoda"
@@ -20982,25 +21047,25 @@ msgid "steam_turbine"
msgstr ""
msgid "Coal Power Generator"
-msgstr ""
+msgstr "Elektrownia węglowa"
msgid "Gas Power Generator"
-msgstr ""
+msgstr "Elektrownia gazowa"
msgid "combined_cycle"
msgstr ""
msgid "Oil Power Generator"
-msgstr ""
+msgstr "Elektrownia na ropę"
msgid "Diesel Power Generator"
-msgstr ""
+msgstr "Generator Diesla"
msgid "Gasoline Power Generator"
-msgstr ""
+msgstr "Generator benzynowy"
msgid "Nuclear Reactor"
-msgstr "reaktor atomowy"
+msgstr "Reaktor atomowy"
msgctxt "generator method"
msgid "fission"
@@ -21068,7 +21133,7 @@ msgid "Vodo-Vodyanoi Energetichesky Reactor (VVER)"
msgstr ""
msgid "Solar Power Generator"
-msgstr "Generator słoneczny"
+msgstr "Elektrownia słoneczna"
msgctxt "generator method"
msgid "photovoltaic"
@@ -21091,7 +21156,7 @@ msgid "thermal"
msgstr ""
msgid "Waste Power Generator"
-msgstr ""
+msgstr "Elektrownia na odpady"
msgctxt "generator method"
msgid "pyrolysis"
@@ -21137,7 +21202,7 @@ msgid "pelton_turbine"
msgstr ""
msgid "Tidal Water Turbine"
-msgstr ""
+msgstr "Elektrownia pływowa"
msgctxt "generator method"
msgid "barrage"
@@ -21157,19 +21222,19 @@ msgid "vertical_axis"
msgstr ""
msgid "Wave Energy Converter"
-msgstr ""
+msgstr "Elektrownia falowa"
msgid "Osmotic Power Generator"
-msgstr ""
+msgstr "Elektrownia osmotyczna"
msgid "Geothermal Power Generator"
-msgstr ""
+msgstr "Elektrownia geotermiczna"
msgid "heat_pump"
msgstr "pompa ciepła"
msgid "Wind Turbine"
-msgstr ""
+msgstr "Turbina wiatrowa"
msgid "Power Substation"
msgstr "Podstacja energetyczna"
@@ -21665,7 +21730,7 @@ msgid "Wayside Shrine"
msgstr "Kapliczka"
msgid "Place of worship"
-msgstr ""
+msgstr "Miejsce kultu religijnego"
msgctxt "building"
msgid "wayside_shrine"
@@ -21783,7 +21848,7 @@ msgid "Video Games"
msgstr "Gry wideo"
msgid "Music"
-msgstr "Muzyczny"
+msgstr "Sklep muzyczny (płytowy)"
msgid "Cash"
msgstr "Gotówka"
@@ -22077,13 +22142,13 @@ msgid "Cryptocurrencies"
msgstr "Kryptowaluta"
msgid "Bitcoin"
-msgstr ""
+msgstr "Bitcoin"
msgid "Dogecoin"
-msgstr ""
+msgstr "Dogecoin"
msgid "Litecoin"
-msgstr ""
+msgstr "Litecoin"
msgid "Geography"
msgstr "Geografia"
@@ -22131,7 +22196,7 @@ msgid "Title or type of protection"
msgstr ""
msgid "Border type"
-msgstr ""
+msgstr "Typ granicy"
msgid "baseline"
msgstr ""
@@ -22156,13 +22221,13 @@ msgstr "Kraj"
msgctxt "place"
msgid "State"
-msgstr ""
+msgstr "Województwo/Stan/Prowincja"
msgid "Region"
msgstr "Region"
msgid "County"
-msgstr "Okręg"
+msgstr "Powiat/Hrabstwo"
msgid "City"
msgstr "Miasto"
@@ -22180,10 +22245,10 @@ msgid "Isolated Dwelling"
msgstr "Pojedyncze zabudowania"
msgid "Suburb"
-msgstr "Przedmieście"
+msgstr "Dzielnica/Przedmieście"
msgid "Neighbourhood"
-msgstr "Dzielnica"
+msgstr "Osiedle/Sąsiedztwo"
msgid "Farm"
msgstr "Farma"
@@ -22195,13 +22260,13 @@ msgid "(please use isolated_dwelling for an isolated farm)"
msgstr ""
msgid "Locality"
-msgstr "Okolica"
+msgstr "Miejsce niezaludnione"
msgid "Peak"
msgstr "Szczyt"
msgid "The top (summit) of a mountain or hill."
-msgstr ""
+msgstr "Szczyt (wierzchołek) góry lub wzgórza."
msgid "Saddle"
msgstr "Przełęcz"
@@ -22241,6 +22306,18 @@ msgstr ""
msgid "scoria"
msgstr ""
+msgid "Ridge"
+msgstr "Grzbiet górski"
+
+msgid "A mountain or hill ridge."
+msgstr "Grzbiet górski lub wzgórza"
+
+msgid "Valley"
+msgstr "Dolina"
+
+msgid "A low area between hills."
+msgstr ""
+
msgid "Cave Entrance"
msgstr "Wejście do jaskini"
@@ -22253,12 +22330,6 @@ msgstr "Wyspa"
msgid "Islet"
msgstr "Wysepka"
-msgid "Ridge"
-msgstr "Grzbiet górski"
-
-msgid "A mountain or hill ridge."
-msgstr "Grzbiet górski lub wzgórza"
-
msgid "Nature"
msgstr "Natura"
@@ -22286,6 +22357,37 @@ msgstr ""
msgid "Forest"
msgstr "Las"
+msgid "Cutline"
+msgstr "Przecinka leśna"
+
+msgctxt "cutline"
+msgid "border"
+msgstr ""
+
+msgctxt "cutline"
+msgid "firebreak"
+msgstr ""
+
+msgctxt "cutline"
+msgid "hunting"
+msgstr ""
+
+msgctxt "cutline"
+msgid "loggingmachine"
+msgstr ""
+
+msgctxt "cutline"
+msgid "pipeline"
+msgstr ""
+
+msgctxt "cutline"
+msgid "piste"
+msgstr ""
+
+msgctxt "cutline"
+msgid "section"
+msgstr ""
+
msgid "Grassland"
msgstr "Teren trawiasty"
@@ -22502,7 +22604,7 @@ msgid "Street name"
msgstr "Nazwa ulicy"
msgid "Place name"
-msgstr ""
+msgstr "Nazwa miejsca"
msgid "City name"
msgstr "Nazwa miejscowości"
@@ -22916,10 +23018,10 @@ msgid "lcn"
msgstr ""
msgid "Mountain Biking Route"
-msgstr ""
+msgstr "Górski szlak rowerowy"
msgid "Hiking Route"
-msgstr ""
+msgstr "Szlak pieszy"
msgid "iwn"
msgstr ""
@@ -22940,7 +23042,7 @@ msgid "natural"
msgstr "naturalne"
msgid "Piste Route"
-msgstr ""
+msgstr "Trasa narciarska"
msgid "link segment"
msgstr ""
@@ -22955,25 +23057,25 @@ msgid "entry points"
msgstr ""
msgid "Ski Route"
-msgstr ""
+msgstr "Szlak narciarski"
msgid "alpine"
msgstr ""
msgid "Detour Route"
-msgstr ""
+msgstr "Objazd"
msgid "Destination"
msgstr ""
msgid "Ref of the way this is a detour to"
-msgstr ""
+msgstr "Numer drogi której dotyczy objazd"
msgid "fork node for alternative routes"
msgstr ""
msgid "Power Route"
-msgstr ""
+msgstr "Szlak energetyczny"
msgid "Railway Route"
msgstr "Szlak kolejowy"
@@ -23221,6 +23323,9 @@ msgstr ""
msgid "Unspecific tag {0}"
msgstr ""
+msgid "Definition of {0} is unclear"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -23472,7 +23577,7 @@ msgid "Processing..."
msgstr "Przetwarzanie..."
msgid "Aborted"
-msgstr ""
+msgstr "Anulowano"
msgid "Error executing the script: "
msgstr "Bład podczas wykonywania skryptu: "
@@ -23706,16 +23811,16 @@ msgid "Save as is"
msgstr ""
msgid "Snap to nodes"
-msgstr ""
+msgstr "Przyciągaj do węzłów"
msgid "Add fixed points on click"
-msgstr ""
+msgstr "Dodawaj nowe punkty przez kliknięcie"
msgid "Add fixed points on spacebar"
-msgstr ""
+msgstr "Dodawaj nowe punkty spacją"
msgid "Draw closed polygons only"
-msgstr ""
+msgstr "Rysuj tylko zamknięte wielokąty"
msgid "FastDraw configuration"
msgstr ""
@@ -24748,7 +24853,7 @@ msgid "address"
msgstr "adres"
msgid "locality"
-msgstr "okolica"
+msgstr "miejsce niezaludnione"
msgid "section"
msgstr ""
@@ -25127,7 +25232,7 @@ msgid "Is not vectorized."
msgstr "Nie jest zwektoryzowane."
msgid "Bounding box: {0}"
-msgstr ""
+msgstr "Obszar edycji: {0}"
msgid "Image size (px): {0}/{1}"
msgstr ""
@@ -26674,7 +26779,7 @@ msgid "XAPI query: "
msgstr ""
msgid "Download from Overpass API ..."
-msgstr ""
+msgstr "Pobierz z Overpass API ..."
msgid "Download map data from Overpass API server."
msgstr ""
@@ -26683,7 +26788,7 @@ msgid "Overpass query: "
msgstr ""
msgid "Select OSM mirror URL"
-msgstr ""
+msgstr "Wybierz adres serwera lustrzanego OSM"
msgid "Select OSM mirror URL to download from."
msgstr ""
@@ -28616,7 +28721,7 @@ msgstr ""
msgid "No object selected"
msgstr ""
-msgid "SeaMap Editor"
+msgid "SeaChart Editor"
msgstr ""
msgid "Seamark Inspector"
@@ -28688,6 +28793,9 @@ msgstr ""
msgid "Merge Nearby Nodes Threshold"
msgstr ""
+msgid "SeaMap Editor"
+msgstr ""
+
msgid "AutoSave LiveData"
msgstr ""
diff --git a/i18n/po/pt.po b/i18n/po/pt.po
index b5d50a6..1a2b763 100644
--- a/i18n/po/pt.po
+++ b/i18n/po/pt.po
@@ -7,16 +7,16 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-04 03:32+0100\n"
-"PO-Revision-Date: 2015-03-03 20:13+0000\n"
+"POT-Creation-Date: 2015-04-01 03:33+0200\n"
+"PO-Revision-Date: 2015-03-15 00:41+0000\n"
"Last-Translator: Rui <xande6ruz at yandex.com>\n"
"Language-Team: Portuguese <pt at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-03-04 04:54+0000\n"
-"X-Generator: Launchpad (build 17361)\n"
+"X-Launchpad-Export-Date: 2015-04-01 04:54+0000\n"
+"X-Generator: Launchpad (build 17413)\n"
"Language: pt\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -1877,9 +1877,15 @@ msgstr "Dados GPX descarregados"
msgid "Markers from {0}"
msgstr "Marcas de {0}"
+msgid "Download OSM Notes"
+msgstr "Descarregar erros reportados"
+
msgid "Downloading Notes"
msgstr "A descarregar erros reportados"
+msgid "Notes"
+msgstr "Erros reportados"
+
msgid "Download Compressed OSM Change"
msgstr "Descarregar OSM Change comprimido"
@@ -4235,6 +4241,8 @@ msgid ""
"With the currently used mappaint style the style for inner way equals the "
"multipolygon style"
msgstr ""
+"O estilo da linha interior (inner) é igual ao do multi-polígono, mudar as "
+"etiquetas para a relação"
msgid "Style for outer way mismatches"
msgstr "Etiqueta na linha exterior deve estar na relação"
@@ -4243,6 +4251,8 @@ msgid ""
"With the currently used mappaint style(s) the style for outer way mismatches "
"polygon"
msgstr ""
+"Uma etiqueta da linha exterior está em conflito com uma do multi-polígono, "
+"mudar as etiquetas para a relação e escolher a adequada"
msgid "Area style on outer way"
msgstr "Etiqueta de área na linha de contorno deve estar na relação"
@@ -4730,7 +4740,7 @@ msgid "Unnamed junction"
msgstr "Rotunda sem nome"
msgid "Untagged ways (commented)"
-msgstr "Linhas sem etiquetas (apenas com comentário)"
+msgstr "Linhas sem etiquetas (apenas c/ comentário ou área)"
msgid "Untagged ways"
msgstr "Linhas sem etiquetas"
@@ -6730,6 +6740,9 @@ msgstr "Preferências de estilo"
msgid "Customize the style"
msgstr "Personalizar o estilo"
+msgid "List of notes"
+msgstr "Lista de erros reportados"
+
msgid "Add comment"
msgstr "Adicionar comentário ao erro reportado"
@@ -7053,7 +7066,7 @@ msgid "Closed"
msgstr "Fechado"
msgid "ID"
-msgstr "Identificador"
+msgstr "ID (País: Indonésia; Estado Idaho)"
msgid "Open"
msgstr "Abrir"
@@ -8199,9 +8212,6 @@ msgstr ""
"Selecionar para descarregar trilhos GPS do OpenStreetMap na área selecionada "
"(será criada uma camada GPX)"
-msgid "Notes"
-msgstr "Erros reportados"
-
msgid "Select to download notes in the selected download area."
msgstr ""
"Selecione para descarregar erros reportados no mapa na área selecionada."
@@ -17491,7 +17501,7 @@ msgid "Reference"
msgstr "Referência"
msgid "Operator"
-msgstr "Empresa / operador"
+msgstr "Empresa/organismo que faz a gestão"
msgid "Service Times"
msgstr "Horário de Missas"
@@ -17609,9 +17619,6 @@ msgstr "centro desportivo"
msgid "stadium"
msgstr "estádio"
-msgid "Select sport:"
-msgstr "Selecione o desporto:"
-
msgid "Sport"
msgstr "Desporto"
@@ -17732,6 +17739,10 @@ msgid "rugby_union"
msgstr "râguebi de 15 (rugby union)"
msgctxt "sport"
+msgid "running"
+msgstr ""
+
+msgctxt "sport"
msgid "shooting"
msgstr "tiro"
@@ -17744,10 +17755,6 @@ msgid "skating"
msgstr "patinagem/skate"
msgctxt "sport"
-msgid "skiing"
-msgstr "esqui"
-
-msgctxt "sport"
msgid "soccer"
msgstr "futebol"
@@ -17990,7 +17997,7 @@ msgid "110000;20000"
msgstr "110000;20000"
msgid "Branch operator"
-msgstr ""
+msgstr "Operador da filial"
msgid "Amount of Cables"
msgstr "Número de Cabos"
@@ -18072,6 +18079,31 @@ msgstr "Peso máximo (toneladas)"
msgid "Toll"
msgstr "Com Portagem Física ou Eletrónica"
+msgid "Is the water body intermittent (disappears seasonally)?"
+msgstr ""
+"O corpo de água é ocasional (desaparece e aparece conforme as estações)?"
+
+msgid "culvert"
+msgstr ""
+
+msgid "Water access rules:"
+msgstr ""
+
+msgid "Ship"
+msgstr ""
+
+msgid "designated"
+msgstr "designado"
+
+msgid "Boat"
+msgstr ""
+
+msgid "Motorboat"
+msgstr ""
+
+msgid "Canoe"
+msgstr ""
+
msgid "Streets"
msgstr "Estradas"
@@ -18103,10 +18135,10 @@ msgid "Secondary Link"
msgstr "Ligação a Estrada Regional (Secundária)"
msgid "Tertiary"
-msgstr "Estrada Municipal (Terciária)"
+msgstr "Estrada / Caminho Municipal (Terciária)"
msgid "Tertiary Link"
-msgstr "Ligação a Estrada Municipal (Terciária)"
+msgstr "Ligação a Estrada / Caminho Municipal (Terciária)"
msgid "Unclassified"
msgstr "Estrada sem classificação oficial"
@@ -18153,7 +18185,7 @@ msgid "Living Street"
msgstr "Living Street (não existem em Portugal)"
msgid "Pedestrian"
-msgstr "Rua Pedonal"
+msgstr "Rua Pedonal (ou Praça numa área)"
msgid "Area"
msgstr "É uma área e não uma linha"
@@ -18180,7 +18212,7 @@ msgid "Parking Aisle"
msgstr "Estrada de Parque de Estacionamento"
msgid "Escape"
-msgstr "Rampa de Paragem de Emergência (para falhas nos travões)"
+msgstr "Escapatória (rampa de paragem de emergência)"
msgid ""
"Emergency lane beside long descending slopes for trucks and other vehicles "
@@ -18229,11 +18261,11 @@ msgstr "ligação_a_estrada_regional"
msgctxt "Highway"
msgid "tertiary"
-msgstr "estrada_municipal"
+msgstr "estrada ou caminho municipal"
msgctxt "Highway"
msgid "tertiary_link"
-msgstr "ligação_a_estrada_municipal"
+msgstr "ligação a estrada ou caminho municipal"
msgctxt "Highway"
msgid "bus_guideway"
@@ -18249,7 +18281,7 @@ msgstr "living street (não existem em Portugal)"
msgctxt "Highway"
msgid "pedestrian"
-msgstr "rua pedonal"
+msgstr "rua pedonal (ou praça numa área)"
msgctxt "Highway"
msgid "track"
@@ -18291,9 +18323,6 @@ msgstr "Restrições de transporte"
msgid "official"
msgstr "oficial (c/sinal permissão)"
-msgid "designated"
-msgstr "designado"
-
msgid "Vehicles per type"
msgstr "Veículos por tipo"
@@ -18692,6 +18721,9 @@ msgstr "dos ponteiros do relógio"
msgid "Pedestrian Crossing"
msgstr "Passagem de Peões (normalmente c/ passadeira)"
+msgid "In case of traffic signals:"
+msgstr ""
+
msgid "Traffic Calming"
msgstr "Redutor de Velocidade (lombas...)"
@@ -18940,15 +18972,12 @@ msgstr "Fosso / Vala / Trincheira"
msgid "Stream"
msgstr "Ribeiro"
-msgid "Wadi"
-msgstr ""
+msgid "River"
+msgstr "Rio"
msgid "Canal"
msgstr "Canal"
-msgid "River"
-msgstr "Rio"
-
msgid "Spring"
msgstr "Nascente"
@@ -19014,10 +19043,6 @@ msgstr "rio"
msgid "Salt Water"
msgstr "Água Salgada"
-msgid "Is the water body intermittent (disappears seasonally)?"
-msgstr ""
-"O corpo de água é ocasional (desaparece e aparece conforme as estações)?"
-
msgid "Coastline"
msgstr "Linha Costeira"
@@ -19860,6 +19885,9 @@ msgstr "Paragem de Autocarro"
msgid "Tactile Paving"
msgstr "Pavimento Táctil"
+msgid "incorrect"
+msgstr ""
+
msgid "Bus Platform"
msgstr "Plataforma Rodoviária"
@@ -19933,13 +19961,13 @@ msgid "Motel"
msgstr "Motel"
msgid "Guest House/Bed & Breakfast"
-msgstr ""
+msgstr "Pensão / Guest House / Hospedagem Domiciliar"
msgid "Chalet"
msgstr "Chalé"
msgid "Hostel"
-msgstr "Pousada / Hostel"
+msgstr "Pousada / Hostel / Albergue"
msgid "Alpine Hut"
msgstr "Albergue de Montanha"
@@ -20022,6 +20050,9 @@ msgstr "sushi"
msgid "Microbrewery"
msgstr "Destila e vende cerveja artesanal"
+msgid "Outdoor seating"
+msgstr ""
+
msgid "Fast Food"
msgstr "Comida Rápida (Fast Food)"
@@ -20619,16 +20650,14 @@ msgstr "Marco / caixa de correio"
msgid "Collection times"
msgstr "Horário de recolha"
-msgid "11:30"
-msgstr "11:30"
+msgid "Mo-Sa 09:00"
+msgstr ""
-msgid "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
+msgid "Mo-Fr 17:30; Sa 12:00"
msgstr ""
-"Segunda-Sexta 15:00,17:45,19:00,23:00; Sábado 15:10; Domingo 10:30,23:00"
-msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; Su,PH off"
+msgid "Mo-Fr 15:00,19:00; Sa 15:10; Su 10:30"
msgstr ""
-"Segunda-Sexta 09:00-12:00,17:15; Sábado 14:00; Domingos e feriados encerrado"
msgid "Drive through"
msgstr "Serviço ao volante (sem sair do carro)"
@@ -20886,6 +20915,15 @@ msgstr "Centro Desportivo"
msgid "Pitch"
msgstr "Campo"
+msgid "artificial_turf"
+msgstr ""
+
+msgid "decoturf"
+msgstr ""
+
+msgid "tartan"
+msgstr ""
+
msgid "Racetrack"
msgstr ""
"Pista de Corridas (não de Veículos a Motor): atletismo, ciclismo, equestre, "
@@ -20995,6 +21033,12 @@ msgstr "nórdico"
msgid "skitour"
msgstr "esqui-alpinismo"
+msgid "sled"
+msgstr ""
+
+msgid "sleigh"
+msgstr ""
+
msgid "snow_park"
msgstr "pista de gelo (em centros comerciais, etc.)"
@@ -21247,6 +21291,10 @@ msgctxt "building"
msgid "construction"
msgstr "em construção"
+msgctxt "building"
+msgid "Levels"
+msgstr ""
+
msgid "Residential Building"
msgstr "Edifício Residencial"
@@ -21282,6 +21330,16 @@ msgctxt "building"
msgid "farm"
msgstr "quinta"
+msgid "Building part"
+msgstr ""
+
+msgctxt "building"
+msgid "Skipped Levels"
+msgstr ""
+
+msgid "Skipped height (meters)"
+msgstr ""
+
msgid "Entrance"
msgstr "Entrada"
@@ -21327,7 +21385,7 @@ msgid "Flagpole"
msgstr "Mastro de Bandeira"
msgid "Works"
-msgstr "Edifício Industrial"
+msgstr "Área industrial / Fábrica"
msgid "Chimney"
msgstr "Chaminé Industrial"
@@ -21440,7 +21498,7 @@ msgid "zircon"
msgstr "zircão"
msgid "Visible Headframe"
-msgstr ""
+msgstr "Estrutura Principal Visível"
msgid "Disused"
msgstr "Abandonado"
@@ -21717,7 +21775,7 @@ msgid "gas_turbine"
msgstr "turbina a gás"
msgid "reciprocating_engine"
-msgstr ""
+msgstr "motor alternativo"
msgid "steam_generator"
msgstr "gerador de vapor"
@@ -21733,7 +21791,7 @@ msgstr "Método"
msgctxt "generator method"
msgid "anaerobic_digestion"
-msgstr ""
+msgstr "digestão anaeróbia/ biometanização"
msgctxt "generator method"
msgid "combustion"
@@ -21741,16 +21799,16 @@ msgstr "combustão"
msgctxt "generator method"
msgid "gasification"
-msgstr ""
+msgstr "fermentação"
msgid "bioreactor"
-msgstr ""
+msgstr "bioreator"
msgid "anaerobic_digestion / combustion"
-msgstr ""
+msgstr "digestão anaeróbia / combustão"
msgid "pyrolysis"
-msgstr ""
+msgstr "pirólise"
msgid "combustion"
msgstr "combustão"
@@ -21788,28 +21846,28 @@ msgid "fusion"
msgstr "fusão"
msgid "Boiling Water Reactor 1 (BWR-1)"
-msgstr ""
+msgstr "Reator de Água em Ebulição 1 (BWR-1)"
msgid "fission"
msgstr "fissão"
msgid "Boiling Water Reactor 2 (BWR-2)"
-msgstr ""
+msgstr "Reator de Água em Ebulição 2 (BWR-2)"
msgid "Boiling Water Reactor 3 (BWR-3)"
-msgstr ""
+msgstr "Reator de Água em Ebulição 3 (BWR-3)"
msgid "Boiling Water Reactor 4 (BWR-4)"
-msgstr ""
+msgstr "Reator de Água em Ebulição 4 (BWR-4)"
msgid "Boiling Water Reactor 5 (BWR-5)"
-msgstr ""
+msgstr "Reator de Água em Ebulição 5 (BWR-5)"
msgid "Boiling Water Reactor 6 (BWR-6)"
-msgstr ""
+msgstr "Reator de Água em Ebulição 6 (BWR-6)"
msgid "CANada Deuterium Uranium reactor (CANDU)"
-msgstr ""
+msgstr "Reator CANDU (Canada Deuterium Uranium)"
msgid "cold-fusion"
msgstr "fusão a frio"
@@ -21818,31 +21876,31 @@ msgid "fusion"
msgstr "fusão"
msgid "China Pressurized Reactor (CPR-1000)"
-msgstr ""
+msgstr "Reator Pressurizado Chinês (CPR-1000)"
msgid "European Pressurized Reactor (EPR)"
-msgstr ""
+msgstr "Reator Pressurizado Europeu (EPR)"
msgid "Inertial Confinement Fusion (ICF)"
-msgstr ""
+msgstr "Fusão de Confinamento Inercial (ICF)"
msgid "Pressurized water reactor (PWR)"
msgstr "Reator a água pressurizada (PWR)"
msgid "Reactor Bolshoy Moshchnosti Kanalniy 1000 (RBMK-1000)"
-msgstr ""
+msgstr "Reator Bolshoy Moshchnosti Kanalniy 1000 (RBMK-1000)"
msgid "Reactor Bolshoy Moshchnosti Kanalniy 1500 (RBMK-1500)"
-msgstr ""
+msgstr "Reator Bolshoy Moshchnosti Kanalniy 1500 (RBMK-1500)"
msgid "stellarator"
-msgstr ""
+msgstr "stellarator"
msgid "tokamak"
-msgstr ""
+msgstr "tokamak"
msgid "Vodo-Vodyanoi Energetichesky Reactor (VVER)"
-msgstr ""
+msgstr "Reator Vodo-Vodyanoi Energetichesky (VVER)"
msgid "Solar Power Generator"
msgstr "Gerador de Energia a Solar"
@@ -21872,13 +21930,13 @@ msgstr "Gerador de Energia a Desperdícios"
msgctxt "generator method"
msgid "pyrolysis"
-msgstr ""
+msgstr "pirólise"
msgid "gasification"
-msgstr ""
+msgstr "fermentação"
msgid "Water Turbine"
-msgstr ""
+msgstr "Turbina Hidráulica (normal em barragens)"
msgctxt "generator method"
msgid "run-of-the-river"
@@ -21886,55 +21944,55 @@ msgstr ""
msgctxt "generator method"
msgid "water-pumped-storage"
-msgstr ""
+msgstr "armazenamento de água bombeada (barragem reversível)"
msgctxt "generator method"
msgid "water-storage"
-msgstr ""
+msgstr "armazenamento de água (+comum em barragens)"
msgid "francis_turbine"
-msgstr ""
+msgstr "turbina francis"
msgid "all methods"
-msgstr ""
+msgstr "todos os métodos"
msgid "hydrodynamic_screw"
-msgstr ""
+msgstr "turbina em parafuso de arquimedes"
msgid "run-of-the-river"
msgstr ""
msgid "kaplan_turbine"
-msgstr ""
+msgstr "turbina kaplan"
msgid "run-of-the-river / water-storage"
msgstr ""
msgid "pelton_turbine"
-msgstr ""
+msgstr "turbina pelton"
msgid "Tidal Water Turbine"
msgstr "Turbina de Marés"
msgctxt "generator method"
msgid "barrage"
-msgstr ""
+msgstr "barragem"
msgctxt "generator method"
msgid "stream"
-msgstr ""
+msgstr "ponto fixo"
msgid "horizontal_axis"
-msgstr ""
+msgstr "eixo horizontal"
msgid "barrage"
-msgstr ""
+msgstr "barragem"
msgid "vertical_axis"
-msgstr ""
+msgstr "eixo vertical"
msgid "Wave Energy Converter"
-msgstr ""
+msgstr "Conversor de Energia das Marés"
msgid "Osmotic Power Generator"
msgstr "Gerador de Energia a Osmose"
@@ -21943,7 +22001,7 @@ msgid "Geothermal Power Generator"
msgstr "Gerador de Energia a Geotérmica"
msgid "heat_pump"
-msgstr ""
+msgstr "bomba a calor"
msgid "Wind Turbine"
msgstr "Turbina Eólica"
@@ -22005,7 +22063,7 @@ msgid "100 MVA"
msgstr "100 MVA"
msgid "Gas insulated"
-msgstr ""
+msgstr "Isolado a gás"
msgid "Power Transformer"
msgstr "Transformador de Energia"
@@ -22777,7 +22835,7 @@ msgid "Girocard"
msgstr "Girocard"
msgid "Laser"
-msgstr ""
+msgstr "Laser"
msgid "Maestro"
msgstr "Maestro"
@@ -22813,40 +22871,40 @@ msgid "Electronic purses and Charge cards"
msgstr "Bilhetes Eletrónicos (cartões recarregáveis ou não)"
msgid "Avant (fi)"
-msgstr ""
+msgstr "Avant (fi)"
msgid "Cash (ch)"
-msgstr ""
+msgstr "Cash (ch)"
msgid "Chipknip (nl)"
-msgstr ""
+msgstr "Chipknip (nl)"
msgid "Geldkarte (de)"
-msgstr ""
+msgstr "Geldkarte (de)"
msgid "Mep (pt)"
-msgstr ""
+msgstr "Mep (pt)"
msgid "Minicash (lu)"
-msgstr ""
+msgstr "Minicash (lu)"
msgid "Minipay (it)"
-msgstr ""
+msgstr "Minipay (it)"
msgid "Mondero (ar)"
-msgstr ""
+msgstr "Mondero (ar)"
msgid "Mondero 4b (es)"
-msgstr ""
+msgstr "Mondero 4b (es)"
msgid "Moneo (fr)"
-msgstr ""
+msgstr "Moneo (fr)"
msgid "Proton (be)"
-msgstr ""
+msgstr "Proton (be)"
msgid "Quick (au)"
-msgstr ""
+msgstr "Quick (au)"
msgid "Cryptocurrencies"
msgstr "Criptomoedas"
@@ -22885,10 +22943,10 @@ msgid "canton"
msgstr "cantão"
msgid "linguistic_community"
-msgstr ""
+msgstr "comunidade linguística"
msgid "ward"
-msgstr ""
+msgstr "ward"
msgid "Postal Code"
msgstr "Código Postal"
@@ -22980,10 +23038,10 @@ msgid "The top (summit) of a mountain or hill."
msgstr "O topo de uma montanha ou colina."
msgid "Saddle"
-msgstr ""
+msgstr "Ponto de Sela"
msgid "A saddle point between mountains or hills."
-msgstr ""
+msgstr "Um ponto de sela entre duas montanhas ou colinas"
msgid "Glacier"
msgstr "Glaciar"
@@ -22992,6 +23050,8 @@ msgid ""
"A persistent body of dense ice that is constantly moving under its own "
"weight."
msgstr ""
+"Um corpo persistente de gelo denso que se move constantemente sobre o seu "
+"próprio peso."
msgid "Volcano"
msgstr "Vulcão"
@@ -23017,6 +23077,18 @@ msgstr "em escudo"
msgid "scoria"
msgstr ""
+msgid "Ridge"
+msgstr "Cumeeira"
+
+msgid "A mountain or hill ridge."
+msgstr "Cumeeiras de uma montanha"
+
+msgid "Valley"
+msgstr ""
+
+msgid "A low area between hills."
+msgstr ""
+
msgid "Cave Entrance"
msgstr "Entrada de Caverna"
@@ -23029,12 +23101,6 @@ msgstr "Ilha"
msgid "Islet"
msgstr "Ilhéu"
-msgid "Ridge"
-msgstr "Cumeeira"
-
-msgid "A mountain or hill ridge."
-msgstr "Cumeeiras de uma montanha"
-
msgid "Nature"
msgstr "Natureza"
@@ -23058,10 +23124,42 @@ msgstr "Bosque"
msgid "Woodland where timber production does not dominate use."
msgstr ""
+"Bosque no qual não é predominante a produção de madeira para uso comercial."
msgid "Forest"
msgstr "Floresta"
+msgid "Cutline"
+msgstr ""
+
+msgctxt "cutline"
+msgid "border"
+msgstr ""
+
+msgctxt "cutline"
+msgid "firebreak"
+msgstr ""
+
+msgctxt "cutline"
+msgid "hunting"
+msgstr ""
+
+msgctxt "cutline"
+msgid "loggingmachine"
+msgstr ""
+
+msgctxt "cutline"
+msgid "pipeline"
+msgstr ""
+
+msgctxt "cutline"
+msgid "piste"
+msgstr ""
+
+msgctxt "cutline"
+msgid "section"
+msgstr ""
+
msgid "Grassland"
msgstr "Pradaria"
@@ -23309,43 +23407,43 @@ msgid "State"
msgstr "Estado (E.U.A., Brasil...)"
msgid "AL"
-msgstr "AL (Alabama, Alagoas)"
+msgstr "AL (País: Albânia; Estados: Alabama, Alagoas)"
msgid "AK"
msgstr "AK (Alaska)"
msgid "AZ"
-msgstr "AZ (Arizona)"
+msgstr "AZ (País: Azerbaijão; Estado: Arizona)"
msgid "AR"
-msgstr "AR (Arcansas, Arunachal Pradesh)"
+msgstr "AR (País: Arcansas; Estados: Arunachal Pradesh)"
msgid "CA"
-msgstr "CA (Califórnia)"
+msgstr "CA (País: Canadá; Estado: Califórnia)"
msgid "CO"
-msgstr "CO (Colorado)"
+msgstr "CO (País:Colômbia; Estado: Colorado)"
msgid "CT"
msgstr "CT (Coneticute)"
msgid "DE"
-msgstr "DE (Delaware)"
+msgstr "DE (País: Alemanha; Estado: Delaware)"
msgid "FL"
msgstr "FL (Flórida)"
msgid "GA"
-msgstr "GA (Geórgia)"
+msgstr "GA (País: Gabão; Estado: Geórgia)"
msgid "HI"
msgstr "HI (Havai)"
msgid "IL"
-msgstr "IL (Ilinóis)"
+msgstr "IL (País: Israel; Estado: Ilinóis)"
msgid "IN"
-msgstr "IN (Indiana)"
+msgstr "IN (País: Índia; Estado: Indiana)"
msgid "IA"
msgstr "IA (Iowa)"
@@ -23354,16 +23452,16 @@ msgid "KS"
msgstr "KS (Kansas)"
msgid "KY"
-msgstr "KY (Kentucky)"
+msgstr "KY (País: Ilhas Caimão; Estado: Kentucky)"
msgid "LA"
-msgstr "LA (Luisiana)"
+msgstr "LA (País: Laos; Estado: Luisiana)"
msgid "ME"
-msgstr "ME (Maine)"
+msgstr "ME (País:Marrocos; Estado: Maine)"
msgid "MD"
-msgstr "MD (Maryland)"
+msgstr "MD (País: Moldávia; Estado: Maryland)"
msgid "MA"
msgstr "MA (Massachusetts, Maranhão)"
@@ -23372,19 +23470,19 @@ msgid "MI"
msgstr "MI (Michigan)"
msgid "MN"
-msgstr "MN (Minnesota)"
+msgstr "MN (País: Mongólia; Estado: Minnesota)"
msgid "MS"
-msgstr "MS (Mississippi, Mato Grosso do Sul)"
+msgstr "MS (País: Monserrate; Estados: Mississippi, Mato Grosso do Sul)"
msgid "MO"
-msgstr "MO (Missouri)"
+msgstr "MO (País: Macau; Estado: Missouri)"
msgid "MT"
-msgstr "MT (Montana, Mato Grosso)"
+msgstr "MT (Páis: Malta; Estado: Montana, Mato Grosso)"
msgid "NE"
-msgstr "NE (Nebraska)"
+msgstr "NE (País: Níger; Estado: Nebraska)"
msgid "NV"
msgstr "NV (Nevada)"
@@ -23402,7 +23500,7 @@ msgid "NY"
msgstr "NY (Nova Iorque)"
msgid "NC"
-msgstr "NC (Carolina do Norte)"
+msgstr "NC (País: Nova Caledónia; Estado: Carolina do Norte)"
msgid "ND"
msgstr "ND (Dakota do Norte)"
@@ -23414,19 +23512,19 @@ msgid "OR"
msgstr "OR (Oregon)"
msgid "PA"
-msgstr "PA (Pensilvânia, Pará)"
+msgstr "PA (País: Panamá; Estados: Pensilvânia, Pará)"
msgid "RI"
msgstr "RI (Rhode Island)"
msgid "SC"
-msgstr "SC (Carolina do Sul, Santa Catarina)"
+msgstr "SC (País: Seicheles; Estados: Carolina do Sul, Santa Catarina)"
msgid "SD"
-msgstr "SD (Carolina do Sul)"
+msgstr "SD (País: Sudão; Estado: Carolina do Sul)"
msgid "TN"
-msgstr "TN (Tennessee)"
+msgstr "TN (País: Tunísia; Estado:Tennessee)"
msgid "TX"
msgstr "TX (Texas)"
@@ -23438,7 +23536,7 @@ msgid "VT"
msgstr "VT (Vermont)"
msgid "VA"
-msgstr "VA (Virgínia)"
+msgstr "VA (País: Cidade do Vaticano; Estado: Virgínia)"
msgid "WA"
msgstr "WA (Washington)"
@@ -23462,7 +23560,7 @@ msgid "MP"
msgstr "MP (Marianas Setentrionais)"
msgid "PR"
-msgstr "PR (Porto Rico, Paraná)"
+msgstr "PR (País: Porto Rico, Estado: Paraná)"
msgid "UM"
msgstr "UM (Ilhas Menores Distantes dos EUA)"
@@ -23521,6 +23619,8 @@ msgid ""
"It might be viewable to the end user (perhaps using a search system or a map "
"with pop-ups)."
msgstr ""
+"Pode ser visível pelo utilizador final (talvez usando um sistema de pesquisa "
+"ou uma mapa com pop-ups)"
msgctxt "note=*, fixme=*, description=*"
msgid "Similar but different tags:"
@@ -23952,13 +24052,13 @@ msgid "sport without physical feature"
msgstr "etiqueta desporto sem nenhuma outra etiqueta física, por ex. campo"
msgid "{0} should be on the node where {1} and {2} intersect"
-msgstr ""
+msgstr "{0} deve estar no nó onde{1} e {2} se cruzam"
msgid "alternative name without {0}"
msgstr "c/nome alternativo mas sem etiqueta {0}"
msgid "incomplete usage of {0} on a way without {1}"
-msgstr ""
+msgstr "uso incompleto de {0} numa via sem {1}"
msgid "{0}={1} is deprecated"
msgstr "{0}={1} está em desuso"
@@ -23973,6 +24073,7 @@ msgid ""
"''{0}'' does not specify the official mode of transportation, use ''{1}'' "
"for example"
msgstr ""
+"''{0}'' não especifica o uso oficial de transporte, use por exemplo ''{1}''"
msgid ""
"{0}={1} is unspecific. Instead of ''{1}'' please give more information about "
@@ -23992,6 +24093,8 @@ msgstr ""
msgid ""
"{0} is deprecated. Please delete this object and use a private layer instead"
msgstr ""
+"{0} está em desuso. Por favor elimine este elemento e use uma camada privada "
+"(sem enviar para o OSM)"
msgid "{0}={1} is unspecific. Please replace ''{1}'' by a specific value."
msgstr "{0}={1} é genérico. Substitua ''{1}'' por um valor específico."
@@ -24012,6 +24115,9 @@ msgstr ""
msgid "Unspecific tag {0}"
msgstr "Etiqueta genérica {0}"
+msgid "Definition of {0} is unclear"
+msgstr "A definição de {0} é incerta"
+
msgid "{0} on a node. Should be used on a way."
msgstr "{0} num nó. Deve ser usado numa linha."
@@ -24085,7 +24191,7 @@ msgid "{0} with multiple values"
msgstr "{0} com vários valores"
msgid "empty value in semicolon-separated ''{0}''"
-msgstr ""
+msgstr "valor vazio em separação por ponto e vírgula ''{0}''"
msgid "numerical key"
msgstr ""
@@ -24171,25 +24277,25 @@ msgid "''wikipedia''=''language:page title''"
msgstr "''wikipedia''=''língua:página''"
msgid "Hide icons at low zoom"
-msgstr ""
+msgstr "Esconder ícones em aproximações de vista baixas"
msgid "Less obtrusive node symbols at low zoom"
-msgstr ""
+msgstr "Símbolos de nós menos obstrutivos em aproximações de vista baixas"
msgid "Display street labels (at high zoom)"
-msgstr ""
+msgstr "Mostrar nomes das vias (em níveis de aproximação de vista altos)"
msgid "Use alternative turn restriction icon set"
msgstr "Usar conjunto de ícones alternativo em restrições de viragem"
msgid "OSM Export"
-msgstr ""
+msgstr "Exportar OSM"
msgid "Export traffic data to SUMO network file."
-msgstr ""
+msgstr "Exportar dados de tráfego para um ficheiro de rede SUMO."
msgid "SUMO Export"
-msgstr ""
+msgstr "Exportar SUMO"
msgid "Export"
msgstr "Exportar"
@@ -24219,7 +24325,7 @@ msgid "Importing CSV file ''%s''..."
msgstr "A importar o ficheiro CSV ''%s''..."
msgid "Markers of "
-msgstr ""
+msgstr "Marcadores de "
msgid "Show summary after import"
msgstr "Mostrar sumário após importar"
@@ -24249,18 +24355,23 @@ msgid ""
"No command has been found. Would you like to download and install default "
"commands now?"
msgstr ""
+"Não foram encontrados comandos. Quer descarregar e instalar os comandos de "
+"origem agora?"
msgid "No command found"
-msgstr ""
+msgstr "Não foram encontrados comandos"
msgid "Default commands have been successfully installed"
-msgstr ""
+msgstr "Os comandos de origem foram instalados com sucesso"
msgid ""
"Failed to download and install default commands.\n"
"\n"
"Error: {0}"
msgstr ""
+"Não foi possível descarregar e instalar os comandos de origem.\n"
+"\n"
+"Erro: {0}"
msgid "Processing..."
msgstr "A processar..."
@@ -24451,7 +24562,7 @@ msgid "Elevation Grid"
msgstr "Grelha de Elevação"
msgid "No SRTM data"
-msgstr ""
+msgstr "Sem dados SRTM"
msgid "Open the elevation profile window."
msgstr "Abre o painel de contornos de elevação."
@@ -24528,7 +24639,7 @@ msgid "FastDraw configuration"
msgstr "Configuração de DesenhoRápido"
msgid "Try copying tags from properties table"
-msgstr ""
+msgstr "Tente copiar as etiquetas da lista de etiquetas no painel direito"
msgid "Save settings"
msgstr "Gravar definições"
@@ -24781,7 +24892,7 @@ msgid "Layer Properties"
msgstr "Propriedades da Camada"
msgid "Error while creating image layer: {0}"
-msgstr ""
+msgstr "Erro ao criar a camada de imagem {0}"
msgid "Import image"
msgstr "Importar Imagem"
@@ -24802,19 +24913,19 @@ msgid "NanoLog of {0} lines, {1} of them with coordinates."
msgstr "NanoLog de {0} linhas, {1} delas com coordenadas."
msgid "Correlate with GPX..."
-msgstr ""
+msgstr "Correlacionar com o GPX..."
msgid "Put on GPX..."
-msgstr ""
+msgstr "Colocar no GPX..."
msgid "Correlate entries with GPS trace"
-msgstr ""
+msgstr "Correlacionar entradas com o trilho GPS"
msgid "Save layer..."
msgstr "Gravar camada..."
msgid "Save NanoLog layer"
-msgstr ""
+msgstr "Gravar camada NanoLog"
msgid "Open NanoLog panel"
msgstr "Abrir o painel NanoLog"
@@ -24823,7 +24934,7 @@ msgid "Open NanoLog file..."
msgstr "Abrir um ficheiro NanoLog..."
msgid "Could not read NanoLog file:"
-msgstr ""
+msgstr "Não foi possível ler o ficheiro NanoLog:"
msgid "Edit opening hours"
msgstr "Editar horário de abertura"
@@ -24861,40 +24972,40 @@ msgid "Error in timeformat"
msgstr "Erro no formato de tempo"
msgid "open end"
-msgstr "fim aberto"
+msgstr "fecho indeterminado"
msgid "Import Osm Inspector Bugs..."
-msgstr ""
+msgstr "Importar Erros do OSM Inspetor"
msgid "OsmInspector"
-msgstr ""
+msgstr "OsmInspector"
msgid "Open OsmInspector"
msgstr "Abrir OsmInspector"
msgid "OsmBugInfo"
-msgstr ""
+msgstr "OsmBugInfo"
msgid "Open a OSM Inspector selection list window."
-msgstr ""
+msgstr "Abrir uma janela de seleção de lista do OSM Inspector"
msgid "Current Selected Bug Info"
-msgstr ""
+msgstr "Informações do Erro Selecionado Atual"
msgid "Prev OSMI bug"
-msgstr ""
+msgstr "Erro OSMI anterior"
msgid "Next OSMI bug"
-msgstr ""
+msgstr "Erro OSMI seguinte"
msgid "Osm Inspector Bugs"
-msgstr ""
+msgstr "Osm Inspector Bugs"
msgid "OSM Inspector Bugs"
-msgstr ""
+msgstr "OSM Inspector Bugs"
msgid "Selected Bug Info"
-msgstr ""
+msgstr "Informações do Erro Selecionado"
msgid "Handy Address Interpolation Functions"
msgstr "Funções práticas para endereços com números de porta interpolados"
@@ -25399,10 +25510,10 @@ msgid "Area Selection"
msgstr "Seleção de Área"
msgid "Select an area (e.g. building) from an underlying image."
-msgstr ""
+msgstr "Selecione uma área (por ex. um edifício) de uma imagem por baixo"
msgid "Area Selector"
-msgstr ""
+msgstr "Selecionador de Área"
msgid "Created area"
msgstr "Área criada"
@@ -25417,12 +25528,14 @@ msgid "Something went wrong!"
msgstr "Algo correu mal!"
msgid "Please file a bug report on the github project page under"
-msgstr ""
+msgstr "Por favor preencha um relatório de erro na página do github em"
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 ""
+"Conte-nos o que fez e o que aconteceu e adicione o seguinte texto no "
+"relatório de erro, para que possamos encontrar a origem do problema."
msgid "Area detection algorithm settings."
msgstr "Definições do algoritmo de deteção de área."
@@ -25434,6 +25547,8 @@ msgid ""
"The color threshold defines how far the color can be of the original color "
"to be selected (Default: {0})."
msgstr ""
+"O intervalo de cor define até quanto a cor pode ser da cor original para ser "
+"selecionado (Padrão: {0})."
msgid "Color Threshold"
msgstr "Limiar de Cor"
@@ -25442,12 +25557,14 @@ msgid ""
"Maximum distance away each point in the sequence can be from a line, in "
"pixels (Default: {0})."
msgstr ""
+"Distância máxima entre cada ponto na sequência pode ser de uma linha, em "
+"pixéis (Padrão: {0})."
msgid "Tolerance Distance"
msgstr "Distância de Tolerância"
msgid "Tolerance for fitting angles, in radians (Default {0})."
-msgstr ""
+msgstr "Tolerância para ângulos que se enquadrem, em radianos (Padrão: {0})."
msgid "Tolerance Angle"
msgstr "Ângulo de Tolerância"
@@ -25462,7 +25579,7 @@ msgid "show address dialog"
msgstr "mostrar janela de endereço"
msgid "Merge nodes with neighbors"
-msgstr ""
+msgstr "Fundir nós com nós vizinhos"
msgid "merge nodes"
msgstr "fundir nós"
@@ -25843,6 +25960,8 @@ msgstr ""
msgid "Replace greyscale by white color (smaller files and memory usage)."
msgstr ""
+"Substituir escala de cinzento por branco (ficheiros mais pequenos e menos "
+"uso de memória)"
msgid "Display crosspieces:"
msgstr "Mostrar cruzes:"
@@ -26178,57 +26297,57 @@ msgid "Color Schemes"
msgstr "Esquema de Cores"
msgid "Conflate object pair"
-msgstr ""
+msgstr "Fundir par do objeto"
msgid "Added {0} object to subject layer"
msgid_plural "Added {0} objects to subject layer"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Adicionado {0} objeto à camada sujeita a fusão"
+msgstr[1] "Adicionados {0} objetos à camada sujeita a fusão"
msgid "Conflation"
-msgstr ""
+msgstr "Fusão de dados"
msgid "Activates the conflation plugin"
-msgstr ""
+msgstr "Ativa o módulo de fusão de dados"
msgid "Matches"
-msgstr ""
+msgstr "Correspondências"
msgid "Reference only"
-msgstr ""
+msgstr "Apenas referência"
msgid "Subject only"
-msgstr ""
+msgstr "Apenas sujeita a fusão"
msgid "Matches ({0})"
-msgstr ""
+msgstr "Correspondências ({0})"
msgid "Reference only ({0})"
-msgstr ""
+msgstr "Apenas referência ({0})"
msgid "Subject only ({0})"
-msgstr ""
+msgstr "Apenas sujeita a fusão ({0})"
msgid "Configure conflation options"
-msgstr ""
+msgstr "Configurar opções de fusão de dados"
msgid "Delete {0} conflation matches"
-msgstr ""
+msgstr "Eliminar {0} correspondências de fusão"
msgid "Remove {0} unmatched objects"
-msgstr ""
+msgstr "Remover {0} objetos sem correspondência"
msgid "Remove selected matches"
-msgstr ""
+msgstr "Remover correspondências selecionadas"
msgid "Conflate"
-msgstr ""
+msgstr "Fundir dados"
msgid "Conflate selected objects"
-msgstr ""
+msgstr "Fundir objetos selecionados"
msgid "Conflation: {0}"
-msgstr ""
+msgstr "Fusão: {0}"
msgid "Cannot replace geometry."
msgstr "Não foi possível substituir a geometria."
@@ -26243,52 +26362,52 @@ msgid "Select the primitives currently selected in the list"
msgstr "Selecione os objetos atualmente selecionados na lista"
msgid "Match finder settings"
-msgstr ""
+msgstr "Definições do pesquisador de correspondências"
msgid "Match finder method"
-msgstr ""
+msgstr "Método do pesquisador de correspondências"
msgid "Threshold distance"
msgstr "Limiar de distância"
msgid "Distances greater than this will result in a score of zero."
-msgstr ""
+msgstr "Distâncias maiores que isto não terão correspondências."
msgid "Centroid distance"
-msgstr ""
+msgstr "Distância centroide"
msgid "Hausdorff distance"
-msgstr ""
+msgstr "Distância Hausdorff"
msgid "Configure conflation settings"
-msgstr ""
+msgstr "Configurar definições de fusão"
msgid "Generate matches"
-msgstr ""
+msgstr "Gerar correspondências"
msgid "Subject"
-msgstr ""
+msgstr "Sujeito a fusão"
msgid "Selections must be made for both reference and subject."
-msgstr ""
+msgstr "As seleções devem ser feitas para a referência e o sujeito a fusão"
msgid "Incomplete selections"
msgstr "Seleções incompletas"
msgid "Restore subject selection"
-msgstr ""
+msgstr "Restaurar seleção do sujeito a fusão"
msgid "Restore reference selection"
-msgstr ""
+msgstr "Restaurar seleção da referência"
msgid "Freeze subject selection"
-msgstr ""
+msgstr "Congelar seleção do sujeito a fusão"
msgid "No valid OSM data layer present."
-msgstr ""
+msgstr "Não está presente nenhuma camada de dados do OpenStreetMap válida."
msgid "Error freezing selection"
-msgstr ""
+msgstr "Erro ao congelar a seleção"
msgid "Nothing is selected, please try again."
msgstr "Não está nada selecionado, tente de novo."
@@ -26297,7 +26416,7 @@ msgid "Empty selection"
msgstr "Seleção vazia"
msgid "Invalid reference or subject"
-msgstr ""
+msgstr "Referência ou sujeito a fusão inválidos"
msgid "Address"
msgstr "Endereço"
@@ -26449,7 +26568,7 @@ msgid "Login"
msgstr "Iniciar sessão"
msgid "Enable autologin"
-msgstr "Ativar innício de sessão automático"
+msgstr "Ativar início de sessão automático"
msgid "{0} user"
msgid_plural "{0} users"
@@ -26460,7 +26579,7 @@ msgid "not logged in"
msgstr "sem sessão iniciada"
msgid "Failed to log in to GeoChat:"
-msgstr ""
+msgstr "Não foi possóvel ligar o GeoChat:"
msgid "Failed to send message:"
msgstr "Não foi possível enviar a mensagem:"
@@ -27153,7 +27272,7 @@ msgid "Uploading a new offset..."
msgstr ""
msgid "This string should be 3 to 200 letters long."
-msgstr ""
+msgstr "Este texto deve ter entre 3 e 200 caracteres."
msgid "Adjust imagery"
msgstr ""
@@ -27231,7 +27350,7 @@ msgid "SVG files [ImportVec plugin] (*.svg)"
msgstr ""
msgid "Please open or create data layer before importing"
-msgstr ""
+msgstr "Por favor abra ou crie uma camada antes de importar"
msgid "InfoMode"
msgstr ""
@@ -27740,13 +27859,13 @@ msgid "XAPI query: "
msgstr "Pedido XAPI: "
msgid "Download from Overpass API ..."
-msgstr ""
+msgstr "Descarregar da API Overpass..."
msgid "Download map data from Overpass API server."
-msgstr ""
+msgstr "Descarregar dados do mapa da API Overpass."
msgid "Overpass query: "
-msgstr ""
+msgstr "Pedido Overpass: "
msgid "Select OSM mirror URL"
msgstr "Escolha o endereço web do servidor espelho do OpenStreetMap"
@@ -27760,7 +27879,7 @@ msgid "Base URL"
msgstr "URL de Base"
msgid "Enforce meta data"
-msgstr ""
+msgstr "Forçar meta dados"
msgid "About Plugin"
msgstr "Sobre o Módulo"
@@ -27909,13 +28028,13 @@ msgid "Split this data by neighbourhood (admin_level=11)."
msgstr "Dividir estes dados por bairros (admin_level=11)."
msgid "Download open data"
-msgstr ""
+msgstr "Descarregar dados abertos"
msgid "License URL not available: {0}"
msgstr "URL da licença não disponível: {0}"
msgid "OpenData preferences"
-msgstr ""
+msgstr "Preferências do módulo DadosAbertos"
msgid "License Agreement"
msgstr "Acordo de Licenciamento"
@@ -28018,7 +28137,7 @@ msgstr ""
"Mostra as diferenças entre o conjunto de dados atual e os dados do OSM."
msgid "Open tools menu for this data."
-msgstr ""
+msgstr "Abrir o menu de ferramentas para estes dados."
msgid "Open the OpenData window."
msgstr "Mostra o painel do módulo DadosAbertos."
@@ -28133,6 +28252,8 @@ msgid ""
"Unable to detect Coordinate Reference System.\n"
"Would you like to fallback to ESPG:4326 (WGS 84) ?"
msgstr ""
+"Não foi possível detetar o Sistema de Referência de Coordenadas.\n"
+"Quer reverter para o ESPG:4326 (WGS 84) ?"
msgid "Warning: CRS not found"
msgstr ""
@@ -28168,6 +28289,8 @@ msgstr "Ver a página wiki do OSM"
msgid "Launch browser to the OSM Wiki page of the selected data set"
msgstr ""
+"Abrir o navegador de internet sobre a página wiki do OpenStreetMap sobre o "
+"conjunto de dados selecionados"
msgid "View Local Portal page"
msgstr "Ver página do Portal Local"
@@ -29409,7 +29532,7 @@ msgid "Reconstruct polygons from relation {0}"
msgstr "Reconstruir linhas fechadas da relação {0}"
msgid "Reconstruct route"
-msgstr ""
+msgstr "Reconstruir rota"
msgid "Open relation wiki page"
msgstr "Abrir página wiki da relação"
@@ -29440,10 +29563,10 @@ msgid "Relation has streets with different names"
msgstr "A relação contém estradas com nomes diferentes"
msgid "fix associatedStreet relation"
-msgstr ""
+msgstr "corrigir relação de Estrada Associada"
msgid "Relation without ''subarea'' role found"
-msgstr ""
+msgstr "Encontrada relação sem a função ''subarea''"
msgid "Node without ''label'' or ''admin_centre'' role found"
msgstr ""
@@ -29804,8 +29927,8 @@ msgstr "Gravar ficheiro Separate Data Store"
msgid "No object selected"
msgstr "Nenhum objeto selecionado"
-msgid "SeaMap Editor"
-msgstr "Editor SeaMap"
+msgid "SeaChart Editor"
+msgstr ""
msgid "Seamark Inspector"
msgstr ""
@@ -29814,7 +29937,7 @@ msgid "Select only one object"
msgstr "Selecione apenas 1 objeto"
msgid "Select a map object"
-msgstr ""
+msgstr "Selecionar um objeto do mapa"
msgid "Simplify Area"
msgstr "Simplificar Área"
@@ -29891,6 +30014,9 @@ msgstr "Fator de Distância"
msgid "Merge Nearby Nodes Threshold"
msgstr "Limiar de Fusão de Nós Adjacentes"
+msgid "SeaMap Editor"
+msgstr "Editor SeaMap"
+
msgid "AutoSave LiveData"
msgstr "Gravar Automaticamente"
@@ -30018,7 +30144,7 @@ msgid "create an associatedStreet relation"
msgstr "criar uma relação de ''estrada associada''"
msgid "keep outline way"
-msgstr ""
+msgstr "manter via de contorno"
msgid "Street name: "
msgstr "Nome da rua: "
@@ -30140,7 +30266,7 @@ msgid "Tracer2 error"
msgstr ""
msgid "Parameter for server request"
-msgstr ""
+msgstr "Parâmetro para pedido ao servidor"
msgid "Tile size:"
msgstr "Tamanho da tela:"
@@ -30155,28 +30281,28 @@ msgid "Threshold:"
msgstr "Limiar:"
msgid "Points per circle:"
-msgstr ""
+msgstr "Pontos por círculo:"
msgid "Tag:"
msgstr "Etiqueta:"
msgid "Preferred values:"
-msgstr ""
+msgstr "Valores preferidos:"
msgid "Delete parameter \"{0}\"?"
-msgstr ""
+msgstr "Eliminar parâmetro \"{0}\"?"
msgid "Add new"
msgstr "Adicionar novo"
msgid "Add predefined"
-msgstr ""
+msgstr "Adicionar pré-definido"
msgid "Select predefined parameter"
-msgstr ""
+msgstr "Selecione o parâmetro pré-definido"
msgid "Modify list of parameter for server request."
-msgstr ""
+msgstr "Modificar lista de parâmetros para pedido ao servidor."
msgid "Parameter:"
msgstr "Parâmetro:"
@@ -31297,7 +31423,7 @@ msgid "Unglued Relations"
msgstr "Relações Desligadas"
msgid "Change relation member for {0} {1}"
-msgstr ""
+msgstr "Alterar membro da relação para {0} {1}"
msgid "Circle arc"
msgstr "Arco de circunferência"
@@ -31418,7 +31544,7 @@ msgid "Tag multiple objects [alpha]"
msgstr "Etiquetar vários objetos [alpha]"
msgid "Edit tags of object list in table"
-msgstr ""
+msgstr "Editar etiquetas da lista de ojetos da tabela"
msgid "Tag multiple objects"
msgstr "Etiquetar vários objetos"
@@ -31436,10 +31562,10 @@ msgid "Delete tags from multiple objects"
msgstr "Remover etiquetas de vários objetos"
msgid "Duplicate tags from the first"
-msgstr ""
+msgstr "Duplicar etiquetas da lista"
msgid "Set tags for multiple objects"
-msgstr ""
+msgstr "Definir etiquetas para vários objetos"
msgid "Delete from history"
msgstr "Eliminar dos histórico"
@@ -31702,7 +31828,7 @@ msgid "Keep centered"
msgstr "Manter centrado"
msgid "follows the video icon automatically"
-msgstr ""
+msgstr "segue o ícone do vídeo automaticamente"
msgid "Subtitles"
msgstr "Legendas"
@@ -31771,7 +31897,7 @@ msgid "mute"
msgstr "silenciar"
msgid "Walking Papers Scanned Map"
-msgstr ""
+msgstr "Mapa Digitalizado do Walking Papers"
msgid ""
"Display a map that was previously scanned and uploaded to walking-papers.org"
@@ -31898,10 +32024,10 @@ msgid "Available via WIWOSM server"
msgstr "Disponível pelo servidor WIWOSM (Wikipedia where in OSM)"
msgid "Available in local dataset"
-msgstr "Disponível no conjunto de dados local"
+msgstr "Já aplicado num objeto no mapa local"
msgid "Not linked yet"
-msgstr "Ainda não ligado"
+msgstr "Nenhum objeto no mapa local com esta etiqueta da Wikipédia"
msgid "{0}.Wikipedia.org"
msgstr "{0}.Wikipedia.org"
diff --git a/i18n/po/pt_BR.po b/i18n/po/pt_BR.po
index d837e4c..88c4dd0 100644
--- a/i18n/po/pt_BR.po
+++ b/i18n/po/pt_BR.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-04 03:32+0100\n"
+"POT-Creation-Date: 2015-04-01 03:33+0200\n"
"PO-Revision-Date: 2015-02-05 00:48+0000\n"
"Last-Translator: Felipe L. <felipe.idj at hotmail.com>\n"
"Language-Team: Português Brasileiro <gnome-pt_br-list at gnome.org>\n"
@@ -16,8 +16,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2015-03-04 05:03+0000\n"
-"X-Generator: Launchpad (build 17361)\n"
+"X-Launchpad-Export-Date: 2015-04-01 05:02+0000\n"
+"X-Generator: Launchpad (build 17413)\n"
"Language: pt_BR\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -1850,9 +1850,15 @@ msgstr "Dados GPX baixados"
msgid "Markers from {0}"
msgstr "Marcadores de {0}"
+msgid "Download OSM Notes"
+msgstr ""
+
msgid "Downloading Notes"
msgstr "Baixando notas"
+msgid "Notes"
+msgstr "Notas"
+
msgid "Download Compressed OSM Change"
msgstr "Baixar modificações OSM comprimidas"
@@ -6664,6 +6670,9 @@ msgstr "Configurações do estilo"
msgid "Customize the style"
msgstr "Personalizar o estilo"
+msgid "List of notes"
+msgstr ""
+
msgid "Add comment"
msgstr "Adicionar comentário"
@@ -8118,9 +8127,6 @@ 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."
@@ -17377,9 +17383,6 @@ msgstr "sports_centre"
msgid "stadium"
msgstr "estádio"
-msgid "Select sport:"
-msgstr "Selecionar esporte:"
-
msgid "Sport"
msgstr "Esporte"
@@ -17500,6 +17503,10 @@ msgid "rugby_union"
msgstr "rugby_union"
msgctxt "sport"
+msgid "running"
+msgstr ""
+
+msgctxt "sport"
msgid "shooting"
msgstr "Clube de Tiro"
@@ -17512,10 +17519,6 @@ msgid "skating"
msgstr "Skate"
msgctxt "sport"
-msgid "skiing"
-msgstr "Esqui"
-
-msgctxt "sport"
msgid "soccer"
msgstr "futebol"
@@ -17840,6 +17843,30 @@ msgstr "Peso máximo (toneladas)"
msgid "Toll"
msgstr "Pedágio"
+msgid "Is the water body intermittent (disappears seasonally)?"
+msgstr "O corpo de água é intermitente (desaparece sazonalmente)?"
+
+msgid "culvert"
+msgstr ""
+
+msgid "Water access rules:"
+msgstr ""
+
+msgid "Ship"
+msgstr ""
+
+msgid "designated"
+msgstr "designado"
+
+msgid "Boat"
+msgstr ""
+
+msgid "Motorboat"
+msgstr ""
+
+msgid "Canoe"
+msgstr ""
+
msgid "Streets"
msgstr "Ruas"
@@ -18055,9 +18082,6 @@ msgstr "Restrições do modo de transporte"
msgid "official"
msgstr "oficial"
-msgid "designated"
-msgstr "designado"
-
msgid "Vehicles per type"
msgstr "Veículos por tipo"
@@ -18460,6 +18484,9 @@ msgstr "sentido horário"
msgid "Pedestrian Crossing"
msgstr "Faixa de pedestres"
+msgid "In case of traffic signals:"
+msgstr ""
+
msgid "Traffic Calming"
msgstr "Redutor de velocidade"
@@ -18706,15 +18733,12 @@ msgstr "Canal Artificial"
msgid "Stream"
msgstr "Córrego"
-msgid "Wadi"
-msgstr "Wadi"
+msgid "River"
+msgstr "Rio"
msgid "Canal"
msgstr "Canal"
-msgid "River"
-msgstr "Rio"
-
msgid "Spring"
msgstr "Fonte"
@@ -18782,9 +18806,6 @@ msgstr "rio"
msgid "Salt Water"
msgstr "Água salgada"
-msgid "Is the water body intermittent (disappears seasonally)?"
-msgstr "O corpo de água é intermitente (desaparece sazonalmente)?"
-
msgid "Coastline"
msgstr "Linha Costeira"
@@ -19630,6 +19651,9 @@ msgstr "Ponto de Ônibus"
msgid "Tactile Paving"
msgstr "Piso táctil"
+msgid "incorrect"
+msgstr ""
+
msgid "Bus Platform"
msgstr "Plataforma de Ônibus"
@@ -19792,6 +19816,9 @@ msgstr "sushi"
msgid "Microbrewery"
msgstr "Microcervejaria"
+msgid "Outdoor seating"
+msgstr ""
+
msgid "Fast Food"
msgstr "Lanchonete"
@@ -20389,14 +20416,14 @@ msgstr "Caixa de Correio"
msgid "Collection times"
msgstr "Tempos de coleta"
-msgid "11:30"
-msgstr "11:30"
+msgid "Mo-Sa 09:00"
+msgstr ""
-msgid "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
-msgstr "Seg-Sex 15:00,17:45,19:00,23:00; Sáb 15:10; Dom 10:30,23:00"
+msgid "Mo-Fr 17:30; Sa 12:00"
+msgstr ""
-msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; Su,PH off"
-msgstr "Seg-Sex 09:00-12:00,17:15; Sáb 14:00; Dom, não em feriados"
+msgid "Mo-Fr 15:00,19:00; Sa 15:10; Su 10:30"
+msgstr ""
msgid "Drive through"
msgstr "Dirija através de"
@@ -20654,6 +20681,15 @@ msgstr "Centro de Esportes"
msgid "Pitch"
msgstr "Campo"
+msgid "artificial_turf"
+msgstr ""
+
+msgid "decoturf"
+msgstr ""
+
+msgid "tartan"
+msgstr ""
+
msgid "Racetrack"
msgstr "Pista de Corrida"
@@ -20761,6 +20797,12 @@ msgstr "nórdico"
msgid "skitour"
msgstr "skitour"
+msgid "sled"
+msgstr ""
+
+msgid "sleigh"
+msgstr ""
+
msgid "snow_park"
msgstr "snow_park"
@@ -21013,6 +21055,10 @@ msgctxt "building"
msgid "construction"
msgstr "construção"
+msgctxt "building"
+msgid "Levels"
+msgstr ""
+
msgid "Residential Building"
msgstr "Edifício Residencial"
@@ -21048,6 +21094,16 @@ msgctxt "building"
msgid "farm"
msgstr "fazenda"
+msgid "Building part"
+msgstr ""
+
+msgctxt "building"
+msgid "Skipped Levels"
+msgstr ""
+
+msgid "Skipped height (meters)"
+msgstr ""
+
msgid "Entrance"
msgstr "Entrada"
@@ -22785,6 +22841,18 @@ msgstr "blindagem"
msgid "scoria"
msgstr "escória"
+msgid "Ridge"
+msgstr "Cume"
+
+msgid "A mountain or hill ridge."
+msgstr "Uma montanha ou o cume do monte."
+
+msgid "Valley"
+msgstr ""
+
+msgid "A low area between hills."
+msgstr ""
+
msgid "Cave Entrance"
msgstr "Entrada de Caverna"
@@ -22797,12 +22865,6 @@ msgstr "Ilha"
msgid "Islet"
msgstr "Ilhota"
-msgid "Ridge"
-msgstr "Cume"
-
-msgid "A mountain or hill ridge."
-msgstr "Uma montanha ou o cume do monte."
-
msgid "Nature"
msgstr "Natureza"
@@ -22830,6 +22892,37 @@ msgstr "Woodland, onde a produção de madeira não dominam o uso."
msgid "Forest"
msgstr "Floresta"
+msgid "Cutline"
+msgstr ""
+
+msgctxt "cutline"
+msgid "border"
+msgstr ""
+
+msgctxt "cutline"
+msgid "firebreak"
+msgstr ""
+
+msgctxt "cutline"
+msgid "hunting"
+msgstr ""
+
+msgctxt "cutline"
+msgid "loggingmachine"
+msgstr ""
+
+msgctxt "cutline"
+msgid "pipeline"
+msgstr ""
+
+msgctxt "cutline"
+msgid "piste"
+msgstr ""
+
+msgctxt "cutline"
+msgid "section"
+msgstr ""
+
msgid "Grassland"
msgstr "Pradaria"
@@ -23785,6 +23878,9 @@ msgstr ""
msgid "Unspecific tag {0}"
msgstr ""
+msgid "Definition of {0} is unclear"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr "{0} em um nó. Deveria ser usado em uma via."
@@ -29575,8 +29671,8 @@ msgstr "Salvar arquivo SDS"
msgid "No object selected"
msgstr ""
-msgid "SeaMap Editor"
-msgstr "Editor SeaMap"
+msgid "SeaChart Editor"
+msgstr ""
msgid "Seamark Inspector"
msgstr ""
@@ -29659,6 +29755,9 @@ msgstr "Fator de distância"
msgid "Merge Nearby Nodes Threshold"
msgstr "Unir nós próximos"
+msgid "SeaMap Editor"
+msgstr "Editor SeaMap"
+
msgid "AutoSave LiveData"
msgstr "AutoSave LiveData"
diff --git a/i18n/po/rm.po b/i18n/po/rm.po
index 297e62a..dfad704 100644
--- a/i18n/po/rm.po
+++ b/i18n/po/rm.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-04 03:32+0100\n"
+"POT-Creation-Date: 2015-04-01 03:33+0200\n"
"PO-Revision-Date: 2009-06-21 19:14+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: Raeto-Romance <rm at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n !=1;\n"
-"X-Launchpad-Export-Date: 2015-03-04 04:55+0000\n"
-"X-Generator: Launchpad (build 17361)\n"
+"X-Launchpad-Export-Date: 2015-04-01 04:54+0000\n"
+"X-Generator: Launchpad (build 17413)\n"
"Language: \n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -1696,9 +1696,15 @@ msgstr ""
msgid "Markers from {0}"
msgstr ""
+msgid "Download OSM Notes"
+msgstr ""
+
msgid "Downloading Notes"
msgstr ""
+msgid "Notes"
+msgstr ""
+
msgid "Download Compressed OSM Change"
msgstr ""
@@ -6109,6 +6115,9 @@ msgstr ""
msgid "Customize the style"
msgstr ""
+msgid "List of notes"
+msgstr ""
+
msgid "Add comment"
msgstr ""
@@ -7428,9 +7437,6 @@ 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 ""
@@ -15682,9 +15688,6 @@ msgstr ""
msgid "stadium"
msgstr ""
-msgid "Select sport:"
-msgstr ""
-
msgid "Sport"
msgstr ""
@@ -15805,19 +15808,19 @@ msgid "rugby_union"
msgstr ""
msgctxt "sport"
-msgid "shooting"
+msgid "running"
msgstr ""
msgctxt "sport"
-msgid "skateboard"
+msgid "shooting"
msgstr ""
msgctxt "sport"
-msgid "skating"
+msgid "skateboard"
msgstr ""
msgctxt "sport"
-msgid "skiing"
+msgid "skating"
msgstr ""
msgctxt "sport"
@@ -16145,6 +16148,30 @@ msgstr ""
msgid "Toll"
msgstr ""
+msgid "Is the water body intermittent (disappears seasonally)?"
+msgstr ""
+
+msgid "culvert"
+msgstr ""
+
+msgid "Water access rules:"
+msgstr ""
+
+msgid "Ship"
+msgstr ""
+
+msgid "designated"
+msgstr ""
+
+msgid "Boat"
+msgstr ""
+
+msgid "Motorboat"
+msgstr ""
+
+msgid "Canoe"
+msgstr ""
+
msgid "Streets"
msgstr ""
@@ -16360,9 +16387,6 @@ msgstr ""
msgid "official"
msgstr ""
-msgid "designated"
-msgstr ""
-
msgid "Vehicles per type"
msgstr ""
@@ -16752,6 +16776,9 @@ msgstr ""
msgid "Pedestrian Crossing"
msgstr ""
+msgid "In case of traffic signals:"
+msgstr ""
+
msgid "Traffic Calming"
msgstr ""
@@ -16998,15 +17025,12 @@ msgstr ""
msgid "Stream"
msgstr ""
-msgid "Wadi"
+msgid "River"
msgstr ""
msgid "Canal"
msgstr ""
-msgid "River"
-msgstr ""
-
msgid "Spring"
msgstr ""
@@ -17072,9 +17096,6 @@ msgstr ""
msgid "Salt Water"
msgstr ""
-msgid "Is the water body intermittent (disappears seasonally)?"
-msgstr ""
-
msgid "Coastline"
msgstr ""
@@ -17914,6 +17935,9 @@ msgstr ""
msgid "Tactile Paving"
msgstr ""
+msgid "incorrect"
+msgstr ""
+
msgid "Bus Platform"
msgstr ""
@@ -18076,6 +18100,9 @@ msgstr ""
msgid "Microbrewery"
msgstr ""
+msgid "Outdoor seating"
+msgstr ""
+
msgid "Fast Food"
msgstr ""
@@ -18670,13 +18697,13 @@ msgstr ""
msgid "Collection times"
msgstr ""
-msgid "11:30"
+msgid "Mo-Sa 09:00"
msgstr ""
-msgid "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
+msgid "Mo-Fr 17:30; Sa 12:00"
msgstr ""
-msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; Su,PH off"
+msgid "Mo-Fr 15:00,19:00; Sa 15:10; Su 10:30"
msgstr ""
msgid "Drive through"
@@ -18935,6 +18962,15 @@ msgstr ""
msgid "Pitch"
msgstr ""
+msgid "artificial_turf"
+msgstr ""
+
+msgid "decoturf"
+msgstr ""
+
+msgid "tartan"
+msgstr ""
+
msgid "Racetrack"
msgstr ""
@@ -19042,6 +19078,12 @@ msgstr ""
msgid "skitour"
msgstr ""
+msgid "sled"
+msgstr ""
+
+msgid "sleigh"
+msgstr ""
+
msgid "snow_park"
msgstr ""
@@ -19294,6 +19336,10 @@ msgctxt "building"
msgid "construction"
msgstr ""
+msgctxt "building"
+msgid "Levels"
+msgstr ""
+
msgid "Residential Building"
msgstr ""
@@ -19329,6 +19375,16 @@ msgctxt "building"
msgid "farm"
msgstr ""
+msgid "Building part"
+msgstr ""
+
+msgctxt "building"
+msgid "Skipped Levels"
+msgstr ""
+
+msgid "Skipped height (meters)"
+msgstr ""
+
msgid "Entrance"
msgstr ""
@@ -21062,22 +21118,28 @@ msgstr ""
msgid "scoria"
msgstr ""
-msgid "Cave Entrance"
+msgid "Ridge"
msgstr ""
-msgid "The entrance to a cave."
+msgid "A mountain or hill ridge."
msgstr ""
-msgid "Island"
+msgid "Valley"
msgstr ""
-msgid "Islet"
+msgid "A low area between hills."
msgstr ""
-msgid "Ridge"
+msgid "Cave Entrance"
msgstr ""
-msgid "A mountain or hill ridge."
+msgid "The entrance to a cave."
+msgstr ""
+
+msgid "Island"
+msgstr ""
+
+msgid "Islet"
msgstr ""
msgid "Nature"
@@ -21107,6 +21169,37 @@ msgstr ""
msgid "Forest"
msgstr ""
+msgid "Cutline"
+msgstr ""
+
+msgctxt "cutline"
+msgid "border"
+msgstr ""
+
+msgctxt "cutline"
+msgid "firebreak"
+msgstr ""
+
+msgctxt "cutline"
+msgid "hunting"
+msgstr ""
+
+msgctxt "cutline"
+msgid "loggingmachine"
+msgstr ""
+
+msgctxt "cutline"
+msgid "pipeline"
+msgstr ""
+
+msgctxt "cutline"
+msgid "piste"
+msgstr ""
+
+msgctxt "cutline"
+msgid "section"
+msgstr ""
+
msgid "Grassland"
msgstr ""
@@ -22040,6 +22133,9 @@ msgstr ""
msgid "Unspecific tag {0}"
msgstr ""
+msgid "Definition of {0} is unclear"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -27401,7 +27497,7 @@ msgstr ""
msgid "No object selected"
msgstr ""
-msgid "SeaMap Editor"
+msgid "SeaChart Editor"
msgstr ""
msgid "Seamark Inspector"
@@ -27473,6 +27569,9 @@ msgstr ""
msgid "Merge Nearby Nodes Threshold"
msgstr ""
+msgid "SeaMap Editor"
+msgstr ""
+
msgid "AutoSave LiveData"
msgstr ""
diff --git a/i18n/po/ro.po b/i18n/po/ro.po
index 657e843..b55dd4c 100644
--- a/i18n/po/ro.po
+++ b/i18n/po/ro.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: JOSM\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-04 03:32+0100\n"
+"POT-Creation-Date: 2015-04-01 03:33+0200\n"
"PO-Revision-Date: 2015-02-24 11:34+0000\n"
"Last-Translator: Ciprian <c1pr1an_43v3r at yahoo.com>\n"
"Language-Team: Romanian <gnomero-list at lists.sourceforge.net>\n"
@@ -16,8 +16,8 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=(n == 1 ? 0: (((n % 100 > 19) || ((n % 100 "
"== 0) && (n != 0))) ? 2: 1));\n"
-"X-Launchpad-Export-Date: 2015-03-04 04:55+0000\n"
-"X-Generator: Launchpad (build 17361)\n"
+"X-Launchpad-Export-Date: 2015-04-01 04:54+0000\n"
+"X-Generator: Launchpad (build 17413)\n"
"X-Poedit-Country: ROMANIA\n"
"Language: ro\n"
"X-Poedit-Language: Romanian\n"
@@ -1750,9 +1750,15 @@ msgstr "Descarcă date GPX"
msgid "Markers from {0}"
msgstr ""
+msgid "Download OSM Notes"
+msgstr ""
+
msgid "Downloading Notes"
msgstr ""
+msgid "Notes"
+msgstr ""
+
msgid "Download Compressed OSM Change"
msgstr ""
@@ -6169,6 +6175,9 @@ msgstr ""
msgid "Customize the style"
msgstr ""
+msgid "List of notes"
+msgstr ""
+
msgid "Add comment"
msgstr ""
@@ -7488,9 +7497,6 @@ 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 ""
@@ -15749,9 +15755,6 @@ msgstr ""
msgid "stadium"
msgstr ""
-msgid "Select sport:"
-msgstr ""
-
msgid "Sport"
msgstr ""
@@ -15872,19 +15875,19 @@ msgid "rugby_union"
msgstr ""
msgctxt "sport"
-msgid "shooting"
+msgid "running"
msgstr ""
msgctxt "sport"
-msgid "skateboard"
+msgid "shooting"
msgstr ""
msgctxt "sport"
-msgid "skating"
+msgid "skateboard"
msgstr ""
msgctxt "sport"
-msgid "skiing"
+msgid "skating"
msgstr ""
msgctxt "sport"
@@ -16212,6 +16215,30 @@ msgstr ""
msgid "Toll"
msgstr ""
+msgid "Is the water body intermittent (disappears seasonally)?"
+msgstr ""
+
+msgid "culvert"
+msgstr ""
+
+msgid "Water access rules:"
+msgstr ""
+
+msgid "Ship"
+msgstr ""
+
+msgid "designated"
+msgstr ""
+
+msgid "Boat"
+msgstr ""
+
+msgid "Motorboat"
+msgstr ""
+
+msgid "Canoe"
+msgstr ""
+
msgid "Streets"
msgstr ""
@@ -16427,9 +16454,6 @@ msgstr ""
msgid "official"
msgstr ""
-msgid "designated"
-msgstr ""
-
msgid "Vehicles per type"
msgstr ""
@@ -16819,6 +16843,9 @@ msgstr ""
msgid "Pedestrian Crossing"
msgstr ""
+msgid "In case of traffic signals:"
+msgstr ""
+
msgid "Traffic Calming"
msgstr ""
@@ -17065,15 +17092,12 @@ msgstr ""
msgid "Stream"
msgstr ""
-msgid "Wadi"
+msgid "River"
msgstr ""
msgid "Canal"
msgstr ""
-msgid "River"
-msgstr ""
-
msgid "Spring"
msgstr ""
@@ -17139,9 +17163,6 @@ msgstr ""
msgid "Salt Water"
msgstr ""
-msgid "Is the water body intermittent (disappears seasonally)?"
-msgstr ""
-
msgid "Coastline"
msgstr ""
@@ -17981,6 +18002,9 @@ msgstr ""
msgid "Tactile Paving"
msgstr ""
+msgid "incorrect"
+msgstr ""
+
msgid "Bus Platform"
msgstr ""
@@ -18143,6 +18167,9 @@ msgstr ""
msgid "Microbrewery"
msgstr ""
+msgid "Outdoor seating"
+msgstr ""
+
msgid "Fast Food"
msgstr ""
@@ -18737,13 +18764,13 @@ msgstr ""
msgid "Collection times"
msgstr ""
-msgid "11:30"
+msgid "Mo-Sa 09:00"
msgstr ""
-msgid "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
+msgid "Mo-Fr 17:30; Sa 12:00"
msgstr ""
-msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; Su,PH off"
+msgid "Mo-Fr 15:00,19:00; Sa 15:10; Su 10:30"
msgstr ""
msgid "Drive through"
@@ -19002,6 +19029,15 @@ msgstr ""
msgid "Pitch"
msgstr ""
+msgid "artificial_turf"
+msgstr ""
+
+msgid "decoturf"
+msgstr ""
+
+msgid "tartan"
+msgstr ""
+
msgid "Racetrack"
msgstr ""
@@ -19109,6 +19145,12 @@ msgstr ""
msgid "skitour"
msgstr ""
+msgid "sled"
+msgstr ""
+
+msgid "sleigh"
+msgstr ""
+
msgid "snow_park"
msgstr ""
@@ -19361,6 +19403,10 @@ msgctxt "building"
msgid "construction"
msgstr ""
+msgctxt "building"
+msgid "Levels"
+msgstr ""
+
msgid "Residential Building"
msgstr ""
@@ -19396,6 +19442,16 @@ msgctxt "building"
msgid "farm"
msgstr ""
+msgid "Building part"
+msgstr ""
+
+msgctxt "building"
+msgid "Skipped Levels"
+msgstr ""
+
+msgid "Skipped height (meters)"
+msgstr ""
+
msgid "Entrance"
msgstr ""
@@ -21129,22 +21185,28 @@ msgstr ""
msgid "scoria"
msgstr ""
-msgid "Cave Entrance"
+msgid "Ridge"
msgstr ""
-msgid "The entrance to a cave."
+msgid "A mountain or hill ridge."
msgstr ""
-msgid "Island"
+msgid "Valley"
msgstr ""
-msgid "Islet"
+msgid "A low area between hills."
msgstr ""
-msgid "Ridge"
+msgid "Cave Entrance"
msgstr ""
-msgid "A mountain or hill ridge."
+msgid "The entrance to a cave."
+msgstr ""
+
+msgid "Island"
+msgstr ""
+
+msgid "Islet"
msgstr ""
msgid "Nature"
@@ -21174,6 +21236,37 @@ msgstr ""
msgid "Forest"
msgstr ""
+msgid "Cutline"
+msgstr ""
+
+msgctxt "cutline"
+msgid "border"
+msgstr ""
+
+msgctxt "cutline"
+msgid "firebreak"
+msgstr ""
+
+msgctxt "cutline"
+msgid "hunting"
+msgstr ""
+
+msgctxt "cutline"
+msgid "loggingmachine"
+msgstr ""
+
+msgctxt "cutline"
+msgid "pipeline"
+msgstr ""
+
+msgctxt "cutline"
+msgid "piste"
+msgstr ""
+
+msgctxt "cutline"
+msgid "section"
+msgstr ""
+
msgid "Grassland"
msgstr ""
@@ -22107,6 +22200,9 @@ msgstr ""
msgid "Unspecific tag {0}"
msgstr ""
+msgid "Definition of {0} is unclear"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -27468,7 +27564,7 @@ msgstr ""
msgid "No object selected"
msgstr ""
-msgid "SeaMap Editor"
+msgid "SeaChart Editor"
msgstr ""
msgid "Seamark Inspector"
@@ -27540,6 +27636,9 @@ msgstr ""
msgid "Merge Nearby Nodes Threshold"
msgstr ""
+msgid "SeaMap Editor"
+msgstr ""
+
msgid "AutoSave LiveData"
msgstr ""
diff --git a/i18n/po/ru.po b/i18n/po/ru.po
index 51861c0..8dc5cc4 100644
--- a/i18n/po/ru.po
+++ b/i18n/po/ru.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-04 03:32+0100\n"
-"PO-Revision-Date: 2015-03-02 18:57+0000\n"
+"POT-Creation-Date: 2015-04-01 03:33+0200\n"
+"PO-Revision-Date: 2015-03-29 05:19+0000\n"
"Last-Translator: Nkolay Parukhin <parukhin at gmail.com>\n"
"Language-Team: Koptev Oleg <koptev.oleg at gmail.com>\n"
"MIME-Version: 1.0\n"
@@ -16,10 +16,13 @@ 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: 2015-03-04 04:56+0000\n"
-"X-Generator: Launchpad (build 17361)\n"
+"X-Launchpad-Export-Date: 2015-04-01 04:55+0000\n"
+"X-Generator: Launchpad (build 17413)\n"
"Language: ru_RU\n"
+msgid "Note"
+msgstr "Заметка"
+
msgid "Use OAuth"
msgstr "OAuth (Открытый протокол авторизации)"
@@ -1868,9 +1871,15 @@ msgstr "Скачанные GPX данные"
msgid "Markers from {0}"
msgstr "Маркеры из {0}"
+msgid "Download OSM Notes"
+msgstr "Скачать заметки OSM"
+
msgid "Downloading Notes"
msgstr "Загрузка заметок"
+msgid "Notes"
+msgstr "Заметки"
+
msgid "Download Compressed OSM Change"
msgstr "Скачать сжатые OSM изменения"
@@ -6729,6 +6738,9 @@ msgstr "Настройки стиля"
msgid "Customize the style"
msgstr "Настроить стиль"
+msgid "List of notes"
+msgstr "Список заметок"
+
msgid "Add comment"
msgstr "Добавить комментарий"
@@ -8181,9 +8193,6 @@ 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 "Выберите для скачивания заметок в выделенной области скачивания"
@@ -9579,9 +9588,6 @@ msgstr ""
msgid "Save Layer"
msgstr "Сохранить слой"
-msgid "Note"
-msgstr "Примечание"
-
msgid "Notes layer"
msgstr "Слой заметок"
@@ -9595,7 +9601,7 @@ msgid "Data Layer {0}"
msgstr "Слой данных {0}"
msgid "outside downloaded area"
-msgstr "вне области для скачивания"
+msgstr "вне скачанной области"
msgid "Merging layers"
msgstr "Объединение слоёв"
@@ -17513,9 +17519,6 @@ msgstr "спортивный центр"
msgid "stadium"
msgstr "стадион"
-msgid "Select sport:"
-msgstr "Выберите спорт:"
-
msgid "Sport"
msgstr "Спорт"
@@ -17636,6 +17639,10 @@ msgid "rugby_union"
msgstr "регби-юнион (регби-15)"
msgctxt "sport"
+msgid "running"
+msgstr "бег"
+
+msgctxt "sport"
msgid "shooting"
msgstr "стрельба"
@@ -17648,10 +17655,6 @@ msgid "skating"
msgstr "коньки"
msgctxt "sport"
-msgid "skiing"
-msgstr "лыжи"
-
-msgctxt "sport"
msgid "soccer"
msgstr "футбол"
@@ -17976,6 +17979,30 @@ msgstr "Макс. масса (в тоннах)"
msgid "Toll"
msgstr "Платная"
+msgid "Is the water body intermittent (disappears seasonally)?"
+msgstr "Пересыхающий водоём (исчезает в жаркий сезон)?"
+
+msgid "culvert"
+msgstr "водопропускная труба"
+
+msgid "Water access rules:"
+msgstr "Правила доступа к воде:"
+
+msgid "Ship"
+msgstr "Корабль"
+
+msgid "designated"
+msgstr "осн. предназначение"
+
+msgid "Boat"
+msgstr "Лодки"
+
+msgid "Motorboat"
+msgstr "Моторные лодки"
+
+msgid "Canoe"
+msgstr "Каноэ"
+
msgid "Streets"
msgstr "Улицы"
@@ -18195,9 +18222,6 @@ msgstr "Ограничения режима передвижения"
msgid "official"
msgstr "официальное"
-msgid "designated"
-msgstr "осн. предназначение"
-
msgid "Vehicles per type"
msgstr "Транспортные средства по типу"
@@ -18600,6 +18624,9 @@ msgstr "по часовой стрелке"
msgid "Pedestrian Crossing"
msgstr "Пешеходный переход"
+msgid "In case of traffic signals:"
+msgstr "При наличии светофора:"
+
msgid "Traffic Calming"
msgstr "Приспособление для ограничения скорости"
@@ -18848,15 +18875,12 @@ msgstr "Канава"
msgid "Stream"
msgstr "Ручей"
-msgid "Wadi"
-msgstr "Сухое русло"
+msgid "River"
+msgstr "Река"
msgid "Canal"
msgstr "Канал"
-msgid "River"
-msgstr "Река"
-
msgid "Spring"
msgstr "Родник"
@@ -18923,9 +18947,6 @@ msgstr "река"
msgid "Salt Water"
msgstr "Солёная вода"
-msgid "Is the water body intermittent (disappears seasonally)?"
-msgstr "Пересыхающий водоём (исчезает в жаркий сезон)?"
-
msgid "Coastline"
msgstr "Береговая линия"
@@ -19773,6 +19794,9 @@ msgstr "Автобусная остановка"
msgid "Tactile Paving"
msgstr "Тактильное мощение"
+msgid "incorrect"
+msgstr "неправильное"
+
msgid "Bus Platform"
msgstr "Автобусная платформа"
@@ -19935,6 +19959,9 @@ msgstr "суши"
msgid "Microbrewery"
msgstr "Пивоварня"
+msgid "Outdoor seating"
+msgstr "Столики на улице"
+
msgid "Fast Food"
msgstr "Ресторан быстрого питания"
@@ -20529,14 +20556,14 @@ msgstr "Почтовый ящик"
msgid "Collection times"
msgstr "Время выемки писем"
-msgid "11:30"
-msgstr "11:30"
+msgid "Mo-Sa 09:00"
+msgstr "Mo-Sa 09:00"
-msgid "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
-msgstr "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
+msgid "Mo-Fr 17:30; Sa 12:00"
+msgstr "Mo-Fr 17:30; Sa 12:00"
-msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; Su,PH off"
-msgstr "Mo-Fr 09:00-12:00,17:15; Sa 14:00; Su,PH off"
+msgid "Mo-Fr 15:00,19:00; Sa 15:10; Su 10:30"
+msgstr "Mo-Fr 15:00,19:00; Sa 15:10; Su 10:30"
msgid "Drive through"
msgstr "Доступен не выходя из автомобиля"
@@ -20794,6 +20821,15 @@ msgstr "Спортивный центр"
msgid "Pitch"
msgstr "Спортивное поле"
+msgid "artificial_turf"
+msgstr "искусственная трава"
+
+msgid "decoturf"
+msgstr "DecoTurf"
+
+msgid "tartan"
+msgstr "тартан"
+
msgid "Racetrack"
msgstr "Трек"
@@ -20901,6 +20937,12 @@ msgstr "беговые лыжи"
msgid "skitour"
msgstr "лыжный тур"
+msgid "sled"
+msgstr "санки"
+
+msgid "sleigh"
+msgstr "сани"
+
msgid "snow_park"
msgstr "снежный парк"
@@ -21153,6 +21195,10 @@ msgctxt "building"
msgid "construction"
msgstr "строительство"
+msgctxt "building"
+msgid "Levels"
+msgstr "Этажи"
+
msgid "Residential Building"
msgstr "Жилое здание"
@@ -21188,6 +21234,16 @@ msgctxt "building"
msgid "farm"
msgstr "ферма"
+msgid "Building part"
+msgstr "Часть здания"
+
+msgctxt "building"
+msgid "Skipped Levels"
+msgstr "Пропущенные этажи"
+
+msgid "Skipped height (meters)"
+msgstr "Пропущенная высота (метры)"
+
msgid "Entrance"
msgstr "проход"
@@ -21954,7 +22010,7 @@ msgid "Power Bay"
msgstr "Ячейка"
msgid "Power Switch"
-msgstr "Коммутатор"
+msgstr "Разъединитель"
msgid "Power Converter"
msgstr "Преобразователь"
@@ -22468,7 +22524,7 @@ msgid "Music"
msgstr "Музыка"
msgid "Cash"
-msgstr "Финансы"
+msgstr "Наличные"
msgid "Bank"
msgstr "Банк"
@@ -22925,6 +22981,18 @@ msgstr "щитовой вулкан"
msgid "scoria"
msgstr "шлаковый конус"
+msgid "Ridge"
+msgstr "Кряж или горный хребет"
+
+msgid "A mountain or hill ridge."
+msgstr "Горный хребет или гряда холмов."
+
+msgid "Valley"
+msgstr "Долина"
+
+msgid "A low area between hills."
+msgstr "Линейно вытянутая область пониженного рельефа между холмами"
+
msgid "Cave Entrance"
msgstr "Вход в пещеру"
@@ -22937,12 +23005,6 @@ msgstr "Остров"
msgid "Islet"
msgstr "Островок"
-msgid "Ridge"
-msgstr "Кряж или горный хребет"
-
-msgid "A mountain or hill ridge."
-msgstr "Горный хребет или гряда холмов."
-
msgid "Nature"
msgstr "Природа"
@@ -22970,6 +23032,37 @@ msgstr "Лес, основным назначением которого не я
msgid "Forest"
msgstr "Лесопосадки"
+msgid "Cutline"
+msgstr "Просека"
+
+msgctxt "cutline"
+msgid "border"
+msgstr "граница земельных владений"
+
+msgctxt "cutline"
+msgid "firebreak"
+msgstr "огнезащитная"
+
+msgctxt "cutline"
+msgid "hunting"
+msgstr "для охоты"
+
+msgctxt "cutline"
+msgid "loggingmachine"
+msgstr "для лесозаготовительных машин"
+
+msgctxt "cutline"
+msgid "pipeline"
+msgstr "для трубопровода"
+
+msgctxt "cutline"
+msgid "piste"
+msgstr "лыжня"
+
+msgctxt "cutline"
+msgid "section"
+msgstr "граница лесных кварталов"
+
msgid "Grassland"
msgstr "Луг"
@@ -23933,6 +24026,9 @@ msgstr ""
msgid "Unspecific tag {0}"
msgstr "Неспецифичный тег {0}"
+msgid "Definition of {0} is unclear"
+msgstr "Неточное определение {0}"
+
msgid "{0} on a node. Should be used on a way."
msgstr "{0} на точке. Должен использоваться на линии."
@@ -29705,7 +29801,7 @@ msgstr "Сохранить SDS-файл"
msgid "No object selected"
msgstr "Объект не выбран"
-msgid "SeaMap Editor"
+msgid "SeaChart Editor"
msgstr "Редактор морских карт"
msgid "Seamark Inspector"
@@ -29789,6 +29885,9 @@ msgstr "Коэффициент расстояния"
msgid "Merge Nearby Nodes Threshold"
msgstr "Порог близости точек (м)"
+msgid "SeaMap Editor"
+msgstr "Редактор морских карт"
+
msgid "AutoSave LiveData"
msgstr "Автосохранение данных позиционирования"
diff --git a/i18n/po/sk.po b/i18n/po/sk.po
index 318a1d0..000dcfe 100644
--- a/i18n/po/sk.po
+++ b/i18n/po/sk.po
@@ -9,16 +9,16 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-04 03:32+0100\n"
-"PO-Revision-Date: 2015-02-28 21:57+0000\n"
+"POT-Creation-Date: 2015-04-01 03:33+0200\n"
+"PO-Revision-Date: 2015-03-25 22:02+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: 2015-03-04 04:57+0000\n"
-"X-Generator: Launchpad (build 17361)\n"
+"X-Launchpad-Export-Date: 2015-04-01 04:56+0000\n"
+"X-Generator: Launchpad (build 17413)\n"
"Language: sk\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -1848,9 +1848,15 @@ msgstr "Stiahnuté GPX dáta"
msgid "Markers from {0}"
msgstr "Značky z {0}"
+msgid "Download OSM Notes"
+msgstr "Stiahnuť OSM Poznámky"
+
msgid "Downloading Notes"
msgstr "Sťahujú sa poznámky (Notes)."
+msgid "Notes"
+msgstr "Poznámky"
+
msgid "Download Compressed OSM Change"
msgstr "Stiahnuť komprimovanú OSM zmenu"
@@ -6689,6 +6695,9 @@ msgstr "Nastavenia štýlu"
msgid "Customize the style"
msgstr "Upraviť štýl"
+msgid "List of notes"
+msgstr "Zoznam poznámok"
+
msgid "Add comment"
msgstr "Pridať komentár"
@@ -8135,9 +8144,6 @@ 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 "Poznámky"
-
msgid "Select to download notes in the selected download area."
msgstr "Zvoľte pre stiahnutie poznámok vo vybranej oblasti na stiahnutie."
@@ -8241,7 +8247,7 @@ msgid "Null pointer exception, possibly some missing tags."
msgstr "Chyba null pointera, možno sú neprítomné značky"
msgid "Search ..."
-msgstr "Hľadám ..."
+msgstr "Hľadať ..."
msgid "Click to start searching for places"
msgstr "Kliknutím sa spustí hľadanie pre miesta"
@@ -17449,9 +17455,6 @@ msgstr "športové centrum"
msgid "stadium"
msgstr "štadión"
-msgid "Select sport:"
-msgstr "Vyberte šport:"
-
msgid "Sport"
msgstr "Šport"
@@ -17576,6 +17579,10 @@ msgid "rugby_union"
msgstr "ragbyová únia"
msgctxt "sport"
+msgid "running"
+msgstr "beh"
+
+msgctxt "sport"
msgid "shooting"
msgstr "streľba"
@@ -17588,10 +17595,6 @@ msgid "skating"
msgstr "korčuľovanie"
msgctxt "sport"
-msgid "skiing"
-msgstr "lyžovanie"
-
-msgctxt "sport"
msgid "soccer"
msgstr "futbal"
@@ -17916,6 +17919,30 @@ msgstr "Max. hmotnosť (t)"
msgid "Toll"
msgstr "Mýto (Toll)"
+msgid "Is the water body intermittent (disappears seasonally)?"
+msgstr "Je voda občasná (mizne v závislosti od ročného obdobia)?"
+
+msgid "culvert"
+msgstr "priepust"
+
+msgid "Water access rules:"
+msgstr "Obmedzenia prístupu na vodu:"
+
+msgid "Ship"
+msgstr "Loď"
+
+msgid "designated"
+msgstr "určený pre tento typ vozidiel (designated)"
+
+msgid "Boat"
+msgstr "Čln"
+
+msgid "Motorboat"
+msgstr "Motorový čln"
+
+msgid "Canoe"
+msgstr "Kanoe"
+
msgid "Streets"
msgstr "Hlavné komunikácie"
@@ -18135,9 +18162,6 @@ msgstr "Obmedzenia spôsobu prepravy"
msgid "official"
msgstr "oficiálne určené"
-msgid "designated"
-msgstr "určený pre tento typ vozidiel (designated)"
-
msgid "Vehicles per type"
msgstr "Vozidlá podľa typu"
@@ -18541,6 +18565,9 @@ msgstr "v smere hodinových ručičiek (pravotočivý)"
msgid "Pedestrian Crossing"
msgstr "Priechod pre chodcov"
+msgid "In case of traffic signals:"
+msgstr "Ak ide o semafory:"
+
msgid "Traffic Calming"
msgstr "Spomaľovací retardér"
@@ -18792,15 +18819,12 @@ msgstr "Priekopa (ditch)"
msgid "Stream"
msgstr "Potok (stream)"
-msgid "Wadi"
-msgstr "Nepravidelný tok (sezónne vysychajúci)"
+msgid "River"
+msgstr "Rieka"
msgid "Canal"
msgstr "Prieplav (canal)"
-msgid "River"
-msgstr "Rieka"
-
msgid "Spring"
msgstr "Prameň"
@@ -18866,9 +18890,6 @@ msgstr "rieka"
msgid "Salt Water"
msgstr "Slaná voda"
-msgid "Is the water body intermittent (disappears seasonally)?"
-msgstr "Je voda občasná (mizne v závislosti od ročného obdobia)?"
-
msgid "Coastline"
msgstr "Pobrežie"
@@ -19712,6 +19733,9 @@ msgstr "Autobusová zastávka"
msgid "Tactile Paving"
msgstr "Dlažba pre nevidiacich"
+msgid "incorrect"
+msgstr "nesprávne"
+
msgid "Bus Platform"
msgstr "Autobusové nástupište"
@@ -19874,6 +19898,9 @@ msgstr "sushi"
msgid "Microbrewery"
msgstr "Minipivovar"
+msgid "Outdoor seating"
+msgstr "Vonkajšie sedenie"
+
msgid "Fast Food"
msgstr "Rýchle občerstvenie (fast food)"
@@ -20468,14 +20495,14 @@ msgstr "Poštová schránka"
msgid "Collection times"
msgstr "Čas výberu pošty"
-msgid "11:30"
-msgstr "11:30"
+msgid "Mo-Sa 09:00"
+msgstr "Po-So 09:00"
-msgid "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
-msgstr "Po-Pi 15:00,17:45,19:00,23:00; So 15:10; Ne 10:30,23:00"
+msgid "Mo-Fr 17:30; Sa 12:00"
+msgstr "Po-Pi 17:30; So 12:00"
-msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; Su,PH off"
-msgstr "Po-Pi 09:00-12:00,17:15; So 14:00; Ne,Sv zatvorené"
+msgid "Mo-Fr 15:00,19:00; Sa 15:10; Su 10:30"
+msgstr "Po-Pi 15:00,19:00; So 15:10; Ne 10:30"
msgid "Drive through"
msgstr "Prejazd"
@@ -20733,6 +20760,15 @@ msgstr "Športové centrum"
msgid "Pitch"
msgstr "Hracia plocha (ihrisko)"
+msgid "artificial_turf"
+msgstr "umelý trávnik"
+
+msgid "decoturf"
+msgstr "DecoTurf"
+
+msgid "tartan"
+msgstr "tartan"
+
msgid "Racetrack"
msgstr "Pretekárska dráha"
@@ -20840,6 +20876,12 @@ msgstr "beh na lyžiach (nordic)"
msgid "skitour"
msgstr "lyžiarsky okruh (nordic+downhill)"
+msgid "sled"
+msgstr "sánkovanie"
+
+msgid "sleigh"
+msgstr "sane v záprahu"
+
msgid "snow_park"
msgstr "park zimných športov"
@@ -21092,6 +21134,10 @@ msgctxt "building"
msgid "construction"
msgstr "vo výstavbe"
+msgctxt "building"
+msgid "Levels"
+msgstr "Počet podlaží"
+
msgid "Residential Building"
msgstr "Bytový dom"
@@ -21127,6 +21173,16 @@ msgctxt "building"
msgid "farm"
msgstr "farmársky dom"
+msgid "Building part"
+msgstr "Časť budovy"
+
+msgctxt "building"
+msgid "Skipped Levels"
+msgstr "Vynechané podlažia"
+
+msgid "Skipped height (meters)"
+msgstr "Vynechaná výška (metre)"
+
msgid "Entrance"
msgstr "Vchod"
@@ -22862,6 +22918,18 @@ msgstr "štítová"
msgid "scoria"
msgstr "trosková"
+msgid "Ridge"
+msgstr "Chrbát"
+
+msgid "A mountain or hill ridge."
+msgstr "Horský chrbát"
+
+msgid "Valley"
+msgstr "Dolina"
+
+msgid "A low area between hills."
+msgstr "Znížené územie medzi kopcami."
+
msgid "Cave Entrance"
msgstr "Vstup do jaskyne"
@@ -22874,12 +22942,6 @@ msgstr "Ostrov"
msgid "Islet"
msgstr "Ostrovček"
-msgid "Ridge"
-msgstr "Chrbát"
-
-msgid "A mountain or hill ridge."
-msgstr "Horský chrbát"
-
msgid "Nature"
msgstr "Príroda"
@@ -22907,6 +22969,37 @@ msgstr "Lesný porast, kde nie je hlavným účelom ťažba dreva."
msgid "Forest"
msgstr "Hospodársky les"
+msgid "Cutline"
+msgstr "Výsek lesa"
+
+msgctxt "cutline"
+msgid "border"
+msgstr "oddelenie pozemkov"
+
+msgctxt "cutline"
+msgid "firebreak"
+msgstr "požiarna ochrana"
+
+msgctxt "cutline"
+msgid "hunting"
+msgstr "pre poľovníkov"
+
+msgctxt "cutline"
+msgid "loggingmachine"
+msgstr "pre drevorubačské stroje"
+
+msgctxt "cutline"
+msgid "pipeline"
+msgstr "pre potrubie"
+
+msgctxt "cutline"
+msgid "piste"
+msgstr "zjazdovka"
+
+msgctxt "cutline"
+msgid "section"
+msgstr "rozdelenie pre údržbu lesa"
+
msgid "Grassland"
msgstr "Divoká tráva/Step"
@@ -23864,6 +23957,9 @@ msgstr ""
msgid "Unspecific tag {0}"
msgstr "Málo špecifická značka {0}"
+msgid "Definition of {0} is unclear"
+msgstr "Definícia {0} je nejasná"
+
msgid "{0} on a node. Should be used on a way."
msgstr "{0} na bode. Malo by byť použité na ceste."
@@ -29371,7 +29467,7 @@ msgstr ""
msgid "No object selected"
msgstr ""
-msgid "SeaMap Editor"
+msgid "SeaChart Editor"
msgstr ""
msgid "Seamark Inspector"
@@ -29443,6 +29539,9 @@ msgstr ""
msgid "Merge Nearby Nodes Threshold"
msgstr ""
+msgid "SeaMap Editor"
+msgstr ""
+
msgid "AutoSave LiveData"
msgstr "Automatické ukladanie LiveData"
diff --git a/i18n/po/sl.po b/i18n/po/sl.po
index b0d6bff..438b2a3 100644
--- a/i18n/po/sl.po
+++ b/i18n/po/sl.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-04 03:32+0100\n"
+"POT-Creation-Date: 2015-04-01 03:33+0200\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"
@@ -16,8 +16,8 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || "
"n%100==4 ? 3 : 0);\n"
-"X-Launchpad-Export-Date: 2015-03-04 04:57+0000\n"
-"X-Generator: Launchpad (build 17361)\n"
+"X-Launchpad-Export-Date: 2015-04-01 04:57+0000\n"
+"X-Generator: Launchpad (build 17413)\n"
"Language: sl\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -1708,9 +1708,15 @@ msgstr "Sprejeti podatki GPX"
msgid "Markers from {0}"
msgstr ""
+msgid "Download OSM Notes"
+msgstr ""
+
msgid "Downloading Notes"
msgstr ""
+msgid "Notes"
+msgstr "Bankovci"
+
msgid "Download Compressed OSM Change"
msgstr ""
@@ -6139,6 +6145,9 @@ msgstr ""
msgid "Customize the style"
msgstr ""
+msgid "List of notes"
+msgstr ""
+
msgid "Add comment"
msgstr ""
@@ -7463,9 +7472,6 @@ 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 ""
@@ -15746,9 +15752,6 @@ msgstr ""
msgid "stadium"
msgstr "stadion"
-msgid "Select sport:"
-msgstr ""
-
msgid "Sport"
msgstr "Šport"
@@ -15869,19 +15872,19 @@ msgid "rugby_union"
msgstr ""
msgctxt "sport"
-msgid "shooting"
+msgid "running"
msgstr ""
msgctxt "sport"
-msgid "skateboard"
+msgid "shooting"
msgstr ""
msgctxt "sport"
-msgid "skating"
+msgid "skateboard"
msgstr ""
msgctxt "sport"
-msgid "skiing"
+msgid "skating"
msgstr ""
msgctxt "sport"
@@ -16209,6 +16212,30 @@ msgstr ""
msgid "Toll"
msgstr "Cestnina"
+msgid "Is the water body intermittent (disappears seasonally)?"
+msgstr ""
+
+msgid "culvert"
+msgstr ""
+
+msgid "Water access rules:"
+msgstr ""
+
+msgid "Ship"
+msgstr ""
+
+msgid "designated"
+msgstr ""
+
+msgid "Boat"
+msgstr ""
+
+msgid "Motorboat"
+msgstr ""
+
+msgid "Canoe"
+msgstr ""
+
msgid "Streets"
msgstr "Ceste"
@@ -16424,9 +16451,6 @@ msgstr ""
msgid "official"
msgstr ""
-msgid "designated"
-msgstr ""
-
msgid "Vehicles per type"
msgstr ""
@@ -16816,6 +16840,9 @@ msgstr ""
msgid "Pedestrian Crossing"
msgstr ""
+msgid "In case of traffic signals:"
+msgstr ""
+
msgid "Traffic Calming"
msgstr ""
@@ -17062,15 +17089,12 @@ msgstr ""
msgid "Stream"
msgstr "Potok"
-msgid "Wadi"
-msgstr ""
+msgid "River"
+msgstr "Reka"
msgid "Canal"
msgstr "Kanal"
-msgid "River"
-msgstr "Reka"
-
msgid "Spring"
msgstr "Izvir"
@@ -17136,9 +17160,6 @@ msgstr ""
msgid "Salt Water"
msgstr ""
-msgid "Is the water body intermittent (disappears seasonally)?"
-msgstr ""
-
msgid "Coastline"
msgstr ""
@@ -17978,6 +17999,9 @@ msgstr "Avtobusno postajališče"
msgid "Tactile Paving"
msgstr ""
+msgid "incorrect"
+msgstr ""
+
msgid "Bus Platform"
msgstr "Avtobusni peron"
@@ -18140,6 +18164,9 @@ msgstr ""
msgid "Microbrewery"
msgstr ""
+msgid "Outdoor seating"
+msgstr ""
+
msgid "Fast Food"
msgstr ""
@@ -18734,13 +18761,13 @@ msgstr "Poštni nabiralnik"
msgid "Collection times"
msgstr ""
-msgid "11:30"
+msgid "Mo-Sa 09:00"
msgstr ""
-msgid "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
+msgid "Mo-Fr 17:30; Sa 12:00"
msgstr ""
-msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; Su,PH off"
+msgid "Mo-Fr 15:00,19:00; Sa 15:10; Su 10:30"
msgstr ""
msgid "Drive through"
@@ -18999,6 +19026,15 @@ msgstr "Športno središče"
msgid "Pitch"
msgstr ""
+msgid "artificial_turf"
+msgstr ""
+
+msgid "decoturf"
+msgstr ""
+
+msgid "tartan"
+msgstr ""
+
msgid "Racetrack"
msgstr ""
@@ -19106,6 +19142,12 @@ msgstr ""
msgid "skitour"
msgstr ""
+msgid "sled"
+msgstr ""
+
+msgid "sleigh"
+msgstr ""
+
msgid "snow_park"
msgstr ""
@@ -19358,6 +19400,10 @@ msgctxt "building"
msgid "construction"
msgstr ""
+msgctxt "building"
+msgid "Levels"
+msgstr ""
+
msgid "Residential Building"
msgstr "Stanovanjska zgradba"
@@ -19393,6 +19439,16 @@ msgctxt "building"
msgid "farm"
msgstr ""
+msgid "Building part"
+msgstr ""
+
+msgctxt "building"
+msgid "Skipped Levels"
+msgstr ""
+
+msgid "Skipped height (meters)"
+msgstr ""
+
msgid "Entrance"
msgstr ""
@@ -21126,6 +21182,18 @@ msgstr ""
msgid "scoria"
msgstr ""
+msgid "Ridge"
+msgstr ""
+
+msgid "A mountain or hill ridge."
+msgstr ""
+
+msgid "Valley"
+msgstr ""
+
+msgid "A low area between hills."
+msgstr ""
+
msgid "Cave Entrance"
msgstr ""
@@ -21138,12 +21206,6 @@ msgstr "Otok"
msgid "Islet"
msgstr ""
-msgid "Ridge"
-msgstr ""
-
-msgid "A mountain or hill ridge."
-msgstr ""
-
msgid "Nature"
msgstr ""
@@ -21171,6 +21233,37 @@ msgstr ""
msgid "Forest"
msgstr "Gozd"
+msgid "Cutline"
+msgstr ""
+
+msgctxt "cutline"
+msgid "border"
+msgstr ""
+
+msgctxt "cutline"
+msgid "firebreak"
+msgstr ""
+
+msgctxt "cutline"
+msgid "hunting"
+msgstr ""
+
+msgctxt "cutline"
+msgid "loggingmachine"
+msgstr ""
+
+msgctxt "cutline"
+msgid "pipeline"
+msgstr ""
+
+msgctxt "cutline"
+msgid "piste"
+msgstr ""
+
+msgctxt "cutline"
+msgid "section"
+msgstr ""
+
msgid "Grassland"
msgstr ""
@@ -22104,6 +22197,9 @@ msgstr ""
msgid "Unspecific tag {0}"
msgstr ""
+msgid "Definition of {0} is unclear"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -27467,7 +27563,7 @@ msgstr ""
msgid "No object selected"
msgstr ""
-msgid "SeaMap Editor"
+msgid "SeaChart Editor"
msgstr ""
msgid "Seamark Inspector"
@@ -27539,6 +27635,9 @@ msgstr ""
msgid "Merge Nearby Nodes Threshold"
msgstr ""
+msgid "SeaMap Editor"
+msgstr ""
+
msgid "AutoSave LiveData"
msgstr ""
diff --git a/i18n/po/sq.po b/i18n/po/sq.po
index 822e195..7fa3335 100644
--- a/i18n/po/sq.po
+++ b/i18n/po/sq.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-04 03:32+0100\n"
+"POT-Creation-Date: 2015-04-01 03:33+0200\n"
"PO-Revision-Date: 2011-11-04 19:43+0000\n"
"Last-Translator: StefanPrifti <Unknown>\n"
"Language-Team: FLOSS Kosova\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-03-04 04:31+0000\n"
-"X-Generator: Launchpad (build 17361)\n"
+"X-Launchpad-Export-Date: 2015-04-01 04:31+0000\n"
+"X-Generator: Launchpad (build 17413)\n"
"Language: \n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -1696,9 +1696,15 @@ msgstr ""
msgid "Markers from {0}"
msgstr ""
+msgid "Download OSM Notes"
+msgstr ""
+
msgid "Downloading Notes"
msgstr ""
+msgid "Notes"
+msgstr ""
+
msgid "Download Compressed OSM Change"
msgstr ""
@@ -6109,6 +6115,9 @@ msgstr ""
msgid "Customize the style"
msgstr ""
+msgid "List of notes"
+msgstr ""
+
msgid "Add comment"
msgstr ""
@@ -7428,9 +7437,6 @@ 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 ""
@@ -15682,9 +15688,6 @@ msgstr ""
msgid "stadium"
msgstr ""
-msgid "Select sport:"
-msgstr ""
-
msgid "Sport"
msgstr ""
@@ -15805,19 +15808,19 @@ msgid "rugby_union"
msgstr ""
msgctxt "sport"
-msgid "shooting"
+msgid "running"
msgstr ""
msgctxt "sport"
-msgid "skateboard"
+msgid "shooting"
msgstr ""
msgctxt "sport"
-msgid "skating"
+msgid "skateboard"
msgstr ""
msgctxt "sport"
-msgid "skiing"
+msgid "skating"
msgstr ""
msgctxt "sport"
@@ -16145,6 +16148,30 @@ msgstr ""
msgid "Toll"
msgstr ""
+msgid "Is the water body intermittent (disappears seasonally)?"
+msgstr ""
+
+msgid "culvert"
+msgstr ""
+
+msgid "Water access rules:"
+msgstr ""
+
+msgid "Ship"
+msgstr ""
+
+msgid "designated"
+msgstr ""
+
+msgid "Boat"
+msgstr ""
+
+msgid "Motorboat"
+msgstr ""
+
+msgid "Canoe"
+msgstr ""
+
msgid "Streets"
msgstr ""
@@ -16360,9 +16387,6 @@ msgstr ""
msgid "official"
msgstr ""
-msgid "designated"
-msgstr ""
-
msgid "Vehicles per type"
msgstr ""
@@ -16752,6 +16776,9 @@ msgstr ""
msgid "Pedestrian Crossing"
msgstr ""
+msgid "In case of traffic signals:"
+msgstr ""
+
msgid "Traffic Calming"
msgstr ""
@@ -16998,15 +17025,12 @@ msgstr ""
msgid "Stream"
msgstr ""
-msgid "Wadi"
+msgid "River"
msgstr ""
msgid "Canal"
msgstr ""
-msgid "River"
-msgstr ""
-
msgid "Spring"
msgstr ""
@@ -17072,9 +17096,6 @@ msgstr ""
msgid "Salt Water"
msgstr ""
-msgid "Is the water body intermittent (disappears seasonally)?"
-msgstr ""
-
msgid "Coastline"
msgstr ""
@@ -17914,6 +17935,9 @@ msgstr ""
msgid "Tactile Paving"
msgstr ""
+msgid "incorrect"
+msgstr ""
+
msgid "Bus Platform"
msgstr ""
@@ -18076,6 +18100,9 @@ msgstr ""
msgid "Microbrewery"
msgstr ""
+msgid "Outdoor seating"
+msgstr ""
+
msgid "Fast Food"
msgstr ""
@@ -18670,13 +18697,13 @@ msgstr ""
msgid "Collection times"
msgstr ""
-msgid "11:30"
+msgid "Mo-Sa 09:00"
msgstr ""
-msgid "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
+msgid "Mo-Fr 17:30; Sa 12:00"
msgstr ""
-msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; Su,PH off"
+msgid "Mo-Fr 15:00,19:00; Sa 15:10; Su 10:30"
msgstr ""
msgid "Drive through"
@@ -18935,6 +18962,15 @@ msgstr ""
msgid "Pitch"
msgstr ""
+msgid "artificial_turf"
+msgstr ""
+
+msgid "decoturf"
+msgstr ""
+
+msgid "tartan"
+msgstr ""
+
msgid "Racetrack"
msgstr ""
@@ -19042,6 +19078,12 @@ msgstr ""
msgid "skitour"
msgstr ""
+msgid "sled"
+msgstr ""
+
+msgid "sleigh"
+msgstr ""
+
msgid "snow_park"
msgstr ""
@@ -19294,6 +19336,10 @@ msgctxt "building"
msgid "construction"
msgstr ""
+msgctxt "building"
+msgid "Levels"
+msgstr ""
+
msgid "Residential Building"
msgstr ""
@@ -19329,6 +19375,16 @@ msgctxt "building"
msgid "farm"
msgstr ""
+msgid "Building part"
+msgstr ""
+
+msgctxt "building"
+msgid "Skipped Levels"
+msgstr ""
+
+msgid "Skipped height (meters)"
+msgstr ""
+
msgid "Entrance"
msgstr ""
@@ -21062,22 +21118,28 @@ msgstr ""
msgid "scoria"
msgstr ""
-msgid "Cave Entrance"
+msgid "Ridge"
msgstr ""
-msgid "The entrance to a cave."
+msgid "A mountain or hill ridge."
msgstr ""
-msgid "Island"
+msgid "Valley"
msgstr ""
-msgid "Islet"
+msgid "A low area between hills."
msgstr ""
-msgid "Ridge"
+msgid "Cave Entrance"
msgstr ""
-msgid "A mountain or hill ridge."
+msgid "The entrance to a cave."
+msgstr ""
+
+msgid "Island"
+msgstr ""
+
+msgid "Islet"
msgstr ""
msgid "Nature"
@@ -21107,6 +21169,37 @@ msgstr ""
msgid "Forest"
msgstr ""
+msgid "Cutline"
+msgstr ""
+
+msgctxt "cutline"
+msgid "border"
+msgstr ""
+
+msgctxt "cutline"
+msgid "firebreak"
+msgstr ""
+
+msgctxt "cutline"
+msgid "hunting"
+msgstr ""
+
+msgctxt "cutline"
+msgid "loggingmachine"
+msgstr ""
+
+msgctxt "cutline"
+msgid "pipeline"
+msgstr ""
+
+msgctxt "cutline"
+msgid "piste"
+msgstr ""
+
+msgctxt "cutline"
+msgid "section"
+msgstr ""
+
msgid "Grassland"
msgstr ""
@@ -22040,6 +22133,9 @@ msgstr ""
msgid "Unspecific tag {0}"
msgstr ""
+msgid "Definition of {0} is unclear"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -27401,7 +27497,7 @@ msgstr ""
msgid "No object selected"
msgstr ""
-msgid "SeaMap Editor"
+msgid "SeaChart Editor"
msgstr ""
msgid "Seamark Inspector"
@@ -27473,6 +27569,9 @@ msgstr ""
msgid "Merge Nearby Nodes Threshold"
msgstr ""
+msgid "SeaMap Editor"
+msgstr ""
+
msgid "AutoSave LiveData"
msgstr ""
diff --git a/i18n/po/sr.po b/i18n/po/sr.po
index 2b63d46..015e6b1 100644
--- a/i18n/po/sr.po
+++ b/i18n/po/sr.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-04 03:32+0100\n"
+"POT-Creation-Date: 2015-04-01 03:33+0200\n"
"PO-Revision-Date: 2015-02-01 15:30+0000\n"
"Last-Translator: Slobodan Simić <Unknown>\n"
"Language-Team: Serbian <sr at li.org>\n"
@@ -16,8 +16,8 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2015-03-04 04:56+0000\n"
-"X-Generator: Launchpad (build 17361)\n"
+"X-Launchpad-Export-Date: 2015-04-01 04:55+0000\n"
+"X-Generator: Launchpad (build 17413)\n"
"Language: sr\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -1697,9 +1697,15 @@ msgstr ""
msgid "Markers from {0}"
msgstr ""
+msgid "Download OSM Notes"
+msgstr ""
+
msgid "Downloading Notes"
msgstr ""
+msgid "Notes"
+msgstr ""
+
msgid "Download Compressed OSM Change"
msgstr ""
@@ -6110,6 +6116,9 @@ msgstr ""
msgid "Customize the style"
msgstr ""
+msgid "List of notes"
+msgstr ""
+
msgid "Add comment"
msgstr ""
@@ -7429,9 +7438,6 @@ 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 ""
@@ -15684,9 +15690,6 @@ msgstr ""
msgid "stadium"
msgstr ""
-msgid "Select sport:"
-msgstr ""
-
msgid "Sport"
msgstr ""
@@ -15807,19 +15810,19 @@ msgid "rugby_union"
msgstr ""
msgctxt "sport"
-msgid "shooting"
+msgid "running"
msgstr ""
msgctxt "sport"
-msgid "skateboard"
+msgid "shooting"
msgstr ""
msgctxt "sport"
-msgid "skating"
+msgid "skateboard"
msgstr ""
msgctxt "sport"
-msgid "skiing"
+msgid "skating"
msgstr ""
msgctxt "sport"
@@ -16147,6 +16150,30 @@ msgstr ""
msgid "Toll"
msgstr ""
+msgid "Is the water body intermittent (disappears seasonally)?"
+msgstr ""
+
+msgid "culvert"
+msgstr ""
+
+msgid "Water access rules:"
+msgstr ""
+
+msgid "Ship"
+msgstr ""
+
+msgid "designated"
+msgstr ""
+
+msgid "Boat"
+msgstr ""
+
+msgid "Motorboat"
+msgstr ""
+
+msgid "Canoe"
+msgstr ""
+
msgid "Streets"
msgstr ""
@@ -16362,9 +16389,6 @@ msgstr ""
msgid "official"
msgstr ""
-msgid "designated"
-msgstr ""
-
msgid "Vehicles per type"
msgstr ""
@@ -16754,6 +16778,9 @@ msgstr ""
msgid "Pedestrian Crossing"
msgstr ""
+msgid "In case of traffic signals:"
+msgstr ""
+
msgid "Traffic Calming"
msgstr ""
@@ -17000,15 +17027,12 @@ msgstr ""
msgid "Stream"
msgstr ""
-msgid "Wadi"
+msgid "River"
msgstr ""
msgid "Canal"
msgstr ""
-msgid "River"
-msgstr ""
-
msgid "Spring"
msgstr ""
@@ -17074,9 +17098,6 @@ msgstr ""
msgid "Salt Water"
msgstr ""
-msgid "Is the water body intermittent (disappears seasonally)?"
-msgstr ""
-
msgid "Coastline"
msgstr ""
@@ -17916,6 +17937,9 @@ msgstr ""
msgid "Tactile Paving"
msgstr ""
+msgid "incorrect"
+msgstr ""
+
msgid "Bus Platform"
msgstr ""
@@ -18078,6 +18102,9 @@ msgstr ""
msgid "Microbrewery"
msgstr ""
+msgid "Outdoor seating"
+msgstr ""
+
msgid "Fast Food"
msgstr ""
@@ -18672,13 +18699,13 @@ msgstr ""
msgid "Collection times"
msgstr ""
-msgid "11:30"
+msgid "Mo-Sa 09:00"
msgstr ""
-msgid "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
+msgid "Mo-Fr 17:30; Sa 12:00"
msgstr ""
-msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; Su,PH off"
+msgid "Mo-Fr 15:00,19:00; Sa 15:10; Su 10:30"
msgstr ""
msgid "Drive through"
@@ -18937,6 +18964,15 @@ msgstr ""
msgid "Pitch"
msgstr ""
+msgid "artificial_turf"
+msgstr ""
+
+msgid "decoturf"
+msgstr ""
+
+msgid "tartan"
+msgstr ""
+
msgid "Racetrack"
msgstr ""
@@ -19044,6 +19080,12 @@ msgstr ""
msgid "skitour"
msgstr ""
+msgid "sled"
+msgstr ""
+
+msgid "sleigh"
+msgstr ""
+
msgid "snow_park"
msgstr ""
@@ -19296,6 +19338,10 @@ msgctxt "building"
msgid "construction"
msgstr ""
+msgctxt "building"
+msgid "Levels"
+msgstr ""
+
msgid "Residential Building"
msgstr ""
@@ -19331,6 +19377,16 @@ msgctxt "building"
msgid "farm"
msgstr ""
+msgid "Building part"
+msgstr ""
+
+msgctxt "building"
+msgid "Skipped Levels"
+msgstr ""
+
+msgid "Skipped height (meters)"
+msgstr ""
+
msgid "Entrance"
msgstr ""
@@ -21064,22 +21120,28 @@ msgstr ""
msgid "scoria"
msgstr ""
-msgid "Cave Entrance"
+msgid "Ridge"
msgstr ""
-msgid "The entrance to a cave."
+msgid "A mountain or hill ridge."
msgstr ""
-msgid "Island"
+msgid "Valley"
msgstr ""
-msgid "Islet"
+msgid "A low area between hills."
msgstr ""
-msgid "Ridge"
+msgid "Cave Entrance"
msgstr ""
-msgid "A mountain or hill ridge."
+msgid "The entrance to a cave."
+msgstr ""
+
+msgid "Island"
+msgstr ""
+
+msgid "Islet"
msgstr ""
msgid "Nature"
@@ -21109,6 +21171,37 @@ msgstr ""
msgid "Forest"
msgstr ""
+msgid "Cutline"
+msgstr ""
+
+msgctxt "cutline"
+msgid "border"
+msgstr ""
+
+msgctxt "cutline"
+msgid "firebreak"
+msgstr ""
+
+msgctxt "cutline"
+msgid "hunting"
+msgstr ""
+
+msgctxt "cutline"
+msgid "loggingmachine"
+msgstr ""
+
+msgctxt "cutline"
+msgid "pipeline"
+msgstr ""
+
+msgctxt "cutline"
+msgid "piste"
+msgstr ""
+
+msgctxt "cutline"
+msgid "section"
+msgstr ""
+
msgid "Grassland"
msgstr ""
@@ -22042,6 +22135,9 @@ msgstr ""
msgid "Unspecific tag {0}"
msgstr ""
+msgid "Definition of {0} is unclear"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -27403,7 +27499,7 @@ msgstr ""
msgid "No object selected"
msgstr ""
-msgid "SeaMap Editor"
+msgid "SeaChart Editor"
msgstr ""
msgid "Seamark Inspector"
@@ -27475,6 +27571,9 @@ msgstr ""
msgid "Merge Nearby Nodes Threshold"
msgstr ""
+msgid "SeaMap Editor"
+msgstr ""
+
msgid "AutoSave LiveData"
msgstr ""
diff --git a/i18n/po/sv.po b/i18n/po/sv.po
index 5c46191..9aad924 100644
--- a/i18n/po/sv.po
+++ b/i18n/po/sv.po
@@ -7,16 +7,16 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-04 03:32+0100\n"
-"PO-Revision-Date: 2015-02-13 20:18+0000\n"
+"POT-Creation-Date: 2015-04-01 03:33+0200\n"
+"PO-Revision-Date: 2015-03-12 23:01+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: 2015-03-04 04:58+0000\n"
-"X-Generator: Launchpad (build 17361)\n"
+"X-Launchpad-Export-Date: 2015-04-01 04:58+0000\n"
+"X-Generator: Launchpad (build 17413)\n"
"Language: sv\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -1825,8 +1825,14 @@ msgstr "Hämtade GPX-data"
msgid "Markers from {0}"
msgstr "Markörer från {0}"
+msgid "Download OSM Notes"
+msgstr "Hämta OSM-anteckningar"
+
msgid "Downloading Notes"
-msgstr "Laddar ner anteckningar"
+msgstr "Hämtar anteckningar"
+
+msgid "Notes"
+msgstr "Anteckningar"
msgid "Download Compressed OSM Change"
msgstr "Ladda ner komprimerad OSM-förändring"
@@ -2661,6 +2667,7 @@ msgstr "matchar om \"nyckel\" existerar"
msgid "matches if ''key'' is greater than ''value'' (analogously, less than)"
msgstr ""
+"matchar om \"nyckeln\" är större än \"värdet\" (jämfört med \"mindre än\")"
msgid "combinators"
msgstr "kombinerare"
@@ -2756,10 +2763,10 @@ msgid "all parents of objects matching the expression"
msgstr "alla föräldrar liknande uttrycket"
msgid "n-th member of relation and/or n-th node of way"
-msgstr ""
+msgstr "n:te medlemmen i relation och/eller n:te noden på en väg"
msgid "every n-th member of relation and/or every n-th node of way"
-msgstr ""
+msgstr "var n:te medlem i relation och/eller var n:te nod på en väg"
msgid "view"
msgstr "visa"
@@ -2832,13 +2839,13 @@ msgid "Expecting <i>min</i>/<i>max</i> after ''timestamp''"
msgstr "Förväntat <i>min</i>/<i>max</i> efter ''tidsstämpel''"
msgid "Range of primitive ids expected"
-msgstr ""
+msgstr "Lista med primitiva id:n förväntas"
msgid "Range of changeset ids expected"
msgstr ""
msgid "Range of versions expected"
-msgstr ""
+msgstr "Lista med versioner förväntas"
msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
msgstr ""
@@ -2920,7 +2927,7 @@ msgid "Cycling dependencies"
msgstr "Cykliska beroenden"
msgid "Uploading modified notes"
-msgstr ""
+msgstr "Ladda upp modifierade anteckningar"
msgid "Note {0} failed: {1}"
msgstr "Anteckingen {0} misslyckades: {1}"
@@ -3144,7 +3151,7 @@ msgstr[0] "Valde {0} objekt"
msgstr[1] "Valde {0} objekt"
msgid "Sequence: {0}"
-msgstr ""
+msgstr "Sekvens: {0}"
msgid "Transform {0} node"
msgid_plural "Transform {0} nodes"
@@ -3155,6 +3162,8 @@ msgid ""
"<html>Layer ''{0}'' already has a conflict for object<br>''{1}''.<br>This "
"conflict cannot be added.</html>"
msgstr ""
+"<html>Lager ''{0}'' har redan en konflikt för objekt<br>''{1}''.<br>Denna "
+"konflikt kan inte läggas till.</html>"
msgid "Double conflict"
msgstr "Dubbel konflikt"
@@ -3304,7 +3313,7 @@ msgid "Unable to create file {0}, other filename will be used"
msgstr "Kunde ej skapa filen {0}, ett annat filnamn kommer att användas"
msgid "IOError while creating file, autosave will be skipped: {0}"
-msgstr ""
+msgstr "IO-fel vid skapande av fil, autosparning kommer att hoppas över: {0}"
msgid "Unable to delete old backup file {0}"
msgstr "Kunde Ej ta bort den utdaterade backup-filen {0}"
@@ -3425,7 +3434,7 @@ msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
msgstr ""
msgid "The revision file ''/REVISION'' is missing."
-msgstr ""
+msgstr "Revisionsfilen \"/REVISION\" saknas."
msgid "Already registered a conflict for primitive ''{0}''."
msgstr ""
@@ -6420,6 +6429,9 @@ msgstr ""
msgid "Customize the style"
msgstr ""
+msgid "List of notes"
+msgstr ""
+
msgid "Add comment"
msgstr ""
@@ -7768,9 +7780,6 @@ 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 ""
@@ -16292,9 +16301,6 @@ msgstr "sporthall"
msgid "stadium"
msgstr "stadion"
-msgid "Select sport:"
-msgstr "Välj sport:"
-
msgid "Sport"
msgstr "Sport"
@@ -16415,19 +16421,19 @@ msgid "rugby_union"
msgstr ""
msgctxt "sport"
-msgid "shooting"
+msgid "running"
msgstr ""
msgctxt "sport"
-msgid "skateboard"
+msgid "shooting"
msgstr ""
msgctxt "sport"
-msgid "skating"
+msgid "skateboard"
msgstr ""
msgctxt "sport"
-msgid "skiing"
+msgid "skating"
msgstr ""
msgctxt "sport"
@@ -16755,6 +16761,30 @@ msgstr "Största tillåtna vikt (ton)"
msgid "Toll"
msgstr "Betalstation"
+msgid "Is the water body intermittent (disappears seasonally)?"
+msgstr ""
+
+msgid "culvert"
+msgstr ""
+
+msgid "Water access rules:"
+msgstr ""
+
+msgid "Ship"
+msgstr ""
+
+msgid "designated"
+msgstr "avsedd för"
+
+msgid "Boat"
+msgstr ""
+
+msgid "Motorboat"
+msgstr ""
+
+msgid "Canoe"
+msgstr ""
+
msgid "Streets"
msgstr "Vägar"
@@ -16970,9 +17000,6 @@ msgstr ""
msgid "official"
msgstr ""
-msgid "designated"
-msgstr "avsedd för"
-
msgid "Vehicles per type"
msgstr "Fordon per typ"
@@ -17362,6 +17389,9 @@ msgstr "medurs"
msgid "Pedestrian Crossing"
msgstr "Övergångsställe för fotgängare"
+msgid "In case of traffic signals:"
+msgstr ""
+
msgid "Traffic Calming"
msgstr "Farthinder"
@@ -17608,15 +17638,12 @@ msgstr "Dike"
msgid "Stream"
msgstr "Bäck"
-msgid "Wadi"
-msgstr ""
+msgid "River"
+msgstr "Flod"
msgid "Canal"
msgstr "Kanal"
-msgid "River"
-msgstr "Flod"
-
msgid "Spring"
msgstr "Källa"
@@ -17682,9 +17709,6 @@ msgstr "flod"
msgid "Salt Water"
msgstr ""
-msgid "Is the water body intermittent (disappears seasonally)?"
-msgstr ""
-
msgid "Coastline"
msgstr "Kustlinje"
@@ -18524,6 +18548,9 @@ msgstr "Busshållplats"
msgid "Tactile Paving"
msgstr ""
+msgid "incorrect"
+msgstr ""
+
msgid "Bus Platform"
msgstr "Bussplattform"
@@ -18686,6 +18713,9 @@ msgstr "sushi"
msgid "Microbrewery"
msgstr "Mikrobryggeri"
+msgid "Outdoor seating"
+msgstr ""
+
msgid "Fast Food"
msgstr "Snabbmat"
@@ -19282,13 +19312,13 @@ msgstr "Brevlåda"
msgid "Collection times"
msgstr ""
-msgid "11:30"
+msgid "Mo-Sa 09:00"
msgstr ""
-msgid "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
+msgid "Mo-Fr 17:30; Sa 12:00"
msgstr ""
-msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; Su,PH off"
+msgid "Mo-Fr 15:00,19:00; Sa 15:10; Su 10:30"
msgstr ""
msgid "Drive through"
@@ -19547,6 +19577,15 @@ msgstr "Sporthall"
msgid "Pitch"
msgstr "Plan"
+msgid "artificial_turf"
+msgstr ""
+
+msgid "decoturf"
+msgstr ""
+
+msgid "tartan"
+msgstr ""
+
msgid "Racetrack"
msgstr "Bana"
@@ -19654,6 +19693,12 @@ msgstr "längdskidåkning"
msgid "skitour"
msgstr ""
+msgid "sled"
+msgstr ""
+
+msgid "sleigh"
+msgstr ""
+
msgid "snow_park"
msgstr ""
@@ -19906,6 +19951,10 @@ msgctxt "building"
msgid "construction"
msgstr ""
+msgctxt "building"
+msgid "Levels"
+msgstr ""
+
msgid "Residential Building"
msgstr ""
@@ -19941,6 +19990,16 @@ msgctxt "building"
msgid "farm"
msgstr "bondgård"
+msgid "Building part"
+msgstr ""
+
+msgctxt "building"
+msgid "Skipped Levels"
+msgstr ""
+
+msgid "Skipped height (meters)"
+msgstr ""
+
msgid "Entrance"
msgstr "Ingång"
@@ -20533,46 +20592,46 @@ msgid "pyrolysis"
msgstr ""
msgid "gasification"
-msgstr ""
+msgstr "gasifiering"
msgid "Water Turbine"
-msgstr ""
+msgstr "Vattenturbin"
msgctxt "generator method"
msgid "run-of-the-river"
-msgstr ""
+msgstr "vattenflöde"
msgctxt "generator method"
msgid "water-pumped-storage"
-msgstr ""
+msgstr "vattenpumpat lager"
msgctxt "generator method"
msgid "water-storage"
-msgstr ""
+msgstr "vattenlagring"
msgid "francis_turbine"
-msgstr ""
+msgstr "francisturbin"
msgid "all methods"
-msgstr ""
+msgstr "alla metoder"
msgid "hydrodynamic_screw"
-msgstr ""
+msgstr "archimedesskruv"
msgid "run-of-the-river"
-msgstr ""
+msgstr "vattenflöde"
msgid "kaplan_turbine"
-msgstr ""
+msgstr "kaplanturbin"
msgid "run-of-the-river / water-storage"
msgstr ""
msgid "pelton_turbine"
-msgstr ""
+msgstr "peltonturbin"
msgid "Tidal Water Turbine"
-msgstr ""
+msgstr "Tidsvattenturbin"
msgctxt "generator method"
msgid "barrage"
@@ -20580,16 +20639,16 @@ msgstr ""
msgctxt "generator method"
msgid "stream"
-msgstr ""
+msgstr "bäck"
msgid "horizontal_axis"
-msgstr ""
+msgstr "horisontell axel"
msgid "barrage"
msgstr ""
msgid "vertical_axis"
-msgstr ""
+msgstr "vertikal axel"
msgid "Wave Energy Converter"
msgstr ""
@@ -21674,6 +21733,18 @@ msgstr ""
msgid "scoria"
msgstr ""
+msgid "Ridge"
+msgstr ""
+
+msgid "A mountain or hill ridge."
+msgstr ""
+
+msgid "Valley"
+msgstr ""
+
+msgid "A low area between hills."
+msgstr ""
+
msgid "Cave Entrance"
msgstr "Grottöppning"
@@ -21686,12 +21757,6 @@ msgstr "Ö"
msgid "Islet"
msgstr "Holme"
-msgid "Ridge"
-msgstr ""
-
-msgid "A mountain or hill ridge."
-msgstr ""
-
msgid "Nature"
msgstr "Natur"
@@ -21719,6 +21784,37 @@ msgstr ""
msgid "Forest"
msgstr "Kulturskog"
+msgid "Cutline"
+msgstr ""
+
+msgctxt "cutline"
+msgid "border"
+msgstr ""
+
+msgctxt "cutline"
+msgid "firebreak"
+msgstr ""
+
+msgctxt "cutline"
+msgid "hunting"
+msgstr ""
+
+msgctxt "cutline"
+msgid "loggingmachine"
+msgstr ""
+
+msgctxt "cutline"
+msgid "pipeline"
+msgstr ""
+
+msgctxt "cutline"
+msgid "piste"
+msgstr ""
+
+msgctxt "cutline"
+msgid "section"
+msgstr ""
+
msgid "Grassland"
msgstr "Gräsmark"
@@ -22658,6 +22754,9 @@ msgstr ""
msgid "Unspecific tag {0}"
msgstr ""
+msgid "Definition of {0} is unclear"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -28060,7 +28159,7 @@ msgstr ""
msgid "No object selected"
msgstr ""
-msgid "SeaMap Editor"
+msgid "SeaChart Editor"
msgstr ""
msgid "Seamark Inspector"
@@ -28132,6 +28231,9 @@ msgstr ""
msgid "Merge Nearby Nodes Threshold"
msgstr ""
+msgid "SeaMap Editor"
+msgstr ""
+
msgid "AutoSave LiveData"
msgstr "Spara LiveData automatiskt"
diff --git a/i18n/po/ta.po b/i18n/po/ta.po
index 3bb8f2e..734e4d2 100644
--- a/i18n/po/ta.po
+++ b/i18n/po/ta.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-04 03:32+0100\n"
+"POT-Creation-Date: 2015-04-01 03:33+0200\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"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-03-04 04:59+0000\n"
-"X-Generator: Launchpad (build 17361)\n"
+"X-Launchpad-Export-Date: 2015-04-01 04:58+0000\n"
+"X-Generator: Launchpad (build 17413)\n"
"X-Poedit-Country: INDIA\n"
"Language: ta\n"
"X-Poedit-Language: Tamil\n"
@@ -1730,9 +1730,15 @@ msgstr ""
msgid "Markers from {0}"
msgstr ""
+msgid "Download OSM Notes"
+msgstr ""
+
msgid "Downloading Notes"
msgstr ""
+msgid "Notes"
+msgstr ""
+
msgid "Download Compressed OSM Change"
msgstr ""
@@ -6143,6 +6149,9 @@ msgstr ""
msgid "Customize the style"
msgstr ""
+msgid "List of notes"
+msgstr ""
+
msgid "Add comment"
msgstr ""
@@ -7463,9 +7472,6 @@ 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 ""
@@ -15719,9 +15725,6 @@ msgstr ""
msgid "stadium"
msgstr ""
-msgid "Select sport:"
-msgstr ""
-
msgid "Sport"
msgstr ""
@@ -15842,19 +15845,19 @@ msgid "rugby_union"
msgstr ""
msgctxt "sport"
-msgid "shooting"
+msgid "running"
msgstr ""
msgctxt "sport"
-msgid "skateboard"
+msgid "shooting"
msgstr ""
msgctxt "sport"
-msgid "skating"
+msgid "skateboard"
msgstr ""
msgctxt "sport"
-msgid "skiing"
+msgid "skating"
msgstr ""
msgctxt "sport"
@@ -16182,6 +16185,30 @@ msgstr ""
msgid "Toll"
msgstr ""
+msgid "Is the water body intermittent (disappears seasonally)?"
+msgstr ""
+
+msgid "culvert"
+msgstr ""
+
+msgid "Water access rules:"
+msgstr ""
+
+msgid "Ship"
+msgstr ""
+
+msgid "designated"
+msgstr ""
+
+msgid "Boat"
+msgstr ""
+
+msgid "Motorboat"
+msgstr ""
+
+msgid "Canoe"
+msgstr ""
+
msgid "Streets"
msgstr ""
@@ -16397,9 +16424,6 @@ msgstr ""
msgid "official"
msgstr ""
-msgid "designated"
-msgstr ""
-
msgid "Vehicles per type"
msgstr ""
@@ -16789,6 +16813,9 @@ msgstr ""
msgid "Pedestrian Crossing"
msgstr ""
+msgid "In case of traffic signals:"
+msgstr ""
+
msgid "Traffic Calming"
msgstr ""
@@ -17035,15 +17062,12 @@ msgstr ""
msgid "Stream"
msgstr ""
-msgid "Wadi"
+msgid "River"
msgstr ""
msgid "Canal"
msgstr ""
-msgid "River"
-msgstr ""
-
msgid "Spring"
msgstr ""
@@ -17109,9 +17133,6 @@ msgstr ""
msgid "Salt Water"
msgstr ""
-msgid "Is the water body intermittent (disappears seasonally)?"
-msgstr ""
-
msgid "Coastline"
msgstr ""
@@ -17951,6 +17972,9 @@ msgstr ""
msgid "Tactile Paving"
msgstr ""
+msgid "incorrect"
+msgstr ""
+
msgid "Bus Platform"
msgstr ""
@@ -18113,6 +18137,9 @@ msgstr ""
msgid "Microbrewery"
msgstr ""
+msgid "Outdoor seating"
+msgstr ""
+
msgid "Fast Food"
msgstr ""
@@ -18707,13 +18734,13 @@ msgstr ""
msgid "Collection times"
msgstr ""
-msgid "11:30"
+msgid "Mo-Sa 09:00"
msgstr ""
-msgid "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
+msgid "Mo-Fr 17:30; Sa 12:00"
msgstr ""
-msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; Su,PH off"
+msgid "Mo-Fr 15:00,19:00; Sa 15:10; Su 10:30"
msgstr ""
msgid "Drive through"
@@ -18972,6 +18999,15 @@ msgstr ""
msgid "Pitch"
msgstr ""
+msgid "artificial_turf"
+msgstr ""
+
+msgid "decoturf"
+msgstr ""
+
+msgid "tartan"
+msgstr ""
+
msgid "Racetrack"
msgstr ""
@@ -19079,6 +19115,12 @@ msgstr ""
msgid "skitour"
msgstr ""
+msgid "sled"
+msgstr ""
+
+msgid "sleigh"
+msgstr ""
+
msgid "snow_park"
msgstr ""
@@ -19331,6 +19373,10 @@ msgctxt "building"
msgid "construction"
msgstr ""
+msgctxt "building"
+msgid "Levels"
+msgstr ""
+
msgid "Residential Building"
msgstr ""
@@ -19366,6 +19412,16 @@ msgctxt "building"
msgid "farm"
msgstr ""
+msgid "Building part"
+msgstr ""
+
+msgctxt "building"
+msgid "Skipped Levels"
+msgstr ""
+
+msgid "Skipped height (meters)"
+msgstr ""
+
msgid "Entrance"
msgstr ""
@@ -21099,22 +21155,28 @@ msgstr ""
msgid "scoria"
msgstr ""
-msgid "Cave Entrance"
+msgid "Ridge"
msgstr ""
-msgid "The entrance to a cave."
+msgid "A mountain or hill ridge."
msgstr ""
-msgid "Island"
+msgid "Valley"
msgstr ""
-msgid "Islet"
+msgid "A low area between hills."
msgstr ""
-msgid "Ridge"
+msgid "Cave Entrance"
msgstr ""
-msgid "A mountain or hill ridge."
+msgid "The entrance to a cave."
+msgstr ""
+
+msgid "Island"
+msgstr ""
+
+msgid "Islet"
msgstr ""
msgid "Nature"
@@ -21144,6 +21206,37 @@ msgstr ""
msgid "Forest"
msgstr ""
+msgid "Cutline"
+msgstr ""
+
+msgctxt "cutline"
+msgid "border"
+msgstr ""
+
+msgctxt "cutline"
+msgid "firebreak"
+msgstr ""
+
+msgctxt "cutline"
+msgid "hunting"
+msgstr ""
+
+msgctxt "cutline"
+msgid "loggingmachine"
+msgstr ""
+
+msgctxt "cutline"
+msgid "pipeline"
+msgstr ""
+
+msgctxt "cutline"
+msgid "piste"
+msgstr ""
+
+msgctxt "cutline"
+msgid "section"
+msgstr ""
+
msgid "Grassland"
msgstr ""
@@ -22077,6 +22170,9 @@ msgstr ""
msgid "Unspecific tag {0}"
msgstr ""
+msgid "Definition of {0} is unclear"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -27444,7 +27540,7 @@ msgstr ""
msgid "No object selected"
msgstr ""
-msgid "SeaMap Editor"
+msgid "SeaChart Editor"
msgstr ""
msgid "Seamark Inspector"
@@ -27516,6 +27612,9 @@ msgstr ""
msgid "Merge Nearby Nodes Threshold"
msgstr ""
+msgid "SeaMap Editor"
+msgstr ""
+
msgid "AutoSave LiveData"
msgstr ""
diff --git a/i18n/po/te.po b/i18n/po/te.po
index 0f00836..195aa17 100644
--- a/i18n/po/te.po
+++ b/i18n/po/te.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-04 03:32+0100\n"
+"POT-Creation-Date: 2015-04-01 03:33+0200\n"
"PO-Revision-Date: 2011-05-13 08:50+0000\n"
"Last-Translator: Praveen Illa <mail2ipn at gmail.com>\n"
"Language-Team: Telugu <te at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-03-04 04:59+0000\n"
-"X-Generator: Launchpad (build 17361)\n"
+"X-Launchpad-Export-Date: 2015-04-01 04:59+0000\n"
+"X-Generator: Launchpad (build 17413)\n"
"Language: te\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -1696,9 +1696,15 @@ msgstr ""
msgid "Markers from {0}"
msgstr ""
+msgid "Download OSM Notes"
+msgstr ""
+
msgid "Downloading Notes"
msgstr ""
+msgid "Notes"
+msgstr ""
+
msgid "Download Compressed OSM Change"
msgstr ""
@@ -6109,6 +6115,9 @@ msgstr ""
msgid "Customize the style"
msgstr ""
+msgid "List of notes"
+msgstr ""
+
msgid "Add comment"
msgstr ""
@@ -7428,9 +7437,6 @@ 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 ""
@@ -15682,9 +15688,6 @@ msgstr ""
msgid "stadium"
msgstr ""
-msgid "Select sport:"
-msgstr ""
-
msgid "Sport"
msgstr ""
@@ -15805,19 +15808,19 @@ msgid "rugby_union"
msgstr ""
msgctxt "sport"
-msgid "shooting"
+msgid "running"
msgstr ""
msgctxt "sport"
-msgid "skateboard"
+msgid "shooting"
msgstr ""
msgctxt "sport"
-msgid "skating"
+msgid "skateboard"
msgstr ""
msgctxt "sport"
-msgid "skiing"
+msgid "skating"
msgstr ""
msgctxt "sport"
@@ -16145,6 +16148,30 @@ msgstr ""
msgid "Toll"
msgstr ""
+msgid "Is the water body intermittent (disappears seasonally)?"
+msgstr ""
+
+msgid "culvert"
+msgstr ""
+
+msgid "Water access rules:"
+msgstr ""
+
+msgid "Ship"
+msgstr ""
+
+msgid "designated"
+msgstr ""
+
+msgid "Boat"
+msgstr ""
+
+msgid "Motorboat"
+msgstr ""
+
+msgid "Canoe"
+msgstr ""
+
msgid "Streets"
msgstr ""
@@ -16360,9 +16387,6 @@ msgstr ""
msgid "official"
msgstr ""
-msgid "designated"
-msgstr ""
-
msgid "Vehicles per type"
msgstr ""
@@ -16752,6 +16776,9 @@ msgstr ""
msgid "Pedestrian Crossing"
msgstr ""
+msgid "In case of traffic signals:"
+msgstr ""
+
msgid "Traffic Calming"
msgstr ""
@@ -16998,15 +17025,12 @@ msgstr ""
msgid "Stream"
msgstr ""
-msgid "Wadi"
+msgid "River"
msgstr ""
msgid "Canal"
msgstr ""
-msgid "River"
-msgstr ""
-
msgid "Spring"
msgstr ""
@@ -17072,9 +17096,6 @@ msgstr ""
msgid "Salt Water"
msgstr ""
-msgid "Is the water body intermittent (disappears seasonally)?"
-msgstr ""
-
msgid "Coastline"
msgstr ""
@@ -17914,6 +17935,9 @@ msgstr ""
msgid "Tactile Paving"
msgstr ""
+msgid "incorrect"
+msgstr ""
+
msgid "Bus Platform"
msgstr ""
@@ -18076,6 +18100,9 @@ msgstr ""
msgid "Microbrewery"
msgstr ""
+msgid "Outdoor seating"
+msgstr ""
+
msgid "Fast Food"
msgstr ""
@@ -18670,13 +18697,13 @@ msgstr ""
msgid "Collection times"
msgstr ""
-msgid "11:30"
+msgid "Mo-Sa 09:00"
msgstr ""
-msgid "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
+msgid "Mo-Fr 17:30; Sa 12:00"
msgstr ""
-msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; Su,PH off"
+msgid "Mo-Fr 15:00,19:00; Sa 15:10; Su 10:30"
msgstr ""
msgid "Drive through"
@@ -18935,6 +18962,15 @@ msgstr ""
msgid "Pitch"
msgstr ""
+msgid "artificial_turf"
+msgstr ""
+
+msgid "decoturf"
+msgstr ""
+
+msgid "tartan"
+msgstr ""
+
msgid "Racetrack"
msgstr ""
@@ -19042,6 +19078,12 @@ msgstr ""
msgid "skitour"
msgstr ""
+msgid "sled"
+msgstr ""
+
+msgid "sleigh"
+msgstr ""
+
msgid "snow_park"
msgstr ""
@@ -19294,6 +19336,10 @@ msgctxt "building"
msgid "construction"
msgstr ""
+msgctxt "building"
+msgid "Levels"
+msgstr ""
+
msgid "Residential Building"
msgstr ""
@@ -19329,6 +19375,16 @@ msgctxt "building"
msgid "farm"
msgstr ""
+msgid "Building part"
+msgstr ""
+
+msgctxt "building"
+msgid "Skipped Levels"
+msgstr ""
+
+msgid "Skipped height (meters)"
+msgstr ""
+
msgid "Entrance"
msgstr ""
@@ -21062,22 +21118,28 @@ msgstr ""
msgid "scoria"
msgstr ""
-msgid "Cave Entrance"
+msgid "Ridge"
msgstr ""
-msgid "The entrance to a cave."
+msgid "A mountain or hill ridge."
msgstr ""
-msgid "Island"
+msgid "Valley"
msgstr ""
-msgid "Islet"
+msgid "A low area between hills."
msgstr ""
-msgid "Ridge"
+msgid "Cave Entrance"
msgstr ""
-msgid "A mountain or hill ridge."
+msgid "The entrance to a cave."
+msgstr ""
+
+msgid "Island"
+msgstr ""
+
+msgid "Islet"
msgstr ""
msgid "Nature"
@@ -21107,6 +21169,37 @@ msgstr ""
msgid "Forest"
msgstr ""
+msgid "Cutline"
+msgstr ""
+
+msgctxt "cutline"
+msgid "border"
+msgstr ""
+
+msgctxt "cutline"
+msgid "firebreak"
+msgstr ""
+
+msgctxt "cutline"
+msgid "hunting"
+msgstr ""
+
+msgctxt "cutline"
+msgid "loggingmachine"
+msgstr ""
+
+msgctxt "cutline"
+msgid "pipeline"
+msgstr ""
+
+msgctxt "cutline"
+msgid "piste"
+msgstr ""
+
+msgctxt "cutline"
+msgid "section"
+msgstr ""
+
msgid "Grassland"
msgstr ""
@@ -22040,6 +22133,9 @@ msgstr ""
msgid "Unspecific tag {0}"
msgstr ""
+msgid "Definition of {0} is unclear"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -27401,7 +27497,7 @@ msgstr ""
msgid "No object selected"
msgstr ""
-msgid "SeaMap Editor"
+msgid "SeaChart Editor"
msgstr ""
msgid "Seamark Inspector"
@@ -27473,6 +27569,9 @@ msgstr ""
msgid "Merge Nearby Nodes Threshold"
msgstr ""
+msgid "SeaMap Editor"
+msgstr ""
+
msgid "AutoSave LiveData"
msgstr ""
diff --git a/i18n/po/th.po b/i18n/po/th.po
index 99b7264..1ae9ec1 100644
--- a/i18n/po/th.po
+++ b/i18n/po/th.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-04 03:32+0100\n"
+"POT-Creation-Date: 2015-04-01 03:33+0200\n"
"PO-Revision-Date: 2009-03-23 02:34+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: Thai <th at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2015-03-04 05:00+0000\n"
-"X-Generator: Launchpad (build 17361)\n"
+"X-Launchpad-Export-Date: 2015-04-01 04:59+0000\n"
+"X-Generator: Launchpad (build 17413)\n"
"Language: th\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -1696,9 +1696,15 @@ msgstr ""
msgid "Markers from {0}"
msgstr ""
+msgid "Download OSM Notes"
+msgstr ""
+
msgid "Downloading Notes"
msgstr ""
+msgid "Notes"
+msgstr ""
+
msgid "Download Compressed OSM Change"
msgstr ""
@@ -6109,6 +6115,9 @@ msgstr ""
msgid "Customize the style"
msgstr ""
+msgid "List of notes"
+msgstr ""
+
msgid "Add comment"
msgstr ""
@@ -7428,9 +7437,6 @@ 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 ""
@@ -15682,9 +15688,6 @@ msgstr ""
msgid "stadium"
msgstr ""
-msgid "Select sport:"
-msgstr ""
-
msgid "Sport"
msgstr ""
@@ -15805,19 +15808,19 @@ msgid "rugby_union"
msgstr ""
msgctxt "sport"
-msgid "shooting"
+msgid "running"
msgstr ""
msgctxt "sport"
-msgid "skateboard"
+msgid "shooting"
msgstr ""
msgctxt "sport"
-msgid "skating"
+msgid "skateboard"
msgstr ""
msgctxt "sport"
-msgid "skiing"
+msgid "skating"
msgstr ""
msgctxt "sport"
@@ -16145,6 +16148,30 @@ msgstr ""
msgid "Toll"
msgstr ""
+msgid "Is the water body intermittent (disappears seasonally)?"
+msgstr ""
+
+msgid "culvert"
+msgstr ""
+
+msgid "Water access rules:"
+msgstr ""
+
+msgid "Ship"
+msgstr ""
+
+msgid "designated"
+msgstr ""
+
+msgid "Boat"
+msgstr ""
+
+msgid "Motorboat"
+msgstr ""
+
+msgid "Canoe"
+msgstr ""
+
msgid "Streets"
msgstr ""
@@ -16360,9 +16387,6 @@ msgstr ""
msgid "official"
msgstr ""
-msgid "designated"
-msgstr ""
-
msgid "Vehicles per type"
msgstr ""
@@ -16752,6 +16776,9 @@ msgstr ""
msgid "Pedestrian Crossing"
msgstr ""
+msgid "In case of traffic signals:"
+msgstr ""
+
msgid "Traffic Calming"
msgstr ""
@@ -16998,15 +17025,12 @@ msgstr ""
msgid "Stream"
msgstr ""
-msgid "Wadi"
+msgid "River"
msgstr ""
msgid "Canal"
msgstr ""
-msgid "River"
-msgstr ""
-
msgid "Spring"
msgstr ""
@@ -17072,9 +17096,6 @@ msgstr ""
msgid "Salt Water"
msgstr ""
-msgid "Is the water body intermittent (disappears seasonally)?"
-msgstr ""
-
msgid "Coastline"
msgstr ""
@@ -17914,6 +17935,9 @@ msgstr ""
msgid "Tactile Paving"
msgstr ""
+msgid "incorrect"
+msgstr ""
+
msgid "Bus Platform"
msgstr ""
@@ -18076,6 +18100,9 @@ msgstr ""
msgid "Microbrewery"
msgstr ""
+msgid "Outdoor seating"
+msgstr ""
+
msgid "Fast Food"
msgstr ""
@@ -18670,13 +18697,13 @@ msgstr ""
msgid "Collection times"
msgstr ""
-msgid "11:30"
+msgid "Mo-Sa 09:00"
msgstr ""
-msgid "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
+msgid "Mo-Fr 17:30; Sa 12:00"
msgstr ""
-msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; Su,PH off"
+msgid "Mo-Fr 15:00,19:00; Sa 15:10; Su 10:30"
msgstr ""
msgid "Drive through"
@@ -18935,6 +18962,15 @@ msgstr ""
msgid "Pitch"
msgstr ""
+msgid "artificial_turf"
+msgstr ""
+
+msgid "decoturf"
+msgstr ""
+
+msgid "tartan"
+msgstr ""
+
msgid "Racetrack"
msgstr ""
@@ -19042,6 +19078,12 @@ msgstr ""
msgid "skitour"
msgstr ""
+msgid "sled"
+msgstr ""
+
+msgid "sleigh"
+msgstr ""
+
msgid "snow_park"
msgstr ""
@@ -19294,6 +19336,10 @@ msgctxt "building"
msgid "construction"
msgstr ""
+msgctxt "building"
+msgid "Levels"
+msgstr ""
+
msgid "Residential Building"
msgstr ""
@@ -19329,6 +19375,16 @@ msgctxt "building"
msgid "farm"
msgstr ""
+msgid "Building part"
+msgstr ""
+
+msgctxt "building"
+msgid "Skipped Levels"
+msgstr ""
+
+msgid "Skipped height (meters)"
+msgstr ""
+
msgid "Entrance"
msgstr ""
@@ -21062,22 +21118,28 @@ msgstr ""
msgid "scoria"
msgstr ""
-msgid "Cave Entrance"
+msgid "Ridge"
msgstr ""
-msgid "The entrance to a cave."
+msgid "A mountain or hill ridge."
msgstr ""
-msgid "Island"
+msgid "Valley"
msgstr ""
-msgid "Islet"
+msgid "A low area between hills."
msgstr ""
-msgid "Ridge"
+msgid "Cave Entrance"
msgstr ""
-msgid "A mountain or hill ridge."
+msgid "The entrance to a cave."
+msgstr ""
+
+msgid "Island"
+msgstr ""
+
+msgid "Islet"
msgstr ""
msgid "Nature"
@@ -21107,6 +21169,37 @@ msgstr ""
msgid "Forest"
msgstr ""
+msgid "Cutline"
+msgstr ""
+
+msgctxt "cutline"
+msgid "border"
+msgstr ""
+
+msgctxt "cutline"
+msgid "firebreak"
+msgstr ""
+
+msgctxt "cutline"
+msgid "hunting"
+msgstr ""
+
+msgctxt "cutline"
+msgid "loggingmachine"
+msgstr ""
+
+msgctxt "cutline"
+msgid "pipeline"
+msgstr ""
+
+msgctxt "cutline"
+msgid "piste"
+msgstr ""
+
+msgctxt "cutline"
+msgid "section"
+msgstr ""
+
msgid "Grassland"
msgstr ""
@@ -22040,6 +22133,9 @@ msgstr ""
msgid "Unspecific tag {0}"
msgstr ""
+msgid "Definition of {0} is unclear"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -27401,7 +27497,7 @@ msgstr ""
msgid "No object selected"
msgstr ""
-msgid "SeaMap Editor"
+msgid "SeaChart Editor"
msgstr ""
msgid "Seamark Inspector"
@@ -27473,6 +27569,9 @@ msgstr ""
msgid "Merge Nearby Nodes Threshold"
msgstr ""
+msgid "SeaMap Editor"
+msgstr ""
+
msgid "AutoSave LiveData"
msgstr ""
diff --git a/i18n/po/tr.po b/i18n/po/tr.po
index 1a4bd38..18c62a5 100644
--- a/i18n/po/tr.po
+++ b/i18n/po/tr.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-04 03:32+0100\n"
+"POT-Creation-Date: 2015-04-01 03:33+0200\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"
@@ -17,8 +17,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-03-04 05:00+0000\n"
-"X-Generator: Launchpad (build 17361)\n"
+"X-Launchpad-Export-Date: 2015-04-01 04:59+0000\n"
+"X-Generator: Launchpad (build 17413)\n"
"Language: \n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -1740,9 +1740,15 @@ msgstr "İndirilen GPX Verisi"
msgid "Markers from {0}"
msgstr "İmleçler {0}"
+msgid "Download OSM Notes"
+msgstr ""
+
msgid "Downloading Notes"
msgstr ""
+msgid "Notes"
+msgstr "Notlar"
+
msgid "Download Compressed OSM Change"
msgstr ""
@@ -6179,6 +6185,9 @@ msgstr ""
msgid "Customize the style"
msgstr ""
+msgid "List of notes"
+msgstr ""
+
msgid "Add comment"
msgstr ""
@@ -7500,9 +7509,6 @@ 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 ""
@@ -15794,9 +15800,6 @@ msgstr "spor_merkezi"
msgid "stadium"
msgstr "stadyum"
-msgid "Select sport:"
-msgstr ""
-
msgid "Sport"
msgstr "Spor"
@@ -15917,19 +15920,19 @@ msgid "rugby_union"
msgstr ""
msgctxt "sport"
-msgid "shooting"
+msgid "running"
msgstr ""
msgctxt "sport"
-msgid "skateboard"
+msgid "shooting"
msgstr ""
msgctxt "sport"
-msgid "skating"
+msgid "skateboard"
msgstr ""
msgctxt "sport"
-msgid "skiing"
+msgid "skating"
msgstr ""
msgctxt "sport"
@@ -16257,6 +16260,30 @@ msgstr "Max. ağırlık (ton)"
msgid "Toll"
msgstr "ücret"
+msgid "Is the water body intermittent (disappears seasonally)?"
+msgstr ""
+
+msgid "culvert"
+msgstr ""
+
+msgid "Water access rules:"
+msgstr ""
+
+msgid "Ship"
+msgstr ""
+
+msgid "designated"
+msgstr "atanmış"
+
+msgid "Boat"
+msgstr ""
+
+msgid "Motorboat"
+msgstr ""
+
+msgid "Canoe"
+msgstr ""
+
msgid "Streets"
msgstr "Sokaklar"
@@ -16472,9 +16499,6 @@ msgstr ""
msgid "official"
msgstr ""
-msgid "designated"
-msgstr "atanmış"
-
msgid "Vehicles per type"
msgstr ""
@@ -16864,6 +16888,9 @@ msgstr ""
msgid "Pedestrian Crossing"
msgstr ""
+msgid "In case of traffic signals:"
+msgstr ""
+
msgid "Traffic Calming"
msgstr ""
@@ -17110,15 +17137,12 @@ msgstr ""
msgid "Stream"
msgstr "dere"
-msgid "Wadi"
-msgstr ""
+msgid "River"
+msgstr "nehir"
msgid "Canal"
msgstr "Kanal"
-msgid "River"
-msgstr "nehir"
-
msgid "Spring"
msgstr "Spring"
@@ -17184,9 +17208,6 @@ msgstr ""
msgid "Salt Water"
msgstr ""
-msgid "Is the water body intermittent (disappears seasonally)?"
-msgstr ""
-
msgid "Coastline"
msgstr "Sahil Çizgisi"
@@ -18026,6 +18047,9 @@ msgstr "otobüs durağı"
msgid "Tactile Paving"
msgstr ""
+msgid "incorrect"
+msgstr ""
+
msgid "Bus Platform"
msgstr "otobüs platformu"
@@ -18188,6 +18212,9 @@ msgstr ""
msgid "Microbrewery"
msgstr ""
+msgid "Outdoor seating"
+msgstr ""
+
msgid "Fast Food"
msgstr "Fast Food"
@@ -18782,13 +18809,13 @@ msgstr "Posta Kutusu"
msgid "Collection times"
msgstr ""
-msgid "11:30"
+msgid "Mo-Sa 09:00"
msgstr ""
-msgid "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
+msgid "Mo-Fr 17:30; Sa 12:00"
msgstr ""
-msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; Su,PH off"
+msgid "Mo-Fr 15:00,19:00; Sa 15:10; Su 10:30"
msgstr ""
msgid "Drive through"
@@ -19047,6 +19074,15 @@ msgstr "spor merkezi"
msgid "Pitch"
msgstr "atıcılık"
+msgid "artificial_turf"
+msgstr ""
+
+msgid "decoturf"
+msgstr ""
+
+msgid "tartan"
+msgstr ""
+
msgid "Racetrack"
msgstr "yarış pisti"
@@ -19154,6 +19190,12 @@ msgstr ""
msgid "skitour"
msgstr ""
+msgid "sled"
+msgstr ""
+
+msgid "sleigh"
+msgstr ""
+
msgid "snow_park"
msgstr ""
@@ -19406,6 +19448,10 @@ msgctxt "building"
msgid "construction"
msgstr ""
+msgctxt "building"
+msgid "Levels"
+msgstr ""
+
msgid "Residential Building"
msgstr ""
@@ -19441,6 +19487,16 @@ msgctxt "building"
msgid "farm"
msgstr ""
+msgid "Building part"
+msgstr ""
+
+msgctxt "building"
+msgid "Skipped Levels"
+msgstr ""
+
+msgid "Skipped height (meters)"
+msgstr ""
+
msgid "Entrance"
msgstr "Giriş"
@@ -21174,6 +21230,18 @@ msgstr ""
msgid "scoria"
msgstr ""
+msgid "Ridge"
+msgstr ""
+
+msgid "A mountain or hill ridge."
+msgstr ""
+
+msgid "Valley"
+msgstr ""
+
+msgid "A low area between hills."
+msgstr ""
+
msgid "Cave Entrance"
msgstr "Mağara Girişi"
@@ -21186,12 +21254,6 @@ msgstr "Ada"
msgid "Islet"
msgstr ""
-msgid "Ridge"
-msgstr ""
-
-msgid "A mountain or hill ridge."
-msgstr ""
-
msgid "Nature"
msgstr ""
@@ -21219,6 +21281,37 @@ msgstr ""
msgid "Forest"
msgstr "orman"
+msgid "Cutline"
+msgstr ""
+
+msgctxt "cutline"
+msgid "border"
+msgstr ""
+
+msgctxt "cutline"
+msgid "firebreak"
+msgstr ""
+
+msgctxt "cutline"
+msgid "hunting"
+msgstr ""
+
+msgctxt "cutline"
+msgid "loggingmachine"
+msgstr ""
+
+msgctxt "cutline"
+msgid "pipeline"
+msgstr ""
+
+msgctxt "cutline"
+msgid "piste"
+msgstr ""
+
+msgctxt "cutline"
+msgid "section"
+msgstr ""
+
msgid "Grassland"
msgstr ""
@@ -22152,6 +22245,9 @@ msgstr ""
msgid "Unspecific tag {0}"
msgstr ""
+msgid "Definition of {0} is unclear"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -27527,8 +27623,8 @@ msgstr ""
msgid "No object selected"
msgstr ""
-msgid "SeaMap Editor"
-msgstr "SeaMap düzenleyici"
+msgid "SeaChart Editor"
+msgstr ""
msgid "Seamark Inspector"
msgstr ""
@@ -27599,6 +27695,9 @@ msgstr "Mesafe faktörü"
msgid "Merge Nearby Nodes Threshold"
msgstr ""
+msgid "SeaMap Editor"
+msgstr "SeaMap düzenleyici"
+
msgid "AutoSave LiveData"
msgstr "Canlı veriyi otomatik sakla"
diff --git a/i18n/po/ug.po b/i18n/po/ug.po
index 38b32f0..f5bc79b 100644
--- a/i18n/po/ug.po
+++ b/i18n/po/ug.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-04 03:32+0100\n"
+"POT-Creation-Date: 2015-04-01 03:33+0200\n"
"PO-Revision-Date: 2012-07-14 16:22+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: Uyghur <ug at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2015-03-04 05:01+0000\n"
-"X-Generator: Launchpad (build 17361)\n"
+"X-Launchpad-Export-Date: 2015-04-01 05:00+0000\n"
+"X-Generator: Launchpad (build 17413)\n"
"Language: \n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -1696,9 +1696,15 @@ msgstr ""
msgid "Markers from {0}"
msgstr ""
+msgid "Download OSM Notes"
+msgstr ""
+
msgid "Downloading Notes"
msgstr ""
+msgid "Notes"
+msgstr ""
+
msgid "Download Compressed OSM Change"
msgstr ""
@@ -6109,6 +6115,9 @@ msgstr ""
msgid "Customize the style"
msgstr ""
+msgid "List of notes"
+msgstr ""
+
msgid "Add comment"
msgstr ""
@@ -7428,9 +7437,6 @@ 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 ""
@@ -15682,9 +15688,6 @@ msgstr ""
msgid "stadium"
msgstr ""
-msgid "Select sport:"
-msgstr ""
-
msgid "Sport"
msgstr ""
@@ -15805,19 +15808,19 @@ msgid "rugby_union"
msgstr ""
msgctxt "sport"
-msgid "shooting"
+msgid "running"
msgstr ""
msgctxt "sport"
-msgid "skateboard"
+msgid "shooting"
msgstr ""
msgctxt "sport"
-msgid "skating"
+msgid "skateboard"
msgstr ""
msgctxt "sport"
-msgid "skiing"
+msgid "skating"
msgstr ""
msgctxt "sport"
@@ -16145,6 +16148,30 @@ msgstr ""
msgid "Toll"
msgstr ""
+msgid "Is the water body intermittent (disappears seasonally)?"
+msgstr ""
+
+msgid "culvert"
+msgstr ""
+
+msgid "Water access rules:"
+msgstr ""
+
+msgid "Ship"
+msgstr ""
+
+msgid "designated"
+msgstr ""
+
+msgid "Boat"
+msgstr ""
+
+msgid "Motorboat"
+msgstr ""
+
+msgid "Canoe"
+msgstr ""
+
msgid "Streets"
msgstr ""
@@ -16360,9 +16387,6 @@ msgstr ""
msgid "official"
msgstr ""
-msgid "designated"
-msgstr ""
-
msgid "Vehicles per type"
msgstr ""
@@ -16752,6 +16776,9 @@ msgstr ""
msgid "Pedestrian Crossing"
msgstr ""
+msgid "In case of traffic signals:"
+msgstr ""
+
msgid "Traffic Calming"
msgstr ""
@@ -16998,15 +17025,12 @@ msgstr ""
msgid "Stream"
msgstr ""
-msgid "Wadi"
+msgid "River"
msgstr ""
msgid "Canal"
msgstr ""
-msgid "River"
-msgstr ""
-
msgid "Spring"
msgstr ""
@@ -17072,9 +17096,6 @@ msgstr ""
msgid "Salt Water"
msgstr ""
-msgid "Is the water body intermittent (disappears seasonally)?"
-msgstr ""
-
msgid "Coastline"
msgstr ""
@@ -17914,6 +17935,9 @@ msgstr ""
msgid "Tactile Paving"
msgstr ""
+msgid "incorrect"
+msgstr ""
+
msgid "Bus Platform"
msgstr ""
@@ -18076,6 +18100,9 @@ msgstr ""
msgid "Microbrewery"
msgstr ""
+msgid "Outdoor seating"
+msgstr ""
+
msgid "Fast Food"
msgstr ""
@@ -18670,13 +18697,13 @@ msgstr ""
msgid "Collection times"
msgstr ""
-msgid "11:30"
+msgid "Mo-Sa 09:00"
msgstr ""
-msgid "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
+msgid "Mo-Fr 17:30; Sa 12:00"
msgstr ""
-msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; Su,PH off"
+msgid "Mo-Fr 15:00,19:00; Sa 15:10; Su 10:30"
msgstr ""
msgid "Drive through"
@@ -18935,6 +18962,15 @@ msgstr ""
msgid "Pitch"
msgstr ""
+msgid "artificial_turf"
+msgstr ""
+
+msgid "decoturf"
+msgstr ""
+
+msgid "tartan"
+msgstr ""
+
msgid "Racetrack"
msgstr ""
@@ -19042,6 +19078,12 @@ msgstr ""
msgid "skitour"
msgstr ""
+msgid "sled"
+msgstr ""
+
+msgid "sleigh"
+msgstr ""
+
msgid "snow_park"
msgstr ""
@@ -19294,6 +19336,10 @@ msgctxt "building"
msgid "construction"
msgstr ""
+msgctxt "building"
+msgid "Levels"
+msgstr ""
+
msgid "Residential Building"
msgstr ""
@@ -19329,6 +19375,16 @@ msgctxt "building"
msgid "farm"
msgstr ""
+msgid "Building part"
+msgstr ""
+
+msgctxt "building"
+msgid "Skipped Levels"
+msgstr ""
+
+msgid "Skipped height (meters)"
+msgstr ""
+
msgid "Entrance"
msgstr ""
@@ -21062,22 +21118,28 @@ msgstr ""
msgid "scoria"
msgstr ""
-msgid "Cave Entrance"
+msgid "Ridge"
msgstr ""
-msgid "The entrance to a cave."
+msgid "A mountain or hill ridge."
msgstr ""
-msgid "Island"
+msgid "Valley"
msgstr ""
-msgid "Islet"
+msgid "A low area between hills."
msgstr ""
-msgid "Ridge"
+msgid "Cave Entrance"
msgstr ""
-msgid "A mountain or hill ridge."
+msgid "The entrance to a cave."
+msgstr ""
+
+msgid "Island"
+msgstr ""
+
+msgid "Islet"
msgstr ""
msgid "Nature"
@@ -21107,6 +21169,37 @@ msgstr ""
msgid "Forest"
msgstr ""
+msgid "Cutline"
+msgstr ""
+
+msgctxt "cutline"
+msgid "border"
+msgstr ""
+
+msgctxt "cutline"
+msgid "firebreak"
+msgstr ""
+
+msgctxt "cutline"
+msgid "hunting"
+msgstr ""
+
+msgctxt "cutline"
+msgid "loggingmachine"
+msgstr ""
+
+msgctxt "cutline"
+msgid "pipeline"
+msgstr ""
+
+msgctxt "cutline"
+msgid "piste"
+msgstr ""
+
+msgctxt "cutline"
+msgid "section"
+msgstr ""
+
msgid "Grassland"
msgstr ""
@@ -22040,6 +22133,9 @@ msgstr ""
msgid "Unspecific tag {0}"
msgstr ""
+msgid "Definition of {0} is unclear"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -27401,7 +27497,7 @@ msgstr ""
msgid "No object selected"
msgstr ""
-msgid "SeaMap Editor"
+msgid "SeaChart Editor"
msgstr ""
msgid "Seamark Inspector"
@@ -27473,6 +27569,9 @@ msgstr ""
msgid "Merge Nearby Nodes Threshold"
msgstr ""
+msgid "SeaMap Editor"
+msgstr ""
+
msgid "AutoSave LiveData"
msgstr ""
diff --git a/i18n/po/uk.po b/i18n/po/uk.po
index d6057ae..7540cc2 100644
--- a/i18n/po/uk.po
+++ b/i18n/po/uk.po
@@ -7,17 +7,17 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-04 03:32+0100\n"
-"PO-Revision-Date: 2015-02-22 14:10+0000\n"
-"Last-Translator: Dirk Stöcker <launchpad at dstoecker.de>\n"
+"POT-Creation-Date: 2015-04-01 03:33+0200\n"
+"PO-Revision-Date: 2015-03-30 02:14+0000\n"
+"Last-Translator: andygol <Unknown>\n"
"Language-Team: Ukrainian <uk at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2015-03-04 05:01+0000\n"
-"X-Generator: Launchpad (build 17361)\n"
+"X-Launchpad-Export-Date: 2015-04-01 05:00+0000\n"
+"X-Generator: Launchpad (build 17413)\n"
"Language: uk\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -1868,9 +1868,15 @@ msgstr "Отримані GPX-дані"
msgid "Markers from {0}"
msgstr "Мітки з {0}"
+msgid "Download OSM Notes"
+msgstr "Завантажити нотатки OSM"
+
msgid "Downloading Notes"
msgstr "Завантаження нотаток"
+msgid "Notes"
+msgstr "Нотатки"
+
msgid "Download Compressed OSM Change"
msgstr "Завантаження стиснених змін OSM"
@@ -4246,6 +4252,8 @@ msgid ""
"With the currently used mappaint style(s) the style for outer way mismatches "
"polygon"
msgstr ""
+"З поточним стилем (стилями) показу мапи стиль зовнішньої лінії не відповідає "
+"стилю полігона"
msgid "Area style on outer way"
msgstr "Стиль ділянки на зовнішній лінії"
@@ -5165,7 +5173,7 @@ msgid "Click to open the imagery tab in the preferences"
msgstr "Відкрити вкладку налаштування фону в Налаштуваннях"
msgid "Search menu items"
-msgstr "Пункти меню Пошук"
+msgstr "Пошук пунктів меню"
msgid "Audio"
msgstr "Звук"
@@ -6729,6 +6737,9 @@ msgstr "Налаштування стилю"
msgid "Customize the style"
msgstr "Налаштувати стиль"
+msgid "List of notes"
+msgstr "Преік нотаток"
+
msgid "Add comment"
msgstr "Додати коментар"
@@ -8171,9 +8182,6 @@ 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 "Оберіть для завантаження нотаток з виділеної ділянки."
@@ -9088,7 +9096,7 @@ msgid "Decide how to upload the data and which changeset to use"
msgstr "Вирішіть, як завантажувати дані та які використовувати набори змін"
msgid "Tags of new changeset"
-msgstr "Теґи нового набору змін"
+msgstr "Теґи набору змін"
msgid "Apply tags to the changeset data is uploaded to"
msgstr "Застосувати теґи до набору змін, який надіслано на сервер"
@@ -15890,7 +15898,7 @@ msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
msgstr "Атлантична Луара - Ортофото 2012 - 20 см"
msgid "SIG L-R - Languedoc-Roussillon 2012 - 20 cm"
-msgstr ""
+msgstr "SIG L-R - Лангедок-Руссильон 2012 - 20 см"
msgid "Toulouse - Orthophotoplan 2013"
msgstr "Тулуза - Ортофотоплан 2013"
@@ -16217,10 +16225,10 @@ msgid "Slovakia Historic Maps"
msgstr "Словаччина: історичні мапи"
msgid "RABA-KGZ: Slovenia farmland use"
-msgstr ""
+msgstr "RABA-KGZ: Словенія - використання сільгоспземель"
msgid "RABA-KGZ: Slovenia built-up areas"
-msgstr ""
+msgstr "RABA-KGZ: Словенія - територія забудови"
msgid "South Africa CD:NGI Aerial"
msgstr "Південна Африка CD:NGI Aerial"
@@ -17491,9 +17499,6 @@ msgstr "спортивний центр"
msgid "stadium"
msgstr "стадіон"
-msgid "Select sport:"
-msgstr "Вид спорту"
-
msgid "Sport"
msgstr "Спорт"
@@ -17614,6 +17619,10 @@ msgid "rugby_union"
msgstr "союз регбі"
msgctxt "sport"
+msgid "running"
+msgstr "біг"
+
+msgctxt "sport"
msgid "shooting"
msgstr "стрільба"
@@ -17626,10 +17635,6 @@ msgid "skating"
msgstr "катання на ковзанах"
msgctxt "sport"
-msgid "skiing"
-msgstr "катання на лижах"
-
-msgctxt "sport"
msgid "soccer"
msgstr "футбол"
@@ -17954,6 +17959,30 @@ msgstr "Макс. вага (в тоннах)"
msgid "Toll"
msgstr "Платна"
+msgid "Is the water body intermittent (disappears seasonally)?"
+msgstr "Чи водойма пересихає (періодично зникає)?"
+
+msgid "culvert"
+msgstr "кульверт"
+
+msgid "Water access rules:"
+msgstr "Правила доступу до води"
+
+msgid "Ship"
+msgstr "Корабель"
+
+msgid "designated"
+msgstr "осн. призначення"
+
+msgid "Boat"
+msgstr "Човни"
+
+msgid "Motorboat"
+msgstr "Моторні човни"
+
+msgid "Canoe"
+msgstr "Каное"
+
msgid "Streets"
msgstr "Дороги"
@@ -18174,9 +18203,6 @@ msgstr "Обмеження за типами транспорту"
msgid "official"
msgstr "офіційно"
-msgid "designated"
-msgstr "осн. призначення"
-
msgid "Vehicles per type"
msgstr "Транспортні засоби"
@@ -18563,7 +18589,7 @@ msgid "Cross on horseback"
msgstr "Дозволено переїзд верхи"
msgid "Optional values for specific countries"
-msgstr "Необов’язкові значення для конкретних країн"
+msgstr "Необов’язкові значення для певних країн"
msgid "Stop"
msgstr "Стоп"
@@ -18580,6 +18606,9 @@ msgstr "за годинниковою стрілкою"
msgid "Pedestrian Crossing"
msgstr "Пішохідний перехід"
+msgid "In case of traffic signals:"
+msgstr "У разі наявності світлофора"
+
msgid "Traffic Calming"
msgstr "Засоби для обмеження швидкості"
@@ -18826,15 +18855,12 @@ msgstr "Канава"
msgid "Stream"
msgstr "Струмок"
-msgid "Wadi"
-msgstr "Ваді"
+msgid "River"
+msgstr "Ріка"
msgid "Canal"
msgstr "Канал"
-msgid "River"
-msgstr "Ріка"
-
msgid "Spring"
msgstr "Джерело"
@@ -18900,9 +18926,6 @@ msgstr "ріка"
msgid "Salt Water"
msgstr "Солона вода"
-msgid "Is the water body intermittent (disappears seasonally)?"
-msgstr "Чи водойма пересихає (періодично зникає)?"
-
msgid "Coastline"
msgstr "Узбережжя"
@@ -19524,7 +19547,7 @@ msgid "Public Bicycle Repair Station"
msgstr "Публічна станція ремонту велосипедів"
msgid "Chain tool"
-msgstr ""
+msgstr "Приладдя для ремонту ланцюгів"
msgid "Public Transport"
msgstr "Громадський транспорт"
@@ -19748,6 +19771,9 @@ msgstr "Автобусна зупинка"
msgid "Tactile Paving"
msgstr "Тактильне мощення"
+msgid "incorrect"
+msgstr "неправильне"
+
msgid "Bus Platform"
msgstr "Автобусна платформа"
@@ -19910,6 +19936,9 @@ msgstr "суші"
msgid "Microbrewery"
msgstr "Міні-пивоварня"
+msgid "Outdoor seating"
+msgstr "Місця на вулиці"
+
msgid "Fast Food"
msgstr "Швидке харчування"
@@ -20504,14 +20533,14 @@ msgstr "Поштова скринька"
msgid "Collection times"
msgstr "Час виїмки"
-msgid "11:30"
-msgstr "11:30"
+msgid "Mo-Sa 09:00"
+msgstr "Пн-Сб 09:00"
-msgid "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
-msgstr "Пн-Пт 15:00,17:45,19:00,23:00; Сб 15:10; Нд 10:30,23:00"
+msgid "Mo-Fr 17:30; Sa 12:00"
+msgstr "Пн-Пт 17:30; Сб 12:00"
-msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; Su,PH off"
-msgstr "Пн-Пт 09:00-12:00,17:15; Сб 14:00; крім Нд,Свят"
+msgid "Mo-Fr 15:00,19:00; Sa 15:10; Su 10:30"
+msgstr "Пн-Пт 15:00,19:00; Сб 15:10; Нд 10:30"
msgid "Drive through"
msgstr "Обслуговування автомобілістів"
@@ -20769,6 +20798,15 @@ msgstr "Спортивний центр"
msgid "Pitch"
msgstr "Спортивний майданчик"
+msgid "artificial_turf"
+msgstr "штучне трав’яне покриття"
+
+msgid "decoturf"
+msgstr "DecoTurf"
+
+msgid "tartan"
+msgstr "тартан"
+
msgid "Racetrack"
msgstr "Бігова доріжка"
@@ -20876,6 +20914,12 @@ msgstr "бігові лижі"
msgid "skitour"
msgstr "лижна подорож"
+msgid "sled"
+msgstr "санки"
+
+msgid "sleigh"
+msgstr "сани"
+
msgid "snow_park"
msgstr "сніговий парк"
@@ -21128,6 +21172,10 @@ msgctxt "building"
msgid "construction"
msgstr "будується"
+msgctxt "building"
+msgid "Levels"
+msgstr "Поверхи"
+
msgid "Residential Building"
msgstr "Житлова будівля"
@@ -21163,6 +21211,16 @@ msgctxt "building"
msgid "farm"
msgstr "ферма"
+msgid "Building part"
+msgstr "Частина будівлі"
+
+msgctxt "building"
+msgid "Skipped Levels"
+msgstr "Починається після поверху"
+
+msgid "Skipped height (meters)"
+msgstr "Починається з висоти (метри)"
+
msgid "Entrance"
msgstr "Вхід/В’їзд"
@@ -22027,7 +22085,7 @@ msgid "tubular"
msgstr "трубчастий"
msgid "solid"
-msgstr ""
+msgstr "суцільна"
msgid "steel"
msgstr "сталь"
@@ -22902,6 +22960,18 @@ msgstr "щитовий"
msgid "scoria"
msgstr "шлаковий конус"
+msgid "Ridge"
+msgstr "хребет"
+
+msgid "A mountain or hill ridge."
+msgstr "Хребет гори чи пагорба."
+
+msgid "Valley"
+msgstr "Долина"
+
+msgid "A low area between hills."
+msgstr "Місцевість між пагорбами."
+
msgid "Cave Entrance"
msgstr "Вхід до печери"
@@ -22914,12 +22984,6 @@ msgstr "Острів"
msgid "Islet"
msgstr "Острівець"
-msgid "Ridge"
-msgstr "хребет"
-
-msgid "A mountain or hill ridge."
-msgstr "Хребет гори чи пагорба."
-
msgid "Nature"
msgstr "Природа"
@@ -22948,6 +23012,37 @@ msgstr ""
msgid "Forest"
msgstr "Лісовий масив"
+msgid "Cutline"
+msgstr "Просіка"
+
+msgctxt "cutline"
+msgid "border"
+msgstr "межа"
+
+msgctxt "cutline"
+msgid "firebreak"
+msgstr "протипожежна просіка"
+
+msgctxt "cutline"
+msgid "hunting"
+msgstr "мисливські угіддя"
+
+msgctxt "cutline"
+msgid "loggingmachine"
+msgstr "шлях для лісозаготівельної техніки"
+
+msgctxt "cutline"
+msgid "pipeline"
+msgstr "трубопровід"
+
+msgctxt "cutline"
+msgid "piste"
+msgstr "лижня"
+
+msgctxt "cutline"
+msgid "section"
+msgstr "просіка"
+
msgid "Grassland"
msgstr "Трави"
@@ -23553,7 +23648,7 @@ msgid "mindistance"
msgstr "мінімальна дистанція"
msgid "check"
-msgstr ""
+msgstr "пункт котролю"
msgid "Max. height (meters, only if enforcement=maxheight)"
msgstr "Макс. висота (метри, тільки якщо enforcement=maxheight)"
@@ -23913,6 +24008,9 @@ msgstr ""
msgid "Unspecific tag {0}"
msgstr "Незрозумілий теґ {0}"
+msgid "Definition of {0} is unclear"
+msgstr "Визначення {0} є неточним"
+
msgid "{0} on a node. Should be used on a way."
msgstr "{0} на точці. Слід застосовувати до лінії."
@@ -29681,8 +29779,8 @@ msgstr "Зберегти файл SDS"
msgid "No object selected"
msgstr "Немає виділених об’єктів"
-msgid "SeaMap Editor"
-msgstr "Редактор морських мап"
+msgid "SeaChart Editor"
+msgstr "Редактор SeaChart"
msgid "Seamark Inspector"
msgstr "Перевірка навігаційних знаків"
@@ -29767,6 +29865,9 @@ msgstr "Коефіцієнт відстані"
msgid "Merge Nearby Nodes Threshold"
msgstr "Поріг злиття найближчих точок"
+msgid "SeaMap Editor"
+msgstr "Редактор морських мап"
+
msgid "AutoSave LiveData"
msgstr "Автозбереження редагованих даних"
diff --git a/i18n/po/ur.po b/i18n/po/ur.po
index f801429..f28cf6c 100644
--- a/i18n/po/ur.po
+++ b/i18n/po/ur.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-04 03:32+0100\n"
+"POT-Creation-Date: 2015-04-01 03:33+0200\n"
"PO-Revision-Date: 2010-05-13 04:15+0000\n"
"Last-Translator: Shoaib Mirza <Unknown>\n"
"Language-Team: Urdu <ur at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-03-04 05:02+0000\n"
-"X-Generator: Launchpad (build 17361)\n"
+"X-Launchpad-Export-Date: 2015-04-01 05:01+0000\n"
+"X-Generator: Launchpad (build 17413)\n"
"Language: ur\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -1696,9 +1696,15 @@ msgstr ""
msgid "Markers from {0}"
msgstr ""
+msgid "Download OSM Notes"
+msgstr ""
+
msgid "Downloading Notes"
msgstr ""
+msgid "Notes"
+msgstr ""
+
msgid "Download Compressed OSM Change"
msgstr ""
@@ -6109,6 +6115,9 @@ msgstr ""
msgid "Customize the style"
msgstr ""
+msgid "List of notes"
+msgstr ""
+
msgid "Add comment"
msgstr ""
@@ -7428,9 +7437,6 @@ 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 ""
@@ -15682,9 +15688,6 @@ msgstr ""
msgid "stadium"
msgstr ""
-msgid "Select sport:"
-msgstr ""
-
msgid "Sport"
msgstr ""
@@ -15805,19 +15808,19 @@ msgid "rugby_union"
msgstr ""
msgctxt "sport"
-msgid "shooting"
+msgid "running"
msgstr ""
msgctxt "sport"
-msgid "skateboard"
+msgid "shooting"
msgstr ""
msgctxt "sport"
-msgid "skating"
+msgid "skateboard"
msgstr ""
msgctxt "sport"
-msgid "skiing"
+msgid "skating"
msgstr ""
msgctxt "sport"
@@ -16145,6 +16148,30 @@ msgstr ""
msgid "Toll"
msgstr ""
+msgid "Is the water body intermittent (disappears seasonally)?"
+msgstr ""
+
+msgid "culvert"
+msgstr ""
+
+msgid "Water access rules:"
+msgstr ""
+
+msgid "Ship"
+msgstr ""
+
+msgid "designated"
+msgstr ""
+
+msgid "Boat"
+msgstr ""
+
+msgid "Motorboat"
+msgstr ""
+
+msgid "Canoe"
+msgstr ""
+
msgid "Streets"
msgstr ""
@@ -16360,9 +16387,6 @@ msgstr ""
msgid "official"
msgstr ""
-msgid "designated"
-msgstr ""
-
msgid "Vehicles per type"
msgstr ""
@@ -16752,6 +16776,9 @@ msgstr ""
msgid "Pedestrian Crossing"
msgstr ""
+msgid "In case of traffic signals:"
+msgstr ""
+
msgid "Traffic Calming"
msgstr ""
@@ -16998,15 +17025,12 @@ msgstr ""
msgid "Stream"
msgstr ""
-msgid "Wadi"
+msgid "River"
msgstr ""
msgid "Canal"
msgstr ""
-msgid "River"
-msgstr ""
-
msgid "Spring"
msgstr ""
@@ -17072,9 +17096,6 @@ msgstr ""
msgid "Salt Water"
msgstr ""
-msgid "Is the water body intermittent (disappears seasonally)?"
-msgstr ""
-
msgid "Coastline"
msgstr ""
@@ -17914,6 +17935,9 @@ msgstr ""
msgid "Tactile Paving"
msgstr ""
+msgid "incorrect"
+msgstr ""
+
msgid "Bus Platform"
msgstr ""
@@ -18076,6 +18100,9 @@ msgstr ""
msgid "Microbrewery"
msgstr ""
+msgid "Outdoor seating"
+msgstr ""
+
msgid "Fast Food"
msgstr ""
@@ -18670,13 +18697,13 @@ msgstr ""
msgid "Collection times"
msgstr ""
-msgid "11:30"
+msgid "Mo-Sa 09:00"
msgstr ""
-msgid "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
+msgid "Mo-Fr 17:30; Sa 12:00"
msgstr ""
-msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; Su,PH off"
+msgid "Mo-Fr 15:00,19:00; Sa 15:10; Su 10:30"
msgstr ""
msgid "Drive through"
@@ -18935,6 +18962,15 @@ msgstr ""
msgid "Pitch"
msgstr ""
+msgid "artificial_turf"
+msgstr ""
+
+msgid "decoturf"
+msgstr ""
+
+msgid "tartan"
+msgstr ""
+
msgid "Racetrack"
msgstr ""
@@ -19042,6 +19078,12 @@ msgstr ""
msgid "skitour"
msgstr ""
+msgid "sled"
+msgstr ""
+
+msgid "sleigh"
+msgstr ""
+
msgid "snow_park"
msgstr ""
@@ -19294,6 +19336,10 @@ msgctxt "building"
msgid "construction"
msgstr ""
+msgctxt "building"
+msgid "Levels"
+msgstr ""
+
msgid "Residential Building"
msgstr ""
@@ -19329,6 +19375,16 @@ msgctxt "building"
msgid "farm"
msgstr ""
+msgid "Building part"
+msgstr ""
+
+msgctxt "building"
+msgid "Skipped Levels"
+msgstr ""
+
+msgid "Skipped height (meters)"
+msgstr ""
+
msgid "Entrance"
msgstr ""
@@ -21062,22 +21118,28 @@ msgstr ""
msgid "scoria"
msgstr ""
-msgid "Cave Entrance"
+msgid "Ridge"
msgstr ""
-msgid "The entrance to a cave."
+msgid "A mountain or hill ridge."
msgstr ""
-msgid "Island"
+msgid "Valley"
msgstr ""
-msgid "Islet"
+msgid "A low area between hills."
msgstr ""
-msgid "Ridge"
+msgid "Cave Entrance"
msgstr ""
-msgid "A mountain or hill ridge."
+msgid "The entrance to a cave."
+msgstr ""
+
+msgid "Island"
+msgstr ""
+
+msgid "Islet"
msgstr ""
msgid "Nature"
@@ -21107,6 +21169,37 @@ msgstr ""
msgid "Forest"
msgstr ""
+msgid "Cutline"
+msgstr ""
+
+msgctxt "cutline"
+msgid "border"
+msgstr ""
+
+msgctxt "cutline"
+msgid "firebreak"
+msgstr ""
+
+msgctxt "cutline"
+msgid "hunting"
+msgstr ""
+
+msgctxt "cutline"
+msgid "loggingmachine"
+msgstr ""
+
+msgctxt "cutline"
+msgid "pipeline"
+msgstr ""
+
+msgctxt "cutline"
+msgid "piste"
+msgstr ""
+
+msgctxt "cutline"
+msgid "section"
+msgstr ""
+
msgid "Grassland"
msgstr ""
@@ -22040,6 +22133,9 @@ msgstr ""
msgid "Unspecific tag {0}"
msgstr ""
+msgid "Definition of {0} is unclear"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -27401,7 +27497,7 @@ msgstr ""
msgid "No object selected"
msgstr ""
-msgid "SeaMap Editor"
+msgid "SeaChart Editor"
msgstr ""
msgid "Seamark Inspector"
@@ -27473,6 +27569,9 @@ msgstr ""
msgid "Merge Nearby Nodes Threshold"
msgstr ""
+msgid "SeaMap Editor"
+msgstr ""
+
msgid "AutoSave LiveData"
msgstr ""
diff --git a/i18n/po/vi.po b/i18n/po/vi.po
index 9c8ed2f..d269292 100644
--- a/i18n/po/vi.po
+++ b/i18n/po/vi.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-04 03:32+0100\n"
+"POT-Creation-Date: 2015-04-01 03:33+0200\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"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2015-03-04 05:02+0000\n"
-"X-Generator: Launchpad (build 17361)\n"
+"X-Launchpad-Export-Date: 2015-04-01 05:01+0000\n"
+"X-Generator: Launchpad (build 17413)\n"
"Language: vi\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -1707,9 +1707,15 @@ msgstr "Đã tải dữ liệu GPX"
msgid "Markers from {0}"
msgstr ""
+msgid "Download OSM Notes"
+msgstr ""
+
msgid "Downloading Notes"
msgstr ""
+msgid "Notes"
+msgstr ""
+
msgid "Download Compressed OSM Change"
msgstr ""
@@ -6119,6 +6125,9 @@ msgstr ""
msgid "Customize the style"
msgstr ""
+msgid "List of notes"
+msgstr ""
+
msgid "Add comment"
msgstr ""
@@ -7438,9 +7447,6 @@ 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 ""
@@ -15706,9 +15712,6 @@ msgstr ""
msgid "stadium"
msgstr ""
-msgid "Select sport:"
-msgstr ""
-
msgid "Sport"
msgstr ""
@@ -15829,19 +15832,19 @@ msgid "rugby_union"
msgstr ""
msgctxt "sport"
-msgid "shooting"
+msgid "running"
msgstr ""
msgctxt "sport"
-msgid "skateboard"
+msgid "shooting"
msgstr ""
msgctxt "sport"
-msgid "skating"
+msgid "skateboard"
msgstr ""
msgctxt "sport"
-msgid "skiing"
+msgid "skating"
msgstr ""
msgctxt "sport"
@@ -16169,6 +16172,30 @@ msgstr ""
msgid "Toll"
msgstr ""
+msgid "Is the water body intermittent (disappears seasonally)?"
+msgstr ""
+
+msgid "culvert"
+msgstr ""
+
+msgid "Water access rules:"
+msgstr ""
+
+msgid "Ship"
+msgstr ""
+
+msgid "designated"
+msgstr ""
+
+msgid "Boat"
+msgstr ""
+
+msgid "Motorboat"
+msgstr ""
+
+msgid "Canoe"
+msgstr ""
+
msgid "Streets"
msgstr ""
@@ -16384,9 +16411,6 @@ msgstr ""
msgid "official"
msgstr ""
-msgid "designated"
-msgstr ""
-
msgid "Vehicles per type"
msgstr ""
@@ -16776,6 +16800,9 @@ msgstr ""
msgid "Pedestrian Crossing"
msgstr ""
+msgid "In case of traffic signals:"
+msgstr ""
+
msgid "Traffic Calming"
msgstr ""
@@ -17022,15 +17049,12 @@ msgstr ""
msgid "Stream"
msgstr ""
-msgid "Wadi"
+msgid "River"
msgstr ""
msgid "Canal"
msgstr ""
-msgid "River"
-msgstr ""
-
msgid "Spring"
msgstr ""
@@ -17096,9 +17120,6 @@ msgstr ""
msgid "Salt Water"
msgstr ""
-msgid "Is the water body intermittent (disappears seasonally)?"
-msgstr ""
-
msgid "Coastline"
msgstr ""
@@ -17938,6 +17959,9 @@ msgstr ""
msgid "Tactile Paving"
msgstr ""
+msgid "incorrect"
+msgstr ""
+
msgid "Bus Platform"
msgstr ""
@@ -18100,6 +18124,9 @@ msgstr ""
msgid "Microbrewery"
msgstr ""
+msgid "Outdoor seating"
+msgstr ""
+
msgid "Fast Food"
msgstr ""
@@ -18694,13 +18721,13 @@ msgstr ""
msgid "Collection times"
msgstr ""
-msgid "11:30"
+msgid "Mo-Sa 09:00"
msgstr ""
-msgid "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
+msgid "Mo-Fr 17:30; Sa 12:00"
msgstr ""
-msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; Su,PH off"
+msgid "Mo-Fr 15:00,19:00; Sa 15:10; Su 10:30"
msgstr ""
msgid "Drive through"
@@ -18959,6 +18986,15 @@ msgstr ""
msgid "Pitch"
msgstr ""
+msgid "artificial_turf"
+msgstr ""
+
+msgid "decoturf"
+msgstr ""
+
+msgid "tartan"
+msgstr ""
+
msgid "Racetrack"
msgstr ""
@@ -19066,6 +19102,12 @@ msgstr ""
msgid "skitour"
msgstr ""
+msgid "sled"
+msgstr ""
+
+msgid "sleigh"
+msgstr ""
+
msgid "snow_park"
msgstr ""
@@ -19318,6 +19360,10 @@ msgctxt "building"
msgid "construction"
msgstr ""
+msgctxt "building"
+msgid "Levels"
+msgstr ""
+
msgid "Residential Building"
msgstr ""
@@ -19353,6 +19399,16 @@ msgctxt "building"
msgid "farm"
msgstr ""
+msgid "Building part"
+msgstr ""
+
+msgctxt "building"
+msgid "Skipped Levels"
+msgstr ""
+
+msgid "Skipped height (meters)"
+msgstr ""
+
msgid "Entrance"
msgstr ""
@@ -21086,22 +21142,28 @@ msgstr ""
msgid "scoria"
msgstr ""
-msgid "Cave Entrance"
+msgid "Ridge"
msgstr ""
-msgid "The entrance to a cave."
+msgid "A mountain or hill ridge."
msgstr ""
-msgid "Island"
+msgid "Valley"
msgstr ""
-msgid "Islet"
+msgid "A low area between hills."
msgstr ""
-msgid "Ridge"
+msgid "Cave Entrance"
msgstr ""
-msgid "A mountain or hill ridge."
+msgid "The entrance to a cave."
+msgstr ""
+
+msgid "Island"
+msgstr ""
+
+msgid "Islet"
msgstr ""
msgid "Nature"
@@ -21131,6 +21193,37 @@ msgstr ""
msgid "Forest"
msgstr ""
+msgid "Cutline"
+msgstr ""
+
+msgctxt "cutline"
+msgid "border"
+msgstr ""
+
+msgctxt "cutline"
+msgid "firebreak"
+msgstr ""
+
+msgctxt "cutline"
+msgid "hunting"
+msgstr ""
+
+msgctxt "cutline"
+msgid "loggingmachine"
+msgstr ""
+
+msgctxt "cutline"
+msgid "pipeline"
+msgstr ""
+
+msgctxt "cutline"
+msgid "piste"
+msgstr ""
+
+msgctxt "cutline"
+msgid "section"
+msgstr ""
+
msgid "Grassland"
msgstr ""
@@ -22064,6 +22157,9 @@ msgstr ""
msgid "Unspecific tag {0}"
msgstr ""
+msgid "Definition of {0} is unclear"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -27425,7 +27521,7 @@ msgstr ""
msgid "No object selected"
msgstr ""
-msgid "SeaMap Editor"
+msgid "SeaChart Editor"
msgstr ""
msgid "Seamark Inspector"
@@ -27497,6 +27593,9 @@ msgstr ""
msgid "Merge Nearby Nodes Threshold"
msgstr ""
+msgid "SeaMap Editor"
+msgstr ""
+
msgid "AutoSave LiveData"
msgstr ""
diff --git a/i18n/po/zh_CN.po b/i18n/po/zh_CN.po
index 74fd6b1..e674627 100644
--- a/i18n/po/zh_CN.po
+++ b/i18n/po/zh_CN.po
@@ -10,16 +10,16 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-04 03:32+0100\n"
-"PO-Revision-Date: 2015-02-21 05:39+0000\n"
+"POT-Creation-Date: 2015-04-01 03:33+0200\n"
+"PO-Revision-Date: 2015-03-10 12:54+0000\n"
"Last-Translator: rc1028 <q371320247 at live.com>\n"
"Language-Team: 汉语 <>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2015-03-04 05:05+0000\n"
-"X-Generator: Launchpad (build 17361)\n"
+"X-Launchpad-Export-Date: 2015-04-01 05:04+0000\n"
+"X-Generator: Launchpad (build 17413)\n"
"Language: zh_CN\n"
msgid "yard"
@@ -1702,9 +1702,15 @@ msgstr "已下载的 GPX 数据"
msgid "Markers from {0}"
msgstr "{0} 的标记"
+msgid "Download OSM Notes"
+msgstr "下载OSM地图注释"
+
msgid "Downloading Notes"
msgstr "下载说明"
+msgid "Notes"
+msgstr "纸币"
+
msgid "Download Compressed OSM Change"
msgstr "下载压缩 OSM 修改"
@@ -2725,7 +2731,7 @@ msgid "Uploading modified notes"
msgstr "正在上传修改后的注释"
msgid "Note {0} failed: {1}"
-msgstr ""
+msgstr "注释{0}失败:{1}"
msgid "Notes failed to upload"
msgstr "上传注释失败"
@@ -3829,7 +3835,7 @@ msgstr[0] "多边形关系应用区域标签标记，而非外侧路径"
msgid ""
"With the currently used mappaint style the style for inner way equals the "
"multipolygon style"
-msgstr ""
+msgstr "在当前图幅配色方案下，路径内边界和多重多边形的样式相同"
msgid "Style for outer way mismatches"
msgstr "外部路径的样式不符"
@@ -3837,7 +3843,7 @@ msgstr "外部路径的样式不符"
msgid ""
"With the currently used mappaint style(s) the style for outer way mismatches "
"polygon"
-msgstr ""
+msgstr "在当前图幅配色方案下，路径外边界和多边形不一致"
msgid "Area style on outer way"
msgstr "面状要素采用多重多边形路径外边界表示"
@@ -6138,6 +6144,9 @@ msgstr "样式设置"
msgid "Customize the style"
msgstr "自定义样式"
+msgid "List of notes"
+msgstr "地图注释列表"
+
msgid "Add comment"
msgstr "添加评论"
@@ -7461,9 +7470,6 @@ 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 "选择下载选定区域内的地图注释"
@@ -8491,7 +8497,7 @@ msgid "Cancel uploading"
msgstr "正在取消上传"
msgid "Unexpected value for key ''{0}'' in preferences, got ''{1}''"
-msgstr ""
+msgstr "首选项中意外的键\"{0}\"值\"{1}\""
msgid "Please select the upload strategy:"
msgstr "请选择上传的方式："
@@ -8626,7 +8632,7 @@ msgid "Jump to next marker"
msgstr "跳至下一个标记"
msgid "Previous marker"
-msgstr ""
+msgstr "上一个标记"
msgid "Jump to previous marker"
msgstr "跳至前一个标记"
@@ -10681,7 +10687,7 @@ msgid "3. Select image format"
msgstr "3.选择图像格式"
msgid "4. Verify generated WMS URL"
-msgstr ""
+msgstr "确认生成的WMS URL地址"
msgid "5. Enter name for this layer"
msgstr "输入该图层的名称"
@@ -11179,7 +11185,7 @@ msgid "3 or 7 term datum transform parameters"
msgstr "基准变换三参数或七参数"
msgid "NTv2 grid file"
-msgstr ""
+msgstr "NTv2网格文件"
msgid "Built-in:"
msgstr "内置："
@@ -11188,7 +11194,7 @@ msgid "Projection bounds (in degrees)"
msgstr "投影范围(度)"
msgid "Sets the SRS=... parameter in the WMS request"
-msgstr ""
+msgstr "在WMS请求中设置参数SRS=..."
msgid "Gauß-Krüger"
msgstr "高斯克鲁格"
@@ -11434,7 +11440,7 @@ msgstr "选择以使用 OAuth 做为验证机制"
msgid ""
"Unsupported value in preference ''{0}'', got ''{1}''. Using authentication "
"method ''Basic Authentication''."
-msgstr ""
+msgstr "首选项\"{0}\"设置不支持的值\"{1}\"。使用“基本认证”方法。"
msgid "OSM username:"
msgstr "OSM 用户名："
@@ -11627,7 +11633,7 @@ msgid ""
msgstr "<html>从{0}加载规则源失败。<br><br>详情如下（可能未翻译）：<br>{1}</html>"
msgid "Warning: illegal format of entry in rule list ''{0}''. Got ''{1}''"
-msgstr ""
+msgstr "警告：规则列表\"{0}\"中非法的条目格式\"{1}\""
msgid "Checks for errors on addresses"
msgstr "检查地址错误"
@@ -11809,7 +11815,7 @@ msgid "Optional Attributes:"
msgstr "额外属性："
msgid "Select auto-increment of {0} for this field"
-msgstr ""
+msgstr "选择此栏自增{0}"
msgid "Cancel auto-increment for this field"
msgstr "取消此项自增"
@@ -11820,17 +11826,17 @@ msgstr "{0}："
msgid ""
"Warning in tagging preset \"{0}-{1}\": Ignoring ''{2}'' attribute as ''{3}'' "
"elements are given."
-msgstr ""
+msgstr "标签预设组合\"{0}-{1}\"警告: 忽略\"{2}\"属性，因为给定了\"{3}\"个元素。"
msgid ""
"Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' is "
"not \"{2}\""
-msgstr ""
+msgstr "损坏的标签预设组合\"{0}-{1}\" - \"values_from\"中给出的Java方法不是\"{2}\""
msgid ""
"Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' "
"threw {2} ({3})"
-msgstr ""
+msgstr "损坏的标签预设组合\"{0}-{1}\" - \"values_from\"中给出的Java方法抛出{2}({3})"
msgid ""
"Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' "
@@ -11852,7 +11858,7 @@ msgid "Preset group {0}"
msgstr "预设组合 {0}"
msgid "Reference {0} is being used before it was defined"
-msgstr ""
+msgstr "引用{0}在定义前使用"
msgid "Roles cannot appear more than once"
msgstr "角色不能出现超过一次"
@@ -11896,7 +11902,7 @@ msgid "Adjustable {0} not registered yet."
msgstr "可调整的 {0} 尚未注册。"
msgid "Some of the key listeners forgot to remove themselves: {0}"
-msgstr ""
+msgstr "部分键盘监听器忘记移除自身:{0}"
msgid "Some of the key modifier listeners forgot to remove themselves: {0}"
msgstr ""
@@ -11905,7 +11911,7 @@ msgid "All files (*.*)"
msgstr "所有文件(*.*)"
msgid "Received error page:"
-msgstr ""
+msgstr "收到错误页:"
msgid "Min. latitude"
msgstr "最小纬度"
@@ -11956,7 +11962,7 @@ msgid "unset: do not set this property on the selected objects"
msgstr "取消设定：不要在选定的对象上设定这个属性"
msgid "Cut"
-msgstr ""
+msgstr "剪切"
msgid "Right click = copy to clipboard"
msgstr "右键=复制到剪贴板"
@@ -12020,7 +12026,7 @@ msgstr "打开资源“{0}”的输入串流失败"
msgid ""
"Failed to open file with extension ''{2}'' and namepart ''{3}'' in zip file "
"''{0}''. Exception was: {1}"
-msgstr ""
+msgstr "打开扩展名为\"{2}\"的文件中名为\"{3}\"的压缩文件\"{0}\"失败。异常如下:{1}"
msgid "Failed to rename file {0} to {1}."
msgstr "无法重命名文件 {0} 为 {1}。"
@@ -12073,7 +12079,7 @@ msgid "Unsupported parameter ''{0}'' in changeset query string"
msgstr "在修改集合查询字串中有不支持的参数“{0}”"
msgid "Unexpected format for port number in preference ''{0}''. Got ''{1}''."
-msgstr ""
+msgstr "首选项\"{0}\"中意外的端口号格式\"{1}\"。"
msgid "The proxy will not be used."
msgstr "将不使用代理服务器。"
@@ -12084,25 +12090,25 @@ msgstr "首选项“{0}”中有无效的端口号。得到“{1}”。"
msgid ""
"Unexpected value for preference ''{0}'' found. Got ''{1}''. Will use no "
"proxy."
-msgstr ""
+msgstr "首选项\"{0}\"中发现意外值\"{1}\"。将不使用代理。"
msgid ""
"Unexpected parameters for HTTP proxy. Got host ''{0}'' and port ''{1}''."
-msgstr ""
+msgstr "HTTP代理服务器意外参数:主机\"{0}\",端口\"{1}\""
msgid ""
"Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port ''{1}''."
-msgstr ""
+msgstr "SOCKS代理服务器意外参数:主机\"{0}\",端口\"{1}\""
msgid ""
"Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
-msgstr ""
+msgstr "与位于\"{1}\"的代理服务器\"{0}\"连接失败。异常如下:{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 ""
+msgstr "JVM未被配置为从系统设置中查找代理。启动时''java.net.useSystemProxies''属性丢失。将不使用代理服务器。"
msgid "Parsing response from server..."
msgstr "正在分析服务器的回应..."
@@ -12214,7 +12220,7 @@ msgid "No image files found."
msgstr "找不到图像文件。"
msgid "get number of unread messages"
-msgstr ""
+msgstr "获取未读消息数"
msgid "You have {0} unread message."
msgid_plural "You have {0} unread messages."
@@ -12285,25 +12291,25 @@ msgid "Zero coordinates: {0}"
msgstr "零坐标：{0}"
msgid "NMEA import success:"
-msgstr ""
+msgstr "NMEA导入成功:"
msgid "NMEA import failure!"
msgstr "NMEA 输入失败！"
msgid "Note Files"
-msgstr ""
+msgstr "注释文件"
msgid "OSM API"
-msgstr ""
+msgstr "OSM API"
msgid "JOSM website"
-msgstr ""
+msgstr "JOSM网站"
msgid "Unable to access ''{0}'': {1} not available (offline mode)"
-msgstr ""
+msgstr "无法访问\"{0}\":{1}(离线模式)"
msgid "Unable to initialize OSM API."
-msgstr ""
+msgstr "OSM API无法初始化"
msgid "This version of JOSM is incompatible with the configured server."
msgstr "这个版本的 JOSM 与设定的服务器。"
@@ -12369,13 +12375,13 @@ msgid "Open changeset expected. Got closed changeset with id {0}."
msgstr "需要开放的修改集合。却发现 id {0} 的关闭修改集合。"
msgid "Note upload failed"
-msgstr ""
+msgstr "注释上传失败"
msgid "Error parsing note response from server"
-msgstr ""
+msgstr "解析服务器返回的地图注释响应失败"
msgid "Error encoding string: {0}"
-msgstr ""
+msgstr "字符串{0}编码错误"
msgid "(Code={0})"
msgstr "(代码={0})"
@@ -12410,7 +12416,7 @@ msgstr "不支持的版本：{0}"
msgid ""
"Unsupported start element ''{0}'' in changeset content at position "
"({1},{2}). Skipping."
-msgstr ""
+msgstr "不支持修改集合内容({1},{2})处的开始元素\"{0}\"。正在跳过。"
msgid ""
"Illegal document structure. Found node, way, or relation outside of "
@@ -12420,7 +12426,7 @@ msgstr "不合法的文件结构。发现节点、路径或关系并非“create
msgid ""
"Unsupported end element ''{0}'' in changeset content at position ({1},{2}). "
"Skipping."
-msgstr ""
+msgstr "不支持修改集合内容({1},{2})处的结束元素\"{0}\"。正在跳过。"
msgid "Parsing changeset content ..."
msgstr "正在分析修改集合内容..."
@@ -12447,7 +12453,7 @@ msgid "Failed to sign a HTTP connection with an OAuth Authentication header"
msgstr "无法以 OAuth 验证标头签署 HTTP 连接"
msgid "Unexpected value for preference ''{0}''. Got ''{1}''."
-msgstr ""
+msgstr "首选项\"{0}\"的意外值\"{1}\""
msgid "<html>An error occurred while saving.<br>Error is:<br>{0}</html>"
msgstr "<html>在保存时发生错误。<br>错误为：<br>{0}</html>"
@@ -12479,7 +12485,7 @@ msgid "Open OSM file"
msgstr "打开 OSM 文件"
msgid "Reading was canceled"
-msgstr ""
+msgstr "读取已取消"
msgid ""
"Missing mandatory attributes on element ''bounds''. Got "
@@ -12534,7 +12540,7 @@ msgstr "在 OSM 原型 ID {0} 的属性“version”有不合法的数值。得
msgid ""
"Normalizing value of attribute ''version'' of element {0} to {2}, API "
"version is ''{3}''. Got {1}."
-msgstr ""
+msgstr "正在从{0}到{2}归一化元素“版本”属性{1}, API版本是\"{3}\""
msgid "Unknown or unsupported API version. Got {0}."
msgstr "不明或不支持的 API 版本。得到 {0}。"
@@ -12557,7 +12563,7 @@ msgid "Illegal long value for attribute ''{0}''. Got ''{1}''."
msgstr "属性“{0}”有不合法的 long 数值。得到“{1}”。"
msgid "{0} bytes have been read"
-msgstr ""
+msgstr "已读入{0}字节"
msgid "Prepare OSM data..."
msgstr "准备 OSM 数据..."
@@ -12606,7 +12612,7 @@ msgid "Contacting Server..."
msgstr "正在连接服务器..."
msgid "Downloading OSM notes..."
-msgstr ""
+msgstr "正在下载OSM地图注释"
msgid "Failed to open connection to API {0}."
msgstr "打开 API {0} 连接失败"
@@ -12662,7 +12668,7 @@ msgid "Unexpected id 0 for osm primitive found"
msgstr "发现意外的 id 0 osm 原型"
msgid "OSM Server Files zip compressed"
-msgstr ""
+msgstr "OSM服务器文件被压缩为zip"
msgid "WMS Files (*.wms)"
msgstr "WMS 文件(*.wms)"
@@ -12705,7 +12711,7 @@ msgid "Assume"
msgstr "猜测"
msgid "Existing values"
-msgstr ""
+msgstr "已有值"
msgid "Enable the checkbox to accept the value"
msgstr "启用该复选框可接值参"
@@ -15816,9 +15822,6 @@ msgstr "运动中心"
msgid "stadium"
msgstr "体育场"
-msgid "Select sport:"
-msgstr ""
-
msgid "Sport"
msgstr "运动"
@@ -15939,19 +15942,19 @@ msgid "rugby_union"
msgstr ""
msgctxt "sport"
-msgid "shooting"
+msgid "running"
msgstr ""
msgctxt "sport"
-msgid "skateboard"
+msgid "shooting"
msgstr ""
msgctxt "sport"
-msgid "skating"
+msgid "skateboard"
msgstr ""
msgctxt "sport"
-msgid "skiing"
+msgid "skating"
msgstr ""
msgctxt "sport"
@@ -16279,6 +16282,30 @@ msgstr "限重(吨)"
msgid "Toll"
msgstr "收费"
+msgid "Is the water body intermittent (disappears seasonally)?"
+msgstr ""
+
+msgid "culvert"
+msgstr ""
+
+msgid "Water access rules:"
+msgstr ""
+
+msgid "Ship"
+msgstr ""
+
+msgid "designated"
+msgstr "指定"
+
+msgid "Boat"
+msgstr ""
+
+msgid "Motorboat"
+msgstr ""
+
+msgid "Canoe"
+msgstr ""
+
msgid "Streets"
msgstr "街道"
@@ -16494,9 +16521,6 @@ msgstr "交通模式限制"
msgid "official"
msgstr "官方"
-msgid "designated"
-msgstr "指定"
-
msgid "Vehicles per type"
msgstr "各种类型的车辆"
@@ -16886,6 +16910,9 @@ msgstr "顺时针"
msgid "Pedestrian Crossing"
msgstr "人行横道"
+msgid "In case of traffic signals:"
+msgstr ""
+
msgid "Traffic Calming"
msgstr "道路减速设施"
@@ -17132,15 +17159,12 @@ msgstr "沟"
msgid "Stream"
msgstr "溪流"
-msgid "Wadi"
-msgstr "干河"
+msgid "River"
+msgstr "河流"
msgid "Canal"
msgstr "运河"
-msgid "River"
-msgstr "河流"
-
msgid "Spring"
msgstr "泉"
@@ -17206,9 +17230,6 @@ msgstr "河"
msgid "Salt Water"
msgstr ""
-msgid "Is the water body intermittent (disappears seasonally)?"
-msgstr ""
-
msgid "Coastline"
msgstr "海岸线"
@@ -18048,6 +18069,9 @@ msgstr "公交车停靠站"
msgid "Tactile Paving"
msgstr "盲道"
+msgid "incorrect"
+msgstr ""
+
msgid "Bus Platform"
msgstr "公交车月台"
@@ -18210,6 +18234,9 @@ msgstr "寿司"
msgid "Microbrewery"
msgstr "自酿酒"
+msgid "Outdoor seating"
+msgstr ""
+
msgid "Fast Food"
msgstr "快餐"
@@ -18804,13 +18831,13 @@ msgstr "邮筒"
msgid "Collection times"
msgstr ""
-msgid "11:30"
+msgid "Mo-Sa 09:00"
msgstr ""
-msgid "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
+msgid "Mo-Fr 17:30; Sa 12:00"
msgstr ""
-msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; Su,PH off"
+msgid "Mo-Fr 15:00,19:00; Sa 15:10; Su 10:30"
msgstr ""
msgid "Drive through"
@@ -19069,6 +19096,15 @@ msgstr "运动中心"
msgid "Pitch"
msgstr "场地"
+msgid "artificial_turf"
+msgstr ""
+
+msgid "decoturf"
+msgstr ""
+
+msgid "tartan"
+msgstr ""
+
msgid "Racetrack"
msgstr "跑道"
@@ -19176,6 +19212,12 @@ msgstr "北欧"
msgid "skitour"
msgstr ""
+msgid "sled"
+msgstr ""
+
+msgid "sleigh"
+msgstr ""
+
msgid "snow_park"
msgstr "公园"
@@ -19428,6 +19470,10 @@ msgctxt "building"
msgid "construction"
msgstr ""
+msgctxt "building"
+msgid "Levels"
+msgstr ""
+
msgid "Residential Building"
msgstr "住宅楼"
@@ -19463,6 +19509,16 @@ msgctxt "building"
msgid "farm"
msgstr "农场"
+msgid "Building part"
+msgstr ""
+
+msgctxt "building"
+msgid "Skipped Levels"
+msgstr ""
+
+msgid "Skipped height (meters)"
+msgstr ""
+
msgid "Entrance"
msgstr "入口"
@@ -21196,6 +21252,18 @@ msgstr ""
msgid "scoria"
msgstr ""
+msgid "Ridge"
+msgstr ""
+
+msgid "A mountain or hill ridge."
+msgstr ""
+
+msgid "Valley"
+msgstr ""
+
+msgid "A low area between hills."
+msgstr ""
+
msgid "Cave Entrance"
msgstr "洞窟入口"
@@ -21208,12 +21276,6 @@ msgstr "岛"
msgid "Islet"
msgstr "屿"
-msgid "Ridge"
-msgstr ""
-
-msgid "A mountain or hill ridge."
-msgstr ""
-
msgid "Nature"
msgstr "自然"
@@ -21241,6 +21303,37 @@ msgstr ""
msgid "Forest"
msgstr "森林"
+msgid "Cutline"
+msgstr ""
+
+msgctxt "cutline"
+msgid "border"
+msgstr ""
+
+msgctxt "cutline"
+msgid "firebreak"
+msgstr ""
+
+msgctxt "cutline"
+msgid "hunting"
+msgstr ""
+
+msgctxt "cutline"
+msgid "loggingmachine"
+msgstr ""
+
+msgctxt "cutline"
+msgid "pipeline"
+msgstr ""
+
+msgctxt "cutline"
+msgid "piste"
+msgstr ""
+
+msgctxt "cutline"
+msgid "section"
+msgstr ""
+
msgid "Grassland"
msgstr "草原"
@@ -22174,6 +22267,9 @@ msgstr ""
msgid "Unspecific tag {0}"
msgstr ""
+msgid "Definition of {0} is unclear"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -27658,8 +27754,8 @@ msgstr "保存 SDS 文件"
msgid "No object selected"
msgstr ""
-msgid "SeaMap Editor"
-msgstr "海标编辑器"
+msgid "SeaChart Editor"
+msgstr ""
msgid "Seamark Inspector"
msgstr ""
@@ -27730,6 +27826,9 @@ msgstr "距离系数"
msgid "Merge Nearby Nodes Threshold"
msgstr "合并阈值附近的节点"
+msgid "SeaMap Editor"
+msgstr "海标编辑器"
+
msgid "AutoSave LiveData"
msgstr "自动保存即时数据"
diff --git a/i18n/po/zh_TW.po b/i18n/po/zh_TW.po
index 4ab2574..efb842b 100644
--- a/i18n/po/zh_TW.po
+++ b/i18n/po/zh_TW.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-04 03:32+0100\n"
+"POT-Creation-Date: 2015-04-01 03:33+0200\n"
"PO-Revision-Date: 2015-01-30 10:41+0000\n"
"Last-Translator: yellowsoar <Unknown>\n"
"Language-Team: Traditional Chinese\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2015-03-04 05:05+0000\n"
-"X-Generator: Launchpad (build 17361)\n"
+"X-Launchpad-Export-Date: 2015-04-01 05:04+0000\n"
+"X-Generator: Launchpad (build 17413)\n"
"Language: zh_TW\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -1697,9 +1697,15 @@ msgstr "已下載的 GPX 資料"
msgid "Markers from {0}"
msgstr "{0} 的標記"
+msgid "Download OSM Notes"
+msgstr ""
+
msgid "Downloading Notes"
msgstr ""
+msgid "Notes"
+msgstr "備註"
+
msgid "Download Compressed OSM Change"
msgstr ""
@@ -6108,6 +6114,9 @@ msgstr ""
msgid "Customize the style"
msgstr ""
+msgid "List of notes"
+msgstr ""
+
msgid "Add comment"
msgstr ""
@@ -7425,9 +7434,6 @@ 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 ""
@@ -15753,9 +15759,6 @@ msgstr "運動中心"
msgid "stadium"
msgstr "體育館"
-msgid "Select sport:"
-msgstr ""
-
msgid "Sport"
msgstr "運動"
@@ -15876,19 +15879,19 @@ msgid "rugby_union"
msgstr ""
msgctxt "sport"
-msgid "shooting"
+msgid "running"
msgstr ""
msgctxt "sport"
-msgid "skateboard"
+msgid "shooting"
msgstr ""
msgctxt "sport"
-msgid "skating"
+msgid "skateboard"
msgstr ""
msgctxt "sport"
-msgid "skiing"
+msgid "skating"
msgstr ""
msgctxt "sport"
@@ -16216,6 +16219,30 @@ msgstr "總重限制（噸）"
msgid "Toll"
msgstr "通行費"
+msgid "Is the water body intermittent (disappears seasonally)?"
+msgstr ""
+
+msgid "culvert"
+msgstr ""
+
+msgid "Water access rules:"
+msgstr ""
+
+msgid "Ship"
+msgstr ""
+
+msgid "designated"
+msgstr "已指定"
+
+msgid "Boat"
+msgstr ""
+
+msgid "Motorboat"
+msgstr ""
+
+msgid "Canoe"
+msgstr ""
+
msgid "Streets"
msgstr "街道"
@@ -16431,9 +16458,6 @@ msgstr ""
msgid "official"
msgstr "正式的"
-msgid "designated"
-msgstr "已指定"
-
msgid "Vehicles per type"
msgstr ""
@@ -16823,6 +16847,9 @@ msgstr "順時針"
msgid "Pedestrian Crossing"
msgstr "行人穿越道"
+msgid "In case of traffic signals:"
+msgstr ""
+
msgid "Traffic Calming"
msgstr "道路減速設施"
@@ -17069,15 +17096,12 @@ msgstr "渠道"
msgid "Stream"
msgstr "溪流"
-msgid "Wadi"
-msgstr ""
+msgid "River"
+msgstr "河流"
msgid "Canal"
msgstr "運河"
-msgid "River"
-msgstr "河流"
-
msgid "Spring"
msgstr "泉"
@@ -17143,9 +17167,6 @@ msgstr ""
msgid "Salt Water"
msgstr ""
-msgid "Is the water body intermittent (disappears seasonally)?"
-msgstr ""
-
msgid "Coastline"
msgstr "海岸線"
@@ -17985,6 +18006,9 @@ msgstr "公車站牌"
msgid "Tactile Paving"
msgstr ""
+msgid "incorrect"
+msgstr ""
+
msgid "Bus Platform"
msgstr "公車月台"
@@ -18147,6 +18171,9 @@ msgstr "壽司"
msgid "Microbrewery"
msgstr ""
+msgid "Outdoor seating"
+msgstr ""
+
msgid "Fast Food"
msgstr "速食"
@@ -18741,13 +18768,13 @@ msgstr "郵筒"
msgid "Collection times"
msgstr ""
-msgid "11:30"
+msgid "Mo-Sa 09:00"
msgstr ""
-msgid "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
+msgid "Mo-Fr 17:30; Sa 12:00"
msgstr ""
-msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; Su,PH off"
+msgid "Mo-Fr 15:00,19:00; Sa 15:10; Su 10:30"
msgstr ""
msgid "Drive through"
@@ -19006,6 +19033,15 @@ msgstr "運動中心"
msgid "Pitch"
msgstr ""
+msgid "artificial_turf"
+msgstr ""
+
+msgid "decoturf"
+msgstr ""
+
+msgid "tartan"
+msgstr ""
+
msgid "Racetrack"
msgstr "跑道"
@@ -19113,6 +19149,12 @@ msgstr ""
msgid "skitour"
msgstr ""
+msgid "sled"
+msgstr ""
+
+msgid "sleigh"
+msgstr ""
+
msgid "snow_park"
msgstr ""
@@ -19365,6 +19407,10 @@ msgctxt "building"
msgid "construction"
msgstr ""
+msgctxt "building"
+msgid "Levels"
+msgstr ""
+
msgid "Residential Building"
msgstr "居住的建築"
@@ -19400,6 +19446,16 @@ msgctxt "building"
msgid "farm"
msgstr ""
+msgid "Building part"
+msgstr ""
+
+msgctxt "building"
+msgid "Skipped Levels"
+msgstr ""
+
+msgid "Skipped height (meters)"
+msgstr ""
+
msgid "Entrance"
msgstr "入口"
@@ -21133,6 +21189,18 @@ msgstr ""
msgid "scoria"
msgstr ""
+msgid "Ridge"
+msgstr ""
+
+msgid "A mountain or hill ridge."
+msgstr ""
+
+msgid "Valley"
+msgstr ""
+
+msgid "A low area between hills."
+msgstr ""
+
msgid "Cave Entrance"
msgstr "洞窟入口"
@@ -21145,12 +21213,6 @@ msgstr "島嶼"
msgid "Islet"
msgstr "小島"
-msgid "Ridge"
-msgstr ""
-
-msgid "A mountain or hill ridge."
-msgstr ""
-
msgid "Nature"
msgstr "自然"
@@ -21178,6 +21240,37 @@ msgstr ""
msgid "Forest"
msgstr "森林"
+msgid "Cutline"
+msgstr ""
+
+msgctxt "cutline"
+msgid "border"
+msgstr ""
+
+msgctxt "cutline"
+msgid "firebreak"
+msgstr ""
+
+msgctxt "cutline"
+msgid "hunting"
+msgstr ""
+
+msgctxt "cutline"
+msgid "loggingmachine"
+msgstr ""
+
+msgctxt "cutline"
+msgid "pipeline"
+msgstr ""
+
+msgctxt "cutline"
+msgid "piste"
+msgstr ""
+
+msgctxt "cutline"
+msgid "section"
+msgstr ""
+
msgid "Grassland"
msgstr ""
@@ -22111,6 +22204,9 @@ msgstr ""
msgid "Unspecific tag {0}"
msgstr ""
+msgid "Definition of {0} is unclear"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -27546,8 +27642,8 @@ msgstr ""
msgid "No object selected"
msgstr ""
-msgid "SeaMap Editor"
-msgstr "海圖編輯器"
+msgid "SeaChart Editor"
+msgstr ""
msgid "Seamark Inspector"
msgstr ""
@@ -27618,6 +27714,9 @@ msgstr ""
msgid "Merge Nearby Nodes Threshold"
msgstr ""
+msgid "SeaMap Editor"
+msgstr "海圖編輯器"
+
msgid "AutoSave LiveData"
msgstr "自動儲存即時資料"
diff --git a/images/presets/dam.png b/images/presets/dam.png
index 598090f..08c9ae1 100644
Binary files a/images/presets/dam.png and b/images/presets/dam.png differ
diff --git a/images/presets/ridge.svg b/images/presets/ridge.svg
new file mode 100644
index 0000000..119586e
--- /dev/null
+++ b/images/presets/ridge.svg
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="400"
+ height="400"
+ id="svg2"
+ version="1.1"
+ inkscape:version="0.48.0 r9654"
+ sodipodi:docname="peak.svg">
+ <defs
+ id="defs4" />
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="1.28"
+ inkscape:cx="-81.092565"
+ inkscape:cy="202.02508"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ showguides="true"
+ inkscape:snap-global="false"
+ inkscape:guide-bbox="true"
+ inkscape:window-width="1600"
+ inkscape:window-height="848"
+ inkscape:window-x="-8"
+ inkscape:window-y="-8"
+ inkscape:window-maximized="1"
+ fit-margin-top="0"
+ fit-margin-left="0"
+ fit-margin-right="0"
+ fit-margin-bottom="0" />
+ <metadata
+ id="metadata7">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Ebene 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(-0.125,2.75)">
+ <path
+ style="fill:#5c7515;fill-rule:evenodd;stroke:#000000;stroke-width:1.58364117px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 199.92412,110.62652 2.0903838,396.45845 398.24849,396.45629 z"
+ id="rect2985"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccc" />
+ </g>
+</svg>
diff --git a/images/presets/valley.svg b/images/presets/valley.svg
new file mode 100644
index 0000000..77c1a93
--- /dev/null
+++ b/images/presets/valley.svg
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="400"
+ height="400"
+ id="svg2"
+ version="1.1"
+ inkscape:version="0.48.0 r9654"
+ sodipodi:docname="saddle.svg">
+ <defs
+ id="defs4" />
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="1.28"
+ inkscape:cx="103.57162"
+ inkscape:cy="153.96921"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ showguides="true"
+ inkscape:snap-global="false"
+ inkscape:guide-bbox="true"
+ inkscape:window-width="1600"
+ inkscape:window-height="848"
+ inkscape:window-x="-8"
+ inkscape:window-y="-8"
+ inkscape:window-maximized="1"
+ fit-margin-top="0"
+ fit-margin-left="0"
+ fit-margin-right="0"
+ fit-margin-bottom="0"
+ borderlayer="true" />
+ <metadata
+ id="metadata7">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Ebene 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(0.0625,-52.5)">
+ <path
+ style="fill:#5c7515;fill-rule:evenodd;stroke:#000000;stroke-width:1.12357688px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 0.45279466,253.35932 199.97641,396.81907 399.38023,253.59533 l 0.0109,198.33894 -398.81205628,0.12911 z"
+ id="rect2985"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccccc" />
+ </g>
+</svg>
diff --git a/patches/base64.patch b/patches/base64.patch
new file mode 100644
index 0000000..0e5576e
--- /dev/null
+++ b/patches/base64.patch
@@ -0,0 +1,127 @@
+From f44a63833a45ee8f67589334f56549a5d7b72fa4 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Florian=20Sch=C3=A4fer?= <florian at schaeferban.de>
+Date: Sun, 22 Mar 2015 17:39:38 +0100
+Subject: [PATCH] Use Base64-decoder from JAXB instead of Apache/Sun
+
+This removes the dependeny on Apache Commons Codec, which was solely used for Base64 decoding.
+Uses of both org.apache.commons.codec.binary.Base64 and sun.misc.BASE64Decoder are replaced by javax.xml.bind.DatatypeConverter which is part of Java since 1.6.
+---
+ src/com/kitfox/svg/SVGUniverse.java | 7 ++++---
+ src/com/kitfox/svg/app/data/Handler.java | 7 ++++---
+ src/oauth/signpost/signature/OAuthMessageSigner.java | 13 +++----------
+ src/org/openstreetmap/josm/tools/ImageProvider.java | 4 ++--
+ 4 files changed, 13 insertions(+), 18 deletions(-)
+
+diff --git a/src/com/kitfox/svg/SVGUniverse.java b/src/com/kitfox/svg/SVGUniverse.java
+index 9c244dd..1fe4a3d 100644
+--- a/src/com/kitfox/svg/SVGUniverse.java
++++ b/src/com/kitfox/svg/SVGUniverse.java
+@@ -61,6 +61,7 @@
+ import java.util.logging.Logger;
+ import java.util.zip.GZIPInputStream;
+ import javax.imageio.ImageIO;
++import javax.xml.bind.DatatypeConverter;
+ import org.xml.sax.EntityResolver;
+ import org.xml.sax.InputSource;
+ import org.xml.sax.SAXException;
+@@ -190,10 +191,9 @@ URL registerImage(URI imageURI)
+
+ if (content.startsWith("base64"))
+ {
+- content = content.substring(6);
+ try
+ {
+- byte[] buf = new sun.misc.BASE64Decoder().decodeBuffer(content);
++ byte[] buf = DatatypeConverter.parseBase64Binary(content.substring(6));
+ ByteArrayInputStream bais = new ByteArrayInputStream(buf);
+ BufferedImage img = ImageIO.read(bais);
+
+@@ -213,7 +213,8 @@ URL registerImage(URI imageURI)
+ loadedImages.put(url, ref);
+
+ return url;
+- } catch (IOException ex)
++ }
++ catch (IOException | IllegalArgumentException ex)
+ {
+ Logger.getLogger(SVGConst.SVG_LOGGER).log(Level.WARNING,
+ "Could not decode inline image", ex);
+diff --git a/src/com/kitfox/svg/app/data/Handler.java b/src/com/kitfox/svg/app/data/Handler.java
+index 806dcd9..e35c260 100644
+--- a/src/com/kitfox/svg/app/data/Handler.java
++++ b/src/com/kitfox/svg/app/data/Handler.java
+@@ -44,6 +44,8 @@
+ import java.util.logging.Level;
+ import java.util.logging.Logger;
+
++import javax.xml.bind.DatatypeConverter;
++
+ /**
+ *
+ * @author kitfox
+@@ -66,12 +68,11 @@ public Connection(URL url)
+
+ if (content.startsWith("base64,"))
+ {
+- content = content.substring(7);
+ try
+ {
+- buf = new sun.misc.BASE64Decoder().decodeBuffer(content);
++ buf = DatatypeConverter.parseBase64Binary(content.substring(7));
+ }
+- catch (IOException e)
++ catch (IllegalArgumentException e)
+ {
+ Logger.getLogger(SVGConst.SVG_LOGGER).log(Level.WARNING, null, e);
+ }
+diff --git a/src/oauth/signpost/signature/OAuthMessageSigner.java b/src/oauth/signpost/signature/OAuthMessageSigner.java
+index 8d878ae..e24092d 100644
+--- a/src/oauth/signpost/signature/OAuthMessageSigner.java
++++ b/src/oauth/signpost/signature/OAuthMessageSigner.java
+@@ -16,26 +16,20 @@
+
+ import java.io.IOException;
+ import java.io.Serializable;
++import javax.xml.bind.DatatypeConverter;
+
+ import oauth.signpost.exception.OAuthMessageSignerException;
+ import oauth.signpost.http.HttpRequest;
+ import oauth.signpost.http.HttpParameters;
+
+-import org.apache.commons.codec.binary.Base64;
+-
+ public abstract class OAuthMessageSigner implements Serializable {
+
+ private static final long serialVersionUID = 4445779788786131202L;
+
+- private transient Base64 base64;
+-
+ private String consumerSecret;
+
+ private String tokenSecret;
+
+- public OAuthMessageSigner() {
+- this.base64 = new Base64();
+- }
+
+ public abstract String sign(HttpRequest request, HttpParameters requestParameters)
+ throws OAuthMessageSignerException;
+@@ -59,16 +53,15 @@ public void setTokenSecret(String tokenSecret) {
+ }
+
+ protected byte[] decodeBase64(String s) {
+- return base64.decode(s.getBytes());
++ return DatatypeConverter.parseBase64Binary(s);
+ }
+
+ protected String base64Encode(byte[] b) {
+- return new String(base64.encode(b));
++ return DatatypeConverter.printBase64Binary(b);
+ }
+
+ private void readObject(java.io.ObjectInputStream stream)
+ throws IOException, ClassNotFoundException {
+ stream.defaultReadObject();
+- this.base64 = new Base64();
+ }
+ }
diff --git a/src/org/openstreetmap/josm/Main.java b/src/org/openstreetmap/josm/Main.java
index 499b4f9..a9686ff 100644
--- a/src/org/openstreetmap/josm/Main.java
+++ b/src/org/openstreetmap/josm/Main.java
@@ -153,7 +153,7 @@ public abstract class Main {
/**
* Global application.
*/
- public static Main main;
+ public static volatile Main main;
/**
* Command-line arguments used to run the application.
@@ -190,7 +190,7 @@ public abstract class Main {
/**
* The toolbar preference control to register new actions.
*/
- public static ToolbarPreferences toolbar;
+ public static volatile ToolbarPreferences toolbar;
/**
* The commands undo/redo handler.
@@ -467,7 +467,7 @@ public abstract class Main {
* So if you need to hook into those early ones, split your class and send the one with the early hooks
* to the JOSM team for inclusion.
*/
- public static PlatformHook platform;
+ public static volatile PlatformHook platform;
/**
* Whether or not the java vm is openjdk
@@ -524,7 +524,7 @@ public abstract class Main {
}
}
- private static InitStatusListener initListener = null;
+ private static volatile InitStatusListener initListener = null;
public static interface InitStatusListener {
@@ -891,7 +891,7 @@ public abstract class Main {
*/
public static final JPanel panel = new JPanel(new BorderLayout());
- protected static WindowGeometry geometry;
+ protected static volatile WindowGeometry geometry;
protected static int windowState = JFrame.NORMAL;
private final CommandQueueListener redoUndoListener = new CommandQueueListener(){
@@ -1304,7 +1304,7 @@ public abstract class Main {
* use {@link #getProjection()} and {@link #setProjection(Projection)} for access.
* Use {@link #setProjection(Projection)} in order to trigger a projection change event.
*/
- private static Projection proj;
+ private static volatile Projection proj;
/**
* Replies the current projection.
@@ -1480,7 +1480,7 @@ public abstract class Main {
private static MasterWindowListener INSTANCE;
- public static MasterWindowListener getInstance() {
+ public static synchronized MasterWindowListener getInstance() {
if (INSTANCE == null) {
INSTANCE = new MasterWindowListener();
}
diff --git a/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java b/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java
index ebc7bc1..878acaf 100644
--- a/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java
+++ b/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java
@@ -16,6 +16,8 @@ import java.awt.event.KeyEvent;
import java.awt.event.MouseEvent;
import java.awt.event.MouseListener;
import java.awt.event.MouseMotionListener;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
import java.util.Formatter;
import java.util.Locale;
@@ -38,7 +40,7 @@ import org.openstreetmap.josm.tools.ImageProvider;
* @since 3715
*/
public class ImageryAdjustAction extends MapMode implements MouseListener, MouseMotionListener, AWTEventListener{
- private static ImageryOffsetDialog offsetDialog;
+ private static volatile ImageryOffsetDialog offsetDialog;
private static Cursor cursor = ImageProvider.getCursor("normal", "move");
private double oldDx, oldDy;
@@ -206,6 +208,7 @@ public class ImageryAdjustAction extends MapMode implements MouseListener, Mouse
tOffset.addFocusListener(this);
setContent(pnl);
setupDialog();
+ addWindowListener(new WindowEventHandler());
}
private boolean areFieldsInFocus() {
@@ -301,6 +304,13 @@ public class ImageryAdjustAction extends MapMode implements MouseListener, Mouse
Main.map.selectSelectTool(false);
}
}
+
+ class WindowEventHandler extends WindowAdapter {
+ @Override
+ public void windowClosing(WindowEvent e) {
+ setVisible(false);
+ }
+ }
}
@Override
diff --git a/src/org/openstreetmap/josm/actions/SelectByInternalPointAction.java b/src/org/openstreetmap/josm/actions/SelectByInternalPointAction.java
index d32bd8f..066092b 100644
--- a/src/org/openstreetmap/josm/actions/SelectByInternalPointAction.java
+++ b/src/org/openstreetmap/josm/actions/SelectByInternalPointAction.java
@@ -19,16 +19,18 @@ import org.openstreetmap.josm.data.osm.Way;
import org.openstreetmap.josm.tools.Geometry;
/**
- * This allows to select a polygon/multipolgon by an internal point.
+ * This allows to select a polygon/multipolygon by an internal point.
+ * @since 7144
*/
public class SelectByInternalPointAction extends JosmAction {
/**
- * Returns the surrounding polygons/multipolgons
+ * Returns the surrounding polygons/multipolygons
* ordered by their area size (from small to large)
* which contain the internal point.
*
* @param internalPoint the internal point.
+ * @return the surrounding polygons/multipolygons
*/
public static Collection<OsmPrimitive> getSurroundingObjects(EastNorth internalPoint) {
final DataSet ds = getCurrentDataSet();
@@ -38,7 +40,7 @@ public class SelectByInternalPointAction extends JosmAction {
final Node n = new Node(internalPoint);
final TreeMap<Double, OsmPrimitive> found = new TreeMap<>();
for (Way w : ds.getWays()) {
- if (w.isUsable() && w.isClosed()) {
+ if (w.isUsable() && w.isClosed() && w.isSelectable()) {
if (Geometry.nodeInsidePolygon(n, w.getNodes())) {
found.put(Geometry.closedWayArea(w), w);
}
@@ -67,9 +69,10 @@ public class SelectByInternalPointAction extends JosmAction {
/**
- * Returns the smallest surrounding polygon/multipolgon which contains the internal point.
+ * Returns the smallest surrounding polygon/multipolygon which contains the internal point.
*
* @param internalPoint the internal point.
+ * @return the smallest surrounding polygon/multipolygon
*/
public static OsmPrimitive getSmallestSurroundingObject(EastNorth internalPoint) {
final Collection<OsmPrimitive> surroundingObjects = getSurroundingObjects(internalPoint);
diff --git a/src/org/openstreetmap/josm/actions/downloadtasks/DownloadNotesTask.java b/src/org/openstreetmap/josm/actions/downloadtasks/DownloadNotesTask.java
index 3d3f568..53b5775 100644
--- a/src/org/openstreetmap/josm/actions/downloadtasks/DownloadNotesTask.java
+++ b/src/org/openstreetmap/josm/actions/downloadtasks/DownloadNotesTask.java
@@ -58,7 +58,7 @@ public class DownloadNotesTask extends AbstractDownloadTask {
@Override
public String getTitle() {
- return "Download OSM Notes";
+ return tr("Download OSM Notes");
}
@Override
@@ -82,16 +82,16 @@ public class DownloadNotesTask extends AbstractDownloadTask {
@Override
protected void finish() {
- Main.debug("finish called in DownloadNotesTask");
if (isCanceled() || isFailed()) {
- Main.debug("was cancelled or failed");
return;
}
if (notesData == null) {
return;
}
- Main.debug("Notes downloaded: " + notesData.size());
+ if (Main.isDebugEnabled()) {
+ Main.debug("Notes downloaded: " + notesData.size());
+ }
List<NoteLayer> noteLayers = null;
if (Main.map != null) {
@@ -102,7 +102,7 @@ public class DownloadNotesTask extends AbstractDownloadTask {
layer = noteLayers.get(0);
layer.getNoteData().addNotes(notesData);
} else {
- layer = new NoteLayer(notesData, "Notes");
+ layer = new NoteLayer(notesData, tr("Notes"));
Main.main.addLayer(layer);
}
}
@@ -196,5 +196,4 @@ public class DownloadNotesTask extends AbstractDownloadTask {
}
}
}
-
}
diff --git a/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java b/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java
index 960cb14..70ca3c5 100644
--- a/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java
+++ b/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java
@@ -178,7 +178,7 @@ public class DownloadOsmTask extends AbstractDownloadTask {
* Superclass of internal download task.
* @since 7636
*/
- public static abstract class AbstractInternalTask extends PleaseWaitRunnable {
+ public abstract static class AbstractInternalTask extends PleaseWaitRunnable {
protected final boolean newLayer;
protected DataSet dataSet;
diff --git a/src/org/openstreetmap/josm/actions/search/SearchAction.java b/src/org/openstreetmap/josm/actions/search/SearchAction.java
index 89a187b..d44bc46 100644
--- a/src/org/openstreetmap/josm/actions/search/SearchAction.java
+++ b/src/org/openstreetmap/josm/actions/search/SearchAction.java
@@ -124,7 +124,7 @@ public class SearchAction extends JosmAction implements ParameterizedAction {
return ret;
}
- private static SearchSetting lastSearch = null;
+ private static volatile SearchSetting lastSearch = null;
/**
* Constructs a new {@code SearchAction}.
@@ -495,6 +495,8 @@ public class SearchAction extends JosmAction implements ParameterizedAction {
if (s.mode == SearchMode.replace) {
sel.clear();
+ } else if (s.mode == SearchMode.in_selection) {
+ foundMatches = sel.size();
}
Collection<OsmPrimitive> all;
@@ -503,6 +505,7 @@ public class SearchAction extends JosmAction implements ParameterizedAction {
} else {
all = Main.main.getCurrentDataSet().allNonDeletedCompletePrimitives();
}
+
for (OsmPrimitive osm : all) {
if (s.mode == SearchMode.replace) {
if (matcher.match(osm)) {
@@ -515,9 +518,9 @@ public class SearchAction extends JosmAction implements ParameterizedAction {
} else if (s.mode == SearchMode.remove && p.evaluate(osm) && matcher.match(osm)) {
sel.remove(osm);
++foundMatches;
- } else if (s.mode == SearchMode.in_selection && p.evaluate(osm) && !matcher.match(osm)) {
+ } else if (s.mode == SearchMode.in_selection && p.evaluate(osm) && !matcher.match(osm)) {
sel.remove(osm);
- ++foundMatches;
+ --foundMatches;
}
}
} catch (SearchCompiler.ParseError e) {
diff --git a/src/org/openstreetmap/josm/corrector/CorrectionTable.java b/src/org/openstreetmap/josm/corrector/CorrectionTable.java
index 3215ddc..b6d372e 100644
--- a/src/org/openstreetmap/josm/corrector/CorrectionTable.java
+++ b/src/org/openstreetmap/josm/corrector/CorrectionTable.java
@@ -31,7 +31,7 @@ public abstract class CorrectionTable<T extends CorrectionTableModel<?>>
}
}
- private static BoldRenderer boldRenderer = null;
+ private static volatile BoldRenderer boldRenderer = null;
protected CorrectionTable(T correctionTableModel) {
super(correctionTableModel);
diff --git a/src/org/openstreetmap/josm/data/Version.java b/src/org/openstreetmap/josm/data/Version.java
index 922d76c..65081da 100644
--- a/src/org/openstreetmap/josm/data/Version.java
+++ b/src/org/openstreetmap/josm/data/Version.java
@@ -56,7 +56,7 @@ public class Version {
*
* @return the unique instance of the version information
*/
- public static Version getInstance() {
+ public static synchronized Version getInstance() {
if (instance == null) {
instance = new Version();
instance.init();
diff --git a/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java b/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java
index b8cb0cf..1261e8e 100644
--- a/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java
+++ b/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java
@@ -48,7 +48,7 @@ public enum CoordinateFormat {
return getDisplayName();
}
- private static CoordinateFormat defaultCoordinateFormat = DECIMAL_DEGREES;
+ private static volatile CoordinateFormat defaultCoordinateFormat = DECIMAL_DEGREES;
/**
* Replies the default coordinate format to be use
diff --git a/src/org/openstreetmap/josm/data/imagery/ImageryLayerInfo.java b/src/org/openstreetmap/josm/data/imagery/ImageryLayerInfo.java
index c55c583..96f8b50 100644
--- a/src/org/openstreetmap/josm/data/imagery/ImageryLayerInfo.java
+++ b/src/org/openstreetmap/josm/data/imagery/ImageryLayerInfo.java
@@ -30,8 +30,8 @@ public class ImageryLayerInfo {
public static final ImageryLayerInfo instance = new ImageryLayerInfo();
private final List<ImageryInfo> layers = new ArrayList<>();
private final Map<String, ImageryInfo> layerIds = new HashMap<>();
- private final static List<ImageryInfo> defaultLayers = new ArrayList<>();
- private final static Map<String, ImageryInfo> defaultLayerIds = new HashMap<>();
+ private static final List<ImageryInfo> defaultLayers = new ArrayList<>();
+ private static final Map<String, ImageryInfo> defaultLayerIds = new HashMap<>();
private static final String[] DEFAULT_LAYER_SITES = {
Main.getJOSMWebsite()+"/maps"
diff --git a/src/org/openstreetmap/josm/data/osm/Changeset.java b/src/org/openstreetmap/josm/data/osm/Changeset.java
index 5ee09a0..06d7b5e 100644
--- a/src/org/openstreetmap/josm/data/osm/Changeset.java
+++ b/src/org/openstreetmap/josm/data/osm/Changeset.java
@@ -17,7 +17,7 @@ import org.openstreetmap.josm.tools.CheckParameterUtil;
/**
* Represents a single changeset in JOSM. For now its only used during
* upload but in the future we may do more.
- *
+ * @since 625
*/
public final class Changeset implements Tagged {
@@ -348,7 +348,7 @@ public final class Changeset implements Tagged {
* @return the list of comments in the changeset discussion. May be empty but never null
* @since 7704
*/
- public synchronized final List<ChangesetDiscussionComment> getDiscussion() {
+ public final synchronized List<ChangesetDiscussionComment> getDiscussion() {
if (discussion == null) {
return Collections.emptyList();
}
@@ -360,7 +360,7 @@ public final class Changeset implements Tagged {
* @param comment the comment to add. Ignored if null
* @since 7704
*/
- public synchronized final void addDiscussionComment(ChangesetDiscussionComment comment) {
+ public final synchronized void addDiscussionComment(ChangesetDiscussionComment comment) {
if (comment == null) {
return;
}
diff --git a/src/org/openstreetmap/josm/data/osm/User.java b/src/org/openstreetmap/josm/data/osm/User.java
index b87df75..7a373d1 100644
--- a/src/org/openstreetmap/josm/data/osm/User.java
+++ b/src/org/openstreetmap/josm/data/osm/User.java
@@ -9,7 +9,6 @@ import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
-import java.util.concurrent.atomic.AtomicLong;
import org.openstreetmap.josm.tools.Utils;
@@ -24,16 +23,22 @@ import org.openstreetmap.josm.tools.Utils;
*/
public final class User {
- private static AtomicLong uidCounter = new AtomicLong();
+ private static long uidCounter = 0;
/**
* the map of known users
*/
private static Map<Long,User> userMap = new HashMap<>();
+
+ /**
+ * The anonymous user is a local user used in places where no user is known.
+ * @see #getAnonymous()
+ */
private static final User anonymous = createLocalUser(tr("<anonymous>"));
private static long getNextLocalUid() {
- return uidCounter.decrementAndGet();
+ uidCounter--;
+ return uidCounter;
}
/**
@@ -42,12 +47,12 @@ public final class User {
* @param name the name
* @return a new local user with the given name
*/
- public static User createLocalUser(String name) {
- for(long i = -1; i >= uidCounter.get(); --i)
+ public static synchronized User createLocalUser(String name) {
+ for(long i = -1; i >= uidCounter; --i)
{
- User olduser = getById(i);
- if(olduser != null && olduser.hasName(name))
- return olduser;
+ User olduser = getById(i);
+ if(olduser != null && olduser.hasName(name))
+ return olduser;
}
User user = new User(getNextLocalUid(), name);
userMap.put(user.getId(), user);
@@ -61,7 +66,7 @@ public final class User {
* @param name the name
* @return a new OSM user with the given name and uid
*/
- public static User createOsmUser(long uid, String name) {
+ public static synchronized User createOsmUser(long uid, String name) {
User user = userMap.get(uid);
if (user == null) {
user = new User(uid, name);
@@ -73,9 +78,8 @@ public final class User {
/**
* clears the static map of user ids to user objects
- *
*/
- public static void clearUserMap() {
+ public static synchronized void clearUserMap() {
userMap.clear();
}
@@ -85,7 +89,7 @@ public final class User {
* @param uid the user id
* @return the user; null, if there is no user with this id
*/
- public static User getById(long uid) {
+ public static synchronized User getById(long uid) {
return userMap.get(uid);
}
@@ -97,7 +101,7 @@ public final class User {
* @return the list of users with name <code>name</code> or the empty list if
* no such users exist
*/
- public static List<User> getByName(String name) {
+ public static synchronized List<User> getByName(String name) {
if (name == null) {
name = "";
}
diff --git a/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java b/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java
index 09e7723..fdbd3cb 100644
--- a/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java
+++ b/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java
@@ -34,7 +34,7 @@ public class HistoryDataSet implements LayerChangeListener{
*
* @return the unique instance of the history data set
*/
- public static HistoryDataSet getInstance() {
+ public static synchronized HistoryDataSet getInstance() {
if (historyDataSet == null) {
historyDataSet = new HistoryDataSet();
MapView.addLayerChangeListener(historyDataSet);
diff --git a/src/org/openstreetmap/josm/data/osm/visitor/paint/MapRendererFactory.java b/src/org/openstreetmap/josm/data/osm/visitor/paint/MapRendererFactory.java
index cb7716b..2d7398a 100644
--- a/src/org/openstreetmap/josm/data/osm/visitor/paint/MapRendererFactory.java
+++ b/src/org/openstreetmap/josm/data/osm/visitor/paint/MapRendererFactory.java
@@ -90,7 +90,7 @@ public final class MapRendererFactory {
* Replies the unique instance
* @return instance of map rending class
*/
- public static MapRendererFactory getInstance() {
+ public static synchronized MapRendererFactory getInstance() {
if (instance == null) {
instance = new MapRendererFactory();
}
diff --git a/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java b/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java
index 9c5142d..5fa3e80 100644
--- a/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java
+++ b/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java
@@ -9,8 +9,8 @@ import java.util.List;
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.data.Preferences.ColorKey;
import org.openstreetmap.josm.gui.mappaint.MapPaintStyles;
-import org.openstreetmap.josm.gui.mappaint.StyleSource;
import org.openstreetmap.josm.gui.mappaint.MapPaintStyles.MapPaintSylesUpdateListener;
+import org.openstreetmap.josm.gui.mappaint.StyleSource;
public enum PaintColors implements ColorKey {
@@ -34,7 +34,7 @@ public enum PaintColors implements ColorKey {
private final String name;
private final Color defaultColor;
- private static Color backgroundColorCache = null;
+ private static volatile Color backgroundColorCache = null;
private static final MapPaintSylesUpdateListener styleOverrideListener = new MapPaintSylesUpdateListener() {
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 7b5dee7..ee9bbf6 100644
--- a/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java
+++ b/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java
@@ -19,11 +19,13 @@ import java.awt.TexturePaint;
import java.awt.font.FontRenderContext;
import java.awt.font.GlyphVector;
import java.awt.font.LineMetrics;
+import java.awt.font.TextLayout;
import java.awt.geom.AffineTransform;
import java.awt.geom.GeneralPath;
import java.awt.geom.Path2D;
import java.awt.geom.Point2D;
import java.awt.geom.Rectangle2D;
+import java.text.Bidi;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
@@ -318,6 +320,7 @@ public class StyledMapRenderer extends AbstractMapRenderer {
private Font orderFont;
private boolean leftHandTraffic;
+ private Object antialiasing;
/**
* Constructs a new {@code StyledMapRenderer}.
@@ -407,11 +410,15 @@ public class StyledMapRenderer extends AbstractMapRenderer {
} else if (text.haloRadius != null) {
g.setStroke(new BasicStroke(2*text.haloRadius, BasicStroke.CAP_BUTT, BasicStroke.JOIN_ROUND));
g.setColor(text.haloColor);
+ Shape textOutline;
if (gv == null) {
+ if (s.isEmpty()) return;
FontRenderContext frc = g.getFontRenderContext();
- gv = text.font.createGlyphVector(frc, s);
+ TextLayout tl = new TextLayout(s, text.font, frc);
+ textOutline = tl.getOutline(AffineTransform.getTranslateInstance(x, y));
+ } else {
+ textOutline = gv.getOutline(x, y);
}
- Shape textOutline = gv.getOutline(x, y);
g.draw(textOutline);
g.setStroke(new BasicStroke());
g.setColor(text.color);
@@ -432,6 +439,7 @@ public class StyledMapRenderer extends AbstractMapRenderer {
Shape area = path.createTransformedShape(nc.getAffineTransform());
if (!isOutlineOnly) {
+ g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_OFF);
if (fillImage == null) {
if (isInactiveMode) {
g.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 0.33f));
@@ -449,6 +457,7 @@ public class StyledMapRenderer extends AbstractMapRenderer {
g.fill(area);
g.setPaintMode();
}
+ g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, antialiasing);
}
drawAreaText(osm, text, area);
@@ -1199,7 +1208,17 @@ public class StyledMapRenderer extends AbstractMapRenderer {
}
FontRenderContext frc = g.getFontRenderContext();
- GlyphVector gv = text.font.createGlyphVector(frc, name);
+ char[] chars = name.toCharArray();
+ int dirFlag = Bidi.DIRECTION_LEFT_TO_RIGHT;
+ if (Bidi.requiresBidi(chars, 0, chars.length)) {
+ Bidi bd = new Bidi(name, Bidi.DIRECTION_DEFAULT_LEFT_TO_RIGHT);
+ if (bd.isRightToLeft()) {
+ dirFlag = Bidi.DIRECTION_RIGHT_TO_LEFT;
+ }
+ }
+ // only works for text that is completely left-to-right or completely
+ // right-to-left, not bi-directional text
+ GlyphVector gv = text.font.layoutGlyphVector(frc, chars, 0, chars.length, dirFlag);
for (int i=0; i<gv.getNumGlyphs(); ++i) {
Rectangle2D rect = gv.getGlyphLogicalBounds(i).getBounds2D();
@@ -1379,9 +1398,9 @@ public class StyledMapRenderer extends AbstractMapRenderer {
isOutlineOnly = paintSettings.isOutlineOnly();
orderFont = new Font(Main.pref.get("mappaint.font", "Droid Sans"), Font.PLAIN, Main.pref.getInteger("mappaint.fontsize", 8));
- g.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
- Main.pref.getBoolean("mappaint.use-antialiasing", true) ?
- RenderingHints.VALUE_ANTIALIAS_ON : RenderingHints.VALUE_ANTIALIAS_OFF);
+ antialiasing = Main.pref.getBoolean("mappaint.use-antialiasing", true) ?
+ RenderingHints.VALUE_ANTIALIAS_ON : RenderingHints.VALUE_ANTIALIAS_OFF;
+ g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, antialiasing);
highlightLineWidth = Main.pref.getInteger("mappaint.highlight.width", 4);
highlightPointRadius = Main.pref.getInteger("mappaint.highlight.radius", 7);
@@ -1628,7 +1647,6 @@ public class StyledMapRenderer extends AbstractMapRenderer {
if (Main.isTraceEnabled()) {
timeStart = System.currentTimeMillis();
System.err.print("BENCHMARK: rendering ");
- Main.debug(null);
}
List<Node> nodes = data.searchNodes(bbox);
diff --git a/src/org/openstreetmap/josm/data/osm/visitor/paint/relations/Multipolygon.java b/src/org/openstreetmap/josm/data/osm/visitor/paint/relations/Multipolygon.java
index 94c8e49..d338709 100644
--- a/src/org/openstreetmap/josm/data/osm/visitor/paint/relations/Multipolygon.java
+++ b/src/org/openstreetmap/josm/data/osm/visitor/paint/relations/Multipolygon.java
@@ -148,7 +148,7 @@ public class Multipolygon {
* Init a private global matcher object which will listen to preference changes.
*/
private static MultipolygonRoleMatcher roleMatcher;
- private static MultipolygonRoleMatcher getMultipolygonRoleMatcher() {
+ private static synchronized MultipolygonRoleMatcher getMultipolygonRoleMatcher() {
if (roleMatcher == null) {
roleMatcher = new MultipolygonRoleMatcher();
if (Main.pref != null){
diff --git a/src/org/openstreetmap/josm/data/validation/OsmValidator.java b/src/org/openstreetmap/josm/data/validation/OsmValidator.java
index a901201..80ffd91 100644
--- a/src/org/openstreetmap/josm/data/validation/OsmValidator.java
+++ b/src/org/openstreetmap/josm/data/validation/OsmValidator.java
@@ -71,7 +71,7 @@ import org.openstreetmap.josm.tools.Utils;
*/
public class OsmValidator implements LayerChangeListener {
- public static ValidatorLayer errorLayer = null;
+ public static volatile ValidatorLayer errorLayer = null;
/** The validate action */
public ValidateAction validateAction = new ValidateAction();
diff --git a/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java b/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java
index 1903583..9d8ed65 100644
--- a/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java
+++ b/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java
@@ -76,9 +76,9 @@ public class MapCSSTagChecker extends Test.TagTest {
*/
public static class GroupedMapCSSRule {
/** MapCSS selectors **/
- final public List<Selector> selectors;
+ public final List<Selector> selectors;
/** MapCSS declaration **/
- final public Declaration declaration;
+ public final Declaration declaration;
/**
* Constructs a new {@code GroupedMapCSSRule}.
diff --git a/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java b/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java
index 96836ba..10cf415 100644
--- a/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java
+++ b/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java
@@ -56,7 +56,7 @@ public class MultipolygonTest extends Test {
protected static final int NO_STYLE_POLYGON = 1611;
protected static final int OUTER_STYLE = 1613;
- private static ElemStyles styles;
+ private static volatile ElemStyles styles;
private final List<List<Node>> nonClosedWays = new ArrayList<>();
private final Set<String> keysCheckedByAnotherTest = new HashSet<>();
@@ -221,7 +221,7 @@ public class MultipolygonTest extends Test {
addError(r, new TestError(this, Severity.OTHER, tr("No area style for multipolygon"), NO_STYLE, r));
} else {
/* old style multipolygon - solve: copy tags from outer way to multipolygon */
- addError(r, new TestError(this, Severity.WARNING,
+ addError(r, new TestError(this, Severity.WARNING,
trn("Multipolygon relation should be tagged with area tags and not the outer way",
"Multipolygon relation should be tagged with area tags and not the outer ways", polygon.getOuterWays().size()),
NO_STYLE_POLYGON, r));
diff --git a/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java b/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java
index 9664e03..266f28a 100644
--- a/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java
+++ b/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java
@@ -70,9 +70,9 @@ public class TagChecker extends Test.TagTest {
public static final String SPELL_FILE = "resource://data/validator/words.cfg";
/** The spell check key substitutions: the key should be substituted by the value */
- private static Map<String, String> spellCheckKeyData;
+ private static volatile Map<String, String> spellCheckKeyData;
/** The spell check preset values */
- private static MultiMap<String, String> presetsValueData;
+ private static volatile MultiMap<String, String> presetsValueData;
/** The TagChecker data */
private static final List<CheckerData> checkerData = new ArrayList<>();
private static final List<String> ignoreDataStartsWith = new ArrayList<>();
@@ -363,7 +363,7 @@ public class TagChecker extends Test.TagTest {
tr(s, key), MessageFormat.format(s, key), INVALID_KEY, p) );
withErrors.put(p, "IPK");
}
- if (checkKeys && key.indexOf(' ') >= 0 && !withErrors.contains(p, "IPK")) {
+ if (checkKeys && key != null && key.indexOf(' ') >= 0 && !withErrors.contains(p, "IPK")) {
errors.add( new TestError(this, Severity.WARNING, tr("Invalid white space in property key"),
tr(s, key), MessageFormat.format(s, key), INVALID_KEY_SPACE, p) );
withErrors.put(p, "IPK");
@@ -378,7 +378,7 @@ public class TagChecker extends Test.TagTest {
tr(s, key), MessageFormat.format(s, key), INVALID_HTML, p) );
withErrors.put(p, "HTML");
}
- if (checkValues && value != null && value.length() > 0 && presetsValueData != null) {
+ if (checkValues && key != null && value != null && value.length() > 0 && presetsValueData != null) {
final Set<String> values = presetsValueData.get(key);
final boolean keyInPresets = values != null;
final boolean tagInPresets = values != null && (values.isEmpty() || values.contains(prop.getValue()));
@@ -422,7 +422,7 @@ public class TagChecker extends Test.TagTest {
}
}
}
- if (checkFixmes && value != null && value.length() > 0) {
+ if (checkFixmes && key != null && value != null && value.length() > 0) {
if ((value.toLowerCase().contains("fixme")
|| value.contains("check and delete")
|| key.contains("todo") || key.toLowerCase().contains("fixme"))
diff --git a/src/org/openstreetmap/josm/data/validation/util/Entities.java b/src/org/openstreetmap/josm/data/validation/util/Entities.java
index 47b19f2..7441192 100644
--- a/src/org/openstreetmap/josm/data/validation/util/Entities.java
+++ b/src/org/openstreetmap/josm/data/validation/util/Entities.java
@@ -333,7 +333,7 @@ public class Entities {
{"euro", "8364"}, // -- euro sign, U+20AC NEW -->
};
- private static Map<String, String> mapNameToValue = null;
+ private static volatile Map<String, String> mapNameToValue = null;
public String unescape(String str) {
int firstAmp = str.indexOf('&');
diff --git a/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java b/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java
index b7026cb..48e328f 100644
--- a/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java
+++ b/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java
@@ -58,7 +58,7 @@ public class DefaultNameFormatter implements NameFormatter, HistoryNameFormatter
*
* @return the unique instance of this formatter
*/
- public static DefaultNameFormatter getInstance() {
+ public static synchronized DefaultNameFormatter getInstance() {
if (instance == null) {
instance = new DefaultNameFormatter();
}
@@ -108,7 +108,7 @@ public class DefaultNameFormatter implements NameFormatter, HistoryNameFormatter
*
* @return the list of naming tags used in relations
*/
- public static List<String> getNamingtagsForRelations() {
+ public static synchronized List<String> getNamingtagsForRelations() {
if (namingTagsForRelations == null) {
namingTagsForRelations = new ArrayList<>(
Main.pref.getCollection("relation.nameOrder", Arrays.asList(DEFAULT_NAMING_TAGS_FOR_RELATIONS))
diff --git a/src/org/openstreetmap/josm/gui/FileDrop.java b/src/org/openstreetmap/josm/gui/FileDrop.java
index 345eacb..2720350 100644
--- a/src/org/openstreetmap/josm/gui/FileDrop.java
+++ b/src/org/openstreetmap/josm/gui/FileDrop.java
@@ -14,6 +14,7 @@ import java.awt.dnd.DropTargetDragEvent;
import java.awt.dnd.DropTargetDropEvent;
import java.awt.dnd.DropTargetEvent;
import java.awt.dnd.DropTargetListener;
+import java.awt.dnd.InvalidDnDOperationException;
import java.awt.event.HierarchyEvent;
import java.awt.event.HierarchyListener;
import java.io.BufferedReader;
@@ -223,18 +224,16 @@ public class FileDrop
// END 2007-09-12 Nathan Blomquist -- Linux (KDE/Gnome) support added.
} // end else: not a file list
} // end try
- catch ( IOException io)
- { Main.warn("FileDrop: IOException - abort:" );
- Main.error(io);
- evt.rejectDrop();
- } // end catch IOException
- catch (UnsupportedFlavorException ufe)
- { Main.warn("FileDrop: UnsupportedFlavorException - abort:" );
- Main.error(ufe);
- evt.rejectDrop();
- } // end catch: UnsupportedFlavorException
- finally
- {
+ catch (IOException | UnsupportedFlavorException e) {
+ Main.warn("FileDrop: "+e.getClass().getSimpleName()+" - abort:" );
+ Main.error(e);
+ try {
+ evt.rejectDrop();
+ } catch (InvalidDnDOperationException ex) {
+ // Catch InvalidDnDOperationException to fix #11259
+ Main.error(ex);
+ }
+ } finally {
// If it's a Swing component, reset its border
if( c instanceof JComponent )
{ JComponent jc = (JComponent) c;
@@ -279,7 +278,7 @@ public class FileDrop
} // end else: does not support DnD
} // end constructor
- private static boolean supportsDnD()
+ private static synchronized boolean supportsDnD()
{ // Static Boolean
if( supportsDnD == null )
{
diff --git a/src/org/openstreetmap/josm/gui/JosmUserIdentityManager.java b/src/org/openstreetmap/josm/gui/JosmUserIdentityManager.java
index 88504df..9e4794c 100644
--- a/src/org/openstreetmap/josm/gui/JosmUserIdentityManager.java
+++ b/src/org/openstreetmap/josm/gui/JosmUserIdentityManager.java
@@ -58,7 +58,7 @@ public final class JosmUserIdentityManager implements PreferenceChangedListener{
*
* @return the unique instance of the JOSM user identity manager
*/
- public static JosmUserIdentityManager getInstance() {
+ public static synchronized JosmUserIdentityManager getInstance() {
if (instance == null) {
instance = new JosmUserIdentityManager();
if (OsmApi.isUsingOAuth() && OAuthAccessTokenHolder.getInstance().containsAccessToken() &&
@@ -282,7 +282,7 @@ public final class JosmUserIdentityManager implements PreferenceChangedListener{
accessTokenSecretChanged = false;
if (OsmApi.isUsingOAuth()) {
try {
- instance.initFromOAuth(Main.parent);
+ getInstance().initFromOAuth(Main.parent);
} catch (Exception e) {
Main.error(e);
}
diff --git a/src/org/openstreetmap/josm/gui/MapStatus.java b/src/org/openstreetmap/josm/gui/MapStatus.java
index 391a289..390518c 100644
--- a/src/org/openstreetmap/josm/gui/MapStatus.java
+++ b/src/org/openstreetmap/josm/gui/MapStatus.java
@@ -660,7 +660,7 @@ public class MapStatus extends JPanel implements Helpful, Destroyable, Preferenc
if (event instanceof MouseEvent) {
mouseState.mousePos = ((MouseEvent)event).getPoint();
}
- collector.notify();
+ collector.notifyAll();
}
}
}
@@ -672,7 +672,7 @@ public class MapStatus extends JPanel implements Helpful, Destroyable, Preferenc
synchronized (collector) {
mouseState.modifiers = e.getModifiersEx();
mouseState.mousePos = e.getPoint();
- collector.notify();
+ collector.notifyAll();
}
}
@@ -686,7 +686,7 @@ public class MapStatus extends JPanel implements Helpful, Destroyable, Preferenc
@Override public void keyPressed(KeyEvent e) {
synchronized (collector) {
mouseState.modifiers = e.getModifiersEx();
- collector.notify();
+ collector.notifyAll();
}
}
diff --git a/src/org/openstreetmap/josm/gui/NotificationManager.java b/src/org/openstreetmap/josm/gui/NotificationManager.java
index b325817..bed0dba 100644
--- a/src/org/openstreetmap/josm/gui/NotificationManager.java
+++ b/src/org/openstreetmap/josm/gui/NotificationManager.java
@@ -75,7 +75,7 @@ class NotificationManager {
private final Color PANEL_SEMITRANSPARENT = new Color(224, 236, 249, 230);
private final Color PANEL_OPAQUE = new Color(224, 236, 249);
- public static NotificationManager getInstance() {
+ public static synchronized NotificationManager getInstance() {
if (INSTANCE == null) {
INSTANCE = new NotificationManager();
}
@@ -149,9 +149,11 @@ class NotificationManager {
@Override
public void actionPerformed(ActionEvent e) {
hideTimer.stop();
- currentNotificationPanel.setVisible(false);
- ((JFrame) Main.parent).getLayeredPane().remove(currentNotificationPanel);
- currentNotificationPanel = null;
+ if (currentNotificationPanel != null) {
+ currentNotificationPanel.setVisible(false);
+ ((JFrame) Main.parent).getLayeredPane().remove(currentNotificationPanel);
+ currentNotificationPanel = null;
+ }
pauseTimer.restart();
}
}
@@ -171,8 +173,10 @@ class NotificationManager {
@Override
public void actionPerformed(ActionEvent e) {
- currentNotificationPanel.setNotificationBackground(PANEL_SEMITRANSPARENT);
- currentNotificationPanel.repaint();
+ if (currentNotificationPanel != null) {
+ currentNotificationPanel.setNotificationBackground(PANEL_SEMITRANSPARENT);
+ currentNotificationPanel.repaint();
+ }
startHideTimer();
}
}
diff --git a/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java b/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java
index 4eac0c6..b88e277 100644
--- a/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java
+++ b/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java
@@ -58,7 +58,7 @@ public class DeleteFromRelationConfirmationDialog extends JDialog implements Tab
*
* @return The unique instance of this dialog
*/
- public static DeleteFromRelationConfirmationDialog getInstance() {
+ public static synchronized DeleteFromRelationConfirmationDialog getInstance() {
if (instance == null) {
instance = new DeleteFromRelationConfirmationDialog();
}
diff --git a/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java b/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java
index 92fe52d..b82af47 100644
--- a/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java
+++ b/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java
@@ -99,7 +99,7 @@ public class CombinePrimitiveResolverDialog extends JDialog {
* @deprecated use {@link #launchIfNecessary} instead.
*/
@Deprecated
- public static CombinePrimitiveResolverDialog getInstance() {
+ public static synchronized CombinePrimitiveResolverDialog getInstance() {
if (instance == null) {
GuiHelper.runInEDTAndWait(new Runnable() {
@Override public void run() {
diff --git a/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java b/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java
index 8b9f63a..334979c 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java
@@ -79,7 +79,7 @@ import org.openstreetmap.josm.tools.Shortcut;
*/
public class LayerListDialog extends ToggleDialog {
/** the unique instance of the dialog */
- private static LayerListDialog instance;
+ private static volatile LayerListDialog instance;
/**
* Creates the instance of the dialog. It's connected to the map frame <code>mapFrame</code>
diff --git a/src/org/openstreetmap/josm/gui/dialogs/NotesDialog.java b/src/org/openstreetmap/josm/gui/dialogs/NotesDialog.java
index 5f8ebe6..477279e 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/NotesDialog.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/NotesDialog.java
@@ -86,7 +86,7 @@ public class NotesDialog extends ToggleDialog implements LayerChangeListener {
/** Creates a new toggle dialog for notes */
public NotesDialog() {
- super("Notes", "notes/note_open", "List of notes", null, 150);
+ super(tr("Notes"), "notes/note_open", tr("List of notes"), null, 150);
addCommentAction = new AddCommentAction();
closeAction = new CloseAction();
newAction = new NewAction();
diff --git a/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java b/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java
index 5001071..724a68f 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java
@@ -68,7 +68,7 @@ public class ChangesetCacheManager extends JFrame {
public static final ImageIcon UPDATE_CONTENT_ICON = ImageProvider.get("dialogs/changeset", "updatechangesetcontent");
/** the unique instance of the cache manager */
- private static ChangesetCacheManager instance;
+ private static volatile ChangesetCacheManager instance;
/**
* Replies the unique instance of the changeset cache manager
diff --git a/src/org/openstreetmap/josm/gui/download/DownloadDialog.java b/src/org/openstreetmap/josm/gui/download/DownloadDialog.java
index c2a559b..c78ba88 100644
--- a/src/org/openstreetmap/josm/gui/download/DownloadDialog.java
+++ b/src/org/openstreetmap/josm/gui/download/DownloadDialog.java
@@ -59,7 +59,7 @@ public class DownloadDialog extends JDialog {
*
* @return the unique instance of the download dialog
*/
- public static DownloadDialog getInstance() {
+ public static synchronized DownloadDialog getInstance() {
if (instance == null) {
instance = new DownloadDialog(Main.parent);
}
diff --git a/src/org/openstreetmap/josm/gui/help/HelpBrowser.java b/src/org/openstreetmap/josm/gui/help/HelpBrowser.java
index 77181a3..e357e58 100644
--- a/src/org/openstreetmap/josm/gui/help/HelpBrowser.java
+++ b/src/org/openstreetmap/josm/gui/help/HelpBrowser.java
@@ -71,7 +71,7 @@ public class HelpBrowser extends JDialog {
*
* @return the unique instance of the help browser
*/
- public static HelpBrowser getInstance() {
+ public static synchronized HelpBrowser getInstance() {
if (instance == null) {
instance = new HelpBrowser();
}
diff --git a/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialogManager.java b/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialogManager.java
index feb1de7..b458ad6 100644
--- a/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialogManager.java
+++ b/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialogManager.java
@@ -37,7 +37,7 @@ public class HistoryBrowserDialogManager implements MapView.LayerChangeListener
* Replies the unique instance.
* @return the unique instance
*/
- public static HistoryBrowserDialogManager getInstance() {
+ public static synchronized HistoryBrowserDialogManager getInstance() {
if (instance == null) {
instance = new HistoryBrowserDialogManager();
}
diff --git a/src/org/openstreetmap/josm/gui/io/ChangesetCommentModel.java b/src/org/openstreetmap/josm/gui/io/ChangesetCommentModel.java
index 934bfd2..9d323c5 100644
--- a/src/org/openstreetmap/josm/gui/io/ChangesetCommentModel.java
+++ b/src/org/openstreetmap/josm/gui/io/ChangesetCommentModel.java
@@ -1,26 +1,26 @@
// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.gui.io;
+import java.util.Objects;
import java.util.Observable;
/**
* ChangesetCommentModel is an observable model for the changeset comment edited
* in the {@link UploadDialog}.
- *
+ * @since 3133
*/
public class ChangesetCommentModel extends Observable {
private String comment = "";
/**
- * Sets the current changeset comment and notifies observers if the comment
- * has changed.
+ * Sets the current changeset comment and notifies observers if the comment has changed.
*
* @param comment the new upload comment. Empty string assumed if null.
*/
public void setComment(String comment) {
String oldValue = this.comment;
this.comment = comment == null ? "" : comment;
- if (!oldValue.equals(this.comment)) {
+ if (!Objects.equals(oldValue, this.comment)) {
setChanged();
notifyObservers(this.comment);
}
diff --git a/src/org/openstreetmap/josm/gui/io/UploadDialog.java b/src/org/openstreetmap/josm/gui/io/UploadDialog.java
index 667831e..f159b0b 100644
--- a/src/org/openstreetmap/josm/gui/io/UploadDialog.java
+++ b/src/org/openstreetmap/josm/gui/io/UploadDialog.java
@@ -73,7 +73,7 @@ public class UploadDialog extends AbstractUploadDialog implements PropertyChange
*
* @return the unique instance of the upload dialog
*/
- public static UploadDialog getUploadDialog() {
+ public static synchronized UploadDialog getUploadDialog() {
if (uploadDialog == null) {
uploadDialog = new UploadDialog();
}
diff --git a/src/org/openstreetmap/josm/gui/layer/JumpToMarkerActions.java b/src/org/openstreetmap/josm/gui/layer/JumpToMarkerActions.java
index b362861..b78e8f1 100644
--- a/src/org/openstreetmap/josm/gui/layer/JumpToMarkerActions.java
+++ b/src/org/openstreetmap/josm/gui/layer/JumpToMarkerActions.java
@@ -26,8 +26,8 @@ public final class JumpToMarkerActions {
// Hide default constructor for utils classes
}
- private static JumpToNextMarker jumpToNextMarkerAction;
- private static JumpToPreviousMarker jumpToPreviousMarkerAction;
+ private static volatile JumpToNextMarker jumpToNextMarkerAction;
+ private static volatile JumpToPreviousMarker jumpToPreviousMarkerAction;
public static void initialize() {
jumpToNextMarkerAction = new JumpToNextMarker(null);
diff --git a/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java b/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java
index 69fc523..f74d3a2 100644
--- a/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java
+++ b/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java
@@ -231,7 +231,7 @@ public class OsmDataLayer extends AbstractModifiableLayer implements Listener, S
/**
* a paint texture for non-downloaded area
*/
- private static TexturePaint hatched;
+ private static volatile TexturePaint hatched;
static {
createHatchTexture();
@@ -579,69 +579,68 @@ public class OsmDataLayer extends AbstractModifiableLayer implements Listener, S
if (!n.isTagged()) {
doneNodes.add(n);
}
- WayPoint wpt = new WayPoint(n.getCoor());
- if (!n.isTimestampEmpty()) {
- wpt.put("time", DateUtils.fromDate(n.getTimestamp()));
- wpt.setTime();
- }
- trkseg.add(wpt);
+ trkseg.add(nodeToWayPoint(n));
}
gpxData.tracks.add(new ImmutableGpxTrack(trk, trkAttr));
}
}
- private static void nodesToGpxData(Collection<Node> nodes, GpxData gpxData, HashSet<Node> doneNodes) {
- List<Node> sortedNodes = new ArrayList<>(nodes);
- sortedNodes.removeAll(doneNodes);
- Collections.sort(sortedNodes);
- for (Node n : sortedNodes) {
- if (n.isIncomplete() || n.isDeleted()) {
- continue;
- }
- WayPoint wpt = new WayPoint(n.getCoor());
+ private static WayPoint nodeToWayPoint(Node n) {
+ WayPoint wpt = new WayPoint(n.getCoor());
- // Position info
+ // Position info
- addDoubleIfPresent(wpt, n, GpxConstants.PT_ELE);
+ addDoubleIfPresent(wpt, n, GpxConstants.PT_ELE);
- if (!n.isTimestampEmpty()) {
- wpt.put("time", DateUtils.fromDate(n.getTimestamp()));
- wpt.setTime();
- }
+ if (!n.isTimestampEmpty()) {
+ wpt.put("time", DateUtils.fromDate(n.getTimestamp()));
+ wpt.setTime();
+ }
- addDoubleIfPresent(wpt, n, GpxConstants.PT_MAGVAR);
- addDoubleIfPresent(wpt, n, GpxConstants.PT_GEOIDHEIGHT);
+ addDoubleIfPresent(wpt, n, GpxConstants.PT_MAGVAR);
+ addDoubleIfPresent(wpt, n, GpxConstants.PT_GEOIDHEIGHT);
- // Description info
+ // Description info
- addStringIfPresent(wpt, n, GpxConstants.GPX_NAME);
- addStringIfPresent(wpt, n, GpxConstants.GPX_DESC, "description");
- addStringIfPresent(wpt, n, GpxConstants.GPX_CMT, "comment");
- addStringIfPresent(wpt, n, GpxConstants.GPX_SRC, "source", "source:position");
+ addStringIfPresent(wpt, n, GpxConstants.GPX_NAME);
+ addStringIfPresent(wpt, n, GpxConstants.GPX_DESC, "description");
+ addStringIfPresent(wpt, n, GpxConstants.GPX_CMT, "comment");
+ addStringIfPresent(wpt, n, GpxConstants.GPX_SRC, "source", "source:position");
- Collection<GpxLink> links = new ArrayList<>();
- for (String key : new String[]{"link", "url", "website", "contact:website"}) {
- String value = n.get(key);
- if (value != null) {
- links.add(new GpxLink(value));
- }
+ Collection<GpxLink> links = new ArrayList<>();
+ for (String key : new String[]{"link", "url", "website", "contact:website"}) {
+ String value = n.get(key);
+ if (value != null) {
+ links.add(new GpxLink(value));
}
- wpt.put(GpxConstants.META_LINKS, links);
+ }
+ wpt.put(GpxConstants.META_LINKS, links);
+
+ addStringIfPresent(wpt, n, GpxConstants.PT_SYM, "wpt_symbol");
+ addStringIfPresent(wpt, n, GpxConstants.PT_TYPE);
- addStringIfPresent(wpt, n, GpxConstants.PT_SYM, "wpt_symbol");
- addStringIfPresent(wpt, n, GpxConstants.PT_TYPE);
+ // Accuracy info
+ addStringIfPresent(wpt, n, GpxConstants.PT_FIX, "gps:fix");
+ addIntegerIfPresent(wpt, n, GpxConstants.PT_SAT, "gps:sat");
+ addDoubleIfPresent(wpt, n, GpxConstants.PT_HDOP, "gps:hdop");
+ addDoubleIfPresent(wpt, n, GpxConstants.PT_VDOP, "gps:vdop");
+ addDoubleIfPresent(wpt, n, GpxConstants.PT_PDOP, "gps:pdop");
+ addDoubleIfPresent(wpt, n, GpxConstants.PT_AGEOFDGPSDATA, "gps:ageofdgpsdata");
+ addIntegerIfPresent(wpt, n, GpxConstants.PT_DGPSID, "gps:dgpsid");
- // Accuracy info
- addStringIfPresent(wpt, n, GpxConstants.PT_FIX, "gps:fix");
- addIntegerIfPresent(wpt, n, GpxConstants.PT_SAT, "gps:sat");
- addDoubleIfPresent(wpt, n, GpxConstants.PT_HDOP, "gps:hdop");
- addDoubleIfPresent(wpt, n, GpxConstants.PT_VDOP, "gps:vdop");
- addDoubleIfPresent(wpt, n, GpxConstants.PT_PDOP, "gps:pdop");
- addDoubleIfPresent(wpt, n, GpxConstants.PT_AGEOFDGPSDATA, "gps:ageofdgpsdata");
- addIntegerIfPresent(wpt, n, GpxConstants.PT_DGPSID, "gps:dgpsid");
+ return wpt;
+ }
- gpxData.waypoints.add(wpt);
+ private static void nodesToGpxData(Collection<Node> nodes, GpxData gpxData, HashSet<Node> doneNodes) {
+ List<Node> sortedNodes = new ArrayList<>(nodes);
+ sortedNodes.removeAll(doneNodes);
+ Collections.sort(sortedNodes);
+ for (Node n : sortedNodes) {
+ if (n.isIncomplete() || n.isDeleted()) {
+ continue;
+ }
+ gpxData.waypoints.add(nodeToWayPoint(n));
}
}
diff --git a/src/org/openstreetmap/josm/gui/layer/TMSLayer.java b/src/org/openstreetmap/josm/gui/layer/TMSLayer.java
index b43ca9e..e6d113f 100644
--- a/src/org/openstreetmap/josm/gui/layer/TMSLayer.java
+++ b/src/org/openstreetmap/josm/gui/layer/TMSLayer.java
@@ -934,12 +934,12 @@ public class TMSLayer extends ImageryLayer implements ImageObserver, TileLoaderL
int screen_y_offset = target.y - source.y;
// And how many pixels into the image itself does that
// correlate to?
- int img_x_offset = (int)(screen_x_offset * imageXScaling);
- int img_y_offset = (int)(screen_y_offset * imageYScaling);
+ int img_x_offset = (int)(screen_x_offset * imageXScaling + 0.5);
+ int img_y_offset = (int)(screen_y_offset * imageYScaling + 0.5);
// Now calculate the other corner of the image that we need
// by scaling the 'target' rectangle's dimensions.
- int img_x_end = img_x_offset + (int)(target.getWidth() * imageXScaling);
- int img_y_end = img_y_offset + (int)(target.getHeight() * imageYScaling);
+ int img_x_end = img_x_offset + (int)(target.getWidth() * imageXScaling + 0.5);
+ int img_y_end = img_y_offset + (int)(target.getHeight() * imageYScaling + 0.5);
if (Main.isDebugEnabled()) {
Main.debug("drawing image into target rect: " + target);
diff --git a/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java b/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java
index d34e0dd..d739733 100644
--- a/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java
+++ b/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java
@@ -626,8 +626,8 @@ public class GeoImageLayer extends Layer implements PropertyChangeListener, Jump
}
try {
- double speed = dirGps.getDouble(GpsDirectory.TAG_GPS_SPEED);
- String speedRef = dirGps.getString(GpsDirectory.TAG_GPS_SPEED_REF);
+ double speed = dirGps.getDouble(GpsDirectory.TAG_SPEED);
+ String speedRef = dirGps.getString(GpsDirectory.TAG_SPEED_REF);
if (speedRef != null) {
if (speedRef.equalsIgnoreCase("M")) {
// miles per hour
@@ -644,8 +644,8 @@ public class GeoImageLayer extends Layer implements PropertyChangeListener, Jump
}
try {
- double ele = dirGps.getDouble(GpsDirectory.TAG_GPS_ALTITUDE);
- int d = dirGps.getInt(GpsDirectory.TAG_GPS_ALTITUDE_REF);
+ double ele = dirGps.getDouble(GpsDirectory.TAG_ALTITUDE);
+ int d = dirGps.getInt(GpsDirectory.TAG_ALTITUDE_REF);
if (d == 1) {
ele *= -1;
}
@@ -678,7 +678,7 @@ public class GeoImageLayer extends Layer implements PropertyChangeListener, Jump
// 1) GPS_TIME_STAMP not set -> date/time will be null
// 2) GPS_DATE_STAMP not set -> use EXIF date or set to default
// 3) GPS_TIME_STAMP and GPS_DATE_STAMP are set
- int[] timeStampComps = dirGps.getIntArray(GpsDirectory.TAG_GPS_TIME_STAMP);
+ int[] timeStampComps = dirGps.getIntArray(GpsDirectory.TAG_TIME_STAMP);
if (timeStampComps != null) {
int gpsHour = timeStampComps[0];
int gpsMin = timeStampComps[1];
@@ -687,7 +687,7 @@ public class GeoImageLayer extends Layer implements PropertyChangeListener, Jump
// We have the time. Next step is to check if the GPS date stamp is set.
// dirGps.getString() always succeeds, but the return value might be null.
- String dateStampStr = dirGps.getString(GpsDirectory.TAG_GPS_DATE_STAMP);
+ String dateStampStr = dirGps.getString(GpsDirectory.TAG_DATE_STAMP);
if (dateStampStr != null && dateStampStr.matches("^\\d+:\\d+:\\d+$")) {
String[] dateStampComps = dateStampStr.split(":");
cal.set(Calendar.YEAR, Integer.parseInt(dateStampComps[0]));
@@ -901,7 +901,7 @@ public class GeoImageLayer extends Layer implements PropertyChangeListener, Jump
}
}
- private static List<MapMode> supportedMapModes = null;
+ private static volatile List<MapMode> supportedMapModes = null;
/**
* Registers a map mode for which the functionality of this layer should be available.
diff --git a/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java b/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java
index daed154..f858826 100644
--- a/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java
+++ b/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java
@@ -48,7 +48,7 @@ public final class ImageViewerDialog extends ToggleDialog implements LayerChange
private boolean centerView = false;
// Only one instance of that class is present at one time
- private static ImageViewerDialog dialog;
+ private static volatile ImageViewerDialog dialog;
private boolean collapseButtonClicked = false;
diff --git a/src/org/openstreetmap/josm/gui/layer/markerlayer/AudioMarker.java b/src/org/openstreetmap/josm/gui/layer/markerlayer/AudioMarker.java
index 6c3c08b..85bddb0 100644
--- a/src/org/openstreetmap/josm/gui/layer/markerlayer/AudioMarker.java
+++ b/src/org/openstreetmap/josm/gui/layer/markerlayer/AudioMarker.java
@@ -22,7 +22,7 @@ import org.openstreetmap.josm.tools.template_engine.TemplateEngineDataProvider;
public class AudioMarker extends ButtonMarker {
private URL audioUrl;
- private static AudioMarker recentlyPlayedMarker = null;
+ private static volatile AudioMarker recentlyPlayedMarker = null;
public double syncOffset;
public boolean timeFromAudio = false; // as opposed to from the GPX track
diff --git a/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java b/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java
index ee8ab80..d0ee2c6 100644
--- a/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java
+++ b/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java
@@ -37,7 +37,7 @@ public final class PlayHeadMarker extends Marker {
private Timer timer = null;
private double animationInterval = 0.0; // seconds
- private static PlayHeadMarker playHead = null;
+ private static volatile PlayHeadMarker playHead = null;
private MapMode oldMode = null;
private LatLon oldCoor;
private boolean enabled;
diff --git a/src/org/openstreetmap/josm/gui/mappaint/BoxTextElemStyle.java b/src/org/openstreetmap/josm/gui/mappaint/BoxTextElemStyle.java
index 5ec6bcc..565f880 100644
--- a/src/org/openstreetmap/josm/gui/mappaint/BoxTextElemStyle.java
+++ b/src/org/openstreetmap/josm/gui/mappaint/BoxTextElemStyle.java
@@ -171,7 +171,7 @@ public class BoxTextElemStyle extends ElemStyle {
* FIXME: the cache isn't updated if the user changes the preference during a JOSM
* session. There should be preference listener updating this cache.
*/
- private static Color DEFAULT_TEXT_COLOR = null;
+ private static volatile Color DEFAULT_TEXT_COLOR = null;
private static void initDefaultParameters() {
if (DEFAULT_TEXT_COLOR != null) return;
DEFAULT_TEXT_COLOR = PaintColors.TEXT.get();
diff --git a/src/org/openstreetmap/josm/gui/mappaint/ElemStyles.java b/src/org/openstreetmap/josm/gui/mappaint/ElemStyles.java
index d4c93d6..af28bf4 100644
--- a/src/org/openstreetmap/josm/gui/mappaint/ElemStyles.java
+++ b/src/org/openstreetmap/josm/gui/mappaint/ElemStyles.java
@@ -341,7 +341,7 @@ public class ElemStyles {
sl.add(nodeStyle);
addIfNotNull(sl, BoxTextElemStyle.create(env, nodeStyle.getBoxProvider()));
} else {
- addIfNotNull(sl, BoxTextElemStyle.create(env, NodeElemStyle.SIMPLE_NODE_ELEMSTYLE.getBoxProvider()));
+ addIfNotNull(sl, BoxTextElemStyle.create(env, NodeElemStyle.SIMPLE_NODE_ELEMSTYLE_BOXPROVIDER));
}
} else if (osm instanceof Relation) {
if (((Relation)osm).isMultipolygon()) {
diff --git a/src/org/openstreetmap/josm/gui/mappaint/NodeElemStyle.java b/src/org/openstreetmap/josm/gui/mappaint/NodeElemStyle.java
index 54303ea..6e268c3 100644
--- a/src/org/openstreetmap/josm/gui/mappaint/NodeElemStyle.java
+++ b/src/org/openstreetmap/josm/gui/mappaint/NodeElemStyle.java
@@ -86,11 +86,13 @@ public class NodeElemStyle extends ElemStyle implements StyleKeys {
}
public static final NodeElemStyle SIMPLE_NODE_ELEMSTYLE;
+ public static final BoxProvider SIMPLE_NODE_ELEMSTYLE_BOXPROVIDER;
static {
MultiCascade mc = new MultiCascade();
mc.getOrCreateCascade("default");
SIMPLE_NODE_ELEMSTYLE = create(new Environment(null, mc, "default", null), 4.1f, true);
if (SIMPLE_NODE_ELEMSTYLE == null) throw new AssertionError();
+ SIMPLE_NODE_ELEMSTYLE_BOXPROVIDER = SIMPLE_NODE_ELEMSTYLE.getBoxProvider();
}
public static final StyleList DEFAULT_NODE_STYLELIST = new StyleList(NodeElemStyle.SIMPLE_NODE_ELEMSTYLE);
diff --git a/src/org/openstreetmap/josm/gui/mappaint/StyleSource.java b/src/org/openstreetmap/josm/gui/mappaint/StyleSource.java
index d919601..7e4659e 100644
--- a/src/org/openstreetmap/josm/gui/mappaint/StyleSource.java
+++ b/src/org/openstreetmap/josm/gui/mappaint/StyleSource.java
@@ -134,7 +134,7 @@ public abstract class StyleSource extends SourceEntry {
* @since 8097
* @see #getIconProvider()
*/
- private static ImageProvider getDefaultIconProvider() {
+ private static synchronized ImageProvider getDefaultIconProvider() {
if (defaultIconProvider == null) {
defaultIconProvider = new ImageProvider("dialogs/mappaint", "pencil");
}
diff --git a/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java b/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java
index 6a89dd5..c6f062f 100644
--- a/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java
+++ b/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java
@@ -12,13 +12,13 @@ import java.lang.reflect.Field;
import java.nio.charset.StandardCharsets;
import java.text.MessageFormat;
import java.util.ArrayList;
-import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
+import java.util.PriorityQueue;
import java.util.Set;
import java.util.concurrent.locks.ReadWriteLock;
import java.util.concurrent.locks.ReentrantReadWriteLock;
@@ -82,7 +82,7 @@ public class MapCSSStyleSource extends StyleSource {
* For efficiency reasons, these methods are synchronized higher up the
* stack trace.
*/
- public final static ReadWriteLock STYLE_SOURCE_LOCK = new ReentrantReadWriteLock();
+ public static final ReadWriteLock STYLE_SOURCE_LOCK = new ReentrantReadWriteLock();
/**
* Set of all supported MapCSS keys.
@@ -136,7 +136,7 @@ public class MapCSSStyleSource extends StyleSource {
/* tag based index */
public final Map<String,Map<String,Set<MapCSSRule>>> index = new HashMap<>();
/* rules without SimpleKeyValueCondition */
- public final Set<MapCSSRule> remaining = new HashSet<>();
+ public final ArrayList<MapCSSRule> remaining = new ArrayList<>();
public void add(MapCSSRule rule) {
rules.add(rule);
@@ -177,6 +177,7 @@ public class MapCSSStyleSource extends StyleSource {
}
rulesWithMatchingKeyValue.add(r);
}
+ Collections.sort(remaining);
}
/**
@@ -187,8 +188,8 @@ public class MapCSSStyleSource extends StyleSource {
*
* You must have a read lock of STYLE_SOURCE_LOCK when calling this method.
*/
- public Collection<MapCSSRule> getRuleCandidates(OsmPrimitive osm) {
- List<MapCSSRule> ruleCandidates = new ArrayList<>(remaining);
+ public PriorityQueue<MapCSSRule> getRuleCandidates(OsmPrimitive osm) {
+ PriorityQueue<MapCSSRule> ruleCandidates = new PriorityQueue<>(remaining);
for (Map.Entry<String,String> e : osm.getKeys().entrySet()) {
Map<String,Set<MapCSSRule>> v = index.get(e.getKey());
if (v != null) {
@@ -198,7 +199,6 @@ public class MapCSSStyleSource extends StyleSource {
}
}
}
- Collections.sort(ruleCandidates);
return ruleCandidates;
}
@@ -488,7 +488,9 @@ public class MapCSSStyleSource extends StyleSource {
// last used index
int lastDeclUsed = -1;
- for (MapCSSRule r : matchingRuleIndex.getRuleCandidates(osm)) {
+ PriorityQueue<MapCSSRule> candidates = matchingRuleIndex.getRuleCandidates(osm);
+ MapCSSRule r;
+ while ((r = candidates.poll()) != null) {
env.clearSelectorMatchingInformation();
env.layer = null;
String sub = env.layer = r.selector.getSubpart().getId(env);
diff --git a/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java b/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java
index 594438d..9ea7f74 100644
--- a/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java
+++ b/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java
@@ -20,7 +20,7 @@ public class OAuthAccessTokenHolder {
* Replies the unique instance.
* @return The unique instance of {@code OAuthAccessTokenHolder}
*/
- public static OAuthAccessTokenHolder getInstance() {
+ public static synchronized OAuthAccessTokenHolder getInstance() {
if (instance == null) {
instance = new OAuthAccessTokenHolder();
}
diff --git a/src/org/openstreetmap/josm/gui/tagging/PresetLabel.java b/src/org/openstreetmap/josm/gui/tagging/PresetLabel.java
index 60b980a..db43bca 100644
--- a/src/org/openstreetmap/josm/gui/tagging/PresetLabel.java
+++ b/src/org/openstreetmap/josm/gui/tagging/PresetLabel.java
@@ -1,7 +1,6 @@
// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.gui.tagging;
-import javax.swing.JLabel;
import java.awt.Cursor;
import java.awt.Font;
import java.awt.event.MouseEvent;
@@ -9,10 +8,16 @@ import java.awt.event.MouseListener;
import java.awt.font.TextAttribute;
import java.util.Collections;
+import javax.swing.JLabel;
+
public class PresetLabel extends JLabel {
protected final TaggingPreset t;
+ /**
+ * Constructs a new {@code PresetLabel}.
+ * @param t the tagging preset
+ */
public PresetLabel(TaggingPreset t) {
super(t.getName() + " …");
setIcon(t.getIcon());
@@ -25,31 +30,44 @@ public class PresetLabel extends JLabel {
* the corresponding preset when clicked
*/
public static class PresetLabelMouseListener implements MouseListener {
- final protected JLabel label;
- final protected Font hover;
- final protected Font normal;
+ protected final JLabel label;
+ protected final Font hover;
+ protected final Font normal;
+ /**
+ * Constructs a new {@code PresetLabelMouseListener}.
+ * @param lbl Label to highlight
+ */
public PresetLabelMouseListener(JLabel lbl) {
label = lbl;
lbl.setCursor(new Cursor(Cursor.HAND_CURSOR));
normal = label.getFont();
hover = normal.deriveFont(Collections.singletonMap(TextAttribute.UNDERLINE, TextAttribute.UNDERLINE_LOW_DOTTED));
}
+
@Override
- public void mouseClicked(MouseEvent arg0) {
+ public void mouseClicked(MouseEvent e) {
+ // Do nothing
}
@Override
- public void mouseEntered(MouseEvent arg0) {
+ public void mouseEntered(MouseEvent e) {
label.setFont(hover);
}
+
@Override
- public void mouseExited(MouseEvent arg0) {
+ public void mouseExited(MouseEvent e) {
label.setFont(normal);
}
+
@Override
- public void mousePressed(MouseEvent arg0) {}
+ public void mousePressed(MouseEvent e) {
+ // Do nothing
+ }
+
@Override
- public void mouseReleased(MouseEvent arg0) {}
+ public void mouseReleased(MouseEvent e) {
+ // Do nothing
+ }
}
}
diff --git a/src/org/openstreetmap/josm/gui/tagging/TaggingPresetNameTemplateList.java b/src/org/openstreetmap/josm/gui/tagging/TaggingPresetNameTemplateList.java
index d3565d3..d6ecc02 100644
--- a/src/org/openstreetmap/josm/gui/tagging/TaggingPresetNameTemplateList.java
+++ b/src/org/openstreetmap/josm/gui/tagging/TaggingPresetNameTemplateList.java
@@ -20,7 +20,7 @@ public final class TaggingPresetNameTemplateList implements TaggingPresetListene
* Replies the unique instance.
* @return the unique instance
*/
- public static TaggingPresetNameTemplateList getInstance() {
+ public static synchronized TaggingPresetNameTemplateList getInstance() {
if (instance == null) {
instance = new TaggingPresetNameTemplateList();
TaggingPresets.addListener(instance);
diff --git a/src/org/openstreetmap/josm/gui/tagging/TaggingPresetReader.java b/src/org/openstreetmap/josm/gui/tagging/TaggingPresetReader.java
index 01bccca..cfff094 100644
--- a/src/org/openstreetmap/josm/gui/tagging/TaggingPresetReader.java
+++ b/src/org/openstreetmap/josm/gui/tagging/TaggingPresetReader.java
@@ -45,7 +45,7 @@ public final class TaggingPresetReader {
// Hide default constructor for utils classes
}
- private static File zipIcons = null;
+ private static volatile File zipIcons = null;
/**
* Returns the set of preset source URLs.
diff --git a/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java b/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java
index ab9e342..ddfc445 100644
--- a/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java
+++ b/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java
@@ -24,7 +24,7 @@ public final class TaggingPresetSearchDialog extends ExtendedDialog {
* Returns the unique instance of {@code TaggingPresetSearchDialog}.
* @return the unique instance of {@code TaggingPresetSearchDialog}.
*/
- public static TaggingPresetSearchDialog getInstance() {
+ public static synchronized TaggingPresetSearchDialog getInstance() {
if (instance == null) {
instance = new TaggingPresetSearchDialog();
}
diff --git a/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchPrimitiveDialog.java b/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchPrimitiveDialog.java
index 97ddbd2..41958f7 100644
--- a/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchPrimitiveDialog.java
+++ b/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchPrimitiveDialog.java
@@ -1,18 +1,18 @@
package org.openstreetmap.josm.gui.tagging;
-import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.actions.JosmAction;
-import org.openstreetmap.josm.data.osm.OsmPrimitive;
-import org.openstreetmap.josm.gui.ExtendedDialog;
-import org.openstreetmap.josm.tools.Shortcut;
-import org.openstreetmap.josm.tools.Utils;
+import static org.openstreetmap.josm.tools.I18n.tr;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.KeyEvent;
import java.util.HashSet;
-import static org.openstreetmap.josm.tools.I18n.tr;
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.actions.JosmAction;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.gui.ExtendedDialog;
+import org.openstreetmap.josm.tools.Shortcut;
+import org.openstreetmap.josm.tools.Utils;
/**
* A dialog that allows to select a preset and then selects all matching OSM objects.
@@ -28,7 +28,7 @@ public final class TaggingPresetSearchPrimitiveDialog extends ExtendedDialog {
* Returns the unique instance of {@code TaggingPresetSearchPrimitiveDialog}.
* @return the unique instance of {@code TaggingPresetSearchPrimitiveDialog}.
*/
- public static TaggingPresetSearchPrimitiveDialog getInstance() {
+ public static synchronized TaggingPresetSearchPrimitiveDialog getInstance() {
if (instance == null) {
instance = new TaggingPresetSearchPrimitiveDialog();
}
diff --git a/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionItemPriority.java b/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionItemPriority.java
index f70ec50..1a47c16 100644
--- a/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionItemPriority.java
+++ b/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionItemPriority.java
@@ -36,17 +36,17 @@ 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 static final int NO_USER_INPUT = Integer.MAX_VALUE;
private final int userInput;
private final boolean inDataSet;
private final boolean inStandard;
private final 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
@@ -80,7 +80,7 @@ public class AutoCompletionItemPriority implements Comparable<AutoCompletionItem
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.
@@ -114,8 +114,9 @@ public class AutoCompletionItemPriority implements Comparable<AutoCompletionItem
Math.min(userInput, other.userInput));
}
- @Override public String toString() {
- return String.format("<Priority; userInput: %s, inDataSet: %b, inStandard: %b, selected: %b>",
+ @Override
+ public String toString() {
+ 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/util/FileFilterAllFiles.java b/src/org/openstreetmap/josm/gui/util/FileFilterAllFiles.java
index 76538d0..b083d9d 100644
--- a/src/org/openstreetmap/josm/gui/util/FileFilterAllFiles.java
+++ b/src/org/openstreetmap/josm/gui/util/FileFilterAllFiles.java
@@ -9,12 +9,17 @@ import javax.swing.filechooser.FileFilter;
/**
* A FileFilter that accepts all files.
+ * @since 5572
*/
public class FileFilterAllFiles extends FileFilter {
private static FileFilterAllFiles INSTANCE;
- public static FileFilterAllFiles getInstance() {
+ /**
+ * Replies the unique instance.
+ * @return the unique instance
+ */
+ public static synchronized FileFilterAllFiles getInstance() {
if (INSTANCE == null) {
INSTANCE = new FileFilterAllFiles();
}
diff --git a/src/org/openstreetmap/josm/gui/util/StayOpenCheckBoxMenuItem.java b/src/org/openstreetmap/josm/gui/util/StayOpenCheckBoxMenuItem.java
index 80ec310..3dc8f95 100644
--- a/src/org/openstreetmap/josm/gui/util/StayOpenCheckBoxMenuItem.java
+++ b/src/org/openstreetmap/josm/gui/util/StayOpenCheckBoxMenuItem.java
@@ -17,7 +17,7 @@ import javax.swing.event.ChangeListener;
*/
public class StayOpenCheckBoxMenuItem extends JCheckBoxMenuItem {
- private static MenuElement[] path;
+ private static volatile MenuElement[] path;
{
getModel().addChangeListener(new ChangeListener() {
diff --git a/src/org/openstreetmap/josm/gui/util/StayOpenMenuItem.java b/src/org/openstreetmap/josm/gui/util/StayOpenMenuItem.java
index 21c4955..efc732c 100644
--- a/src/org/openstreetmap/josm/gui/util/StayOpenMenuItem.java
+++ b/src/org/openstreetmap/josm/gui/util/StayOpenMenuItem.java
@@ -16,7 +16,7 @@ import javax.swing.event.ChangeListener;
*/
public class StayOpenMenuItem extends JMenuItem {
- private static MenuElement[] path;
+ private static volatile MenuElement[] path;
{
getModel().addChangeListener(new ChangeListener() {
diff --git a/src/org/openstreetmap/josm/gui/util/StayOpenRadioButtonMenuItem.java b/src/org/openstreetmap/josm/gui/util/StayOpenRadioButtonMenuItem.java
index 4acd404..a42fa5b 100644
--- a/src/org/openstreetmap/josm/gui/util/StayOpenRadioButtonMenuItem.java
+++ b/src/org/openstreetmap/josm/gui/util/StayOpenRadioButtonMenuItem.java
@@ -16,7 +16,7 @@ import javax.swing.event.ChangeListener;
*/
public class StayOpenRadioButtonMenuItem extends JRadioButtonMenuItem {
- private static MenuElement[] path;
+ private static volatile MenuElement[] path;
{
getModel().addChangeListener(new ChangeListener() {
diff --git a/src/org/openstreetmap/josm/gui/widgets/AbstractFileChooser.java b/src/org/openstreetmap/josm/gui/widgets/AbstractFileChooser.java
index 28dd507..cfa3133 100644
--- a/src/org/openstreetmap/josm/gui/widgets/AbstractFileChooser.java
+++ b/src/org/openstreetmap/josm/gui/widgets/AbstractFileChooser.java
@@ -15,7 +15,7 @@ import javax.swing.filechooser.FileFilter;
public abstract class AbstractFileChooser {
/** The locale for both implementations */
- protected static Locale locale;
+ protected static volatile Locale locale;
/**
* Sets the default locale for all implementations.
diff --git a/src/org/openstreetmap/josm/io/AbstractParser.java b/src/org/openstreetmap/josm/io/AbstractParser.java
index f53b797..079cf06 100644
--- a/src/org/openstreetmap/josm/io/AbstractParser.java
+++ b/src/org/openstreetmap/josm/io/AbstractParser.java
@@ -41,7 +41,7 @@ public abstract class AbstractParser extends DefaultHandler {
if (v == null) {
throwException(tr("Missing mandatory attribute ''{0}''.", name));
}
- Long l = 0L;
+ long l = 0L;
try {
l = Long.parseLong(v);
} catch(NumberFormatException e) {
diff --git a/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java b/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java
index e452425..89631cc 100644
--- a/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java
+++ b/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java
@@ -207,7 +207,7 @@ public class BoundingBoxDownloader extends OsmServerReader {
private Integer checkDaysClosed(Integer days) {
if (days == null) {
- days = Main.pref.getInteger("osm.notes.daysClosed", 1);
+ days = Main.pref.getInteger("osm.notes.daysClosed", 7);
}
if (days < -1) {
Main.error("Requested days closed must be greater than -1");
diff --git a/src/org/openstreetmap/josm/io/MessageNotifier.java b/src/org/openstreetmap/josm/io/MessageNotifier.java
index 4eaaf2e..860797c 100644
--- a/src/org/openstreetmap/josm/io/MessageNotifier.java
+++ b/src/org/openstreetmap/josm/io/MessageNotifier.java
@@ -49,7 +49,7 @@ public final class MessageNotifier {
private static final Runnable WORKER = new Worker();
- private static ScheduledFuture<?> task = null;
+ private static volatile ScheduledFuture<?> task = null;
private static class Worker implements Runnable {
diff --git a/src/org/openstreetmap/josm/io/OsmReader.java b/src/org/openstreetmap/josm/io/OsmReader.java
index 98204fe..9cc22f1 100644
--- a/src/org/openstreetmap/josm/io/OsmReader.java
+++ b/src/org/openstreetmap/josm/io/OsmReader.java
@@ -54,7 +54,7 @@ public class OsmReader extends AbstractReader {
protected boolean cancel;
/** Used by plugins to register themselves as data postprocessors. */
- private static List<OsmServerReadPostprocessor> postprocessors;
+ private static volatile List<OsmServerReadPostprocessor> postprocessors;
/** register a new postprocessor */
public static void registerPostprocessor(OsmServerReadPostprocessor pp) {
diff --git a/src/org/openstreetmap/josm/io/OsmServerWriter.java b/src/org/openstreetmap/josm/io/OsmServerWriter.java
index 14a9d53..c649c54 100644
--- a/src/org/openstreetmap/josm/io/OsmServerWriter.java
+++ b/src/org/openstreetmap/josm/io/OsmServerWriter.java
@@ -36,7 +36,7 @@ public class OsmServerWriter {
*/
private Collection<OsmPrimitive> processed;
- private static List<OsmServerWritePostprocessor> postprocessors;
+ private static volatile List<OsmServerWritePostprocessor> postprocessors;
public static void registerPostprocessor(OsmServerWritePostprocessor pp) {
if (postprocessors == null) {
postprocessors = new ArrayList<>();
diff --git a/src/org/openstreetmap/josm/io/OsmWriterFactory.java b/src/org/openstreetmap/josm/io/OsmWriterFactory.java
index d6272a7..164b1cc 100644
--- a/src/org/openstreetmap/josm/io/OsmWriterFactory.java
+++ b/src/org/openstreetmap/josm/io/OsmWriterFactory.java
@@ -16,7 +16,7 @@ import java.io.PrintWriter;
*/
public class OsmWriterFactory {
- public static OsmWriterFactory theFactory;
+ public static volatile OsmWriterFactory theFactory;
public static OsmWriter createOsmWriter(PrintWriter out, boolean osmConform, String version) {
// pre-set factory with this default implementation; can still be overwritten
// later. note that the default factory may already be used for constructing
diff --git a/src/org/openstreetmap/josm/io/auth/CredentialsManager.java b/src/org/openstreetmap/josm/io/auth/CredentialsManager.java
index f263edf..927c670 100644
--- a/src/org/openstreetmap/josm/io/auth/CredentialsManager.java
+++ b/src/org/openstreetmap/josm/io/auth/CredentialsManager.java
@@ -19,7 +19,7 @@ import org.openstreetmap.josm.tools.CheckParameterUtil;
*/
public class CredentialsManager implements CredentialsAgent {
- private static CredentialsManager instance;
+ private static volatile CredentialsManager instance;
/**
* Replies the single credential agent used in JOSM
diff --git a/src/org/openstreetmap/josm/io/auth/DefaultAuthenticator.java b/src/org/openstreetmap/josm/io/auth/DefaultAuthenticator.java
index 0fa715b..9e87b7c 100644
--- a/src/org/openstreetmap/josm/io/auth/DefaultAuthenticator.java
+++ b/src/org/openstreetmap/josm/io/auth/DefaultAuthenticator.java
@@ -15,7 +15,7 @@ import org.openstreetmap.josm.io.OsmApi;
* @since 2641
*/
public final class DefaultAuthenticator extends Authenticator {
- private static DefaultAuthenticator instance;
+ private static volatile DefaultAuthenticator instance;
/**
* Returns the unique instance
diff --git a/src/org/openstreetmap/josm/io/remotecontrol/RemoteControlHttpServer.java b/src/org/openstreetmap/josm/io/remotecontrol/RemoteControlHttpServer.java
index 34b5a8b..64c7ed8 100644
--- a/src/org/openstreetmap/josm/io/remotecontrol/RemoteControlHttpServer.java
+++ b/src/org/openstreetmap/josm/io/remotecontrol/RemoteControlHttpServer.java
@@ -22,7 +22,7 @@ public class RemoteControlHttpServer extends Thread {
/** The server socket */
private ServerSocket server;
- private static RemoteControlHttpServer instance;
+ private static volatile RemoteControlHttpServer instance;
/**
* Starts or restarts the HTTP server
diff --git a/src/org/openstreetmap/josm/io/remotecontrol/RemoteControlHttpsServer.java b/src/org/openstreetmap/josm/io/remotecontrol/RemoteControlHttpsServer.java
index 0c642e6..67b300d 100644
--- a/src/org/openstreetmap/josm/io/remotecontrol/RemoteControlHttpsServer.java
+++ b/src/org/openstreetmap/josm/io/remotecontrol/RemoteControlHttpsServer.java
@@ -74,7 +74,7 @@ public class RemoteControlHttpsServer extends Thread {
/** The server socket */
private ServerSocket server;
- private static RemoteControlHttpsServer instance;
+ private static volatile RemoteControlHttpsServer instance;
private boolean initOK = false;
private SSLContext sslContext;
diff --git a/src/org/openstreetmap/josm/plugins/PluginHandler.java b/src/org/openstreetmap/josm/plugins/PluginHandler.java
index 7702a3c..7228424 100644
--- a/src/org/openstreetmap/josm/plugins/PluginHandler.java
+++ b/src/org/openstreetmap/josm/plugins/PluginHandler.java
@@ -565,7 +565,7 @@ public final class PluginHandler {
*
* @return the class loader
*/
- public static DynamicURLClassLoader getPluginClassLoader() {
+ public static synchronized DynamicURLClassLoader getPluginClassLoader() {
if (pluginClassLoader == null) {
pluginClassLoader = AccessController.doPrivileged(new PrivilegedAction<DynamicURLClassLoader>() {
public DynamicURLClassLoader run() {
diff --git a/src/org/openstreetmap/josm/tools/AudioPlayer.java b/src/org/openstreetmap/josm/tools/AudioPlayer.java
index 2782938..fd73618 100644
--- a/src/org/openstreetmap/josm/tools/AudioPlayer.java
+++ b/src/org/openstreetmap/josm/tools/AudioPlayer.java
@@ -25,7 +25,7 @@ import org.openstreetmap.josm.Main;
*/
public final class AudioPlayer extends Thread {
- private static AudioPlayer audioPlayer = null;
+ private static volatile AudioPlayer audioPlayer = null;
private enum State { INITIALIZING, NOTPLAYING, PLAYING, PAUSED, INTERRUPTED }
private State state;
diff --git a/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java b/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java
index 198df45..575ac8f 100644
--- a/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java
+++ b/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java
@@ -41,7 +41,7 @@ import org.openstreetmap.josm.plugins.PluginHandler;
public final class BugReportExceptionHandler implements Thread.UncaughtExceptionHandler {
private static boolean handlingInProgress = false;
- private static BugReporterThread bugReporterThread = null;
+ private static volatile BugReporterThread bugReporterThread = null;
private static int exceptionCounter = 0;
private static boolean suppressExceptionDialogs = false;
diff --git a/src/org/openstreetmap/josm/tools/ExifReader.java b/src/org/openstreetmap/josm/tools/ExifReader.java
index 8ddc6d3..1f41a21 100644
--- a/src/org/openstreetmap/josm/tools/ExifReader.java
+++ b/src/org/openstreetmap/josm/tools/ExifReader.java
@@ -1,6 +1,7 @@
// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.tools;
+import java.awt.geom.AffineTransform;
import java.io.File;
import java.io.IOException;
import java.text.ParseException;
@@ -20,7 +21,6 @@ import com.drew.metadata.Tag;
import com.drew.metadata.exif.ExifIFD0Directory;
import com.drew.metadata.exif.ExifSubIFDDirectory;
import com.drew.metadata.exif.GpsDirectory;
-import java.awt.geom.AffineTransform;
/**
* Read out EXIF information from a JPEG file
@@ -124,8 +124,8 @@ public final class ExifReader {
*/
public static LatLon readLatLon(GpsDirectory dirGps) throws MetadataException {
if (dirGps != null) {
- double lat = readAxis(dirGps, GpsDirectory.TAG_GPS_LATITUDE, GpsDirectory.TAG_GPS_LATITUDE_REF, 'S');
- double lon = readAxis(dirGps, GpsDirectory.TAG_GPS_LONGITUDE, GpsDirectory.TAG_GPS_LONGITUDE_REF, 'W');
+ double lat = readAxis(dirGps, GpsDirectory.TAG_LATITUDE, GpsDirectory.TAG_LATITUDE_REF, 'S');
+ double lon = readAxis(dirGps, GpsDirectory.TAG_LONGITUDE, GpsDirectory.TAG_LONGITUDE_REF, 'W');
return new LatLon(lat, lon);
}
return null;
@@ -158,7 +158,7 @@ public final class ExifReader {
*/
public static Double readDirection(GpsDirectory dirGps) {
if (dirGps != null) {
- Rational direction = dirGps.getRational(GpsDirectory.TAG_GPS_IMG_DIRECTION);
+ Rational direction = dirGps.getRational(GpsDirectory.TAG_IMG_DIRECTION);
if (direction != null) {
return direction.doubleValue();
}
diff --git a/src/org/openstreetmap/josm/tools/Geometry.java b/src/org/openstreetmap/josm/tools/Geometry.java
index d374e19..349fb67 100644
--- a/src/org/openstreetmap/josm/tools/Geometry.java
+++ b/src/org/openstreetmap/josm/tools/Geometry.java
@@ -762,10 +762,10 @@ public final class Geometry {
EastNorth n1 = nodes.get((i+1) % nodes.size()).getEastNorth();
if (n0 != null && n1 != null && n0.isValid() && n1.isValid()) {
- BigDecimal x0 = new BigDecimal(n0.east());
- BigDecimal y0 = new BigDecimal(n0.north());
- BigDecimal x1 = new BigDecimal(n1.east());
- BigDecimal y1 = new BigDecimal(n1.north());
+ BigDecimal x0 = BigDecimal.valueOf(n0.east());
+ BigDecimal y0 = BigDecimal.valueOf(n0.north());
+ BigDecimal x1 = BigDecimal.valueOf(n1.east());
+ BigDecimal y1 = BigDecimal.valueOf(n1.north());
BigDecimal k = x0.multiply(y1, MathContext.DECIMAL128).subtract(y0.multiply(x1, MathContext.DECIMAL128));
diff --git a/src/org/openstreetmap/josm/tools/I18n.java b/src/org/openstreetmap/josm/tools/I18n.java
index 3a7f89b..45389d7 100644
--- a/src/org/openstreetmap/josm/tools/I18n.java
+++ b/src/org/openstreetmap/josm/tools/I18n.java
@@ -75,8 +75,8 @@ public final class I18n {
MODE_SL,*/
}
- private static PluralMode pluralMode = PluralMode.MODE_NOTONE; /* english default */
- private static String loadedCode = "en";
+ private static volatile PluralMode pluralMode = PluralMode.MODE_NOTONE; /* english default */
+ private static volatile String loadedCode = "en";
/* Localization keys for file chooser (and color chooser). */
private static final String[] javaInternalMessageKeys = new String[] {
@@ -163,8 +163,8 @@ public final class I18n {
"OptionPane.noButtonText",
"OptionPane.cancelButtonText"
};
- private static Map<String, String> strings = null;
- private static Map<String, String[]> pstrings = null;
+ private static volatile Map<String, String> strings = null;
+ private static volatile Map<String, String[]> pstrings = null;
private static Map<String, PluralMode> languages = new HashMap<>();
/**
diff --git a/src/org/openstreetmap/josm/tools/ImageProvider.java b/src/org/openstreetmap/josm/tools/ImageProvider.java
index b6c6f16..e311122 100644
--- a/src/org/openstreetmap/josm/tools/ImageProvider.java
+++ b/src/org/openstreetmap/josm/tools/ImageProvider.java
@@ -56,8 +56,8 @@ import javax.imageio.metadata.IIOMetadata;
import javax.imageio.stream.ImageInputStream;
import javax.swing.Icon;
import javax.swing.ImageIcon;
+import javax.xml.bind.DatatypeConverter;
-import org.apache.commons.codec.binary.Base64;
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
import org.openstreetmap.josm.io.CachedFile;
@@ -823,7 +823,7 @@ public class ImageProvider {
String data = m.group(3);
byte[] bytes;
if (";base64".equals(base64)) {
- bytes = Base64.decodeBase64(data);
+ bytes = DatatypeConverter.parseBase64Binary(data);
} else {
try {
bytes = URLDecoder.decode(data, "UTF-8").getBytes(StandardCharsets.UTF_8);
@@ -1355,7 +1355,7 @@ public class ImageProvider {
return img;
}
- private static SVGUniverse getSvgUniverse() {
+ private static synchronized SVGUniverse getSvgUniverse() {
if (svgUniverse == null) {
svgUniverse = new SVGUniverse();
}
diff --git a/src/org/openstreetmap/josm/tools/MultikeyActionsHandler.java b/src/org/openstreetmap/josm/tools/MultikeyActionsHandler.java
index 1e9918a..de78ef8 100644
--- a/src/org/openstreetmap/josm/tools/MultikeyActionsHandler.java
+++ b/src/org/openstreetmap/josm/tools/MultikeyActionsHandler.java
@@ -123,7 +123,7 @@ public final class MultikeyActionsHandler {
* Replies the unique instance of this class.
* @return The unique instance of this class
*/
- public static MultikeyActionsHandler getInstance() {
+ public static synchronized MultikeyActionsHandler getInstance() {
if (instance == null) {
instance = new MultikeyActionsHandler();
}
diff --git a/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java b/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java
index 33e13b5..f09d9f5 100644
--- a/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java
+++ b/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java
@@ -485,9 +485,9 @@ public class PlatformHookUnixoid implements PlatformHook {
Main.warn("extended font config - unable to find font config template file "+templateFile.toString());
return;
}
- try {
+ try (FileInputStream fis = new FileInputStream(templateFile.toFile())) {
Properties props = new Properties();
- props.load(new FileInputStream(templateFile.toFile()));
+ props.load(fis);
byte[] content = Files.readAllBytes(templateFile);
File cachePath = Main.pref.getCacheDirectory();
Path fontconfigFile = cachePath.toPath().resolve("fontconfig.properties");
diff --git a/src/org/openstreetmap/josm/tools/RightAndLefthandTraffic.java b/src/org/openstreetmap/josm/tools/RightAndLefthandTraffic.java
index 3aed1fd..09ab488 100644
--- a/src/org/openstreetmap/josm/tools/RightAndLefthandTraffic.java
+++ b/src/org/openstreetmap/josm/tools/RightAndLefthandTraffic.java
@@ -6,6 +6,7 @@ import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.Collection;
+
import org.openstreetmap.josm.data.coor.LatLon;
import org.openstreetmap.josm.data.osm.BBox;
import org.openstreetmap.josm.data.osm.DataSet;
@@ -46,8 +47,8 @@ public class RightAndLefthandTraffic {
}
}
- private static Collection<Area> leftHandTrafficPolygons;
- private static GeoPropertyIndex<Boolean> rlCache;
+ private static volatile Collection<Area> leftHandTrafficPolygons;
+ private static volatile GeoPropertyIndex<Boolean> rlCache;
/**
* Check if there is right-hand traffic at a certain location.
diff --git a/src/org/openstreetmap/josm/tools/date/DateUtils.java b/src/org/openstreetmap/josm/tools/date/DateUtils.java
index 42d6610..6ac540e 100644
--- a/src/org/openstreetmap/josm/tools/date/DateUtils.java
+++ b/src/org/openstreetmap/josm/tools/date/DateUtils.java
@@ -141,7 +141,7 @@ public final class DateUtils {
}
private static int parsePart(String str, int off, int len) {
- return Integer.valueOf(str.substring(off, off+len));
+ return Integer.parseInt(str.substring(off, off+len));
}
/**
diff --git a/styles/standard/elemstyles.mapcss b/styles/standard/elemstyles.mapcss
index 28ede92..f093906 100644
--- a/styles/standard/elemstyles.mapcss
+++ b/styles/standard/elemstyles.mapcss
@@ -108,7 +108,7 @@ node[restriction] {
/* bridge, tunnel */
/******************/
-way[bridge?]::core_bridge,
+way[bridge=yes]::core_bridge,
way[bridge=viaduct]::core_bridge,
way[bridge=swing]::core_bridge,
way[bridge=movable]::core_bridge,
@@ -123,7 +123,7 @@ way[bridge=aqueduct]::core_bridge {
color: bridge#0000FF;
opacity: 0.9;
}
-way[tunnel?]::core_tunnel,
+way[tunnel=yes]::core_tunnel,
way[tunnel=culvert]::core_tunnel,
way[tunnel=building_passage]::core_tunnel,
way[tunnel=avalanche_protector]::core_tunnel {
@@ -231,7 +231,7 @@ node[traffic_sign][boat?!] {
icon-image: "misc/no_icon.png";
set icon_z17;
}
-node[noexit?] {
+node[noexit=yes] {
icon-image: "vehicle/restriction/dead_end.png";
set icon_z17;
}
@@ -290,6 +290,9 @@ way["addr:interpolation"=alphabetic] {
area[building][!building?!] {
fill-color: building#cb9999;
}
+area[building:part][!building:part?!] {
+ fill-color: buildingpart#dcbbbb;
+}
node[building][!building?!] {
icon-image: "misc/landmark/building.png";
set icon_z17;
@@ -330,7 +333,8 @@ node[entrance=emergency] {
set icon_z17;
text: auto;
}
-node[building=entrance] {
+node[building=entrance],
+node[building:part] {
icon-image: "misc/deprecated.png";
set icon_z17;
text: auto;
@@ -469,7 +473,7 @@ node[barrier=hampshire_gate] {
/* highway tags */
/****************/
-way[motorroad?]::core_motorroad {
+way[motorroad=yes]::core_motorroad {
major-z-index: 2;
z-index: -1;
width: +4;
@@ -711,6 +715,11 @@ node[highway=speed_camera] {
set icon_z17;
text: auto;
}
+relation[type=enforcement] >[role="device"] node {
+ icon-image: "vehicle/restriction/speed_trap.png";
+ set icon_z17;
+ text: auto;
+}
node[traffic_sign=city_limit] {
icon-image: "vehicle/restriction/citylimit.png";
set icon_z17;
@@ -1078,12 +1087,12 @@ way[piste:difficulty=novice]::core_piste {
width: 6;
color: piste_novice#00ff00;
}
-node[piste:difficulty=easy],
-node[piste:difficulty=intermediate],
-node[piste:difficulty=advanced],
-node[piste:difficulty=expert],
-node[piste:difficulty=freeride],
-node[piste:difficulty=novice] {
+node[piste:type=downhill],
+node[piste:type=nordic],
+node[piste:type=skitour],
+node[piste:type=sled],
+node[piste:type=sleigh],
+node[piste:type=snow_park] {
icon-image: "sport/skiing.png";
set icon_z17;
}
@@ -1435,6 +1444,15 @@ node[man_made=water_works] {
set icon_z17;
text: auto;
}
+way[man_made=cutline] {
+ width: 2;
+ color: cutline#99ff55;
+}
+node[man_made=cutline] {
+ icon-image: "misc/deprecated.png";
+ set icon_z17;
+ text: auto;
+}
/***************/
/* office tags */
@@ -1462,8 +1480,6 @@ node[office=government] {
area[leisure=sports_centre],
area[leisure=golf_course],
area[leisure=stadium],
-area[leisure=track][!area?!]:closed,
-area[leisure=pitch],
area[leisure=horse_riding],
area[leisure=water_park] {
fill-color: leisure#c7f1a3;
@@ -1483,31 +1499,37 @@ node[leisure=stadium] {
set icon_z17;
text: auto;
}
+node[leisure=horse_riding] {
+ icon-image: "presets/equestrian.png";
+ icon-width: 16;
+ set icon_z17;
+ text: auto;
+}
+node[leisure=water_park] {
+ icon-image: "leisure/water_park.png";
+ set icon_z17;
+ text: auto;
+}
+area[leisure=track][!area?!]:closed {
+ fill-color: leisuretrack#d4f4b9;
+}
way[leisure=track] {
width: 2;
- color: leisure#c7f1a3;
+ color: leisuretrack#d4f4b9;
}
node[leisure=track] {
icon-image: "sport/track.png";
set icon_z17;
text: auto;
}
+area[leisure=pitch] {
+ fill-color: pitch#baee8d;
+}
node[leisure=pitch] {
icon-image: "sport/pitch.png";
set icon_z17;
text: auto;
}
-node[leisure=horse_riding] {
- icon-image: "presets/equestrian.png";
- icon-width: 16;
- set icon_z17;
- text: auto;
-}
-node[leisure=water_park] {
- icon-image: "leisure/water_park.png";
- set icon_z17;
- text: auto;
-}
area[leisure=marina] {
fill-color: marina#0070cf;
}
@@ -3724,17 +3746,11 @@ node[sport=swimming] {
set icon_z17;
text: auto;
}
-area[sport=skiing],
area[sport=table_tennis],
area[sport=tennis],
area[sport=paintball] {
fill-color: sport#bde3cb;
}
-node[sport=skiing] {
- icon-image: "sport/skiing.png";
- set icon_z17;
- text: auto;
-}
node[sport=table_tennis] {
icon-image: "sport/table_tennis.png";
set icon_z17;
@@ -3909,6 +3925,10 @@ way[natural=ridge] {
width: 1;
color: natural#002f00;
}
+way[natural=valley] {
+ width: 1;
+ color: natural#002f00;
+}
area[natural=scree] {
fill-color: natural#002f00;
}
@@ -4020,7 +4040,8 @@ node[natural=beach],
node[natural=sand],
node[natural=land],
node[natural=bare_rock],
-node[natural=ridge] {
+node[natural=ridge],
+node[natural=valley] {
icon-image: "misc/deprecated.png";
set icon_z17;
text: auto;
@@ -4038,7 +4059,7 @@ area[waterway=riverbank] {
width: 1;
color: riverbank#0000cf;
}
-way[waterway=canal], way[waterway=wadi] {
+way[waterway=canal] {
width: 2;
color: water#0000ff;
}
@@ -4097,15 +4118,6 @@ node[waterway=weir] {
set icon_z17;
text: auto;
}
-way[waterway=rapids] {
- width: 2;
- color: rapids#8080ff;
-}
-node[waterway=rapids] {
- icon-image: "misc/no_icon.png";
- set icon_z17;
- text: auto;
-}
area[waterway=dam]:closed {
fill-color: manmade#d8d8d8;
}
--
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